Skip to content

Commit 170a349

Browse files
ClaudiazhaoyaClaudiazhaoya
committed
Merge branch 'master' of https://github.com/microsoft/rushstack into zhas/add-json-flag-to-check
2 parents 2caa687 + 9f285ae commit 170a349

15 files changed

Lines changed: 67 additions & 38 deletions

File tree

‎build-tests/localization-plugin-test-01/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"dependencies": {
1111
"@microsoft/set-webpack-public-path-plugin": "2.4.0",
1212
"@microsoft/node-core-library": "3.19.3",
13-
"@rushstack/localization-plugin": "0.0.0",
13+
"@rushstack/localization-plugin": "0.1.0",
1414
"@types/webpack-env": "1.13.0",
1515
"@microsoft/rush-stack-compiler-3.5": "0.4.3",
1616
"ts-loader": "6.0.0",

‎build-tests/localization-plugin-test-02/package.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,16 @@
1010
"dependencies": {
1111
"@microsoft/set-webpack-public-path-plugin": "2.4.0",
1212
"@microsoft/node-core-library": "3.19.3",
13-
"@rushstack/localization-plugin": "0.0.0",
13+
"@rushstack/localization-plugin": "0.1.0",
1414
"@types/webpack-env": "1.13.0",
1515
"@microsoft/rush-stack-compiler-3.5": "0.4.3",
1616
"ts-loader": "6.0.0",
1717
"webpack": "~4.31.0",
1818
"webpack-bundle-analyzer": "~3.6.0",
1919
"webpack-cli": "~3.3.2",
2020
"webpack-dev-server": "~3.9.0",
21-
"html-webpack-plugin": "~3.2.0"
21+
"html-webpack-plugin": "~3.2.0",
22+
"@types/lodash": "4.14.116",
23+
"lodash": "~4.17.15"
2224
}
2325
}

‎build-tests/localization-plugin-test-02/src/chunks/chunkWithStrings.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
import * as lodash from 'lodash';
2+
13
import * as strings from './strings2.loc.json';
24

35
export class ChunkWithStringsClass {
46
public doStuff(): void {
5-
console.log(strings.string1);
7+
console.log(lodash.escape(strings.string1));
68
}
79
}

‎build-tests/localization-plugin-test-02/src/chunks/chunkWithoutStrings.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
import * as lodash from 'lodash';
2+
13
export class ChunkWithoutStringsClass {
24
public doStuff(): void {
3-
console.log('STATIC STRING');
5+
console.log(lodash.escape('STATIC STRING'));
46
}
57
}

‎build-tests/localization-plugin-test-03/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"dependencies": {
1111
"@microsoft/set-webpack-public-path-plugin": "2.4.0",
1212
"@microsoft/node-core-library": "3.19.3",
13-
"@rushstack/localization-plugin": "0.0.0",
13+
"@rushstack/localization-plugin": "0.1.0",
1414
"@types/webpack-env": "1.13.0",
1515
"@microsoft/rush-stack-compiler-3.5": "0.4.3",
1616
"ts-loader": "6.0.0",

‎common/changes/@rushstack/localization-plugin/ianc-loc-plugin-prototype_2019-11-19-09-16.json‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎common/config/rush/browser-approved-packages.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// DO NOT ADD COMMENTS IN THIS FILE. They will be lost when the Rush tool resaves it.
22
{
33
"$schema": "https://developer.microsoft.com/json-schemas/rush/v5/approved-packages.schema.json",
4-
"packages": [
5-
]
4+
"packages": []
65
}

‎common/config/rush/nonbrowser-approved-packages.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@
452452
},
453453
{
454454
"name": "lodash",
455-
"allowedCategories": [ "libraries" ]
455+
"allowedCategories": [ "libraries", "tests" ]
456456
},
457457
{
458458
"name": "lodash.merge",

‎common/config/rush/pnpm-lock.yaml‎

Lines changed: 6 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎rush.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,7 @@
863863
"packageName": "@rushstack/localization-plugin",
864864
"projectFolder": "webpack/localization-plugin",
865865
"reviewCategory": "libraries",
866-
"shouldPublish": false
866+
"shouldPublish": true
867867
},
868868
{
869869
"packageName": "@microsoft/loader-raw-script",

0 commit comments

Comments
 (0)