RESX file reader.

iclanton · iclanton · commit 5646f2852b2f · 2020-01-31T17:50:49.000-08:00
diff --git a/common/config/rush/nonbrowser-approved-packages.json b/common/config/rush/nonbrowser-approved-packages.json
@@ -14,10 +14,6 @@
       "name": "@microsoft/api-extractor-model",
       "allowedCategories": [ "libraries" ]
     },
-    {
-      "name": "@rushstack/debug-certificate-manager",
-      "allowedCategories": [ "libraries" ]
-    },
     {
       "name": "@microsoft/decorators",
       "allowedCategories": [ "libraries" ]
@@ -158,6 +154,10 @@
       "name": "@pnpm/logger",
       "allowedCategories": [ "libraries" ]
     },
+    {
+      "name": "@rushstack/debug-certificate-manager",
+      "allowedCategories": [ "libraries" ]
+    },
     {
       "name": "@rushstack/eslint-config",
       "allowedCategories": [ "libraries", "tests" ]
@@ -610,6 +610,10 @@
       "name": "xml",
       "allowedCategories": [ "libraries" ]
     },
+    {
+      "name": "xmldoc",
+      "allowedCategories": [ "libraries" ]
+    },
     {
       "name": "yargs",
       "allowedCategories": [ "libraries" ]
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/webpack/localization-plugin/package.json b/webpack/localization-plugin/package.json
@@ -25,7 +25,8 @@
     "glob": "~7.0.5",
     "jju": "~1.4.0",
     "@microsoft/node-core-library": "3.19.3",
-    "lodash": "~4.17.15"
+    "lodash": "~4.17.15",
+    "xmldoc": "~1.1.2"
   },
   "devDependencies": {
     "@types/webpack": "4.39.8",
@@ -36,6 +37,7 @@
     "@types/loader-utils": "1.1.3",
     "@types/jju": "1.4.1",
     "@types/lodash": "4.14.116",
+    "@types/xmldoc": "1.1.4",
     "gulp": "~4.0.2"
   }
 }
diff --git a/webpack/localization-plugin/src/interfaces.ts b/webpack/localization-plugin/src/interfaces.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-export interface ILocJsonFile {
+export interface ILocFile {
   [stringName: string]: ILocalizedString;
 }
 
diff --git a/webpack/localization-plugin/src/loaders/LocJsonLoader.ts b/webpack/localization-plugin/src/loaders/LocJsonLoader.ts
@@ -6,7 +6,7 @@ import * as loaderUtils from 'loader-utils';
 import * as jju from 'jju';
 
 import { LocalizationPlugin } from '../LocalizationPlugin';
-import { ILocJsonFile } from '../interfaces';
+import { ILocFile } from '../interfaces';
 
 export interface ILocJsonLoaderOptions {
   pluginInstance: LocalizationPlugin;
@@ -15,7 +15,7 @@ export interface ILocJsonLoaderOptions {
 export default function (this: loader.LoaderContext, content: string): string {
   const { pluginInstance } = loaderUtils.getOptions(this) as ILocJsonLoaderOptions;
   const locJsonFilePath: string = this.resourcePath;
-  const locJsonFileData: ILocJsonFile = jju.parse(content);
+  const locJsonFileData: ILocFile = jju.parse(content);
 
   const resultObject: { [stringName: string]: string } = {};
   for (const stringName in locJsonFileData) { // eslint-disable-line guard-for-in
diff --git a/webpack/localization-plugin/src/loaders/SingleLocaleLoader.ts b/webpack/localization-plugin/src/loaders/SingleLocaleLoader.ts
@@ -5,7 +5,7 @@ import { loader } from 'webpack';
 import * as loaderUtils from 'loader-utils';
 import * as jju from 'jju';
 
-import { ILocJsonFile } from '../interfaces';
+import { ILocFile } from '../interfaces';
 
 export interface ILocJsonLoaderOptions {
   /**
@@ -34,7 +34,7 @@ export default function (this: loader.LoaderContext, content: string): string {
       `Strings for file ${locJsonFilePath} were not provided in the LocalizationPlugin configuration.`
       ));
   } else {
-    const locJsonFileData: ILocJsonFile = jju.parse(content);
+    const locJsonFileData: ILocFile = jju.parse(content);
     for (const stringName in locJsonFileData) {
       if (!stringMap.has(stringName)) {
         this.emitError(new Error(
diff --git a/webpack/localization-plugin/src/utilities/ResxReader.ts b/webpack/localization-plugin/src/utilities/ResxReader.ts

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.`
`2`	`2`	`// See LICENSE in the project root for license information.`
`3`	`3`
`4`		`-export interface ILocJsonFile {`
	`4`	`+export interface ILocFile {`
`5`	`5`	`[stringName: string]: ILocalizedString;`
`6`	`6`	`}`
`7`	`7`