Skip to content

Commit a5ecb57

Browse files
authored
Merge branch 'microsoft:main' into main
2 parents ca7d28f + cf7f5e3 commit a5ecb57

File tree

1,485 files changed

+180367
-26493
lines changed

Some content is hidden

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

1,485 files changed

+180367
-26493
lines changed

.gitattributes

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ yarn.lock merge=binary
4747
#
4848
# For more information, see this issue: https://github.com/microsoft/rushstack/issues/1088
4949
#
50-
*.json linguist-language=JSON-with-Comments
50+
*.json linguist-language=JSON-with-Comments

.github/workflows/ci.yml

+38-12
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ jobs:
1111
strategy:
1212
matrix:
1313
include:
14-
- NodeVersion: 16.20.x
15-
NodeVersionDisplayName: 16
16-
OS: ubuntu-latest
1714
- NodeVersion: 18.18.x
1815
NodeVersionDisplayName: 18
1916
OS: ubuntu-latest
@@ -26,42 +23,71 @@ jobs:
2623
name: Node.js v${{ matrix.NodeVersionDisplayName }} (${{ matrix.OS }})
2724
runs-on: ${{ matrix.OS }}
2825
steps:
26+
- name: Create ~/.rush-user/settings.json
27+
shell: pwsh
28+
# Create a .rush-user/settings.json file that looks like this:
29+
#
30+
# { "buildCacheFolder": "/<runner working directory>/rush-cache" }
31+
#
32+
# This configures the local cache to be shared between all Rush repos. This allows us to run a build in
33+
# one clone of the repo (repo-a), and restore from the cache in another clone of the repo (repo-b) to test
34+
# the build cache.
35+
run: |
36+
mkdir -p $HOME/.rush-user
37+
@{ buildCacheFolder = Join-Path ${{ github.workspace }} rush-cache } | ConvertTo-Json > $HOME/.rush-user/settings.json
38+
2939
- uses: actions/checkout@v3
3040
with:
3141
fetch-depth: 2
42+
path: repo-a
3243

3344
- name: Git config user
3445
run: |
3546
git config --local user.name "Rushbot"
3647
git config --local user.email "[email protected]"
48+
working-directory: repo-a
3749

3850
- uses: actions/setup-node@v3
3951
with:
4052
node-version: ${{ matrix.NodeVersion }}
4153

4254
- name: Verify Change Logs
4355
run: node common/scripts/install-run-rush.js change --verify
56+
working-directory: repo-a
4457

4558
- name: Rush Install
4659
run: node common/scripts/install-run-rush.js install
60+
working-directory: repo-a
4761

4862
# - if: runner.os == 'Linux'
4963
# name: Start xvfb
5064
# run: /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
65+
# working-directory: repo-a
5166

5267
- name: Rush retest (install-run-rush)
5368
run: node common/scripts/install-run-rush.js retest --verbose --production
54-
env:
55-
# Prevent time-based browserslist update warning
56-
# See https://github.com/microsoft/rushstack/issues/2981
57-
BROWSERSLIST_IGNORE_OLD_DATA: 1
69+
working-directory: repo-a
5870

5971
- name: Ensure repo README is up-to-date
6072
run: node repo-scripts/repo-toolbox/lib/start.js readme --verify
73+
working-directory: repo-a
74+
75+
- name: Clone another copy of the repo to test the build cache
76+
uses: actions/checkout@v3
77+
with:
78+
fetch-depth: 1
79+
path: repo-b
80+
81+
- name: Git config user
82+
run: |
83+
git config --local user.name "Rushbot"
84+
git config --local user.email "[email protected]"
85+
working-directory: repo-b
86+
87+
- name: Rush update (rush-lib)
88+
run: node ${{ github.workspace }}/repo-a/apps/rush/lib/start-dev.js update
89+
working-directory: repo-b
6190

6291
- name: Rush test (rush-lib)
63-
run: node apps/rush/lib/start-dev.js test --verbose --production --timeline
64-
env:
65-
# Prevent time-based browserslist update warning
66-
# See https://github.com/microsoft/rushstack/issues/2981
67-
BROWSERSLIST_IGNORE_OLD_DATA: 1
92+
run: node ${{ github.workspace }}/repo-a/apps/rush/lib/start-dev.js test --verbose --production --timeline
93+
working-directory: repo-b

.gitignore

+55-33
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,49 @@
33
npm-debug.log*
44
yarn-debug.log*
55
yarn-error.log*
6+
.pnpm-debug.log*
7+
8+
# Diagnostic reports (https://nodejs.org/api/report.html)
9+
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
610

711
# Runtime data
812
*.pid
913
*.seed
1014
*.pid.lock
1115

1216
# Directory for instrumented libs generated by jscoverage/JSCover
13-
lib-cov
17+
lib-cov/
1418

1519
# Coverage directory used by tools like istanbul
16-
coverage
20+
coverage/
1721

1822
# nyc test coverage
19-
.nyc_output
23+
.nyc_output/
2024

2125
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
22-
.grunt
26+
.grunt/
2327

2428
# Bower dependency directory (https://bower.io/)
25-
bower_components
29+
bower_components/
2630

2731
# node-waf configuration
28-
.lock-wscript
32+
.lock-wscript/
2933

3034
# Compiled binary addons (https://nodejs.org/api/addons.html)
31-
build/Release
35+
build/Release/
3236

3337
# Dependency directories
34-
node_modules
38+
node_modules/
3539
jspm_packages/
3640

41+
# TypeScript cache
42+
*.tsbuildinfo
43+
3744
# Optional npm cache directory
38-
.npm
45+
.npm/
3946

4047
# Optional eslint cache
41-
.eslintcache
48+
.eslintcache/
4249

4350
# Optional REPL history
4451
.node_repl_history
@@ -51,9 +58,32 @@ jspm_packages/
5158

5259
# dotenv environment variables file
5360
.env
61+
.env.development.local
62+
.env.test.local
63+
.env.production.local
64+
.env.local
5465

5566
# next.js build output
56-
.next
67+
.next/
68+
69+
# Docusaurus cache and generated files
70+
.docusaurus/
71+
72+
# Serverless directories
73+
.serverless/
74+
75+
# FuseBox cache
76+
.fusebox/
77+
78+
# DynamoDB Local files
79+
.dynamodb/
80+
81+
# yarn v2
82+
.yarn/cache/
83+
.yarn/unplugged/
84+
.yarn/build-state.yml
85+
.yarn/install-state.gz
86+
.pnp.*
5787

5888
# OS X temporary files
5989
.DS_Store
@@ -64,12 +94,9 @@ jspm_packages/
6494
*.iml
6595

6696
# Visual Studio Code
67-
.vscode/*
68-
!.vscode/settings.json
97+
.vscode/
6998
!.vscode/tasks.json
7099
!.vscode/launch.json
71-
!.vscode/extensions.json
72-
!*.code-workspace
73100

74101
# Rush temporary files
75102
common/deploy/
@@ -78,23 +105,18 @@ common/autoinstallers/*/.npmrc
78105
**/.rush/temp/
79106
*.lock
80107

81-
# Heft temporary files
82-
.cache
83-
.heft
84-
85-
# Visual Studio Code
86-
.vscode
87-
88108
# Common toolchain intermediate files
89-
temp
90-
lib
91-
lib-amd
92-
lib-es6
93-
lib-esnext
94-
lib-commonjs
95-
lib-shim
96-
dist
97-
dist-storybook
98-
*.scss.ts
99-
*.sass.ts
109+
temp/
110+
lib/
111+
lib-amd/
112+
lib-es6/
113+
lib-esnext/
114+
lib-commonjs/
115+
lib-shim/
116+
dist/
117+
dist-storybook/
100118
*.tsbuildinfo
119+
120+
# Heft temporary files
121+
.cache/
122+
.heft/

0 commit comments

Comments
 (0)