@epublishing/grunt-epublishing 1.2.10 → 1.2.11

package/lib/webpack.config.js

@@ -139,26 +139,65 @@ function createWebpackConfig(config, options = {}) {
         compiler.hooks.compilation.tap('ResolveRelativeModuleIds', (compilation) => {
           compilation.hooks.beforeModuleIds.tap('ResolveRelativeModuleIds', (modules) => {
             let fallbackId = 0;
-            
+            const usedIds = new Set();
+
+            // Loader-chain disambiguator. The same .css resource produces two
+            // distinct modules (style-loader+css-loader injector, and css-loader-only
+            // source). Both have identical `module.resource`, so without a suffix
+            // they collide on a single ID and the injector ends up importing
+            // itself — which surfaces as `ReferenceError: can't access lexical
+            // declaration 'A' before initialization` because `n.d(e,{default:()=>A})`
+            // returns the in-progress module's own (still-uninitialized) const.
+            // Bake a stable, readable suffix derived from the loader chain so the
+            // two modules always get different IDs.
+            const loaderSuffix = (m) => {
+              const loaders = m.loaders || [];
+              if (loaders.length === 0) return '';
+              const names = loaders
+                .map((l) => {
+                  const match = l.loader && l.loader.match(/[\\/]([^\\/]+-loader)[\\/]/);
+                  return match ? match[1] : null;
+                })
+                .filter(Boolean);
+              if (names.length === 0) return '';
+              // Style-loader presence is the decisive signal for the CSS pair,
+              // but include the full chain for any other multi-loader case.
+              return '?' + names.join('!');
+            };
+
+            const assignId = (m, baseId) => {
+              const suffix = loaderSuffix(m);
+              let id = baseId + suffix;
+              // Final safety net: if a collision still slipped through, append
+              // a numeric tiebreaker rather than silently sharing an ID.
+              if (usedIds.has(id)) {
+                let n = 2;
+                while (usedIds.has(`${id}#${n}`)) n++;
+                id = `${id}#${n}`;
+              }
+              usedIds.add(id);
+              compilation.chunkGraph.setModuleId(m, id);
+            };
+
             for (const module of modules) {
               if (module.id !== null) continue; // Already has an ID
-              
+
               // Handle external modules
               if (module.constructor.name === 'ExternalModule') {
                 const request = module.request || module.userRequest || `external-${fallbackId++}`;
-                compilation.chunkGraph.setModuleId(module, request);
+                assignId(module, request);
                 continue;
               }
-              
+
               if (!module.resource) {
                 // Assign numeric ID for modules without resources
-                compilation.chunkGraph.setModuleId(module, fallbackId++);
+                assignId(module, String(fallbackId++));
                 continue;
               }
 
               const resource = module.resource;
               let foundRelative = false;
-              
+
               // Try to find a relative path from one of the resolve.modules paths
               for (const searchPath of modulePaths) {
                 const absoluteSearchPath = path.resolve(cwd, searchPath);
@@ -168,17 +207,16 @@ function createWebpackConfig(config, options = {}) {
                     .substring(absoluteSearchPath.length + 1)
                     .replace(/\\/g, '/') // Normalize to forward slashes
                     .replace(/\.(js|jsx|ts|tsx)$/, ''); // Remove extension
-                  
-                  // Set the module ID to the relative path
-                  compilation.chunkGraph.setModuleId(module, relativeId);
+
+                  assignId(module, relativeId);
                   foundRelative = true;
                   break;
                 }
               }
-              
+
               // Fallback: use numeric ID if no relative path found
               if (!foundRelative) {
-                compilation.chunkGraph.setModuleId(module, fallbackId++);
+                assignId(module, String(fallbackId++));
               }
             }
           });
@@ -326,16 +364,6 @@ function createWebpackConfig(config, options = {}) {
       moduleIds: false, // Disable default, we'll set IDs manually
       // Don't split runtime - keep it in entries for UMD compatibility
       runtimeChunk: false,
-      // Disable scope hoisting (ModuleConcatenationPlugin) so each ESM
-      // module keeps its own factory scope. With hoisting on, webpack 5
-      // inlines jade-engine, jadechild and the site entry into one IIFE,
-      // and css-loader 7's `n.d(e, {A: () => a})` getter (where `a` is a
-      // `const` initialized at the end of the css module body) can be read
-      // by a sibling export before its initializer line runs — surfacing as
-      // `ReferenceError: can't access lexical declaration 'A' before
-      // initialization` in main.bundle.js. Per-module factories close that
-      // shared TDZ window for a small (~2 KB) bundle-size cost.
-      concatenateModules: false,
     },
 
     devtool: isProduction ? 'cheap-source-map' : 'source-map',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@epublishing/grunt-epublishing",
   "description": "Modern front-end build tools for ePublishing Jade and client sites.",
-  "version": "1.2.10",
+  "version": "1.2.11",
   "homepage": "https://www.epublishing.com",
   "contributors": [
     {