Fix an issue with split chunks not being marked as localized.

iclanton · iclanton · commit 0186908ab481 · 2020-03-27T18:14:47.000-07:00
diff --git a/webpack/localization-plugin/src/LocalizationPlugin.ts b/webpack/localization-plugin/src/LocalizationPlugin.ts
@@ -239,36 +239,14 @@ 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 = false;
-                if (!chunkHasAnyLocModules) {
-                  for (const module of chunk.getModules()) {
-                    if (EntityMarker.getMark(module)) {
-                      chunkHasAnyLocModules = true;
-                      break;
-                    }
-                  }
-                }
-
-                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);
-                }
+                // See if the chunk contains any localized modules or loads any localized chunks
+                const localizedChunk: boolean = this._chunkHasLocalizedModules(chunk);
 
+                // Change the chunk's name to include either the locale name or the locale name for chunks without strings
                 const replacementValue: string = localizedChunk
                   ? Constants.LOCALE_NAME_PLACEHOLDER
                   : this._noStringsLocaleName;
-                EntityMarker.markEntity(chunk, localizedChunk);
                 if (chunk.hasRuntime()) {
                   chunk.filenameTemplate = (compilation.options.output!.filename as string).replace(
                     Constants.LOCALE_FILENAME_PLACEHOLDER_REGEX,
@@ -314,7 +292,7 @@ export class LocalizationPlugin implements Webpack.Plugin {
               }
             }
 
-            if (EntityMarker.getMark(chunk)) {
+            if (this._chunkHasLocalizedModules(chunk)) {
               processChunkJsFile((chunkFilename) => {
                 if (chunkFilename.indexOf(Constants.LOCALE_NAME_PLACEHOLDER) === -1) {
                   throw new Error(`Asset ${chunkFilename} is expected to be localized, but is missing a locale placeholder`);
@@ -655,4 +633,31 @@ export class LocalizationPlugin implements Webpack.Plugin {
       suffix: suffix
     };
   }
+
+  private _chunkHasLocalizedModules(chunk: Webpack.compilation.Chunk): boolean {
+    if (EntityMarker.getMark(chunk) === undefined) {
+      let chunkHasAnyLocModules: boolean = false;
+      if (!chunkHasAnyLocModules) {
+        for (const module of chunk.getModules()) {
+          if (EntityMarker.getMark(module)) {
+            chunkHasAnyLocModules = true;
+            break;
+          }
+        }
+      }
+
+      if (!chunkHasAnyLocModules) {
+        for (const asyncChunk of chunk.getAllAsyncChunks()) {
+          if (this._chunkHasLocalizedModules(asyncChunk)) {
+            chunkHasAnyLocModules = true;
+            break;
+          }
+        }
+      }
+
+      EntityMarker.markEntity(chunk, chunkHasAnyLocModules);
+    }
+
+    return EntityMarker.getMark(chunk)!;
+  }
 }
diff --git a/webpack/localization-plugin/src/utilities/EntityMarker.ts b/webpack/localization-plugin/src/utilities/EntityMarker.ts
@@ -11,7 +11,7 @@ export class EntityMarker {
     module[LABEL] = value;
   }
 
-  public static getMark<TModule>(module: TModule): boolean {
-    return !!module[LABEL];
+  public static getMark<TModule>(module: TModule): boolean | undefined {
+    return module[LABEL];
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ export class EntityMarker {`
`11`	`11`	`module[LABEL] = value;`
`12`	`12`	`}`
`13`	`13`
`14`		`- public static getMark<TModule>(module: TModule): boolean {`
`15`		`- return !!module[LABEL];`
	`14`	`+ public static getMark<TModule>(module: TModule): boolean \| undefined {`
	`15`	`+ return module[LABEL];`
`16`	`16`	`}`
`17`	`17`	`}`