Move file extension regexes to Constants.

iclanton · iclanton · commit fa94d394b19f · 2020-02-04T14:47:03.000-08:00
diff --git a/webpack/localization-plugin/src/WebpackConfigurationUpdater.ts b/webpack/localization-plugin/src/WebpackConfigurationUpdater.ts
@@ -76,11 +76,11 @@ export class WebpackConfigurationUpdater {
       options.configuration,
       [
         {
-          test: /\.loc\.json$/i,
+          test: Constants.LOC_JSON_REGEX,
           loader: loader
         },
         {
-          test: /\.resx$/i,
+          test: Constants.RESX_REGEX,
           use: [
             require.resolve('json-loader'),
             {
@@ -134,7 +134,7 @@ export class WebpackConfigurationUpdater {
           test: {
             and: [
               (filePath: string) => options.locFiles.has(filePath),
-              /\.loc\.json$/i
+              Constants.LOC_JSON_REGEX
             ]
           },
           loader: loader,
@@ -144,7 +144,7 @@ export class WebpackConfigurationUpdater {
           test: {
             and: [
               (filePath: string) => options.locFiles.has(filePath),
-              /\.resx$/i
+              Constants.RESX_REGEX
             ]
           },
           use: [
@@ -172,12 +172,7 @@ export class WebpackConfigurationUpdater {
             and: [
               (filePath: string) => !options.locFiles.has(filePath),
               (filePath: string) => !options.filesToIgnore.has(filePath),
-              {
-                or: [
-                  /\.loc\.json$/i,
-                  /\.resx$/i
-                ]
-              }
+              Constants.RESX_OR_LOC_JSON_REGEX
             ]
           },
           loader: path.resolve(__dirname, 'loaders', 'MissingLocDataWarningLoader.js')
diff --git a/webpack/localization-plugin/src/utilities/Constants.ts b/webpack/localization-plugin/src/utilities/Constants.ts
@@ -16,4 +16,8 @@ export class Constants {
     'g'
   );
   public static STRING_PLACEHOLDER_PREFIX: string = '-LOCALIZED-STRING-f12dy0i7-n4bo-dqwj-39gf-sasqehjmihz9';
+
+  public static RESX_REGEX: RegExp = /\.resx$/i;
+  public static LOC_JSON_REGEX: RegExp = /\.loc\.json$/i;
+  public static RESX_OR_LOC_JSON_REGEX: RegExp = /\.(resx|loc\.json)$/i;
 }

Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,8 @@ export class Constants {`
`16`	`16`	`'g'`
`17`	`17`	`);`
`18`	`18`	`public static STRING_PLACEHOLDER_PREFIX: string = '-LOCALIZED-STRING-f12dy0i7-n4bo-dqwj-39gf-sasqehjmihz9';`
	`19`	`+`
	`20`	`+ public static RESX_REGEX: RegExp = /\.resx$/i;`
	`21`	`+ public static LOC_JSON_REGEX: RegExp = /\.loc\.json$/i;`
	`22`	`+ public static RESX_OR_LOC_JSON_REGEX: RegExp = /\.(resx\|loc\.json)$/i;`
`19`	`23`	`}`