Skip to content

Commit 2caa687

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

File tree

78 files changed

+2127
-6565
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+2127
-6565
lines changed

‎apps/rush-buildxl/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/rush-buildxl",
3-
"version": "5.19.4",
3+
"version": "5.20.0",
44
"description": "An experimental tool that connects Rush and BuildXL",
55
"repository": {
66
"type": "git",
@@ -20,7 +20,7 @@
2020
"license": "MIT",
2121
"dependencies": {
2222
"@microsoft/node-core-library": "3.19.3",
23-
"@microsoft/rush-lib": "5.19.4",
23+
"@microsoft/rush-lib": "5.20.0",
2424
"@microsoft/ts-command-line": "4.3.10"
2525
},
2626
"devDependencies": {

‎apps/rush-lib/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/rush-lib",
3-
"version": "5.19.4",
3+
"version": "5.20.0",
44
"description": "A library for writing scripts that interact with the Rush tool",
55
"repository": {
66
"type": "git",

‎apps/rush-lib/src/cli/actions/PublishAction.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,6 @@ export class PublishAction extends BaseRushAction {
6666
'changes and publish packages, you must use the --commit flag and/or the --publish flag.',
6767
parser
6868
});
69-
70-
// Example: "common\temp\publish-home"
71-
this._targetNpmrcPublishFolder = path.join(this.rushConfiguration.commonTempFolder, 'publish-home');
72-
73-
// Example: "common\temp\publish-home\.npmrc"
74-
this._targetNpmrcPublishPath = path.join(this._targetNpmrcPublishFolder, '.npmrc');
7569
}
7670

7771
protected onDefineParameters(): void {
@@ -211,6 +205,12 @@ export class PublishAction extends BaseRushAction {
211205
return Promise.resolve().then(() => {
212206
PolicyValidator.validatePolicy(this.rushConfiguration, false);
213207

208+
// Example: "common\temp\publish-home"
209+
this._targetNpmrcPublishFolder = path.join(this.rushConfiguration.commonTempFolder, 'publish-home');
210+
211+
// Example: "common\temp\publish-home\.npmrc"
212+
this._targetNpmrcPublishPath = path.join(this._targetNpmrcPublishFolder, '.npmrc');
213+
214214
const allPackages: Map<string, RushConfigurationProject> = this.rushConfiguration.projectsByName;
215215

216216
if (this._regenerateChangelogs.value) {

‎apps/rush-lib/src/logic/EventHooksManager.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@ export class EventHooksManager {
4545
}
4646
);
4747
} catch (error) {
48-
console.error(`${os.EOL} Event hook "${script}" failed. Run "rush" with --debug` +
49-
` to see detailed error information.`);
48+
console.error(
49+
os.EOL + colors.yellow(`Event hook "${script}" failed. Run "rush" with --debug` +
50+
` to see detailed error information.`)
51+
);
5052
if (isDebug) {
5153
console.error(os.EOL + error.message);
5254
}
@@ -56,4 +58,4 @@ export class EventHooksManager {
5658
console.log(os.EOL + colors.green(`Event hooks finished. (${stopwatch.toString()})`));
5759
}
5860
}
59-
}
61+
}

‎apps/rush-lib/src/utilities/Utilities.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ export class Utilities {
203203
(e) => new Error(
204204
`Error: ${e}${os.EOL}Often this is caused by a file lock ` +
205205
'from a process such as your text editor, command prompt, ' +
206-
'or "gulp serve"'
206+
'or a filesystem watcher.'
207207
),
208208
'createFolderWithRetry'
209209
);
@@ -246,8 +246,10 @@ export class Utilities {
246246
try {
247247
FileSystem.deleteFolder(folderPath);
248248
} catch (e) {
249-
throw new Error(e.message + os.EOL + 'Often this is caused by a file lock'
250-
+ ' from a process such as your text editor, command prompt, or "gulp serve"');
249+
throw new Error(
250+
`${e.message}${os.EOL}Often this is caused by a file lock from a process ` +
251+
'such as your text editor, command prompt, or a filesystem watcher'
252+
);
251253
}
252254
}
253255

‎apps/rush/CHANGELOG.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
{
22
"name": "@microsoft/rush",
33
"entries": [
4+
{
5+
"version": "5.20.0",
6+
"tag": "@microsoft/rush_v5.20.0",
7+
"date": "Wed, 12 Feb 2020 21:51:19 GMT",
8+
"comments": {
9+
"none": [
10+
{
11+
"comment": "Support \".\" as a value for the --to and --from parameters to build to the current project."
12+
},
13+
{
14+
"comment": "Improve security by allowing the \"rush publish\" authentication token to be specified via an environment variable."
15+
}
16+
]
17+
}
18+
},
419
{
520
"version": "5.19.4",
621
"tag": "@microsoft/rush_v5.19.4",

‎apps/rush/CHANGELOG.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
# Change Log - @microsoft/rush
22

3-
This log was last generated on Tue, 28 Jan 2020 03:57:30 GMT and should not be manually modified.
3+
This log was last generated on Wed, 12 Feb 2020 21:51:19 GMT and should not be manually modified.
4+
5+
## 5.20.0
6+
Wed, 12 Feb 2020 21:51:19 GMT
7+
8+
### Updates
9+
10+
- Support "." as a value for the --to and --from parameters to build to the current project.
11+
- Improve security by allowing the "rush publish" authentication token to be specified via an environment variable.
412

513
## 5.19.4
614
Tue, 28 Jan 2020 03:57:30 GMT

‎apps/rush/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@microsoft/rush",
3-
"version": "5.19.4",
3+
"version": "5.20.0",
44
"description": "A professional solution for consolidating all your JavaScript projects in one Git repo",
55
"keywords": [
66
"install",
@@ -32,7 +32,7 @@
3232
"license": "MIT",
3333
"dependencies": {
3434
"@microsoft/node-core-library": "3.19.3",
35-
"@microsoft/rush-lib": "5.19.4",
35+
"@microsoft/rush-lib": "5.20.0",
3636
"colors": "~1.2.1",
3737
"semver": "~5.3.0"
3838
},

‎build-tests/localization-plugin-test-01/build.js‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ const child_process = require('child_process');
33
const path = require('path');
44
const process = require('process');
55

6-
const { LocFilePreprocessor } = require('@rushstack/localization-plugin');
7-
86
function executeCommand(command) {
97
console.log('---> ' + command);
108
child_process.execSync(command, { stdio: 'inherit' });
@@ -16,13 +14,6 @@ FileSystem.ensureEmptyFolder('dist');
1614
FileSystem.ensureEmptyFolder('lib');
1715
FileSystem.ensureEmptyFolder('temp');
1816

19-
const preprocessor = new LocFilePreprocessor({
20-
srcFolder: path.resolve(__dirname, 'src'),
21-
generatedTsFolder: path.resolve(__dirname, 'temp', 'loc-json-ts'),
22-
exportAsDefault: true
23-
});
24-
preprocessor.generateTypings();
25-
2617
// Run Webpack
2718
executeCommand('node node_modules/webpack-cli/bin/cli');
2819

‎build-tests/localization-plugin-test-01/serve.js‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ const child_process = require('child_process');
33
const path = require('path');
44
const process = require('process');
55

6-
const { LocFilePreprocessor } = require('@rushstack/localization-plugin');
7-
86
function executeCommand(command) {
97
console.log('---> ' + command);
108
child_process.execSync(command, { stdio: 'inherit' });
@@ -16,11 +14,5 @@ FileSystem.ensureEmptyFolder('dist');
1614
FileSystem.ensureEmptyFolder('lib');
1715
FileSystem.ensureEmptyFolder('temp');
1816

19-
const preprocessor = new LocFilePreprocessor({
20-
srcFolder: path.resolve(__dirname, 'src'),
21-
generatedTsFolder: path.resolve(__dirname, 'temp', 'loc-json-ts')
22-
});
23-
preprocessor.generateTypings();
24-
2517
// Run Webpack
2618
executeCommand('node node_modules/webpack-dev-server/bin/webpack-dev-server');

0 commit comments

Comments
 (0)