Better support single locales and support serve.

iclanton · iclanton · commit 12cc8ed6ad73 · 2020-01-27T17:54:03.000-08:00
diff --git a/build-tests/localization-plugin-test/build.js b/build-tests/localization-plugin-test/build.js
@@ -3,7 +3,7 @@ const child_process = require('child_process');
 const path = require('path');
 const process = require('process');
 
-const { LocJsonPreprocessor } = require('@microsoft/localization-plugin');
+const { LocJsonPreprocessor } = require('@rushstack/localization-plugin');
 
 function executeCommand(command) {
   console.log('---> ' + command);
diff --git a/build-tests/localization-plugin-test/package.json b/build-tests/localization-plugin-test/package.json
@@ -4,14 +4,16 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "build": "node build.js"
+    "build": "node build.js",
+    "serve": "node serve.js"
   },
   "dependencies": {
-    "webpack": "~4.31.0",
     "@rushstack/localization-plugin": "0.0.0",
     "fs-extra": "~7.0.1",
     "@microsoft/rush-stack-compiler-3.5": "0.4.2",
+    "ts-loader": "6.0.0",
+    "webpack": "~4.31.0",
     "webpack-cli": "~3.3.2",
-    "ts-loader": "6.0.0"
+    "webpack-dev-server": "~3.9.0"
   }
 }
diff --git a/build-tests/localization-plugin-test/serve.js b/build-tests/localization-plugin-test/serve.js
@@ -0,0 +1,25 @@
+const fsx = require('fs-extra');
+const child_process = require('child_process');
+const path = require('path');
+const process = require('process');
+
+const { LocJsonPreprocessor } = require('@rushstack/localization-plugin');
+
+function executeCommand(command) {
+  console.log('---> ' + command);
+  child_process.execSync(command, { stdio: 'inherit' });
+}
+
+// Clean the old build outputs
+console.log(`==> Starting build.js for ${path.basename(process.cwd())}`);
+fsx.emptyDirSync('dist');
+fsx.emptyDirSync('lib');
+fsx.emptyDirSync('temp');
+
+LocJsonPreprocessor.preprocessLocJsonFiles({
+  srcFolder: path.resolve(__dirname, 'src'),
+  generatedTsFolder: path.resolve(__dirname, 'temp', 'loc-json-ts')
+});
+
+// Run Webpack
+executeCommand('node node_modules/webpack-dev-server/bin/webpack-dev-server');
diff --git a/build-tests/localization-plugin-test/webpack.config.js b/build-tests/localization-plugin-test/webpack.config.js
@@ -3,7 +3,7 @@
 const path = require('path');
 const webpack = require('webpack');
 
-const { LocalizationPlugin } = require('@microsoft/localization-plugin');
+const { LocalizationPlugin } = require('@rushstack/localization-plugin');
 
 module.exports = function(env) {
   const configuration = {
@@ -69,6 +69,9 @@ module.exports = function(env) {
         },
         defaultLocale: {
           usePassthroughLocale: true
+        },
+        serveLocale: {
+          locale: 'en-us'
         }
       })
     ]
diff --git a/common/config/rush/browser-approved-packages.json b/common/config/rush/browser-approved-packages.json
@@ -1,5 +1,6 @@
 // DO NOT ADD COMMENTS IN THIS FILE.  They will be lost when the Rush tool resaves it.
 {
   "$schema": "https://developer.microsoft.com/json-schemas/rush/v5/approved-packages.schema.json",
-  "packages": []
+  "packages": [
+  ]
 }
diff --git a/common/config/rush/nonbrowser-approved-packages.json b/common/config/rush/nonbrowser-approved-packages.json
@@ -38,6 +38,10 @@
       "name": "@microsoft/gulp-core-build-serve",
       "allowedCategories": [ "libraries" ]
     },
+    {
+      "name": "webpack-dev-server",
+      "allowedCategories": [ "tests" ]
+    },
     {
       "name": "@microsoft/gulp-core-build-typescript",
       "allowedCategories": [ "libraries" ]
@@ -50,10 +54,6 @@
       "name": "@microsoft/load-themed-styles",
       "allowedCategories": [ "libraries", "tests" ]
     },
-    {
-      "name": "@rushstack/localization-plugin",
-      "allowedCategories": [ "tests" ]
-    },
     {
       "name": "@microsoft/node-core-library",
       "allowedCategories": [ "libraries", "tests" ]
@@ -170,6 +170,10 @@
       "name": "@rushstack/eslint-plugin",
       "allowedCategories": [ "libraries" ]
     },
+    {
+      "name": "@rushstack/localization-plugin",
+      "allowedCategories": [ "tests" ]
+    },
     {
       "name": "@typescript-eslint/eslint-plugin",
       "allowedCategories": [ "libraries" ]
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/webpack/localization-plugin/src/LocalizationPlugin.ts b/webpack/localization-plugin/src/LocalizationPlugin.ts
diff --git a/webpack/localization-plugin/src/loaders/SingleLocaleLoader.ts b/webpack/localization-plugin/src/loaders/SingleLocaleLoader.ts

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`// DO NOT ADD COMMENTS IN THIS FILE. They will be lost when the Rush tool resaves it.`
`2`	`2`	`{`
`3`	`3`	`"$schema": "https://developer.microsoft.com/json-schemas/rush/v5/approved-packages.schema.json",`
`4`		`- "packages": []`
	`4`	`+ "packages": [`
	`5`	`+ ]`
`5`	`6`	`}`