From 09d898704af747b73b27b912e69218835ea6c31a Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Thu, 22 Jun 2023 09:33:15 -0700 Subject: [PATCH] build: update to Aspect CLI 5.5.2 (#53692) Required adding a few import ignore directives in `client/web/BUILD.bazel`. @jbedard is working on a fix for those. Has to do with tsconfig paths. Fix will land in a future release. ## Test plan 5.4.11 output: ``` $ bazel configure Updating BUILD files for protobuf, go, javascript WARN[0000] Failed to load base tsconfig file @sourcegraph/tsconfig: open /Users/greg/aspect/sourcegraph/sourcegraph/@sourcegraph/tsconfig: no such file or directory client/app-shell/src/app-shell.tsx parse error(s): 50: Top-level await is currently not supported with the "iife" output format Failed to parse tsconfig file client/completions-review-tool/tsconfig.json: ERR: position:298 object key must be string pos:298 : 933 BUILD files visited 0 BUILD files updated ``` 5.5.2 output has some new spam as well: ``` $ bazel configure Updating BUILD files for protobuf, go, javascript WARN[0000] Failed to load base tsconfig file @sourcegraph/tsconfig: open /Users/greg/aspect/sourcegraph/sourcegraph/@sourcegraph/tsconfig: no such file or directory Failed to parse tsconfig file client/completions-review-tool/tsconfig.json: ERR: position:298 object key must be string pos:298 : client/web/src/globals.d.ts: 17: } ^ client/web/src/storm/backend/route-loader.ts: 41: usePreloadedQueryData: () => ReturnType> ^ 41: usePreloadedQueryData: () => ReturnType> ^ 934 BUILD files visited 0 BUILD files updated ``` --- .bazeliskrc | 2 +- client/branded/BUILD.bazel | 11 ++++--- client/browser/BUILD.bazel | 11 ++++--- client/browser/src/end-to-end/BUILD.bazel | 8 +++-- client/client-api/BUILD.bazel | 9 ++--- client/codeintellify/BUILD.bazel | 4 +-- client/cody-shared/BUILD.bazel | 1 - client/cody-slack/BUILD.bazel | 1 + client/cody-ui/BUILD.bazel | 3 +- client/cody/BUILD.bazel | 2 +- client/cody/test/integration/BUILD.bazel | 1 + client/common/BUILD.bazel | 11 +++---- client/http-client/BUILD.bazel | 9 +++-- client/jetbrains/webview/BUILD.bazel | 2 +- client/observability-client/BUILD.bazel | 2 -- client/shared/BUILD.bazel | 10 ++++-- client/shared/src/testing/BUILD.bazel | 7 ++-- client/storybook/BUILD.bazel | 8 ++--- client/vscode/BUILD.bazel | 12 ++++--- client/web/BUILD.bazel | 33 +++++++++++-------- client/web/dev/BUILD.bazel | 6 ++-- client/web/scripts/BUILD.bazel | 2 +- client/web/src/end-to-end/BUILD.bazel | 2 ++ client/web/src/integration/BUILD.bazel | 10 ++++-- client/web/src/regression/BUILD.bazel | 5 +-- client/wildcard/BUILD.bazel | 20 +++++------ .../crates/scip-syntax/BUILD.bazel | 4 +-- .../crates/sg-syntax/BUILD.bazel | 6 ++-- 28 files changed, 113 insertions(+), 89 deletions(-) diff --git a/.bazeliskrc b/.bazeliskrc index 7b0036d1714..12cdc63935a 100644 --- a/.bazeliskrc +++ b/.bazeliskrc @@ -1,2 +1,2 @@ BAZELISK_BASE_URL=https://github.com/aspect-build/aspect-cli/releases/download -USE_BAZEL_VERSION=aspect/5.4.11 +USE_BAZEL_VERSION=aspect/5.5.2 diff --git a/client/branded/BUILD.bazel b/client/branded/BUILD.bazel index 5a8ce35eed2..60a15f678c1 100644 --- a/client/branded/BUILD.bazel +++ b/client/branded/BUILD.bazel @@ -167,12 +167,11 @@ ts_project( "src/search-ui/util/stars.ts", ], tsconfig = ":tsconfig", - # TODO(bazel): type-only #keep imports deps = [ ":module_style_typings", ":node_modules/@sourcegraph/codeintellify", #keep ":node_modules/@sourcegraph/common", - ":node_modules/@sourcegraph/extension-api-types", #keep + ":node_modules/@sourcegraph/extension-api-types", ":node_modules/@sourcegraph/observability-client", ":node_modules/@sourcegraph/shared", ":node_modules/@sourcegraph/wildcard", @@ -185,7 +184,7 @@ ts_project( "//:node_modules/@reach/visually-hidden", "//:node_modules/@types/classnames", "//:node_modules/@types/dompurify", - "//:node_modules/@types/history", #keep + "//:node_modules/@types/history", "//:node_modules/@types/lodash", "//:node_modules/@types/node", "//:node_modules/@types/react", @@ -196,7 +195,7 @@ ts_project( "//:node_modules/date-fns", "//:node_modules/dompurify", "//:node_modules/fzf", - "//:node_modules/history", #keep + "//:node_modules/history", "//:node_modules/lodash", "//:node_modules/mdi-react", "//:node_modules/react", @@ -208,7 +207,7 @@ ts_project( "//:node_modules/ts-key-enum", "//:node_modules/use-resize-observer", "//client/shared:graphql_operations", - "//client/shared:shared_lib", #keep + "//client/shared:shared_lib", ], ) @@ -246,9 +245,11 @@ ts_project( tsconfig = ":tsconfig", deps = [ ":branded_lib", + ":node_modules/@sourcegraph/extension-api-types", ":node_modules/@sourcegraph/shared", ":node_modules/@sourcegraph/testing", ":node_modules/@sourcegraph/wildcard", + "//:node_modules/@codemirror/autocomplete", "//:node_modules/@codemirror/state", "//:node_modules/@testing-library/react", "//:node_modules/@testing-library/user-event", diff --git a/client/browser/BUILD.bazel b/client/browser/BUILD.bazel index 3f2796b84a6..02d3a78b98d 100644 --- a/client/browser/BUILD.bazel +++ b/client/browser/BUILD.bazel @@ -230,7 +230,6 @@ ts_project( "src/types/webextension-polyfill/index.d.ts", ], tsconfig = ":tsconfig", - # TODO(bazel): type-only #keep imports deps = [ ":graphql_operations", ":module_style_typings", @@ -238,7 +237,7 @@ ts_project( ":node_modules/@sourcegraph/client-api", ":node_modules/@sourcegraph/codeintellify", ":node_modules/@sourcegraph/common", - ":node_modules/@sourcegraph/extension-api-types", #keep + ":node_modules/@sourcegraph/extension-api-types", ":node_modules/@sourcegraph/http-client", ":node_modules/@sourcegraph/shared", ":node_modules/@sourcegraph/wildcard", @@ -256,7 +255,7 @@ ts_project( "//:node_modules/@types/simmerjs", "//:node_modules/@types/uuid", "//:node_modules/classnames", - "//:node_modules/comlink", #keep + "//:node_modules/comlink", "//:node_modules/graphql", "//:node_modules/history", "//:node_modules/jest", #keep @@ -268,7 +267,7 @@ ts_project( "//:node_modules/react-dom", "//:node_modules/rxjs", "//:node_modules/simmerjs", - "//:node_modules/utility-types", #keep + "//:node_modules/utility-types", "//:node_modules/uuid", "//:node_modules/webext-domain-permission-toggle", "//:node_modules/webextension-polyfill", @@ -302,15 +301,18 @@ ts_project( tsconfig = ":tsconfig", deps = [ ":browser", + ":graphql_operations", ":node_modules/@sourcegraph/common", ":node_modules/@sourcegraph/http-client", ":node_modules/@sourcegraph/shared", ":node_modules/@sourcegraph/wildcard", #keep + ":node_modules/sourcegraph", "//:node_modules/@testing-library/react", "//:node_modules/@types/lodash", "//:node_modules/@types/mz", "//:node_modules/@types/node", "//:node_modules/@types/sinon", + "//:node_modules/comlink", "//:node_modules/jest-fetch-mock", "//:node_modules/lodash", "//:node_modules/mz", @@ -318,6 +320,7 @@ ts_project( "//:node_modules/rxjs", "//:node_modules/sinon", "//:node_modules/util", + "//:node_modules/utility-types", ], ) diff --git a/client/browser/src/end-to-end/BUILD.bazel b/client/browser/src/end-to-end/BUILD.bazel index 2d42bd2d2b3..0bc4f85c309 100644 --- a/client/browser/src/end-to-end/BUILD.bazel +++ b/client/browser/src/end-to-end/BUILD.bazel @@ -21,8 +21,9 @@ ts_project( tsconfig = ":tsconfig", deps = [ "//:node_modules/@types/node", + "//:node_modules/@types/puppeteer", "//:node_modules/expect", - "//:node_modules/puppeteer", #keep + "//:node_modules/puppeteer", "//client/browser:node_modules/@sourcegraph/shared", ], ) @@ -42,11 +43,12 @@ ts_project( ":end-to-end", "//:node_modules/@types/lodash", "//:node_modules/@types/node", + "//:node_modules/@types/puppeteer", "//:node_modules/expect", "//:node_modules/lodash", - "//:node_modules/puppeteer", #keep + "//:node_modules/puppeteer", "//:node_modules/rxjs", - "//client/browser", #keep + "//client/browser", "//client/browser:node_modules/@sourcegraph/common", "//client/browser:node_modules/@sourcegraph/shared", ], diff --git a/client/client-api/BUILD.bazel b/client/client-api/BUILD.bazel index 56f6b6dcd0a..9e5cddc478c 100644 --- a/client/client-api/BUILD.bazel +++ b/client/client-api/BUILD.bazel @@ -29,12 +29,12 @@ ts_project( "src/textDocument.ts", ], tsconfig = ":tsconfig", - # TODO(bazel): "#keep"s required for type-only imports deps = [ - ":node_modules/@sourcegraph/extension-api-types", #keep - ":node_modules/@sourcegraph/template-parser", #keep + ":node_modules/@sourcegraph/extension-api-types", + ":node_modules/@sourcegraph/template-parser", + ":node_modules/sourcegraph", "//:node_modules/@sourcegraph/extension-api-classes", - "//:node_modules/utility-types", #keep + "//:node_modules/utility-types", ], ) @@ -45,6 +45,7 @@ ts_project( tsconfig = ":tsconfig", deps = [ ":client-api_lib", + ":node_modules/@sourcegraph/extension-api-types", "//:node_modules/@sourcegraph/extension-api-classes", ], ) diff --git a/client/codeintellify/BUILD.bazel b/client/codeintellify/BUILD.bazel index 59d184a53ad..d5d91b5dabe 100644 --- a/client/codeintellify/BUILD.bazel +++ b/client/codeintellify/BUILD.bazel @@ -33,10 +33,9 @@ ts_project( "src/typings/html.d.ts", ], tsconfig = ":tsconfig", - # TODO(bazel): "#keep"s required for type-only imports deps = [ ":node_modules/@sourcegraph/common", - ":node_modules/@sourcegraph/extension-api-types", #keep + ":node_modules/@sourcegraph/extension-api-types", "//:node_modules/@types/lodash", "//:node_modules/lodash", "//:node_modules/rxjs", @@ -71,6 +70,7 @@ ts_project( deps = [ ":codeintellify_lib", ":node_modules/@sourcegraph/common", + ":node_modules/@sourcegraph/extension-api-types", "//:node_modules/@types/lodash", "//:node_modules/@types/node", "//:node_modules/lodash", diff --git a/client/cody-shared/BUILD.bazel b/client/cody-shared/BUILD.bazel index a2b9650c54c..987f935fdb1 100644 --- a/client/cody-shared/BUILD.bazel +++ b/client/cody-shared/BUILD.bazel @@ -91,7 +91,6 @@ ts_project( "src/utils.ts", ], tsconfig = ":tsconfig", - # TODO(bazel): "#keep"s required for type-only imports deps = [ ":node_modules/@sourcegraph/common", ":node_modules/@sourcegraph/http-client", diff --git a/client/cody-slack/BUILD.bazel b/client/cody-slack/BUILD.bazel index 6a04fc7c2ab..67e22a29d7f 100644 --- a/client/cody-slack/BUILD.bazel +++ b/client/cody-slack/BUILD.bazel @@ -46,6 +46,7 @@ ts_project( ":node_modules/openai", ":node_modules/slackify-markdown", "//:node_modules/@types/lodash", + "//:node_modules/@types/node", "//:node_modules/envalid", "//:node_modules/lodash", "//:node_modules/octokit", diff --git a/client/cody-ui/BUILD.bazel b/client/cody-ui/BUILD.bazel index 174c58968e0..051383365e0 100644 --- a/client/cody-ui/BUILD.bazel +++ b/client/cody-ui/BUILD.bazel @@ -51,12 +51,11 @@ ts_project( ":cody-ui_styles", ], tsconfig = ":tsconfig", - # TODO(bazel): "#keep"s required for type-only imports deps = [ ":node_modules/@sourcegraph/cody-shared", ":node_modules/@sourcegraph/common", "//:node_modules/@mdi/js", - "//:node_modules/@storybook/react", #keep + "//:node_modules/@storybook/react", "//:node_modules/@types/classnames", "//:node_modules/@types/react", "//:node_modules/classnames", diff --git a/client/cody/BUILD.bazel b/client/cody/BUILD.bazel index e8ab2da91d9..45d0f511227 100644 --- a/client/cody/BUILD.bazel +++ b/client/cody/BUILD.bazel @@ -126,7 +126,7 @@ ts_project( ":node_modules/@sourcegraph/cody-ui", ":node_modules/lru-cache", ":node_modules/wink-nlp-utils", - "//:node_modules/@storybook/react", #keep + "//:node_modules/@storybook/react", "//:node_modules/@types/classnames", "//:node_modules/@types/jest", #keep "//:node_modules/@types/lodash", diff --git a/client/cody/test/integration/BUILD.bazel b/client/cody/test/integration/BUILD.bazel index 7f7cf00f78c..5bd685d6cfc 100644 --- a/client/cody/test/integration/BUILD.bazel +++ b/client/cody/test/integration/BUILD.bazel @@ -42,5 +42,6 @@ ts_project( "//:node_modules/mocha", "//client/cody", "//client/cody:cody_tests", + "//client/cody:node_modules/@sourcegraph/cody-shared", ], ) diff --git a/client/common/BUILD.bazel b/client/common/BUILD.bazel index f99738fc236..d156e14673d 100644 --- a/client/common/BUILD.bazel +++ b/client/common/BUILD.bazel @@ -54,25 +54,24 @@ ts_project( "src/util/url.ts", ], tsconfig = ":tsconfig", - # TODO(bazel): "#keep"s required for type-only imports deps = [ - ":node_modules/@sourcegraph/extension-api-types", #keep + ":node_modules/@sourcegraph/extension-api-types", "//:node_modules/@types/dompurify", "//:node_modules/@types/highlight.js", - "//:node_modules/@types/history", #keep + "//:node_modules/@types/history", "//:node_modules/@types/lodash", "//:node_modules/@types/marked", "//:node_modules/@types/node", #keep "//:node_modules/dompurify", "//:node_modules/highlight.js", "//:node_modules/highlightjs-graphql", - "//:node_modules/history", #keep + "//:node_modules/history", "//:node_modules/jsonc-parser", "//:node_modules/lodash", "//:node_modules/marked", - "//:node_modules/react-router-dom", #keep + "//:node_modules/react-router-dom", "//:node_modules/rxjs", - "//:node_modules/utility-types", #keep + "//:node_modules/utility-types", ], ) diff --git a/client/http-client/BUILD.bazel b/client/http-client/BUILD.bazel index 1fe0bc33938..a5a5c0607c6 100644 --- a/client/http-client/BUILD.bazel +++ b/client/http-client/BUILD.bazel @@ -31,20 +31,19 @@ ts_project( "src/index.ts", ], tsconfig = ":tsconfig", - # TODO(bazel): "#keep"s required for type-only imports deps = [ ":node_modules/@sourcegraph/common", "//:node_modules/@apollo/client", "//:node_modules/@types/lodash", - "//:node_modules/@types/node-fetch", #keep + "//:node_modules/@types/node-fetch", "//:node_modules/@types/react", - "//:node_modules/apollo3-cache-persist", #keep + "//:node_modules/apollo3-cache-persist", "//:node_modules/graphql", "//:node_modules/lodash", - "//:node_modules/node-fetch", #keep + "//:node_modules/node-fetch", "//:node_modules/react", "//:node_modules/rxjs", - "//:node_modules/utility-types", #keep + "//:node_modules/utility-types", ], ) diff --git a/client/jetbrains/webview/BUILD.bazel b/client/jetbrains/webview/BUILD.bazel index e81fd44666f..f3e19737b0c 100644 --- a/client/jetbrains/webview/BUILD.bazel +++ b/client/jetbrains/webview/BUILD.bazel @@ -128,7 +128,7 @@ ts_project( "//:node_modules/mdi-react", "//:node_modules/react", "//:node_modules/react-dom", - "//:node_modules/react-router-dom", #keep + "//:node_modules/react-router-dom", "//:node_modules/rxjs", "//client/jetbrains:node_modules/@sourcegraph/branded", "//client/jetbrains:node_modules/@sourcegraph/common", diff --git a/client/observability-client/BUILD.bazel b/client/observability-client/BUILD.bazel index 0371b149ed4..871b43aec9a 100644 --- a/client/observability-client/BUILD.bazel +++ b/client/observability-client/BUILD.bazel @@ -58,9 +58,7 @@ ts_project( ":node_modules/@sourcegraph/common", "//:node_modules/@opentelemetry/api", "//:node_modules/@opentelemetry/core", - "//:node_modules/@opentelemetry/exporter-trace-otlp-http", "//:node_modules/@opentelemetry/instrumentation", - "//:node_modules/@opentelemetry/resources", "//:node_modules/@opentelemetry/sdk-trace-base", "//:node_modules/@opentelemetry/sdk-trace-web", "//:node_modules/@opentelemetry/semantic-conventions", diff --git a/client/shared/BUILD.bazel b/client/shared/BUILD.bazel index 395fa7a8fbd..236272c5771 100644 --- a/client/shared/BUILD.bazel +++ b/client/shared/BUILD.bazel @@ -268,6 +268,7 @@ ts_project( "src/react-shortcuts/index.ts", "src/react-shortcuts/keys.ts", "src/schema/extensionSchema.ts", + # TODO(bazel): #keep can be removed after https://github.com/aspect-build/aspect-cli/issues/479 is fixed "src/schema/settings.schema.d.ts", #keep "src/search/backend.ts", "src/search/helpers.ts", @@ -343,10 +344,11 @@ ts_project( ":node_modules/@sourcegraph/client-api", ":node_modules/@sourcegraph/codeintellify", ":node_modules/@sourcegraph/common", - ":node_modules/@sourcegraph/extension-api-types", #keep + ":node_modules/@sourcegraph/extension-api-types", ":node_modules/@sourcegraph/http-client", ":node_modules/@sourcegraph/template-parser", ":node_modules/@sourcegraph/wildcard", + ":node_modules/sourcegraph", "//:node_modules/@apollo/client", "//:node_modules/@codemirror/language", "//:node_modules/@codemirror/state", @@ -383,8 +385,8 @@ ts_project( "//:node_modules/tagged-template-noop", "//:node_modules/use-deep-compare-effect", "//:node_modules/util", - "//:node_modules/utility-types", #keep - "//:node_modules/zustand", #keep + "//:node_modules/utility-types", + "//:node_modules/zustand", "//schema:settings", #keep ], ) @@ -480,10 +482,12 @@ ts_project( ":node_modules/@sourcegraph/client-api", ":node_modules/@sourcegraph/codeintellify", ":node_modules/@sourcegraph/common", + ":node_modules/@sourcegraph/extension-api-types", ":node_modules/@sourcegraph/http-client", ":node_modules/@sourcegraph/template-parser", ":node_modules/@sourcegraph/testing", ":node_modules/@sourcegraph/wildcard", + ":node_modules/sourcegraph", ":shared_lib", "//:node_modules/@apollo/client", "//:node_modules/@sourcegraph/extension-api-classes", diff --git a/client/shared/src/testing/BUILD.bazel b/client/shared/src/testing/BUILD.bazel index 29f31af2696..b15078077df 100644 --- a/client/shared/src/testing/BUILD.bazel +++ b/client/shared/src/testing/BUILD.bazel @@ -82,12 +82,13 @@ ts_project( "//:node_modules/@types/react", "//:node_modules/@types/sinon", "//:node_modules/@types/uuid", - "//:node_modules/axe-core", #keep + "//:node_modules/axe-core", "//:node_modules/chalk", + "//:node_modules/comlink", "//:node_modules/date-fns", "//:node_modules/delay", "//:node_modules/expect", - "//:node_modules/graphql", #keep + "//:node_modules/graphql", "//:node_modules/jest", #keep "//:node_modules/jest-mock-extended", "//:node_modules/jsonc-parser", @@ -100,6 +101,7 @@ ts_project( "//:node_modules/prettier", "//:node_modules/puppeteer", "//:node_modules/react", + "//:node_modules/react-visibility-sensor", "//:node_modules/rxjs", "//:node_modules/sinon", "//:node_modules/string-width", @@ -107,6 +109,7 @@ ts_project( "//:node_modules/ts-key-enum", "//:node_modules/util", "//:node_modules/uuid", + "//client/shared:graphql_operations", "//client/shared:node_modules/@sourcegraph/build-config", "//client/shared:node_modules/@sourcegraph/client-api", "//client/shared:node_modules/@sourcegraph/common", diff --git a/client/storybook/BUILD.bazel b/client/storybook/BUILD.bazel index c991f7b5c4b..2c60bc6b018 100644 --- a/client/storybook/BUILD.bazel +++ b/client/storybook/BUILD.bazel @@ -54,16 +54,15 @@ ts_project( "src/webpack.config.dll.ts", ], tsconfig = ":tsconfig", - # TODO(bazel): "#keep"s required for type-only imports deps = [ ":module_style_typings", ":node_modules/@sourcegraph/build-config", ":node_modules/@sourcegraph/wildcard", "//:node_modules/@storybook/addon-actions", "//:node_modules/@storybook/addon-console", - "//:node_modules/@storybook/addons", #keep - "//:node_modules/@storybook/core-common", #keep - "//:node_modules/@storybook/react", #keep + "//:node_modules/@storybook/addons", + "//:node_modules/@storybook/core-common", + "//:node_modules/@storybook/react", "//:node_modules/@storybook/theming", "//:node_modules/@types/case-sensitive-paths-webpack-plugin", "//:node_modules/@types/classnames", @@ -92,7 +91,6 @@ ts_project( testonly = True, srcs = ["src/coverage.test.ts"], tsconfig = ":tsconfig", - # TODO(bazel): "#keep"s required for type-only imports deps = [ ":node_modules/@sourcegraph/shared", "//:node_modules/@storybook/addon-storyshots", diff --git a/client/vscode/BUILD.bazel b/client/vscode/BUILD.bazel index ec11817e808..8d1d098c14d 100644 --- a/client/vscode/BUILD.bazel +++ b/client/vscode/BUILD.bazel @@ -197,21 +197,21 @@ ts_project( "src/webview/theming/sourcegraphTheme.ts", ], tsconfig = ":tsconfig", - # TODO(bazel): type-only #keep imports deps = [ ":graphql_operations", ":module_style_typings", ":node_modules/@sourcegraph/branded", - ":node_modules/@sourcegraph/client-api", #keep - ":node_modules/@sourcegraph/codeintellify", #keep + ":node_modules/@sourcegraph/client-api", + ":node_modules/@sourcegraph/codeintellify", ":node_modules/@sourcegraph/common", - ":node_modules/@sourcegraph/extension-api-types", #keep + ":node_modules/@sourcegraph/extension-api-types", ":node_modules/@sourcegraph/http-client", ":node_modules/@sourcegraph/shared", ":node_modules/@sourcegraph/wildcard", "//:node_modules/@mdi/js", "//:node_modules/@reach/visually-hidden", "//:node_modules/@types/classnames", + "//:node_modules/@types/history", "//:node_modules/@types/lodash", "//:node_modules/@types/node", "//:node_modules/@types/node-fetch", @@ -221,12 +221,13 @@ ts_project( "//:node_modules/@types/vscode", "//:node_modules/@types/vscode-webview", #keep "//:node_modules/@vscode/webview-ui-toolkit", - "//:node_modules/agent-base", #keep + "//:node_modules/agent-base", "//:node_modules/classnames", "//:node_modules/comlink", "//:node_modules/core-js", "//:node_modules/execa", "//:node_modules/graphql", + "//:node_modules/history", "//:node_modules/http-proxy-agent", "//:node_modules/https-proxy-agent", "//:node_modules/lodash", @@ -238,6 +239,7 @@ ts_project( "//:node_modules/react-router-dom", "//:node_modules/rxjs", "//:node_modules/use-deep-compare-effect", + "//:node_modules/utility-types", "//:node_modules/uuid", "//:node_modules/zustand", "//client/common:common_lib", #keep diff --git a/client/web/BUILD.bazel b/client/web/BUILD.bazel index 2a6cf558a5a..8aea5da2b72 100644 --- a/client/web/BUILD.bazel +++ b/client/web/BUILD.bazel @@ -20,6 +20,13 @@ load("//dev:eslint.bzl", "eslint_config_and_lint_root", "eslint_test_with_types" # gazelle:js_ignore_imports **/*.worker.ts # gazelle:js_ignore_imports **/SourcegraphWebApp.scss +# Ignores added with update to Apsect CLI 5.5.2 +# TODO(bazel): remove these once the underlying bug with tsconfig paths is fixed +# gazelle:js_ignore_imports src/graphql-operations +# gazelle:js_ignore_imports src/jscontext +# gazelle:js_ignore_imports src/stores/navbarSearchQueryState +# gazelle:js_ignore_imports ../../schema.json + npm_link_all_packages(name = "node_modules") eslint_config_and_lint_root( @@ -1699,18 +1706,17 @@ ts_project( ":enterprise-yaml", ], tsconfig = ":tsconfig", - # TODO(bazel): type-only #keep imports deps = [ - ":code_intel_schema", #keep + ":code_intel_schema", ":graphql_operations", ":module_style_typings", ":node_modules/@sourcegraph/branded", - ":node_modules/@sourcegraph/client-api", #keep - ":node_modules/@sourcegraph/codeintellify", #keep + ":node_modules/@sourcegraph/client-api", + ":node_modules/@sourcegraph/codeintellify", ":node_modules/@sourcegraph/cody-shared", ":node_modules/@sourcegraph/cody-ui", ":node_modules/@sourcegraph/common", - ":node_modules/@sourcegraph/extension-api-types", #keep + ":node_modules/@sourcegraph/extension-api-types", ":node_modules/@sourcegraph/http-client", ":node_modules/@sourcegraph/observability-client", ":node_modules/@sourcegraph/shared", @@ -1737,11 +1743,11 @@ ts_project( "//:node_modules/@opentelemetry/sdk-trace-base", "//:node_modules/@opentelemetry/semantic-conventions", "//:node_modules/@reach/combobox", - "//:node_modules/@reach/tabs", #keep + "//:node_modules/@reach/tabs", "//:node_modules/@reach/visually-hidden", - "//:node_modules/@sentry/browser", #keep + "//:node_modules/@sentry/browser", "//:node_modules/@sourcegraph/extension-api-classes", - "//:node_modules/@storybook/client-api", #keep + "//:node_modules/@storybook/client-api", "//:node_modules/@tauri-apps/api", "//:node_modules/@types/bloomfilter", "//:node_modules/@types/chrome", #keep @@ -1770,7 +1776,7 @@ ts_project( "//:node_modules/apollo3-cache-persist", "//:node_modules/bloomfilter", "//:node_modules/classnames", - "//:node_modules/comlink", #keep + "//:node_modules/comlink", "//:node_modules/copy-to-clipboard", "//:node_modules/d3-time-format", "//:node_modules/date-fns", @@ -1811,7 +1817,7 @@ ts_project( "//:node_modules/use-callback-ref", "//:node_modules/use-debounce", "//:node_modules/use-resize-observer", - "//:node_modules/utility-types", #keep + "//:node_modules/utility-types", "//:node_modules/uuid", "//:node_modules/yaml-ast-parser", "//:node_modules/zustand", @@ -1822,7 +1828,7 @@ ts_project( js_library( name = "code_intel_schema", srcs = [ - "src/enterprise/codeintel/configuration/schema.json", #keep + "src/enterprise/codeintel/configuration/schema.json", ], ) @@ -1953,10 +1959,11 @@ ts_project( "src/util/url.test.ts", ], tsconfig = ":tsconfig", - # TODO(bazel): type-only #keep imports deps = [ ":graphql_operations", ":module_style_typings", + ":node_modules/@sourcegraph/branded", + ":node_modules/@sourcegraph/codeintellify", ":node_modules/@sourcegraph/common", ":node_modules/@sourcegraph/http-client", ":node_modules/@sourcegraph/shared", @@ -1968,7 +1975,7 @@ ts_project( "//:node_modules/@codemirror/view", "//:node_modules/@testing-library/dom", "//:node_modules/@testing-library/react", - "//:node_modules/@testing-library/react-hooks", #keep + "//:node_modules/@testing-library/react-hooks", "//:node_modules/@testing-library/user-event", "//:node_modules/@types/history", "//:node_modules/@types/lodash", diff --git a/client/web/dev/BUILD.bazel b/client/web/dev/BUILD.bazel index c181392704c..3b942608952 100644 --- a/client/web/dev/BUILD.bazel +++ b/client/web/dev/BUILD.bazel @@ -53,9 +53,9 @@ ts_project( "//:node_modules/jsonc-parser", "//:node_modules/lodash", "//:node_modules/signale", - "//:node_modules/webpack", #keep - "//:node_modules/webpack-dev-server", #keep + "//:node_modules/webpack", + "//:node_modules/webpack-dev-server", "//client/web:node_modules/@sourcegraph/build-config", - "//client/web:web_lib", #keep + "//client/web:web_lib", ], ) diff --git a/client/web/scripts/BUILD.bazel b/client/web/scripts/BUILD.bazel index aebdfd86342..84a32d9b793 100644 --- a/client/web/scripts/BUILD.bazel +++ b/client/web/scripts/BUILD.bazel @@ -9,7 +9,7 @@ ts_project( module = "commonjs", tsconfig = "//client/web:tsconfig", deps = [ - "//:node_modules/@types/shelljs", #keep + "//:node_modules/@types/shelljs", "//:node_modules/octokit", "//:node_modules/shelljs", ], diff --git a/client/web/src/end-to-end/BUILD.bazel b/client/web/src/end-to-end/BUILD.bazel index 134e6acac5f..e32f4792bce 100644 --- a/client/web/src/end-to-end/BUILD.bazel +++ b/client/web/src/end-to-end/BUILD.bazel @@ -27,7 +27,9 @@ ts_project( tsconfig = ":tsconfig", use_preset_env = False, deps = [ + "//:node_modules/@types/mocha", "//:node_modules/@types/mockdate", + "//:node_modules/mocha", "//:node_modules/mockdate", "//client/web:node_modules/@sourcegraph/shared", ], diff --git a/client/web/src/integration/BUILD.bazel b/client/web/src/integration/BUILD.bazel index a9525fcc604..dfbd237d90f 100644 --- a/client/web/src/integration/BUILD.bazel +++ b/client/web/src/integration/BUILD.bazel @@ -30,16 +30,17 @@ ts_project( ], module = "commonjs", tsconfig = ":tsconfig", - # TODO(bazel): type-only imports deps = [ + "//:node_modules/@codemirror/view", "//:node_modules/@types/lodash", "//:node_modules/@types/pollyjs__core", #keep + "//:node_modules/@types/puppeteer", "//:node_modules/lodash", - "//:node_modules/puppeteer", #keep + "//:node_modules/puppeteer", "//client/web:graphql_operations", "//client/web:node_modules/@sourcegraph/common", "//client/web:node_modules/@sourcegraph/shared", - "//client/web:web_lib", #keep + "//client/web:web_lib", "//client/web/dev", ], ) @@ -89,15 +90,18 @@ ts_project( "//:node_modules/@types/lodash", "//:node_modules/@types/mocha", "//:node_modules/@types/node", + "//:node_modules/@types/puppeteer", "//:node_modules/date-fns", "//:node_modules/delay", "//:node_modules/expect", "//:node_modules/lodash", "//:node_modules/mocha", + "//:node_modules/puppeteer", "//:node_modules/ts-key-enum", "//client/web:graphql_operations", "//client/web:node_modules/@sourcegraph/common", "//client/web:node_modules/@sourcegraph/shared", + "//client/web:web_lib", ], ) diff --git a/client/web/src/regression/BUILD.bazel b/client/web/src/regression/BUILD.bazel index 82df1082987..9b042a51caf 100644 --- a/client/web/src/regression/BUILD.bazel +++ b/client/web/src/regression/BUILD.bazel @@ -39,12 +39,13 @@ ts_project( tsconfig = ":tsconfig", deps = [ "//:node_modules/@types/lodash", + "//:node_modules/@types/puppeteer", "//:node_modules/jsonc-parser", "//:node_modules/lodash", - "//:node_modules/puppeteer", #keep + "//:node_modules/puppeteer", "//:node_modules/rxjs", "//:node_modules/ts-key-enum", - "//client/web:graphql_operations", #keep + "//client/web:graphql_operations", "//client/web:node_modules/@sourcegraph/common", "//client/web:node_modules/@sourcegraph/http-client", "//client/web:node_modules/@sourcegraph/shared", diff --git a/client/wildcard/BUILD.bazel b/client/wildcard/BUILD.bazel index 2ef5a02abdb..03bab7d8419 100644 --- a/client/wildcard/BUILD.bazel +++ b/client/wildcard/BUILD.bazel @@ -430,11 +430,11 @@ ts_project( "//:node_modules/@testing-library/react", "//:node_modules/@types/classnames", "//:node_modules/@types/d3-format", - "//:node_modules/@types/d3-scale", #keep - "//:node_modules/@types/d3-shape", #keep + "//:node_modules/@types/d3-scale", + "//:node_modules/@types/d3-shape", "//:node_modules/@types/d3-time-format", - "//:node_modules/@types/d3-voronoi", #keep - "//:node_modules/@types/history", #keep + "//:node_modules/@types/d3-voronoi", + "//:node_modules/@types/history", "//:node_modules/@types/lodash", "//:node_modules/@types/node", #keep "//:node_modules/@types/react", @@ -449,16 +449,16 @@ ts_project( "//:node_modules/@visx/responsive", "//:node_modules/@visx/scale", "//:node_modules/@visx/shape", - "//:node_modules/@visx/text", #keep + "//:node_modules/@visx/text", "//:node_modules/@visx/voronoi", "//:node_modules/chromatic", "//:node_modules/classnames", "//:node_modules/d3-format", - "//:node_modules/d3-scale", #keep - "//:node_modules/d3-shape", #keep + "//:node_modules/d3-scale", + "//:node_modules/d3-shape", "//:node_modules/d3-time-format", - "//:node_modules/d3-voronoi", #keep - "//:node_modules/history", #keep + "//:node_modules/d3-voronoi", + "//:node_modules/history", "//:node_modules/is-absolute-url", "//:node_modules/lodash", "//:node_modules/mdi-react", @@ -473,7 +473,7 @@ ts_project( "//:node_modules/ts-key-enum", "//:node_modules/use-callback-ref", "//:node_modules/use-resize-observer", - "//:node_modules/utility-types", #keep + "//:node_modules/utility-types", "//:node_modules/uuid", ], ) diff --git a/docker-images/syntax-highlighter/crates/scip-syntax/BUILD.bazel b/docker-images/syntax-highlighter/crates/scip-syntax/BUILD.bazel index 0d3a22ed064..0dc8744d23e 100644 --- a/docker-images/syntax-highlighter/crates/scip-syntax/BUILD.bazel +++ b/docker-images/syntax-highlighter/crates/scip-syntax/BUILD.bazel @@ -21,8 +21,8 @@ rust_library( deps = all_crate_deps( normal = True, ) + [ - "//docker-images/syntax-highlighter/crates/scip-treesitter:scip-treesitter", - "//docker-images/syntax-highlighter/crates/scip-treesitter-languages:scip-treesitter-languages", + "//docker-images/syntax-highlighter/crates/scip-treesitter", + "//docker-images/syntax-highlighter/crates/scip-treesitter-languages", ], ) diff --git a/docker-images/syntax-highlighter/crates/sg-syntax/BUILD.bazel b/docker-images/syntax-highlighter/crates/sg-syntax/BUILD.bazel index 4ec67ef205d..15c3aac77a3 100644 --- a/docker-images/syntax-highlighter/crates/sg-syntax/BUILD.bazel +++ b/docker-images/syntax-highlighter/crates/sg-syntax/BUILD.bazel @@ -14,9 +14,9 @@ rust_library( deps = all_crate_deps( normal = True, ) + [ - "//docker-images/syntax-highlighter/crates/scip-syntax:scip-syntax", - "//docker-images/syntax-highlighter/crates/scip-treesitter:scip-treesitter", - "//docker-images/syntax-highlighter/crates/scip-treesitter-languages:scip-treesitter-languages", + "//docker-images/syntax-highlighter/crates/scip-syntax", + "//docker-images/syntax-highlighter/crates/scip-treesitter", + "//docker-images/syntax-highlighter/crates/scip-treesitter-languages", ], )