Skip to content

Commit d3c3b64

Browse files
octogonzoctogonz
authored
Merge pull request #291 from microsoft/octogonz/rush-5.44.0
Upgrade to Rush 5.44.0
2 parents 79fc78f + 3b1deb5 commit d3c3b64

File tree

15 files changed

+1275
-882
lines changed

15 files changed

+1275
-882
lines changed

‎common/changes/@microsoft/tsdoc-config/octogonz-rush-5.44.0_2021-04-20-04-17.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@microsoft/tsdoc-config",
5+
"comment": "",
6+
"type": "none"
7+
}
8+
],
9+
"packageName": "@microsoft/tsdoc-config",
10+
"email": "4673363+octogonz@users.noreply.github.com"
11+
}

‎common/config/azure-pipelines/ci-build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ jobs:
66
strategy:
77
maxParallel: 2
88
matrix:
9-
'NodeJs 10':
10-
NodeVersion: 10
119
'NodeJs 12':
1210
NodeVersion: 12
11+
'NodeJs 14':
12+
NodeVersion: 14
1313
steps:
1414
- checkout: self
1515
- template: templates/build.yaml

‎common/config/azure-pipelines/npm-publish.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pool:
22
vmImage: 'ubuntu-latest'
33
variables:
4-
NodeVersion: 12
4+
NodeVersion: 14
55
FORCE_COLOR: 1
66
steps:
77
- checkout: self

‎common/config/azure-pipelines/npm-republish.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pool:
2-
vmImage: 'windows-latest'
2+
vmImage: 'ubuntu-latest'
33
variables:
4-
NodeVersion: 12
4+
NodeVersion: 14
55
FORCE_COLOR: 1
66
steps:
77
- checkout: self

‎common/config/azure-pipelines/playground-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
resources:
22
- repo: self
33
variables:
4-
NodeVersion: 12
4+
NodeVersion: 14
55
FORCE_COLOR: 1
66
steps:
77
- checkout: self

‎common/config/rush/artifactory.json

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
/**
2+
* This configuration file manages Rush integration with JFrog Artifactory services.
3+
* More documentation is available on the Rush website: https://rushjs.io
4+
*/
5+
{
6+
"$schema": "https://developer.microsoft.com/json-schemas/rush/v5/artifactory.schema.json",
7+
8+
"packageRegistry": {
9+
/**
10+
* (Required) Set this to "true" to enable Rush to manage tokens for an Artifactory NPM registry.
11+
* When enabled, "rush install" will automatically detect when the user's ~/.npmrc
12+
* authentication token is missing or expired. And "rush setup" will prompt the user to
13+
* renew their token.
14+
*
15+
* The default value is false.
16+
*/
17+
"enabled": false,
18+
19+
/**
20+
* (Required) Specify the URL of your NPM registry. This is the same URL that appears in
21+
* your .npmrc file. It should look something like this example:
22+
*
23+
* https://your-company.jfrog.io/your-project/api/npm/npm-private/
24+
*/
25+
"registryUrl": "",
26+
27+
/**
28+
* A list of custom strings that "rush setup" should add to the user's ~/.npmrc file at the time
29+
* when the token is updated. This could be used for example to configure the company registry
30+
* to be used whenever NPM is invoked as a standalone command (but it's not needed for Rush
31+
* operations like "rush add" and "rush install", which get their mappings from the monorepo's
32+
* common/config/rush/.npmrc file).
33+
*
34+
* NOTE: The ~/.npmrc settings are global for the user account on a given machine, so be careful
35+
* about adding settings that may interfere with other work outside the monorepo.
36+
*/
37+
"userNpmrcLinesToAdd": [
38+
// "@example:registry=https://your-company.jfrog.io/your-project/api/npm/npm-private/"
39+
],
40+
41+
/**
42+
* (Required) Specifies the URL of the Artifactory control panel where the user can generate
43+
* an API key. This URL is printed after the "visitWebsite" message.
44+
* It should look something like this example: https://your-company.jfrog.io/
45+
* Specify an empty string to suppress this line entirely.
46+
*/
47+
"artifactoryWebsiteUrl": "",
48+
49+
/**
50+
* These settings allow the "rush setup" interactive prompts to be customized, for
51+
* example with messages specific to your team or configuration. Specify an empty string
52+
* to suppress that message entirely.
53+
*/
54+
"messageOverrides": {
55+
/**
56+
* Overrides the message that normally says:
57+
* "This monorepo consumes packages from an Artifactory private NPM registry."
58+
*/
59+
// "introduction": "",
60+
/**
61+
* Overrides the message that normally says:
62+
* "Please contact the repository maintainers for help with setting up an Artifactory user account."
63+
*/
64+
// "obtainAnAccount": "",
65+
/**
66+
* Overrides the message that normally says:
67+
* "Please open this URL in your web browser:"
68+
*
69+
* The "artifactoryWebsiteUrl" string is printed after this message.
70+
*/
71+
// "visitWebsite": "",
72+
/**
73+
* Overrides the message that normally says:
74+
* "Your user name appears in the upper-right corner of the JFrog website."
75+
*/
76+
// "locateUserName": "",
77+
/**
78+
* Overrides the message that normally says:
79+
* "Click 'Edit Profile' on the JFrog website. Click the 'Generate API Key'
80+
* button if you haven't already done so previously."
81+
*/
82+
// "locateApiKey": ""
83+
}
84+
}
85+
}

‎common/config/rush/command-line.json

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* This configuration file defines custom commands for the "rush" command-line.
3-
* For full documentation, please see https://rushjs.io
3+
* More documentation is available on the Rush website: https://rushjs.io
44
*/
55
{
66
"$schema": "https://developer.microsoft.com/json-schemas/rush/v5/command-line.schema.json",
@@ -107,7 +107,23 @@
107107
// /**
108108
// * If true then this command will be incremental like the built-in "build" command
109109
// */
110-
// "incremental": false
110+
// "incremental": false,
111+
//
112+
// /**
113+
// * (EXPERIMENTAL) Normally Rush terminates after the command finishes. If this option is set to "true" Rush
114+
// * will instead enter a loop where it watches the file system for changes to the selected projects. Whenever a
115+
// * change is detected, the command will be invoked again for the changed project and any selected projects that
116+
// * directly or indirectly depend on it.
117+
// *
118+
// * For details, refer to the website article "Using watch mode".
119+
// */
120+
// "watchForChanges": false,
121+
//
122+
// /**
123+
// * (EXPERIMENTAL) Disable cache for this action. This may be useful if this command affects state outside of
124+
// * projects' own folders.
125+
// */
126+
// "disableBuildCache ": false
111127
// },
112128
//
113129
// {

‎common/config/rush/common-versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* This configuration file specifies NPM dependency version selections that affect all projects
3-
* in a Rush repo. For full documentation, please see https://rushjs.io
3+
* in a Rush repo. More documentation is available on the Rush website: https://rushjs.io
44
*/
55
{
66
"$schema": "https://developer.microsoft.com/json-schemas/rush/v5/common-versions.schema.json",

‎common/config/rush/experiments.json

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* This configuration file allows repo maintainers to enable and disable experimental
3-
* Rush features. For full documentation, please see https://rushjs.io
3+
* Rush features. More documentation is available on the Rush website: https://rushjs.io
44
*/
55
{
66
"$schema": "https://developer.microsoft.com/json-schemas/rush/v5/experiments.schema.json"
@@ -15,14 +15,35 @@
1515
// "legacyIncrementalBuildDependencyDetection": true,
1616

1717
/**
18-
* By default, rush passes --no-prefer-frozen-lockfile to 'pnpm install'.
19-
* Set this option to true to pass '--frozen-lockfile' instead.
18+
* By default, 'rush install' passes --no-prefer-frozen-lockfile to 'pnpm install'.
19+
* Set this option to true to pass '--frozen-lockfile' instead for faster installs.
2020
*/
2121
// "usePnpmFrozenLockfileForRushInstall": true,
2222

23+
/**
24+
* By default, 'rush update' passes --no-prefer-frozen-lockfile to 'pnpm install'.
25+
* Set this option to true to pass '--prefer-frozen-lockfile' instead to minimize shrinkwrap changes.
26+
*/
27+
// "usePnpmPreferFrozenLockfileForRushUpdate": true,
28+
29+
/**
30+
* If using the 'preventManualShrinkwrapChanges' option, restricts the hash to only include the layout of external dependencies.
31+
* Used to allow links between workspace projects or the addition/removal of references to existing dependency versions to not
32+
* cause hash changes.
33+
*/
34+
// "omitImportersFromPreventManualShrinkwrapChanges": true,
35+
2336
/**
2437
* If true, the chmod field in temporary project tar headers will not be normalized.
2538
* This normalization can help ensure consistent tarball integrity across platforms.
2639
*/
27-
// "noChmodFieldInTarHeaderNormalization": true
40+
// "noChmodFieldInTarHeaderNormalization": true,
41+
42+
/**
43+
* If true, the build cache feature is enabled. To use this feature, a common/config/rush/build-cache.json
44+
* file must be created with configuration options.
45+
*
46+
* See https://github.com/microsoft/rushstack/issues/2393 for details about this experimental feature.
47+
*/
48+
// "buildCache": true
2849
}

0 commit comments

Comments
 (0)