Merge pull request microsoft#1821 from iclanton/ianc/fix-loc-vendors-chunk-loading

iclanton · web-flow · commit aba0f11ba54d · 2020-04-08T01:03:29.000-07:00
[Localization Plugin] Fix an issue where the chunk URL generation code would mark some localized chunks as non-localized.
diff --git a/common/changes/@rushstack/localization-plugin/ianc-fix-loc-vendors-chunk-loading_2020-04-08-07-49.json b/common/changes/@rushstack/localization-plugin/ianc-fix-loc-vendors-chunk-loading_2020-04-08-07-49.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@rushstack/localization-plugin",
+      "comment": "Fix an issue where the chunk URL generation code would mark some localized chunks as non-localized.",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@rushstack/localization-plugin",
+  "email": "iclanton@users.noreply.github.com"
+}
diff --git a/webpack/localization-plugin/src/AssetProcessor.ts b/webpack/localization-plugin/src/AssetProcessor.ts
@@ -5,7 +5,6 @@ import * as Webpack from 'webpack';
 import * as lodash from 'lodash';
 
 import { Constants } from './utilities/Constants';
-import { EntityMarker } from './utilities/EntityMarker';
 import { ILocaleElementMap } from './interfaces';
 import { LocalizationPlugin, IStringSerialNumberData as IStringData } from './LocalizationPlugin';
 
@@ -62,6 +61,7 @@ export interface IProcessAssetOptionsBase {
   asset: IAsset;
   chunk: Webpack.compilation.Chunk;
   noStringsLocaleName: string;
+  chunkHasLocalizedModules: (chunk: Webpack.compilation.Chunk) => boolean;
 }
 
 export interface IProcessNonLocalizedAssetOptions extends IProcessAssetOptionsBase { }
@@ -94,7 +94,7 @@ export class AssetProcessor {
     const parsedAsset: IParseResult = AssetProcessor._parseStringToReconstructionSequence(
       options.plugin,
       assetSource,
-      this._getJsonpFunction(options.chunk, options.noStringsLocaleName)
+      this._getJsonpFunction(options.chunk, options.chunkHasLocalizedModules, options.noStringsLocaleName)
     );
     const reconstructedAsset: ILocalizedReconstructionResult = AssetProcessor._reconstructLocalized(
       parsedAsset.reconstructionSeries,
@@ -154,7 +154,7 @@ export class AssetProcessor {
     const parsedAsset: IParseResult = AssetProcessor._parseStringToReconstructionSequence(
       options.plugin,
       assetSource,
-      this._getJsonpFunction(options.chunk, options.noStringsLocaleName)
+      this._getJsonpFunction(options.chunk, options.chunkHasLocalizedModules, options.noStringsLocaleName)
     );
     const reconstructedAsset: INonLocalizedReconstructionResult = AssetProcessor._reconstructNonLocalized(
       parsedAsset.reconstructionSeries,
@@ -417,14 +417,15 @@ export class AssetProcessor {
 
   private static _getJsonpFunction(
     chunk: Webpack.compilation.Chunk,
+    chunkHasLocalizedModules: (chunk: Webpack.compilation.Chunk) => boolean,
     noStringsLocaleName: string
   ): (locale: string, chunkIdToken: string | undefined) => string {
     const idsWithStrings: Set<string> = new Set<string>();
     const idsWithoutStrings: Set<string> = new Set<string>();
 
     const asyncChunks: Set<Webpack.compilation.Chunk> = chunk.getAllAsyncChunks();
     for (const asyncChunk of asyncChunks) {
-      if (EntityMarker.getMark(asyncChunk)) {
+      if (chunkHasLocalizedModules(asyncChunk)) {
         idsWithStrings.add(asyncChunk.id);
       } else {
         idsWithoutStrings.add(asyncChunk.id);
diff --git a/webpack/localization-plugin/src/LocalizationPlugin.ts b/webpack/localization-plugin/src/LocalizationPlugin.ts
@@ -349,6 +349,7 @@ export class LocalizationPlugin implements Webpack.Plugin {
                   assetName: chunkFilename,
                   asset,
                   chunk,
+                  chunkHasLocalizedModules: this._chunkHasLocalizedModules.bind(this),
                   locales: this._locales,
                   noStringsLocaleName: this._noStringsLocaleName,
                   fillMissingTranslationStrings: this._fillMissingTranslationStrings,
@@ -392,7 +393,8 @@ export class LocalizationPlugin implements Webpack.Plugin {
                   assetName: chunkFilename,
                   asset,
                   chunk,
-                  noStringsLocaleName: this._noStringsLocaleName
+                  noStringsLocaleName: this._noStringsLocaleName,
+                  chunkHasLocalizedModules: this._chunkHasLocalizedModules.bind(this)
                 });
 
                 // Delete the existing asset because it's been renamed
