diff --git a/.azure-pipelines/publish-nightly.yml b/.azure-pipelines/publish-nightly.yml index 081ab373..2517d717 100644 --- a/.azure-pipelines/publish-nightly.yml +++ b/.azure-pipelines/publish-nightly.yml @@ -57,7 +57,7 @@ extends: - script: npm ci displayName: Install NPM dependencies - - script: yarn ts-node ./scripts/ci/monaco-editor-core-prepare nightly + - script: npm run ts-node ./scripts/ci/monaco-editor-core-prepare nightly env: VSCODE_REF: ${{ parameters.vscodeRef }} PRERELEASE_VERSION: ${{ parameters.prereleaseVersion }} @@ -78,7 +78,7 @@ extends: - script: npm ci displayName: Install NPM dependencies - - script: yarn ts-node ./scripts/ci/monaco-editor-prepare nightly + - script: npm run ts-node ./scripts/ci/monaco-editor-prepare nightly env: VSCODE_REF: ${{ parameters.vscodeRef }} PRERELEASE_VERSION: ${{ parameters.prereleaseVersion }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index db226144..aed40b1e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,12 +65,12 @@ jobs: - name: Install website node modules working-directory: website - run: yarn install --frozen-lockfile + run: npm ci - name: Build website working-directory: website - run: yarn run build + run: npm run build - name: Test website working-directory: website - run: yarn test + run: npm run test diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index 1ff6c69a..32e9898d 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -28,7 +28,7 @@ jobs: uses: actions/checkout@v3 - uses: actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561 # pin@v2 with: - node-version: 16 + node-version: 20 - name: Cache node modules id: cacheNodeModules uses: actions/cache@v2 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 68998ab7..2a71e8ae 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -35,7 +35,7 @@ This can be done directly from the VS Code repository and does not involve the m - Clone the [VS Code repository](https://github.com/microsoft/vscode): `git clone https://github.com/microsoft/vscode` - Open the repository in VS Code: `code vscode` -- Run `yarn install` +- Run `npm install` - Select and run the launch configuration "Monaco Editor Playground" (this might take a while, as it compiles the sources): ![](./docs/launch%20config.png) diff --git a/scripts/ci/monaco-editor-core.sh b/scripts/ci/monaco-editor-core.sh index 52725a15..56f4c2f9 100755 --- a/scripts/ci/monaco-editor-core.sh +++ b/scripts/ci/monaco-editor-core.sh @@ -3,18 +3,18 @@ set -e # cwd must be the vscode repository. -yarn --frozen-lockfile --network-timeout 180000 -yarn playwright-install -yarn gulp hygiene -yarn valid-layers-check -yarn --cwd build compile -yarn eslint -yarn monaco-compile-check -yarn --max_old_space_size=4095 compile +npm ci +npm run playwright-install +npm run gulp hygiene +npm run valid-layers-check +cd build && npm run compile && cd - +npm run eslint +npm run monaco-compile-check +npm run compile -yarn test-browser --browser chromium +npm run test-browser --browser chromium -yarn gulp editor-distro +npm run gulp editor-distro mkdir typings-test cd typings-test @@ -25,10 +25,10 @@ echo "import '../out-monaco-editor-core';" > a.ts cd .. cd test/monaco -yarn run esm-check -yarn run bundle-webpack -yarn run compile -yarn test +npm run esm-check +npm run bundle-webpack +npm run compile +npm test cd ../.. # npm package is now in dependencies/vscode/out-monaco-editor-core, ready to be published