Fix an issue where base chunks without localized data, but with localized async chunks wouldn't correctly reference the async chunks.

iclanton · iclanton · commit 168d7d6d7450 · 2020-02-16T18:01:43.000-08:00
diff --git a/build-tests/localization-plugin-test-01/webpack.config.js b/build-tests/localization-plugin-test-01/webpack.config.js
@@ -69,8 +69,7 @@ module.exports = function(env) {
       }),
       new SetPublicPathPlugin({
         scriptName: {
-          name: '[name]_[locale]_[contenthash].js',
-          isTokenized: true
+          useAssetName: true
         }
       }),
       new HtmlWebpackPlugin()
diff --git a/build-tests/localization-plugin-test-03/src/indexD.ts b/build-tests/localization-plugin-test-03/src/indexD.ts
@@ -0,0 +1,4 @@
+import(/* webpackChunkName: 'chunk-without-strings' */ './chunks/chunkWithoutStrings').then(({ ChunkWithoutStringsClass }) => {
+  const chunk = new ChunkWithoutStringsClass();
+  chunk.doStuff();
+});
diff --git a/build-tests/localization-plugin-test-03/webpack.config.js b/build-tests/localization-plugin-test-03/webpack.config.js
@@ -31,7 +31,8 @@ module.exports = function(env) {
     entry: {
       'localization-test-A': path.join(__dirname, 'src', 'indexA.ts'),
       'localization-test-B': path.join(__dirname, 'src', 'indexB.ts'),
-      'localization-test-C': path.join(__dirname, 'src', 'indexC.ts')
+      'localization-test-C': path.join(__dirname, 'src', 'indexC.ts'),
+      'localization-test-D': path.join(__dirname, 'src', 'indexD.ts')
     },
     output: {
       path: path.join(__dirname, 'dist'),
diff --git a/webpack/localization-plugin/src/LocalizationPlugin.ts b/webpack/localization-plugin/src/LocalizationPlugin.ts
@@ -166,12 +166,6 @@ export class LocalizationPlugin implements Webpack.Plugin {
       return;
     }
 
-    function tryInstallPreprocessor(): void {
-      if (typingsPreprocessor) {
-        compiler.hooks.beforeRun.tap(PLUGIN_NAME, () => typingsPreprocessor!.generateTypings());
-      }
-    }
-
     if (isWebpackDevServer) {
       if (typingsPreprocessor) {
         compiler.hooks.watchRun.tap(PLUGIN_NAME, () => typingsPreprocessor!.runWatcher());
@@ -185,7 +179,9 @@ export class LocalizationPlugin implements Webpack.Plugin {
 
       WebpackConfigurationUpdater.amendWebpackConfigurationForInPlaceLocFiles(webpackConfigurationUpdaterOptions);
     } else {
-      tryInstallPreprocessor();
+      if (typingsPreprocessor) {
+        compiler.hooks.beforeRun.tap(PLUGIN_NAME, () => typingsPreprocessor!.generateTypings());
+      }
 
       WebpackConfigurationUpdater.amendWebpackConfigurationForMultiLocale(webpackConfigurationUpdaterOptions);
 
@@ -235,10 +231,9 @@ export class LocalizationPlugin implements Webpack.Plugin {
                 return;
               }
 
+              // First pass - see if the chunk directly contains any loc modules
               for (const chunk of chunks) {
-                let chunkHasAnyLocModules: boolean = Array.from(chunk.getAllAsyncChunks()).some(
-                  (asyncChunk) => EntityMarker.getMark(asyncChunk)
-                );
+                let chunkHasAnyLocModules: boolean = false;
                 if (!chunkHasAnyLocModules) {
                   for (const module of chunk.getModules()) {
                     if (EntityMarker.getMark(module)) {
@@ -248,10 +243,24 @@ export class LocalizationPlugin implements Webpack.Plugin {
                   }
                 }
 
-                const replacementValue: string = chunkHasAnyLocModules
+                EntityMarker.markEntity(chunk, chunkHasAnyLocModules);
+              }
+
+              // Second pass - see if the chunk loads any localized chunks
+              for (const chunk of chunks) {
+                let localizedChunk: boolean = EntityMarker.getMark(chunk);
+                if (
+                  !localizedChunk &&
+                  Array.from(chunk.getAllAsyncChunks()).some((asyncChunk) => EntityMarker.getMark(asyncChunk))
+                ) {
+                  localizedChunk = true;
+                  EntityMarker.markEntity(chunk, true);
+                }
+
+                const replacementValue: string = localizedChunk
                   ? Constants.LOCALE_NAME_PLACEHOLDER
                   : this._noStringsLocaleName;
-                EntityMarker.markEntity(chunk, chunkHasAnyLocModules);
+                EntityMarker.markEntity(chunk, localizedChunk);
                 if (chunk.hasRuntime()) {
                   chunk.filenameTemplate = (compilation.options.output!.filename as string).replace(
                     Constants.LOCALE_FILENAME_PLACEHOLDER_REGEX,
