Update aspect dependencies (#1873)

* build: update to latest aspect_bazel_lib, aspect_rules_js, aspect_rules_jasmine and aspect_rules_esbuild

* ci: enable `ASPECT_RULES_JS_FROZEN_PNPM_LOCK` to ensure outdated pnpm file is flagged

In the migration period, until we decide to switch to `pnpm` fully, a pnpm lock file needs to be kept in sync. By default, `rules_js` will try to sync it automatically, but rather we would want to flag it as an error on CI if the pnpm file is outdated- so that not all users need to pay the cost of having to run `pnpm import` from time to time.

---------

Co-authored-by: Greg Magolan <[email protected]>

Author: devversion

.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE2Njg3NjQwMg==

@@ -0,0 +1,7 @@
+# Input hashes for repository rule npm_translate_lock(name = "npm_integration_workspace", pnpm_lock = "//integration/workspace:pnpm-lock.yaml").
+# This file should be checked into version control along with the pnpm-lock.yaml file.
+.npmrc=974837034
+integration/workspace/pnpm-lock.yaml=-1835679858
+integration/workspace/yarn.lock=324353828
+integration/workspace/package.json=-1993643597
+integration/workspace/pnpm-workspace.yaml=1163575902

.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU=

@@ -0,0 +1,7 @@
+# Input hashes for repository rule npm_translate_lock(name = "npm", pnpm_lock = "//:pnpm-lock.yaml").
+# This file should be checked into version control along with the pnpm-lock.yaml file.
+.npmrc=974837034
+pnpm-lock.yaml=-1475648007
+yarn.lock=-146594567
+package.json=-487157359
+pnpm-workspace.yaml=1711114604

.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE5NDc2NjEwNDI=

@@ -0,0 +1,7 @@
+# Input hashes for repository rule npm_translate_lock(name = "npm_integration_project", pnpm_lock = "//integration/project:pnpm-lock.yaml").
+# This file should be checked into version control along with the pnpm-lock.yaml file.
+.npmrc=974837034
+integration/project/pnpm-lock.yaml=56141838
+integration/project/yarn.lock=-1656341479
+integration/project/package.json=195538968
+integration/project/pnpm-workspace.yaml=1163575902

.aspect/rules/external_repository_action_cache/npm_translate_lock_LTIxMDU2NzY0MDI=

@@ -0,0 +1,7 @@
+# Input hashes for repository rule npm_translate_lock(name = "npm_integration_pre_apf_project", pnpm_lock = "//integration/pre_apf_project:pnpm-lock.yaml").
+# This file should be checked into version control along with the pnpm-lock.yaml file.
+.npmrc=974837034
+integration/pre_apf_project/pnpm-lock.yaml=2141171294
+integration/pre_apf_project/yarn.lock=-941201574
+integration/pre_apf_project/package.json=666737612
+integration/pre_apf_project/pnpm-workspace.yaml=1163575902

.bazelignore

@@ -2,5 +2,9 @@ node_modules/
 dist/
 integration/pre_apf_project/node_modules/
 integration/project/node_modules/
+integration/project/libs/post/node_modules
 integration/project/dist/
 integration/workspace/node_modules/
+
+override_rename_ts_plugin/node_modules
+server/node_modules

.circleci/config.yml

@@ -7,9 +7,12 @@ jobs:
       dependency_type:
         # Whether the test should build using the commit dependency versions or the latest builds.
         type: enum
-        enum: ["package.json", "builds-repo"]
+        enum: ['package.json', 'builds-repo']
     docker:
       - image: cimg/node:16.13.0@sha256:05245e5a0f7aa7c45d61c21ba47c13082bdc07efe555a6786087261b28adaa2b
+    environment:
+      # TODO: Remove when pnpm is exclusively used.
+      ASPECT_RULES_JS_FROZEN_PNPM_LOCK: '1'
     steps:
       - checkout
       - node/install-packages:
@@ -28,22 +31,21 @@ jobs:
       - run: scripts/build.sh << parameters.dependency_type >>
       - run: scripts/test.sh
 workflows:
-    build-and-test:
-      jobs:
-        - build-and-test:
-            name: build-and-test
-            dependency_type: "package.json"
-    buid-and-test-against-builds:
-      jobs:
-        - build-and-test:
-            name: build-and-test-builds-repo
-            dependency_type: "builds-repo"
-      triggers:
-        - schedule:
-            filters:
-              branches:
-                only:
-                  - main
-            # Runs monitoring jobs at 10:00AM every day.
-            cron: '0 10 * * *'
-
+  build-and-test:
+    jobs:
+      - build-and-test:
+          name: build-and-test
+          dependency_type: 'package.json'
+  buid-and-test-against-builds:
+    jobs:
+      - build-and-test:
+          name: build-and-test-builds-repo
+          dependency_type: 'builds-repo'
+    triggers:
+      - schedule:
+          filters:
+            branches:
+              only:
+                - main
+          # Runs monitoring jobs at 10:00AM every day.
+          cron: '0 10 * * *'

WORKSPACE

@@ -2,9 +2,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "aspect_rules_js",
-    sha256 = "f93c6d2c4437a9fdc2c711912b6b9b3f3806c2dd2c9c0ec0240f26d3f2ea3030",
-    strip_prefix = "rules_js-1.8.1",
-    url = "https://github.com/aspect-build/rules_js/archive/refs/tags/v1.8.1.tar.gz",
+    sha256 = "1aa0ab76d1f9520bb8993e2d84f82da2a9c87da1e6e8d121dbb4c857a292c2cd",
+    strip_prefix = "rules_js-1.20.1",
+    url = "https://github.com/aspect-build/rules_js/releases/download/v1.20.1/rules_js-v1.20.1.tar.gz",
 )
 
 load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
@@ -13,20 +13,20 @@ rules_js_dependencies()
 
 http_archive(
     name = "aspect_rules_ts",
-    sha256 = "5b501313118b06093497b6429f124b973f99d1eb5a27a1cc372e5d6836360e9d",
-    strip_prefix = "rules_ts-1.0.2",
-    url = "https://github.com/aspect-build/rules_ts/archive/refs/tags/v1.0.2.tar.gz",
+    sha256 = "02480b6a1cd12516edf364e678412e9da10445fe3f1070c014ac75e922c969ea",
+    strip_prefix = "rules_ts-1.3.1",
+    url = "https://github.com/aspect-build/rules_ts/releases/download/v1.3.1/rules_ts-v1.3.1.tar.gz",
 )
 
 load("@aspect_rules_ts//ts:repositories.bzl", "rules_ts_dependencies")
 
-rules_ts_dependencies(ts_version_from = "//:package.json",)
+rules_ts_dependencies(ts_version_from = "//:package.json")
 
 http_archive(
     name = "aspect_rules_jasmine",
-    sha256 = "28bd02acbcd78dd4fbe0ee133b21b11977acd70329a83fc987ff8c0a6ffae9e2",
-    strip_prefix = "rules_jasmine-0.2.3",
-    url = "https://github.com/aspect-build/rules_jasmine/archive/refs/tags/v0.2.3.tar.gz",
+    sha256 = "b3b2ff30ed222db653092d8280e0b62a4d54c5e65c598df09a0a1d7aae78fc8f",
+    strip_prefix = "rules_jasmine-0.3.1",
+    url = "https://github.com/aspect-build/rules_jasmine/releases/download/v0.3.1/rules_jasmine-v0.3.1.tar.gz",
 )
 
 load("@aspect_rules_jasmine//jasmine:dependencies.bzl", "rules_jasmine_dependencies")
@@ -35,9 +35,9 @@ rules_jasmine_dependencies()
 
 http_archive(
     name = "aspect_rules_esbuild",
-    sha256 = "f9b5bf16251e3e4e127337ef968e6a398c9a4f353f1730e6c7ff6c9a8981e858",
-    strip_prefix = "rules_esbuild-0.13.4",
-    url = "https://github.com/aspect-build/rules_esbuild/archive/refs/tags/v0.13.4.tar.gz",
+    sha256 = "c78d38d6ec2e7497dde4f8d67f49c71614daf11e2bbe276e23f5b09a89801677",
+    strip_prefix = "rules_esbuild-0.14.1",
+    url = "https://github.com/aspect-build/rules_esbuild/releases/download/v0.14.1/rules_esbuild-v0.14.1.tar.gz",
 )
 
 load("@aspect_rules_esbuild//esbuild:dependencies.bzl", "rules_esbuild_dependencies")
@@ -70,14 +70,13 @@ load("@aspect_rules_js//npm:npm_import.bzl", "npm_translate_lock")
 
 npm_translate_lock(
     name = "npm",
-    yarn_lock = "//:yarn.lock",
-    package_json = "//:package.json",
-    npmrc = "//:.npmrc",
     data = [
+        "//:package.json",
         "//:pnpm-workspace.yaml",
         # PLACE_HOLDER_FOR_angular/angular_packages/language-service/build.sh
     ],
-    verify_node_modules_ignored = "//:.bazelignore",
+    npmrc = "//:.npmrc",
+    pnpm_lock = "//:pnpm-lock.yaml",
     public_hoist_packages = {
         # Hoist transitive closure of npm deps needed for vsce; this set was determined manually by
         # running `bazel build //:vsix` and burning down missing packages. We do this so that we
@@ -93,6 +92,8 @@ npm_translate_lock(
         "[email protected]": [""],
         "[email protected]": [""],
     },
+    verify_node_modules_ignored = "//:.bazelignore",
+    yarn_lock = "//:yarn.lock",
     # PLACE_HOLDER_FOR_packages/language-service/build.sh_IN_angular_REPO
 )
 
@@ -102,10 +103,14 @@ npm_repositories()
 
 npm_translate_lock(
     name = "npm_integration_workspace",
-    yarn_lock = "//integration/workspace:yarn.lock",
-    package_json = "//integration/workspace:package.json",
+    data = [
+        "//integration/workspace:package.json",
+        "//integration/workspace:pnpm-workspace.yaml",
+    ],
     npmrc = "//:.npmrc",
+    pnpm_lock = "//integration/workspace:pnpm-lock.yaml",
     verify_node_modules_ignored = "//:.bazelignore",
+    yarn_lock = "//integration/workspace:yarn.lock",
 )
 
 load("@npm_integration_workspace//:repositories.bzl", npm_integration_workspace_repositories = "npm_repositories")
@@ -114,10 +119,14 @@ npm_integration_workspace_repositories()
 
 npm_translate_lock(
     name = "npm_integration_pre_apf_project",
-    yarn_lock = "//integration/pre_apf_project:yarn.lock",
-    package_json = "//integration/pre_apf_project:package.json",
+    data = [
+        "//integration/pre_apf_project:package.json",
+        "//integration/pre_apf_project:pnpm-workspace.yaml",
+    ],
     npmrc = "//:.npmrc",
+    pnpm_lock = "//integration/pre_apf_project:pnpm-lock.yaml",
     verify_node_modules_ignored = "//:.bazelignore",
+    yarn_lock = "//integration/pre_apf_project:yarn.lock",
 )
 
 load("@npm_integration_pre_apf_project//:repositories.bzl", npm_integration_pre_apf_project_repositories = "npm_repositories")
@@ -126,10 +135,14 @@ npm_integration_pre_apf_project_repositories()
 
 npm_translate_lock(
     name = "npm_integration_project",
-    yarn_lock = "//integration/project:yarn.lock",
-    package_json = "//integration/project:package.json",
+    data = [
+        "//integration/project:package.json",
+        "//integration/project:pnpm-workspace.yaml",
+    ],
     npmrc = "//:.npmrc",
+    pnpm_lock = "//integration/project:pnpm-lock.yaml",
     verify_node_modules_ignored = "//:.bazelignore",
+    yarn_lock = "//integration/project:yarn.lock",
 )
 
 load("@npm_integration_project//:repositories.bzl", npm_integration_project_repositories = "npm_repositories")

client/src/BUILD.bazel

@@ -7,14 +7,14 @@ ts_project(
     declaration = True,
     source_map = True,
     tsconfig = "//client:tsconfig",
+    visibility = [
+        "//client:__subpackages__",
+    ],
     deps = [
         "//:node_modules/@types/node",
         "//:node_modules/@types/vscode",
         "//:node_modules/typescript",
         "//:node_modules/vscode-languageclient",
         "//common",
     ],
-    visibility = [
-        "//client:__subpackages__",
-    ],
 )

client/src/tests/BUILD.bazel

@@ -17,17 +17,17 @@ ts_project(
     source_map = True,
     tsconfig = ":tsconfig",
     deps = [
-        "//client/src",
-        "//:node_modules/@types/vscode",
         "//:node_modules/@types/jasmine",
+        "//:node_modules/@types/vscode",
         "//:node_modules/vscode-languageserver-textdocument",
+        "//client/src",
     ],
 )
 
 jasmine_test(
     name = "test",
-    data = [":tests"],
     args = ["*_spec.js"],
     chdir = package_name(),
+    data = [":tests"],
     tags = ["unit_test"],
 )

common/BUILD.bazel

@@ -6,8 +6,8 @@ ts_config(
     visibility = [
         "//client:__subpackages__",
         "//common:__subpackages__",
-        "//server:__subpackages__",
         "//integration:__subpackages__",
+        "//server:__subpackages__",
     ],
     deps = ["//:tsconfig"],
 )
@@ -22,8 +22,8 @@ ts_project(
     visibility = [
         "//client:__subpackages__",
         "//common:__subpackages__",
-        "//server:__subpackages__",
         "//integration:__subpackages__",
+        "//server:__subpackages__",
     ],
     deps = [
         "//:node_modules/@types/node",

common/tests/BUILD.bazel

@@ -17,15 +17,15 @@ ts_project(
     source_map = True,
     tsconfig = ":tsconfig",
     deps = [
-        "//common",
         "//:node_modules/@types/jasmine",
+        "//common",
     ],
 )
 
 jasmine_test(
     name = "test",
-    data = [":tests"],
     args = ["*_spec.js"],
     chdir = package_name(),
+    data = [":tests"],
     tags = ["unit_test"],
 )

integration/BUILD.bazel

@@ -3,23 +3,26 @@ load("@aspect_rules_ts//ts:defs.bzl", "ts_config", "ts_project")
 ts_config(
     name = "tsconfig",
     src = "tsconfig.json",
+    visibility = ["//integration:__subpackages__"],
     deps = [
         "//:tsconfig",
         "//server:tsconfig",
     ],
-    visibility = ["//integration:__subpackages__"]
 )
 
 ts_project(
     name = "integration",
     # NB: there is an import cycle between integration/lsp/*.ts and integration/test_constants.ts so
     # they cannot be broken up into separate ts_project targets
     srcs = glob([
-      "*.ts",
+        "*.ts",
     ]) + ["//integration/lsp:srcs"],
     declaration = True,
     source_map = True,
     tsconfig = ":tsconfig",
+    visibility = [
+        "//integration:__subpackages__",
+    ],
     deps = [
         "//:node_modules/@types/jasmine",
         "//:node_modules/@types/node",
@@ -28,7 +31,4 @@ ts_project(
         "//:node_modules/vscode-uri",
         "//common",
     ],
-    visibility = [
-        "//integration:__subpackages__",
-    ],
 )

integration/e2e/BUILD.bazel

@@ -7,16 +7,16 @@ ts_project(
     declaration = True,
     source_map = True,
     tsconfig = "//integration:tsconfig",
+    visibility = [
+        "//integration:__subpackages__",
+    ],
     deps = [
         "//:node_modules/@types/jasmine",
         "//:node_modules/@types/node",
         "//:node_modules/@types/vscode",
         "//:node_modules/vscode-test",
         "//integration",
     ],
-    visibility = [
-        "//integration:__subpackages__",
-    ],
 )
 
 js_test(
@@ -35,5 +35,9 @@ js_test(
     # due to file system protection. It is tagged local so it runs outside of
     # the sandbox. It would need some redesign to allow for sandbox execution.
     # Tagged manual so that `bazel test //...` doesn't run it automatically.
-    tags = ["e2e", "local", "manual"],
+    tags = [
+        "e2e",
+        "local",
+        "manual",
+    ],
 )