Skip to content

Commit b5a6aa1

Browse files
authoredSep 6, 2024
feat: switch to npm as default package manager (microsoft#226927)
* feat: move from yarn to npm * chore: skip yarn.lock files * fix: playwright download * chore: fix compile and hygiene * chore: bump vsce@2.17.0 Refs microsoft/vscode-vsce@8b49e9d * test: update results for bat and sh colorizer tests * fix: add missing lock files for windows * fix: switch to legacy-peer-deps * chore: update markdown-it@14.1.0 Refs markdown-it/markdown-it@737c95a esbuild step in extensions-ci-pr was previously using markdown-it from root which had userland punycode and was able to compile successfully. * ci: increase pr timeout for windows integration tests * chore: fix product build * build: ignore extension dev dependency for rcedit * build: fix working directory inside container * build: fix dependency generation * npm: update dependencies * ci: use global npmrc * ci: update cache * ci: setup global npmrc for private npm auth * build: fix extension bundling * chore: sync npm dependencies * ci: debug env variables for container * ci: fix win32 cli pipeline * build: fix npmrc config usage for build/ and remote/ dirs * fix: windows build * fix: container builds * fix: markdown-language-features tests and bundling ``` [03:58:22] Error: Command failed: /Users/demohan/.nvm/versions/node/v20.15.1/bin/node /Users/demohan/github/vscode/extensions/markdown-language-features/esbuild-notebook.js --outputRoot /Users/demohan/github/vscode/.build/extensions/markdown-language-features ✘ [ERROR] Could not resolve "punycode" extensions/markdown-language-features/node_modules/markdown-it/lib/index.js:14:27: 14 │ var punycode = require('punycode'); ╵ ~~~~~~~~~~ The package "punycode" wasn't found on the file system but is built into node. Are you trying to bundle for node? You can use "platform: 'node'" to do that, which will remove this error. ``` Adds userland package based on markdown-it/markdown-it@beed9ae * fix: container builds for distro * chore: update yarn occurrences * fixup! chore: bump vsce@2.17.0 Uses the closest version to `main` branch that does not include microsoft/vscode-vsce@d3cc84c while still having the fix microsoft/vscode-vsce@8b49e9d * chore: sync npm dependencies * chore: sync npm dependencies * chore: sync npm dependencies * chore: throw error when yarn is used for installation * chore: add review feedback * chore: switch exec => run where needed * chore: npm sync dependencies * fix: markdown-language-features bundling ``` ✘ [ERROR] Could not resolve "punycode" extensions/markdown-language-features/node_modules/markdown-it/lib/index.js:14:27: 14 │ var punycode = require('punycode'); ╵ ~~~~~~~~~~ The package "punycode" wasn't found on the file system but is built into node. Are you trying to bundle for node? You can use "platform: 'node'" to do that, which will remove this error. ``` Adds missing userland package based on markdown-it/markdown-it@beed9ae, can be removed once we update markdown-it >= 14.1.0 * ci: rename no-yarn-lock-changes.yml * chore: sync npm dependencies * ci: restore no-yarn-lock-changes.yml We can disable it in a separate PR to keep the required checks happy and also need workflow edit perms. * chore: sync npm dependencies * ci: rebuild cache * ci: fix no-package-lock-changes.yml * chore: bump distro * chore: rm yarn.lock files * chore: rm yarn.lock files without dependencies * chore: add vscode-selfhost-import-aid to postinstall dirs * chore: bump distro
1 parent 5ae8ffb commit b5a6aa1

File tree

306 files changed

+38280
-23071
lines changed

Some content is hidden

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

306 files changed

+38280
-23071
lines changed
 

‎.configurations/configuration.dsc.yaml

+1-12
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,6 @@ properties:
1818
id: OpenJS.NodeJS.LTS
1919
version: "20.14.0"
2020
source: winget
21-
- resource: NpmDsc/NpmPackage
22-
id: yarn
23-
dependsOn:
24-
- npm
25-
directives:
26-
description: Install Yarn
27-
allowPrerelease: true
28-
settings:
29-
Name: 'yarn'
30-
Global: true
31-
PackageDirectory: '${WinGetConfigRoot}\..\'
3221
- resource: Microsoft.WinGet.DSC/WinGetPackage
3322
directives:
3423
description: Install Python 3.10
@@ -56,7 +45,7 @@ properties:
5645
includeRecommended: true
5746
components:
5847
- Microsoft.VisualStudio.Workload.VCTools
59-
- resource: YarnDsc/YarnInstall
48+
- resource: NpmDsc/NpmInstall
6049
dependsOn:
6150
- npm
6251
directives:

‎.devcontainer/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ RUN git config --system codespaces-theme.hide-status 1
77

88
USER node
99
RUN npm install -g node-gyp
10-
RUN YARN_CACHE="$(yarn cache dir)" && rm -rf "$YARN_CACHE" && ln -s /vscode-dev/yarn-cache "$YARN_CACHE"
10+
RUN NPM_CACHE="$(npm config get cache)" && rm -rf "$NPM_CACHE" && ln -s /vscode-dev/npm-cache "$NPM_CACHE"
1111
RUN echo 'export DISPLAY="${DISPLAY:-:1}"' | tee -a ~/.bashrc >> ~/.zshrc
1212

1313
USER root
14-
CMD chown node:node /vscode-dev && sudo -u node mkdir -p /vscode-dev/yarn-cache && sleep inf
14+
CMD chown node:node /vscode-dev && sudo -u node mkdir -p /vscode-dev/npm-cache && sleep inf

0 commit comments

Comments
 (0)
Please sign in to comment.