Merge branch 'main' into last-modified

.eslintignore

@@ -1,5 +1,4 @@
 helix-importer-ui
-scripts/preact.js
 scripts/htm.js
 scripts/acdl
 tools/picker

README.md

@@ -8,6 +8,14 @@ https://experienceleague.adobe.com/developer/commerce/storefront/
 - Preview: https://main--{repo}--{owner}.aem.page/
 - Live: https://main--{repo}--{owner}.aem.live/
 
+## Documentation
+
+Before using the aem-boilerplate, we recommand you to go through the documentation on https://www.aem.live/docs/ and more specifically:
+1. [Developer Tutorial](https://www.aem.live/developer/tutorial)
+2. [The Anatomy of a Project](https://www.aem.live/developer/anatomy-of-a-project)
+3. [Web Performance](https://www.aem.live/developer/keeping-it-100)
+4. [Markup, Sections, Blocks, and Auto Blocking](https://www.aem.live/developer/markup-sections-blocks)
+
 ## Installation
 
 ```sh
@@ -33,4 +41,4 @@ npm run lint
 
 Major changes are described and documented as part of pull requests and tracked via the `changelog` tag. To keep your project up to date, please follow this list:
 
-https://github.com/hlxsites/aem-boilerplate-commerce/issues?q=label%3Achangelog+is%3Aclosed
+https://github.com/hlxsites/aem-boilerplate-commerce/issues?q=label%3Achangelog+is%3Aclosed

blocks/product-details-custom/Icon.js

@@ -1,7 +1,7 @@
 import {
   h, Component, Fragment,
   // eslint-disable-next-line import/no-unresolved,import/extensions
-} from '../../scripts/preact.js';
+} from '@dropins/tools/preact.js';
 // eslint-disable-next-line import/no-unresolved,import/extensions
 import htm from '../../scripts/htm.js';
 

blocks/product-details-custom/ProductDetailsCarousel.js

@@ -1,6 +1,6 @@
 import {
   h, Component, Fragment,
-} from '../../scripts/preact.js';
+} from '@dropins/tools/preact.js';
 import htm from '../../scripts/htm.js';
 import Icon from './Icon.js';
 

blocks/product-details-custom/ProductDetailsShimmer.js

@@ -1,6 +1,6 @@
 import {
   h, Fragment,
-} from '../../scripts/preact.js';
+} from '@dropins/tools/preact.js';
 import htm from '../../scripts/htm.js';
 import Sidebar from './ProductDetailsSidebar.js';
 import Carousel from './ProductDetailsCarousel.js';

blocks/product-details-custom/ProductDetailsSidebar.js

@@ -1,4 +1,4 @@
-import { Component, Fragment, h } from '../../scripts/preact.js';
+import { Component, Fragment, h } from '@dropins/tools/preact.js';
 import htm from '../../scripts/htm.js';
 import Icon from './Icon.js';
 import { renderPrice } from '../../scripts/commerce.js';

blocks/product-details-custom/product-details-custom.js

@@ -1,7 +1,7 @@
 /* eslint-disable class-methods-use-this */
 import {
   Component, Fragment, h, render,
-} from '../../scripts/preact.js';
+} from '@dropins/tools/preact.js';
 
 import htm from '../../scripts/htm.js';
 import Carousel from './ProductDetailsCarousel.js';

blocks/product-list-page-custom/FacetList.js

@@ -1,7 +1,7 @@
 /* eslint-disable max-classes-per-file */
 import {
   h, Component, createRef,
-} from '../../scripts/preact.js';
+} from '@dropins/tools/preact.js';
 import htm from '../../scripts/htm.js';
 
 const html = htm.bind(h);

blocks/product-list-page-custom/ProductList.js

@@ -1,7 +1,7 @@
 /* eslint-disable object-curly-spacing, class-methods-use-this */
 import {
   h, Component, Fragment,
-} from '../../scripts/preact.js';
+} from '@dropins/tools/preact.js';
 import htm from '../../scripts/htm.js';
 import {
   renderPrice,

blocks/product-list-page-custom/product-list-page-custom.js

@@ -1,6 +1,6 @@
 import {
   h, Component, Fragment, render, createRef,
-} from '../../scripts/preact.js';
+} from '@dropins/tools/preact.js';
 import htm from '../../scripts/htm.js';
 import ProductList from './ProductList.js';
 import FacetList from './FacetList.js';

package.json

@@ -35,6 +35,7 @@
     "@adobe/magento-storefront-event-collector": "^1.8.0",
     "@adobe/magento-storefront-events-sdk": "^1.8.0",
     "@dropins/storefront-pdp": "0.4.0",
-    "@dropins/tools": "^0.33.0"
+    "@dropins/tools": "^0.33.0",
+    "htm": "^3.1.1"
   }
 }

postinstall.js

@@ -24,8 +24,14 @@ fs.readdirSync('node_modules/@dropins', { withFileTypes: true }).forEach((file)
   });
 });
 
-fs.copyFileSync(path.resolve(__dirname, './node_modules/@adobe/magento-storefront-event-collector/dist/index.js'), path.resolve(__dirname, './scripts/commerce-events-collector.js'));
-fs.copyFileSync(path.resolve(__dirname, './node_modules/@adobe/magento-storefront-events-sdk/dist/index.js'), path.resolve(__dirname, './scripts/commerce-events-sdk.js'));
+// Other files to copy
+[
+  { from: '@adobe/magento-storefront-event-collector/dist/index.js', to: 'commerce-events-collector.js' },
+  { from: '@adobe/magento-storefront-events-sdk/dist/index.js', to: 'commerce-events-sdk.js' },
+  { from: 'htm/dist/htm.module.js', to: 'htm.js' },
+].forEach((file) => {
+  fs.copyFileSync(path.resolve(__dirname, 'node_modules', file.from), path.resolve(__dirname, 'scripts', file.to));
+});
 
 function checkPackageLockForArtifactory() {
   return new Promise((resolve, reject) => {

scripts/minicart/Minicart.js

@@ -1,7 +1,7 @@
 /* eslint-disable import/no-cycle, camelcase, max-classes-per-file */
 import {
   h, Component, Fragment, render,
-} from '../preact.js';
+} from '@dropins/tools/preact.js';
 import htm from '../htm.js';
 
 import { store } from './api.js';