JavaScriptExpert
diff --git a/‎webpack/localization-plugin/src/LocFilePreprocessor.ts‎
Lines changed: 1 addition & 1 deletion b/‎webpack/localization-plugin/src/LocFilePreprocessor.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎webpack/localization-plugin/src/LocalizationPlugin.ts‎
Lines changed: 2 additions & 4 deletions b/‎webpack/localization-plugin/src/LocalizationPlugin.ts‎
Lines changed: 2 additions & 4 deletions
diff --git a/‎webpack/set-webpack-public-path-plugin/src/SetPublicPathPlugin.ts‎
Lines changed: 18 additions & 17 deletions b/‎webpack/set-webpack-public-path-plugin/src/SetPublicPathPlugin.ts‎
Lines changed: 18 additions & 17 deletions
@@ -110,7 +110,7 @@ export class LocFilePreprocessor {
     let indent: string = '';
     if (this._options.exportAsDefault) {
       outputLines.push(
-        'interface IStrings {'
+        'export interface IStrings {'
       );
 
       indent = '  ';
 
@@ -161,10 +161,8 @@ export class LocalizationPlugin implements Webpack.Plugin {
             }
 
             for (const chunk of chunkGroup.chunks) {
-              // Clone the chunk files array because we're going to modify it
-              const chunkFiles: string[] = [...chunk.files];
-              const chunkFilesSet: Set<string> = new Set(chunkFiles);
-              for (const chunkFileName of chunkFiles) {
+              const chunkFilesSet: Set<string> = new Set(chunk.files);
+              for (const chunkFileName of chunk.files) {
                 if (
                   chunkFileName.match(Constants.LOCALE_FILENAME_PLACEHOLDER_REGEX) && // Ensure this is expected to be localized
                   chunkFileName.endsWith('.js') && // Ensure this is a JS file
 
@@ -164,23 +164,7 @@ export class SetPublicPathPlugin implements Webpack.Plugin {
       compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation: Webpack.compilation.Compilation) => {
         const v4MainTemplate: IV4MainTemplate = compilation.mainTemplate as IV4MainTemplate;
         v4MainTemplate.hooks.startup.tap(PLUGIN_NAME, (source: string, chunk: IV4Chunk, hash: string) => {
-          let assetOrChunkFound: boolean = !!this.options.skipDetection;
-
-          if (!assetOrChunkFound) {
-            for (const chunkGroup of chunk.groupsIterable) {
-              const children: Webpack.compilation.Chunk[] = chunkGroup.getChildren();
-              assetOrChunkFound = assetOrChunkFound || (children.length > 0);
-            }
-          }
-
-          if (!assetOrChunkFound) {
-            for (const innerModule of chunk.modulesIterable) {
-              if (innerModule.buildInfo.assets && Object.keys(innerModule.buildInfo.assets).length > 0) {
-                assetOrChunkFound = true;
-              }
-            }
-          }
-
+          const assetOrChunkFound: boolean = !!this.options.skipDetection || this._detectAssetsOrChunks(chunk);
           if (assetOrChunkFound) {
             return this._getStartupCode({
               source,
@@ -247,6 +231,23 @@ export class SetPublicPathPlugin implements Webpack.Plugin {
     }
   }
 
+  private _detectAssetsOrChunks(chunk: IV4Chunk): boolean {
+    for (const chunkGroup of chunk.groupsIterable) {
+      const children: Webpack.compilation.Chunk[] = chunkGroup.getChildren();
+      if (children.length > 0) {
+        return true;
+      }
+    }
+
+    for (const innerModule of chunk.modulesIterable) {
+      if (innerModule.buildInfo.assets && Object.keys(innerModule.buildInfo.assets).length > 0) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
   private _getStartupCode(options: IStartupCodeOptions): string {
     const moduleOptions: IInternalOptions = cloneDeep(this.options);