feat: lift dependencies from the root package.json to client workspaces package.json

Author: gitstart-sourcegraph

.npmrc

@@ -1,8 +1,11 @@
 # Disabling pnpm [hoisting](https://pnpm.io/npmrc#hoist) by setting `hoist=false` is recommended on
 # projects using rules_js so that pnpm outside of Bazel lays out a node_modules tree similar to what
 # rules_js lays out under Bazel (without a hidden node_modules/.pnpm/node_modules)
-hoist=true
-shamefully-hoist=true
+hoist=false
+
+hoist-pattern[]=*eslint*
+hoist-pattern[]=*babel*
+hoist-pattern[]=*jest*
 
 # 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.

client/branded/package.json

@@ -4,9 +4,39 @@
   "version": "1.0.0",
   "license": "Apache-2.0",
   "scripts": {
-    "storybook": "STORIES_GLOB='client/branded/src/**/*.story.tsx' pnpm workspace @sourcegraph/storybook run start",
-    "lint:js": "pnpm run -T eslint --cache '**/*.[jt]s?(x)'",
-    "lint:css": "pnpm run -T stylelint 'src/**/*.scss' --quiet",
-    "test": "pnpm run -T jest"
+    "storybook": "STORIES_GLOB='client/branded/src/**/*.story.tsx' pnpm --filter @sourcegraph/storybook run start",
+    "lint:js": "pnpm eslint --cache '**/*.[jt]s?(x)'",
+    "lint:css": "pnpm stylelint 'src/**/*.scss' --quiet",
+    "test": "pnpm jest"
+  },
+  "devDependencies": {
+    "@sourcegraph/extension-api-types": "workspace:*",
+    "@storybook/addon-actions": "^6.5.14",
+    "@testing-library/react": "^13.4.0",
+    "@testing-library/user-event": "^13.5.0",
+    "sinon": "^9.0.2",
+    "@types/react": "18.0.8",
+    "@types/react-dom": "18.0.2",
+    "@storybook/react": "^6.5.14"
+  },
+  "dependencies": {
+    "@sourcegraph/wildcard": "workspace:*",
+    "@sourcegraph/common": "workspace:*",
+    "@sourcegraph/shared": "workspace:*",
+    "@sourcegraph/client-api": "workspace:*",
+    "@sourcegraph/codeintellify": "workspace:*",
+    "@sourcegraph/search-ui": "workspace:*",
+    "@mdi/js": "^6.7.96",
+    "classnames": "^2.2.6",
+    "comlink": "^4.3.0",
+    "copy-to-clipboard": "^3.3.1",
+    "date-fns": "^2.16.1",
+    "history": "4.5.1",
+    "lodash": "^4.17.20",
+    "mdi-react": "^8.1.0",
+    "react": "18.1.0",
+    "react-dom": "18.1.0",
+    "react-router": "^5.2.0",
+    "rxjs": "^6.6.3"
   }
 }

client/browser/package.json

@@ -7,7 +7,7 @@
     "pnpm": ">1.10.0"
   },
   "scripts": {
-    "storybook": "STORIES_GLOB='client/browser/src/**/*.story.tsx' pnpm workspace @sourcegraph/storybook run start",
+    "storybook": "STORIES_GLOB='client/browser/src/**/*.story.tsx' pnpm --filter @sourcegraph/storybook run start",
     "build-inline-extensions": "node scripts/build-inline-extensions",
     "predev": "pnpm run build-inline-extensions",
     "dev": "pnpm run predev && NODE_ENV=development NODE_OPTIONS=--max_old_space_size=8192 node -r ts-node/register scripts/development",
@@ -16,21 +16,82 @@
     "dev:chrome": "TARGETS=chrome pnpm run dev",
     "dev:edge": "TARGETS=edge pnpm run dev",
     "dev:safari": "TARGETS=safari pnpm run build",
-    "prebuild": "pnpm -T run generate && pnpm run build-inline-extensions",
+    "prebuild": "pnpm -w run generate && pnpm run build-inline-extensions",
     "build": "pnpm run prebuild && NODE_ENV=production NODE_OPTIONS=--max_old_space_size=8192 node -r ts-node/register scripts/build",
     "release": "pnpm release:chrome",
-    "release:chrome": "pnpm run -T webstore upload --auto-publish --source build/bundles/chrome-bundle.zip --extension-id dgjhfomjieaadpoljlnidmbgkdffpack --client-id $GOOGLE_CLIENT_ID --client-secret $GOOGLE_CLIENT_SECRET --refresh-token $GOOGLE_REFRESH_TOKEN",
+    "release:chrome": "pnpm webstore upload --auto-publish --source build/bundles/chrome-bundle.zip --extension-id dgjhfomjieaadpoljlnidmbgkdffpack --client-id $GOOGLE_CLIENT_ID --client-secret $GOOGLE_CLIENT_SECRET --refresh-token $GOOGLE_REFRESH_TOKEN",
     "release:firefox": "./scripts/release-firefox.sh",
-    "release:npm": "TS_NODE_COMPILER_OPTIONS=\"{\\\"module\\\":\\\"commonjs\\\"}\" pnpm run -T ts-node ./scripts/publish-npm.ts",
-    "lint": "pnpm run  -T eslint && pnpm run -T stylelint",
-    "lint:js": "pnpm run -T eslint --cache '**/*.[jt]s?(x)'",
-    "lint:css": "pnpm run -T stylelint 'src/**/*.scss'",
+    "release:npm": "TS_NODE_COMPILER_OPTIONS=\"{\\\"module\\\":\\\"commonjs\\\"}\" pnpm ts-node ./scripts/publish-npm.ts",
+    "lint": "pnpm eslint && pnpm stylelint",
+    "lint:js": "pnpm eslint --cache '**/*.[jt]s?(x)'",
+    "lint:css": "pnpm stylelint 'src/**/*.scss'",
     "clean": "rm -rf build/ dist/ *.zip *.xpi .checksum",
-    "test": "pnpm run -T jest --testPathIgnorePatterns end-to-end integration",
-    "test-e2e": "pnpm run -T mocha './src/end-to-end/**/*.test.ts'",
-    "run-integration": "TS_NODE_PROJECT=src/integration/tsconfig.json SOURCEGRAPH_BASE_URL=https://sourcegraph.com pnpm run -T mocha --parallel=${CI:-\"false\"} --retries=2 ./src/integration/**/*.test.ts",
+    "test": "pnpm jest --testPathIgnorePatterns end-to-end integration",
+    "test-e2e": "pnpm mocha './src/end-to-end/**/*.test.ts'",
+    "run-integration": "TS_NODE_PROJECT=src/integration/tsconfig.json SOURCEGRAPH_BASE_URL=https://sourcegraph.com pnpm mocha --parallel=${CI:-\"false\"} --retries=2 ./src/integration/**/*.test.ts",
     "test-integration": "node scripts/test-integration",
     "record-integration": "node scripts/record-integration",
     "create-source-zip": "node scripts/create-source-zip"
+  },
+  "devDependencies": {
+    "@sourcegraph/build-config": "workspace:*",
+    "@sourcegraph/extension-api-types": "workspace:*",
+    "@testing-library/react": "^13.4.0",
+    "css-minimizer-webpack-plugin": "^4.2.2",
+    "execa": "^5.0.0",
+    "expect": "^27.5.1",
+    "googleapis": "^47.0.0",
+    "graphql": "^15.4.0",
+    "jsdom": "^16.7.0",
+    "latest-version": "^5.1.0",
+    "mini-css-extract-plugin": "^2.7.2",
+    "mz": "^2.7.0",
+    "process": "^0.11.10",
+    "puppeteer": "^13.5.1",
+    "shelljs": "^0.8.4",
+    "signale": "^1.4.0",
+    "simmerjs": "^0.5.6",
+    "sinon": "^9.0.2",
+    "socket.io": "^4.5.2",
+    "socket.io-client": "^4.5.2",
+    "terser-webpack-plugin": "^5.3.6",
+    "utc-version": "^2.0.2",
+    "webpack": "^5.75.0",
+    "worker-loader": "^3.0.8",
+    "jest-fetch-mock": "^3.0.3",
+    "monaco-editor": "^0.24.0",
+    "@types/react": "18.0.8",
+    "@types/react-dom": "18.0.2",
+    "@storybook/react": "^6.5.14"
+  },
+  "dependencies": {
+    "@sourcegraph/common": "workspace:*",
+    "@sourcegraph/shared": "workspace:*",
+    "@sourcegraph/wildcard": "workspace:*",
+    "@sourcegraph/branded": "workspace:*",
+    "@sourcegraph/http-client": "workspace:*",
+    "@sourcegraph/client-api": "workspace:*",
+    "@sourcegraph/codeintellify": "workspace:*",
+    "@mdi/js": "^6.7.96",
+    "@reach/combobox": "^0.16.5",
+    "@sentry/browser": "^7.8.1",
+    "@sourcegraph/extension-api-classes": "^1.1.0",
+    "classnames": "^2.2.6",
+    "comlink": "^4.3.0",
+    "delay": "^4.4.1",
+    "history": "4.5.1",
+    "jsonc-parser": "^3.0.0",
+    "lodash": "^4.17.20",
+    "mdi-react": "^8.1.0",
+    "path-browserify": "^1.0.1",
+    "react": "18.1.0",
+    "react-dom": "18.1.0",
+    "rxjs": "^6.6.3",
+    "semver": "^7.3.2",
+    "string-score": "^1.0.1",
+    "url": "^0.11.0",
+    "utility-types": "^3.10.0",
+    "uuid": "^8.3.0",
+    "webext-domain-permission-toggle": "^1.0.1"
   }
 }

client/build-config/package.json

@@ -7,7 +7,29 @@
   "sideEffects": false,
   "license": "Apache-2.0",
   "scripts": {
-    "lint:js": "pnpm run -T eslint --cache 'src/**/*.[jt]s?(x)'",
-    "test": "pnpm run -T jest"
+    "lint:js": "pnpm eslint --cache 'src/**/*.[jt]s?(x)'",
+    "test": "pnpm jest"
+  },
+  "devDependencies": {
+    "css-loader": "^6.7.2",
+    "enhanced-resolve": "^5.9.3",
+    "esbuild": "^0.16.10",
+    "monaco-editor-webpack-plugin": "^3.1.0",
+    "postcss": "^8.4.19",
+    "postcss-loader": "^7.0.2",
+    "postcss-modules": "^6.0.0",
+    "sass": "^1.32.4",
+    "sass-loader": "^13.2.0",
+    "signale": "^1.4.0",
+    "style-loader": "^3.3.1",
+    "terser-webpack-plugin": "^5.3.6",
+    "webpack": "^5.75.0",
+    "worker-loader": "^3.0.8",
+    "@statoscope/webpack-plugin": "^5.24.0"
+  },
+  "dependencies": {
+    "monaco-editor": "^0.24.0",
+    "monaco-yaml": "^3.2.1",
+    "path-browserify": "^1.0.1"
   }
 }

client/client-api/package.json

@@ -7,7 +7,15 @@
   "sideEffects": false,
   "license": "Apache-2.0",
   "scripts": {
-    "lint:js": "pnpm run -T eslint --cache 'src/**/*.[jt]s?(x)'",
-    "test": "pnpm run -T jest"
+    "lint:js": "pnpm eslint --cache 'src/**/*.[jt]s?(x)'",
+    "test": "pnpm jest"
+  },
+  "devDependencies": {
+    "@sourcegraph/extension-api-types": "workspace:*"
+  },
+  "dependencies": {
+    "@sourcegraph/template-parser": "workspace:*",
+    "@sourcegraph/extension-api-classes": "^1.1.0",
+    "utility-types": "^3.10.0"
   }
 }

client/codeintellify/package.json

@@ -7,7 +7,16 @@
   "sideEffects": false,
   "license": "Apache-2.0",
   "scripts": {
-    "lint:js": "pnpm run -T eslint --cache 'src/**/*.[jt]s?(x)'",
-    "test": "pnpm run -T jest"
+    "lint:js": "pnpm eslint --cache 'src/**/*.[jt]s?(x)'",
+    "test": "pnpm jest"
+  },
+  "devDependencies": {
+    "@sourcegraph/extension-api-types": "workspace:*"
+  },
+  "dependencies": {
+    "@sourcegraph/common": "workspace:*",
+    "lodash": "^4.17.20",
+    "rxjs": "^6.6.3",
+    "ts-key-enum": "^2.0.7"
   }
 }

client/common/package.json

@@ -7,7 +7,25 @@
   "sideEffects": false,
   "license": "Apache-2.0",
   "scripts": {
-    "lint:js": "pnpm run -T eslint --cache 'src/**/*.[jt]s?(x)'",
-    "test": "pnpm run -T jest"
+    "lint:js": "pnpm eslint --cache 'src/**/*.[jt]s?(x)'",
+    "test": "pnpm jest"
+  },
+  "devDependencies": {
+    "@sourcegraph/extension-api-types": "workspace:*",
+    "expect": "^27.5.1",
+    "graphql": "^15.4.0",
+    "mockdate": "^3.0.2",
+    "jest-fetch-mock": "^3.0.3"
+  },
+  "dependencies": {
+    "delay": "^4.4.1",
+    "highlight.js": "^10.5.0",
+    "highlightjs-graphql": "^1.0.2",
+    "jsonc-parser": "^3.0.0",
+    "lodash": "^4.17.20",
+    "marked": "4.0.16",
+    "rxjs": "^6.6.3",
+    "sanitize-html": "^2.0.0",
+    "utility-types": "^3.10.0"
   }
 }

client/extension-api-types/package.json

@@ -19,8 +19,8 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "lint:js": "pnpm run -T eslint 'src/**/*.[jt]s?(x)'",
-    "prepublish": "pnpm run -T eslint"
+    "lint:js": "pnpm eslint 'src/**/*.[jt]s?(x)'",
+    "prepublish": "pnpm eslint"
   },
   "peerDependencies": {
     "sourcegraph": "*"

client/extension-api/package.json

@@ -21,12 +21,14 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "lint:js": "pnpm run -T eslint 'src/*.[jt]s?(x)'",
-    "docs": "pnpm run -T typedoc",
-    "prepublish": "pnpm run -T eslint && pnpm run docs"
+    "lint:js": "pnpm eslint 'src/*.[jt]s?(x)'",
+    "docs": "pnpm typedoc",
+    "prepublish": "pnpm eslint && pnpm run docs"
   },
   "devDependencies": {
-    "typedoc": "^0.17.8"
+    "typedoc": "^0.17.8",
+    "graphql": "^15.4.0",
+    "signale": "^1.4.0"
   },
   "peerDependencies": {
     "graphql": "^15.4.0"

client/http-client/package.json

@@ -7,7 +7,26 @@
   "sideEffects": false,
   "license": "Apache-2.0",
   "scripts": {
-    "lint:js": "pnpm run -T eslint --cache 'src/**/*.[jt]s?(x)'",
-    "test": "pnpm run -T jest"
+    "lint:js": "pnpm eslint --cache 'src/**/*.[jt]s?(x)'",
+    "test": "pnpm jest"
+  },
+  "devDependencies": {
+    "graphql": "^15.4.0",
+    "node-fetch": "^2.6.7",
+    "sinon": "^9.0.2",
+    "@types/react": "18.0.8",
+    "@types/react-dom": "18.0.2"
+  },
+  "dependencies": {
+    "@sourcegraph/common": "workspace:*",
+    "@sourcegraph/shared": "workspace:*",
+    "@apollo/client": "^3.5.0",
+    "apollo3-cache-persist": "^0.12.1",
+    "delay": "^4.4.1",
+    "lodash": "^4.17.20",
+    "react": "18.1.0",
+    "react-dom": "18.1.0",
+    "rxjs": "^6.6.3",
+    "utility-types": "^3.10.0"
   }
 }

client/jetbrains/package.json

@@ -15,12 +15,47 @@
   "scripts": {
     "build": "pnpm task:gulp esbuild",
     "lint": "pnpm run lint:js && pnpm run lint:css",
-    "lint:js": "pnpm run -T eslint --cache 'webview/**/*.[jt]s?(x)'",
-    "lint:css": "pnpm run -T stylelint 'webview/**/*.scss'",
-    "standalone": "pnpm run -T ts-node standalone/src/server.ts",
-    "storybook": "STORIES_GLOB='client/jetbrains/webview/src/**/*.story.tsx' pnpm workspace @sourcegraph/storybook run start",
-    "task:gulp": "pnpm run -T cross-env NODE_OPTIONS=\"--max_old_space_size=8192\" gulp",
-    "typecheck": "pnpm run -T tsc -b",
+    "lint:js": "pnpm eslint --cache 'webview/**/*.[jt]s?(x)'",
+    "lint:css": "pnpm stylelint 'webview/**/*.scss'",
+    "standalone": "pnpm ts-node standalone/src/server.ts",
+    "storybook": "STORIES_GLOB='client/jetbrains/webview/src/**/*.story.tsx' pnpm --filter @sourcegraph/storybook run start",
+    "task:gulp": "pnpm cross-env NODE_OPTIONS=\"--max_old_space_size=8192\" gulp",
+    "typecheck": "pnpm tsc -b",
     "watch": "WATCH=true pnpm task:gulp esbuild"
+  },
+  "devDependencies": {
+    "@sourcegraph/build-config": "workspace:*",
+    "@sourcegraph/storybook": "workspace:*",
+    "@sourcegraph/eslint-plugin-wildcard": "workspace:*",
+    "buffer": "^6.0.3",
+    "esbuild": "^0.16.10",
+    "express": "^4.17.1",
+    "jsdom": "^16.7.0",
+    "process": "^0.11.10",
+    "shelljs": "^0.8.4",
+    "storybook-dark-mode": "^2.0.4",
+    "ts-node": "^10.7.0",
+    "@types/react": "18.0.8",
+    "@types/react-dom": "18.0.2",
+    "@storybook/react": "^6.5.14"
+  },
+  "dependencies": {
+    "@sourcegraph/branded": "workspace:*",
+    "@sourcegraph/shared": "workspace:*",
+    "@sourcegraph/common": "workspace:*",
+    "@sourcegraph/wildcard": "workspace:*",
+    "@sourcegraph/http-client": "workspace:*",
+    "@sourcegraph/search-ui": "workspace:*",
+    "@mdi/js": "^6.7.96",
+    "date-fns": "^2.16.1",
+    "https-browserify": "^1.0.0",
+    "js-base64": "^3.7.2",
+    "mdi-react": "^8.1.0",
+    "path-browserify": "^1.0.1",
+    "react": "18.1.0",
+    "react-dom": "18.1.0",
+    "rxjs": "^6.6.3",
+    "stream-http": "^3.2.0",
+    "url": "^0.11.0"
   }
 }

client/observability-client/package.json

@@ -7,7 +7,27 @@
   "sideEffects": false,
   "license": "Apache-2.0",
   "scripts": {
-    "lint:js": "pnpm run -T eslint --cache 'src/**/*.[jt]s?(x)'",
-    "test": "pnpm run -T jest"
+    "lint:js": "pnpm eslint --cache 'src/**/*.[jt]s?(x)'",
+    "test": "pnpm jest"
+  },
+  "devDependencies": {
+    "@types/react": "18.0.8",
+    "@types/react-dom": "18.0.2"
+  },
+  "dependencies": {
+    "@sourcegraph/common": "workspace:*",
+    "@opentelemetry/api": "^1.1.0",
+    "@opentelemetry/core": "1.5.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.31.0",
+    "@opentelemetry/instrumentation": "^0.31.0",
+    "@opentelemetry/instrumentation-fetch": "^0.31.0",
+    "@opentelemetry/resources": "1.5.0",
+    "@opentelemetry/sdk-trace-base": "1.5.0",
+    "@opentelemetry/sdk-trace-web": "^1.5.0",
+    "@opentelemetry/semantic-conventions": "^1.5.0",
+    "is-absolute-url": "^3.0.3",
+    "lodash": "^4.17.20",
+    "react": "18.1.0",
+    "react-dom": "18.1.0"
   }
 }