Fix tree shaking for RESX files.

iclanton · iclanton · commit 8f3746862543 · 2020-02-16T18:01:43.000-08:00
diff --git a/build-tests/localization-plugin-test-02/src/strings5.resx b/build-tests/localization-plugin-test-02/src/strings5.resx
@@ -63,4 +63,8 @@
     <value>"RESX string with quotemarks"</value>
     <comment>RESX string with quotemarks</comment>
   </data>
+  <data name="unusedString" xml:space="preserve">
+    <value>UNUSED STRING</value>
+    <comment>UNUSED STRING</comment>
+  </data>
 </root>
diff --git a/common/config/rush/nonbrowser-approved-packages.json b/common/config/rush/nonbrowser-approved-packages.json
@@ -442,10 +442,6 @@
       "name": "jsdom",
       "allowedCategories": [ "libraries" ]
     },
-    {
-      "name": "json-loader",
-      "allowedCategories": [ "libraries" ]
-    },
     {
       "name": "loader-utils",
       "allowedCategories": [ "libraries" ]
diff --git a/webpack/localization-plugin/package.json b/webpack/localization-plugin/package.json
@@ -31,7 +31,6 @@
     "@microsoft/node-core-library": "3.19.3",
     "lodash": "~4.17.15",
     "xmldoc": "~1.1.2",
-    "json-loader": "~0.5.7",
     "chokidar": "~3.3.1"
   },
   "devDependencies": {
diff --git a/webpack/localization-plugin/src/WebpackConfigurationUpdater.ts b/webpack/localization-plugin/src/WebpackConfigurationUpdater.ts
@@ -26,7 +26,7 @@ export class WebpackConfigurationUpdater {
       exportAsDefault: options.exportAsDefault
     };
 
-    WebpackConfigurationUpdater._addLoadersForProvidedLocFiles(options, loader, loaderOptions);
+    WebpackConfigurationUpdater._addLoadersForLocFiles(options, loader, loaderOptions);
 
     WebpackConfigurationUpdater._tryUpdateLocaleTokenInPublicPathPlugin(options);
   }
@@ -47,13 +47,9 @@ export class WebpackConfigurationUpdater {
         },
         {
           test: Constants.RESX_REGEX,
-          use: [
-            require.resolve('json-loader'),
-            {
-              loader,
-              options: loaderOptions
-            }
-          ]
+          loader: loader,
+          options: loaderOptions,
+          type: 'json'
         }
       ]
     );
@@ -88,7 +84,7 @@ export class WebpackConfigurationUpdater {
     }
   }
 
-  private static _addLoadersForProvidedLocFiles(
+  private static _addLoadersForLocFiles(
     options: IWebpackConfigurationUpdaterOptions,
     loader: string,
     loaderOptions: IBaseLoaderOptions
@@ -113,13 +109,9 @@ export class WebpackConfigurationUpdater {
               Constants.RESX_REGEX
             ]
           },
-          use: [
-            require.resolve('json-loader'),
-            {
-              loader: loader,
-              options: loaderOptions
-            }
-          ]
+          loader: loader,
+          options: loaderOptions,
+          type: 'json'
         }
       ]
     );

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ export class WebpackConfigurationUpdater {`
`26`	`26`	`exportAsDefault: options.exportAsDefault`
`27`	`27`	`};`
`28`	`28`
`29`		`- WebpackConfigurationUpdater._addLoadersForProvidedLocFiles(options, loader, loaderOptions);`
	`29`	`+ WebpackConfigurationUpdater._addLoadersForLocFiles(options, loader, loaderOptions);`
`30`	`30`
`31`	`31`	`WebpackConfigurationUpdater._tryUpdateLocaleTokenInPublicPathPlugin(options);`
`32`	`32`	`}`
`@@ -47,13 +47,9 @@ export class WebpackConfigurationUpdater {`
`47`	`47`	`},`
`48`	`48`	`{`
`49`	`49`	`test: Constants.RESX_REGEX,`
`50`		`- use: [`
`51`		`- require.resolve('json-loader'),`
`52`		`- {`
`53`		`- loader,`
`54`		`- options: loaderOptions`
`55`		`- }`
`56`		`- ]`
	`50`	`+ loader: loader,`
	`51`	`+ options: loaderOptions,`
	`52`	`+ type: 'json'`
`57`	`53`	`}`
`58`	`54`	`]`
`59`	`55`	`);`
`@@ -88,7 +84,7 @@ export class WebpackConfigurationUpdater {`
`88`	`84`	`}`
`89`	`85`	`}`
`90`	`86`
`91`		`- private static _addLoadersForProvidedLocFiles(`
	`87`	`+ private static _addLoadersForLocFiles(`
`92`	`88`	`options: IWebpackConfigurationUpdaterOptions,`
`93`	`89`	`loader: string,`
`94`	`90`	`loaderOptions: IBaseLoaderOptions`
`@@ -113,13 +109,9 @@ export class WebpackConfigurationUpdater {`
`113`	`109`	`Constants.RESX_REGEX`
`114`	`110`	`]`
`115`	`111`	`},`
`116`		`- use: [`
`117`		`- require.resolve('json-loader'),`
`118`		`- {`
`119`		`- loader: loader,`
`120`		`- options: loaderOptions`
`121`		`- }`
`122`		`- ]`
	`112`	`+ loader: loader,`
	`113`	`+ options: loaderOptions,`
	`114`	`+ type: 'json'`
`123`	`115`	`}`
`124`	`116`	`]`
`125`	`117`	`);`