sourcegraph · valerybugakov · Jan 12, 2023 · Dec 23, 2022 · Dec 23, 2022 · Dec 26, 2022
diff --git a/.browserslistrc b/.browserslistrc
@@ -1,6 +1,6 @@
 # This file is used in our production build to adjust CSS and JS output to support specified browsers. For additional information regarding the format and rule options, please see: https://github.com/browserslist/browserslist#queries
 
-# Run `yarn browserslist` to see which browsers are targeted by these queries
+# Run `pnpm browserslist` to see which browsers are targeted by these queries
 
 ### Primary browsers ###
 # Target browsers with the highest usage.

diff --git a/.buildkite/pipeline.async.yml b/.buildkite/pipeline.async.yml
@@ -6,14 +6,14 @@ env:
 
 steps:
   - command:
-      - COVERAGE_INSTRUMENT=true dev/ci/yarn-run.sh storybook:build
-      - yarn run cover-storybook
-      - yarn nyc report -r json
+      - COVERAGE_INSTRUMENT=true dev/ci/pnpm-run.sh storybook:build
+      - pnpm cover-storybook
+      - pnpm nyc report -r json
       - bash <(curl -s https://codecov.io/bash) -c -F typescript -F storybook
     label: ':storybook::codecov: Storybook coverage'
   - command:
-      - dev/ci/yarn-build.sh client/web
-      - yarn lhci autorun
+      - dev/ci/pnpm-build.sh client/web
+      - pnpm lhci autorun
     label: ':lighthouse: Lighthouse'
     retry:
       automatic:

diff --git a/.dockerignore b/.dockerignore
@@ -37,7 +37,8 @@ grapher/ruby/rubysonar/target
 grapher/ruby/rubysonar/dependency-reduced-pom.xml
 grapher/ruby/yard/.bundle
 npm-debug.log
-yarn-error.log
+pnpm-error.log
+pnpm-debug.log
 .codemod.bookmark
 .elasticbeanstalk/
 

diff --git a/.github/ISSUE_TEMPLATE/request_patch_release.md b/.github/ISSUE_TEMPLATE/request_patch_release.md
@@ -56,7 +56,7 @@ I have read [when and why we perform patch releases](https://handbook.sourcegrap
       - [ ] Change `previousRelease` to the previous patch release version
       - [ ] Change `releaseDate` to the current date (time is optional) along with `oneWorkingDayAfterRelease` and `threeWorkingDaysBeforeRelease`
       - [ ] Change `captainSlackUsername` and `captainGitHubUsername` to the patch captain's
-    - [ ] Run `yarn release tracking:issues` on `main`
+    - [ ] Run `pnpm release tracking:issues` on `main`
     - [ ] Add the listed commits alongside a link to this issue to the generated [release tracking issue](https://github.com/sourcegraph/sourcegraph/issues?q=is%3Aissue+label%3Arelease-tracking+)
 - [ ] **Comment and close this issue once the relevant commit(s) have been cherry-picked into the release branch**.
 

diff --git a/.github/workflows/licenses-check.yml b/.github/workflows/licenses-check.yml
@@ -6,6 +6,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+    - uses: pnpm/action-setup@v2
+      id: pnpm-install
+      with:
+        version: 7.24.2
+        run_install: false
+    - name: Get pnpm store directory
+      id: pnpm-cache
+      shell: bash
+      run: |
+        echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+    - uses: actions/cache@v3
+      name: Setup pnpm cache
+      with:
+        path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+        key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+        restore-keys: |
+          ${{ runner.os }}-pnpm-store-
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: '3.1.3' # Not needed with a .ruby-version file   - uses: actions/setup-ruby@v1

diff --git a/.github/workflows/licenses-update.yml b/.github/workflows/licenses-update.yml
@@ -16,9 +16,8 @@ jobs:
     - name: Install asdf plugins
       uses: asdf-vm/actions/install@v1
 
-    # we use classic yarn to install the new version of yarn
-    - name: ensure the correct version of yarn
-      run: yarn
+    - name: Install npm dependencies
+      run: pnpm install --frozen-lockfile
 
     - name: Install license_finder
       run: gem install license_finder:7.1.0 # sync with licenses-check.yml

diff --git a/.github/workflows/lighthouse-production.yml-disabled b/.github/workflows/lighthouse-production.yml-disabled
@@ -19,7 +19,7 @@ jobs:
       with: { node-version: '${{ steps.nvmrc.outputs.NODE_VERSION }}' }
 
     - name: Install dependencies
-      run: yarn --ignore-engines --ignore-scripts
+      run: pnpm --ignore-scripts
 
     - name: Run Lighthouse
       run: |

diff --git a/.github/workflows/scip-typescript.yml b/.github/workflows/scip-typescript.yml
@@ -12,10 +12,27 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - uses: pnpm/action-setup@v2
+        id: pnpm-install
+        with:
+          version: 7.24.2
+          run_install: false
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+      - uses: actions/cache@v3
+        name: Setup pnpm cache
+        with:
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
       - name: Install npm dependencies
-        run: yarn
-      - run: yarn generate
-      - run: yarn dlx -p @sourcegraph/scip-typescript scip-typescript index --yarn-berry-workspaces
+        run: pnpm install --frozen-lockfile
+      - run: pnpm generate
+      - run: pnpm dlx @sourcegraph/scip-typescript index --pnpm-workspaces
       - run: cp index.scip dump.lsif-typed
       - name: Install src-cli
         run: |

diff --git a/.gitignore b/.gitignore
@@ -45,7 +45,8 @@ grapher/ruby/rubysonar/target
 grapher/ruby/rubysonar/dependency-reduced-pom.xml
 grapher/ruby/yard/.bundle
 npm-debug.log
-yarn-error.log
+pnpm-error.log
+pnpm-debug.log
 .codemod.bookmark
 .elasticbeanstalk/
 
@@ -181,14 +182,5 @@ go.work.sum
 # binary
 /sg
 
-# New Yarn without using Zero-Installs (https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored)
-.pnp.*
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions
-
 # SCIP
 index.scip
diff --git a/.npmrc b/.npmrc
@@ -3,6 +3,18 @@
 # rules_js lays out under Bazel (without a hidden node_modules/.pnpm/node_modules)
 hoist=false
 
+# We have to hoist storybook packages because storybok@6 is incompatible with pnpm and relies on
+# package hoisting for internal imports. We cannot migrate to storybook@7 because it's currently
+# in beta and multiple addons that we use are not yet compatible with the beta version.
+# The storybook@7 is fully compatible with pnpm, and once addons are updated, we can upgrade
+# and remove these hoist patterns. For more context, see:
+# https://github.com/storybookjs/storybook/issues/13428#issuecomment-1368062647
+public-hoist-pattern[]=*storybook*
+public-hoist-pattern[]=global
+
+# We have to hoist eslint packages to use them in the `.eslintrc` config.
+public-hoist-pattern[]=*eslint*
+
 # npm_translate_lock with the yarn.lock file will complain about missing/incorrect peer dependencies.
 # Temporarily ignore warnings until we switch to pnpm and can user pnpm.packageExtensions to fix them.
 # https://pnpm.io/package_json#pnpmpackageextensions

diff --git a/.tool-versions b/.tool-versions
@@ -1,9 +1,5 @@
 golang 1.19.3
 nodejs 16.18.1
-# We install classic yarn with asdf, and then use yarn itself to upgrade to 3.2.3
-# This is done because there is a problem fetching yarn via asdf, instead the version is
-# specified in .yarnrc via the yarnPath.
-yarn 1.22.19
 fd 7.4.0
 shfmt 3.5.0
 shellcheck 0.7.1
@@ -16,3 +12,4 @@ awscli 2.4.7
 python system
 rust 1.62.0
 ruby 3.1.3
+pnpm 7.24.2
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -37,17 +37,17 @@
     "build.allowImplicitNetworkAccess": true,
     "local": "github.com/sourcegraph/sourcegraph"
   },
-  "jest.jestCommandLine": "yarn test",
+  "jest.jestCommandLine": "pnpm test",
   "jest.showCoverageOnLoad": false,
   "gulp.autoDetect": "off",
-  "npm.packageManager": "yarn",
+  "npm.packageManager": "pnpm",
   "npm.runSilent": true,
   "typescript.preferences.quoteStyle": "single",
   "typescript.preferences.importModuleSpecifier": "relative",
   "typescript.format.semicolons": "remove",
   "typescript.tsc.autoDetect": "off",
   "typescript.tsdk": "node_modules/typescript/lib",
-  "eslint.packageManager": "yarn",
+  "eslint.packageManager": "pnpm",
   "eslint.lintTask.enable": false,
   "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
   "editor.codeActionsOnSave": {},

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -35,7 +35,7 @@
     },
     {
       "label": "stylelint",
-      "command": "yarn",
+      "command": "pnpm",
       "args": ["run", "lint:css:all", "--", "--formatter", "compact"],
       "problemMatcher": {
         "owner": "stylelint",