Update Code to 1.94.2 (#7026)

* Update Code to 1.94.2 * Convert from yarn to npm This is to match VS Code. We were already partially using npm for the releases so this is some nice alignment. * Update caniuse-lite This was complaining on every unit test. * Update eslint I was having a bunch of dependency conflicts and eslint seemed to be the culprit so I just removed it and set it up again, since it seems things have changed quite a bit. * Update test dependencies I was getting oom when running the unit tests...updating seems to work. * Remove package.json `scripts` property in release The new pre-install script was being included, which is dev-only. This was always the intent; did not realize jq's merge was recursive. * Remove jest and devDependencies in release as well * Update test extension dependencies This appears to be conflicting with the root dependencies. * Fix playwright exec npm does not let you run binaries like yarn does, as far as I know. * Fix import of server-main.js * Fix several tests by waiting for selectors
coder · Oct 18, 2024 · fc6064d · fc6064d
1 parent 6b4b3e0
commit fc6064d
Show file tree

Hide file tree

Showing 67 changed files with 12,536 additions and 7,475 deletions.
diff --git a/.eslintrc.yaml b/.eslintrc.yaml
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -62,7 +62,7 @@ body:
     id: logs
     attributes:
       label: Logs
-      description: Run code-server with the --verbose flag and then paste any relevant logs from the server, from the browser console and/or the browser network tab. For issues with installation, include installation logs (i.e. output of `yarn global add code-server`).
+      description: Run code-server with the --verbose flag and then paste any relevant logs from the server, from the browser console and/or the browser network tab. For issues with installation, include installation logs (i.e. output of `npm install -g code-server`).
       render: shell
 
   - type: textarea

diff --git a/.github/PULL_REQUEST_TEMPLATE/release_template.md b/.github/PULL_REQUEST_TEMPLATE/release_template.md
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -19,7 +19,7 @@ concurrency:
 # this ensures that it only executes if all previous jobs succeeded.
 
 # if: steps.cache-node-modules.outputs.cache-hit != 'true'
-# will skip running `yarn install` if it successfully fetched from cache
+# will skip running `npm install` if it successfully fetched from cache
 
 jobs:
   prettier:
@@ -33,7 +33,7 @@ jobs:
       - name: Run prettier with actionsx/prettier
         uses: actionsx/prettier@v3
         with:
-          args: --check --loglevel=warn .
+          args: --check --log-level=warn .
 
   doctoc:
     name: Doctoc markdown files
@@ -55,14 +55,16 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version-file: .node-version
-          cache: "yarn"
+          cache: npm
+          cache-dependency-path: |
+            package-lock.json
+            test/package-lock.json
 
-      - name: Install doctoc
-        run: yarn global add [email protected]
+      - if: steps.changed-files.outputs.any_changed == 'true'
+        run: SKIP_SUBMODULE_DEPS=1 npm ci
 
-      - name: Run doctoc
-        if: steps.changed-files.outputs.any_changed == 'true'
-        run: yarn doctoc
+      - if: steps.changed-files.outputs.any_changed == 'true'
+        run: npm run doctoc
 
   lint-helm:
     name: Lint Helm chart
@@ -87,12 +89,10 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Install helm kubeval plugin
-        if: steps.changed-files.outputs.any_changed == 'true'
+      - if: steps.changed-files.outputs.any_changed == 'true'
         run: helm plugin install https://github.com/instrumenta/helm-kubeval
 
-      - name: Lint Helm chart
-        if: steps.changed-files.outputs.any_changed == 'true'
+      - if: steps.changed-files.outputs.any_changed == 'true'
         run: helm kubeval ci/helm-chart
 
   lint-ts:
@@ -120,24 +120,17 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version-file: .node-version
+          cache: npm
+          cache-dependency-path: |
+            package-lock.json
+            test/package-lock.json
 
-      - name: Fetch dependencies from cache
-        if: steps.changed-files.outputs.any_changed == 'true'
-        id: cache-node-modules
-        uses: actions/cache@v4
-        with:
-          path: "**/node_modules"
-          key: yarn-build-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            yarn-build-
-
-      - name: Install dependencies
-        if: steps.changed-files.outputs.any_changed == 'true' && steps.cache-node-modules.outputs.cache-hit != 'true'
-        run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
+      - if: steps.changed-files.outputs.any_changed == 'true'
+        run: SKIP_SUBMODULE_DEPS=1 npm ci
 
       - name: Lint TypeScript files
         if: steps.changed-files.outputs.any_changed == 'true'
-        run: yarn lint:ts
+        run: npm run lint:ts
 
   lint-actions:
     name: Lint GitHub Actions
@@ -175,24 +168,16 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version-file: .node-version
+          cache: npm
+          cache-dependency-path: |
+            package-lock.json
+            test/package-lock.json
 
-      - name: Fetch dependencies from cache
-        if: steps.changed-files.outputs.any_changed == 'true'
-        id: cache-node-modules
-        uses: actions/cache@v4
-        with:
-          path: "**/node_modules"
-          key: yarn-build-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            yarn-build-
+      - if: steps.changed-files.outputs.any_changed == 'true'
+        run: SKIP_SUBMODULE_DEPS=1 npm ci
 
-      - name: Install dependencies
-        if: steps.changed-files.outputs.any_changed == 'true' && steps.cache-node-modules.outputs.cache-hit != 'true'
-        run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
-
-      - name: Run unit tests
-        if: steps.changed-files.outputs.any_changed == 'true'
-        run: yarn test:unit
+      - if: steps.changed-files.outputs.any_changed == 'true'
+        run: npm run test:unit
 
       - name: Upload coverage report to Codecov
         uses: codecov/codecov-action@v4
@@ -229,24 +214,16 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version-file: .node-version
+          cache: npm
+          cache-dependency-path: |
+            package-lock.json
+            test/package-lock.json
 
-      - name: Fetch dependencies from cache
-        id: cache-node-modules
-        uses: actions/cache@v4
-        with:
-          path: "**/node_modules"
-          key: yarn-build-code-server-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            yarn-build-code-server-
-
-      - name: Install dependencies
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        run: yarn --frozen-lockfile
+      - run: SKIP_SUBMODULE_DEPS=1 npm ci
 
-      - name: Build code-server
-        env:
+      - env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: yarn build
+        run: npm run build
 
       # Get Code's git hash.  When this changes it means the content is
       # different and we need to rebuild.
@@ -269,17 +246,19 @@ jobs:
         env:
           VERSION: "0.0.0"
         if: steps.cache-vscode.outputs.cache-hit != 'true'
-        run: yarn build:vscode
+        run: |
+          pushd lib/vscode
+          npm ci
+          popd
+          npm run build:vscode
 
       # The release package does not contain any native modules
       # and is neutral to architecture/os/libc version.
-      - name: Create release package
-        run: yarn release
+      - run: npm run release
         if: success()
 
       # https://github.com/actions/upload-artifact/issues/38
-      - name: Compress release package
-        run: tar -czf package.tar.gz release
+      - run: tar -czf package.tar.gz release
 
       - name: Upload npm package artifact
         uses: actions/upload-artifact@v4
@@ -303,38 +282,28 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version-file: .node-version
+          cache: npm
+          cache-dependency-path: |
+            package-lock.json
+            test/package-lock.json
 
-      - name: Fetch dependencies from cache
-        id: cache-node-modules
-        uses: actions/cache@v4
-        with:
-          path: "**/node_modules"
-          key: yarn-build-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            yarn-build-
+      - run: SKIP_SUBMODULE_DEPS=1 npm ci
 
       - name: Download npm package
         uses: actions/download-artifact@v4
         with:
           name: npm-package
 
-      - name: Decompress npm package
-        run: tar -xzf package.tar.gz
+      - run: tar -xzf package.tar.gz
 
-      - name: Install release package dependencies
-        run: cd release && npm install --unsafe-perm --omit=dev
-
-      - name: Install dependencies
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
+      - run: cd release && npm install --unsafe-perm --omit=dev
 
       - name: Install Playwright OS dependencies
         run: |
           ./test/node_modules/.bin/playwright install-deps
           ./test/node_modules/.bin/playwright install
 
-      - name: Run end-to-end tests
-        run: CODE_SERVER_TEST_ENTRY=./release yarn test:e2e
+      - run: CODE_SERVER_TEST_ENTRY=./release npm run test:e2e
 
       - name: Upload test artifacts
         if: always()
@@ -362,30 +331,21 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version-file: .node-version
+          cache: npm
+          cache-dependency-path: |
+            package-lock.json
+            test/package-lock.json
 
-      - name: Fetch dependencies from cache
-        id: cache-node-modules
-        uses: actions/cache@v4
-        with:
-          path: "**/node_modules"
-          key: yarn-build-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            yarn-build-
+      - run: SKIP_SUBMODULE_DEPS=1 npm ci
 
       - name: Download npm package
         uses: actions/download-artifact@v4
         with:
           name: npm-package
 
-      - name: Decompress npm package
-        run: tar -xzf package.tar.gz
+      - run: tar -xzf package.tar.gz
 
-      - name: Install release package dependencies
-        run: cd release && npm install --unsafe-perm --omit=dev
-
-      - name: Install dependencies
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        run: SKIP_SUBMODULE_DEPS=1 yarn --frozen-lockfile
+      - run: cd release && npm install --unsafe-perm --omit=dev
 
       - name: Install Playwright OS dependencies
         run: |
@@ -409,22 +369,15 @@ jobs:
           mkdir -p ~/.cache/caddy
           tar -xzf caddy_2.5.2_linux_amd64.tar.gz --directory ~/.cache/caddy
 
-      - name: Start Caddy
-        run: sudo ~/.cache/caddy/caddy start --config ./ci/Caddyfile
+      - run: sudo ~/.cache/caddy/caddy start --config ./ci/Caddyfile
 
-      - name: Run end-to-end tests
-        run: CODE_SERVER_TEST_ENTRY=./release yarn test:e2e:proxy --global-timeout 840000
+      - run: CODE_SERVER_TEST_ENTRY=./release npm run test:e2e:proxy
 
-      - name: Stop Caddy
-        if: always()
+      - if: always()
         run: sudo ~/.cache/caddy/caddy stop --config ./ci/Caddyfile
 
-      - name: Upload test artifacts
-        if: always()
+      - if: always()
         uses: actions/upload-artifact@v4
         with:
           name: failed-test-videos-proxy
           path: ./test/test-results
-
-      - name: Remove release packages and test artifacts
-        run: rm -rf ./release ./test/test-results