Skip to content

Commit 11550f3

Browse files
Copilotrzhao271
Copilot
and
rzhao271
authored
Migrate from yarn to npm (#8570)
* Initial plan * Initial plan for yarn to npm migration Co-authored-by: rzhao271 <7199958+rzhao271@users.noreply.github.com> * Migrate from yarn to npm Co-authored-by: rzhao271 <7199958+rzhao271@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: rzhao271 <7199958+rzhao271@users.noreply.github.com>
1 parent 531d6e7 commit 11550f3

14 files changed

+13029
-8205
lines changed

‎.github/workflows/copilot-setup-steps.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929
uses: actions/setup-node@v4
3030
with:
3131
node-version: "20"
32-
cache: "yarn"
32+
cache: "npm"
3333

3434
- name: Install dependencies
35-
run: yarn install --frozen-lockfile
35+
run: npm ci
3636
env:
3737
# Skip Playwright browser downloads to avoid installation failures
3838
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
@@ -48,7 +48,7 @@ jobs:
4848
continue-on-error: true
4949

5050
- name: Update VS Code type definitions
51-
run: yarn update-dts
51+
run: npm run update-dts
5252

5353
- name: Basic build verification
5454
run: |

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,6 @@ media
339339
.vscode-test-web
340340
.DS_Store
341341
*.vsix
342-
package-lock.json
343342
src/@types/vscode.d.ts
344343
src/@types/vscode.proposed.d.ts
345344

‎.vscodeignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ webviews/**
2222
.gitignore-revs
2323
.prettierignore
2424
.prettierrc
25-
.yarnrc
25+
package-lock.json
2626
azure-pipeline.*
2727
**/tsconfig*.json
2828
*.tsbuildinfo
2929
**/webpack.config*.js
30-
yarn.lock
30+
npm-debug.log
3131
**/*.map
3232
**/*.svg
3333
!**/git-pull-request_webview.svg

‎.yarnrc‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎azure-pipeline.nightly.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ extends:
3434
nodeVersion: "20.x"
3535

3636
buildSteps:
37-
- script: yarn install --frozen-lockfile --check-files
37+
- script: npm ci
3838
displayName: Install dependencies
3939
retryCountOnTaskFailure: 3
4040

41-
- script: yarn run bundle
41+
- script: npm run bundle
4242
displayName: Compile
4343

4444
- script: >
@@ -51,35 +51,35 @@ extends:
5151
displayName: Override package.json
5252
5353
testSteps:
54-
- script: yarn install --frozen-lockfile --check-files
54+
- script: npm ci
5555
displayName: Install dependencies
5656
retryCountOnTaskFailure: 3
5757

58-
- script: yarn run bundle
58+
- script: npm run bundle
5959
displayName: Compile
6060

6161
- bash: |
6262
/usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
6363
echo ">>> Started xvfb"
6464
displayName: Start xvfb
6565
66-
- script: yarn run test
66+
- script: npm run test
6767
displayName: Run test suite
6868
env:
6969
DISPLAY: ':99.0'
7070
TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/test-results.xml
7171

72-
# - script: yarn run browsertest --browserType=chromium
72+
# - script: npm run browsertest --browserType=chromium
7373
# displayName: Run test suite (chromium)
7474
# env:
7575
# TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/browser-chromium-test-results.xml
7676

77-
# - script: yarn run browsertest --browserType=firefox
77+
# - script: npm run browsertest --browserType=firefox
7878
# displayName: Run test suite (firefox)
7979
# env:
8080
# TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/browser-firefox-test-results.xml
8181

82-
# - script: yarn run browsertest --browserType=webkit
82+
# - script: npm run browsertest --browserType=webkit
8383
# displayName: Run test suite (webkit)
8484
# env:
8585
# TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/browser-webkit-test-results.xml

‎azure-pipeline.pr.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
steps:
77
- template: scripts/ci/common-setup.yml
88

9-
- script: yarn run compile
9+
- script: npm run compile
1010
displayName: Compile
1111

1212
- script: npm run hygiene
@@ -15,25 +15,25 @@ jobs:
1515
- script: npm run lint
1616
displayName: Run lint
1717

18-
- script: yarn run check:commands
18+
- script: npm run check:commands
1919
displayName: Verify command registrations
2020

21-
- script: yarn run test
21+
- script: npm run test
2222
displayName: Run test suite
2323
env:
2424
TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/test-results.xml
2525

26-
# - script: yarn run browsertest --browserType=chromium
26+
# - script: npm run browsertest --browserType=chromium
2727
# displayName: Run test suite (chromium)
2828
# env:
2929
# TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/browser-chromium-test-results.xml
3030

31-
# - script: yarn run browsertest --browserType=firefox
31+
# - script: npm run browsertest --browserType=firefox
3232
# displayName: Run test suite (firefox)
3333
# env:
3434
# TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/browser-firefox-test-results.xml
3535

36-
# - script: yarn run browsertest --browserType=webkit
36+
# - script: npm run browsertest --browserType=webkit
3737
# displayName: Run test suite (webkit)
3838
# env:
3939
# TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/browser-webkit-test-results.xml

‎azure-pipeline.release.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,43 +31,43 @@ extends:
3131
nodeVersion: "20.x"
3232

3333
buildSteps:
34-
- script: yarn install --frozen-lockfile --check-files
34+
- script: npm ci
3535
displayName: Install dependencies
3636
retryCountOnTaskFailure: 3
3737

38-
- script: yarn run bundle
38+
- script: npm run bundle
3939
displayName: Compile
4040

4141
testSteps:
42-
- script: yarn install --frozen-lockfile --check-files
42+
- script: npm ci
4343
displayName: Install dependencies
4444
retryCountOnTaskFailure: 3
4545

46-
- script: yarn run bundle
46+
- script: npm run bundle
4747
displayName: Compile
4848

4949
- bash: |
5050
/usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
5151
echo ">>> Started xvfb"
5252
displayName: Start xvfb
5353
54-
- script: yarn run test
54+
- script: npm run test
5555
displayName: Run test suite
5656
env:
5757
DISPLAY: ':99.0'
5858
TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/test-results.xml
5959

60-
# - script: yarn run browsertest --browserType=chromium
60+
# - script: npm run browsertest --browserType=chromium
6161
# displayName: Run test suite (chromium)
6262
# env:
6363
# TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/browser-chromium-test-results.xml
6464

65-
# - script: yarn run browsertest --browserType=firefox
65+
# - script: npm run browsertest --browserType=firefox
6666
# displayName: Run test suite (firefox)
6767
# env:
6868
# TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/browser-firefox-test-results.xml
6969

70-
# - script: yarn run browsertest --browserType=webkit
70+
# - script: npm run browsertest --browserType=webkit
7171
# displayName: Run test suite (webkit)
7272
# env:
7373
# TEST_JUNIT_XML_PATH: $(Agent.HomeDirectory)/browser-webkit-test-results.xml

‎build/filters.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ module.exports.indentationFilter = [
4747

4848
// except multiple specific files
4949
'!**/package.json',
50+
'!**/package-lock.json',
5051
'!**/yarn.lock',
5152
'!**/yarn-error.log',
5253
'!**/fixtures/**/*'
@@ -70,6 +71,7 @@ module.exports.copyrightFilter = [
7071
'!**/*.yml',
7172
'!**/*.md',
7273
'!package.nls.json',
74+
'!**/package-lock.json',
7375
'!**/*.svg',
7476
'!src/integrations/gitlens/gitlens.d.ts',
7577
'!**/fixtures/**'

0 commit comments

Comments
 (0)