Skip to content

build: update to latest aspect_bazel_lib, aspect_rules_js, aspect_rules_jasmine and aspect_rules_esbuild #1871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# 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=2132478668
yarn.lock=-146594567
package.json=-487157359
Original file line number Diff line number Diff line change
@@ -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=2117413145
integration/project/yarn.lock=-1656341479
integration/project/package.json=195538968
integration/project/pnpm-workspace.yaml=1163575902
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ jobs:
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:
Expand Down
46 changes: 29 additions & 17 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "eb176c20422cd994d409ea2c4727335e04afee5b09f5f333a52187b09b91d02e",
strip_prefix = "rules_js-1.20.3",
url = "https://github.com/aspect-build/rules_js/releases/download/v1.20.3/rules_js-v1.20.3.tar.gz",
)

load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
Expand All @@ -13,9 +13,9 @@ 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 = "58b6c0ad158fc42883dafa157f1a25cddd65bcd788a772620192ac9ceefa0d78",
strip_prefix = "rules_ts-1.3.2",
url = "https://github.com/aspect-build/rules_ts/releases/download/v1.3.2/rules_ts-v1.3.2.tar.gz",
)

load("@aspect_rules_ts//ts:repositories.bzl", "rules_ts_dependencies")
Expand All @@ -24,9 +24,9 @@ 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")
Expand All @@ -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")
Expand Down Expand Up @@ -71,10 +71,10 @@ load("@aspect_rules_js//npm:npm_import.bzl", "npm_translate_lock")
npm_translate_lock(
name = "npm",
yarn_lock = "//:yarn.lock",
package_json = "//:package.json",
pnpm_lock = "//:pnpm-lock.yaml",
npmrc = "//:.npmrc",
data = [
"//:pnpm-workspace.yaml",
"//:package.json",
# PLACE_HOLDER_FOR_angular/angular_packages/language-service/build.sh
],
verify_node_modules_ignored = "//:.bazelignore",
Expand Down Expand Up @@ -103,7 +103,11 @@ npm_repositories()
npm_translate_lock(
name = "npm_integration_workspace",
yarn_lock = "//integration/workspace:yarn.lock",
package_json = "//integration/workspace:package.json",
pnpm_lock = "//integration/workspace:pnpm-lock.yaml",
data = [
"//integration/workspace:package.json",
"//integration/workspace:pnpm-workspace.yaml",
],
npmrc = "//:.npmrc",
verify_node_modules_ignored = "//:.bazelignore",
)
Expand All @@ -115,7 +119,11 @@ 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",
pnpm_lock = "//integration/pre_apf_project:pnpm-lock.yaml",
data = [
"//integration/pre_apf_project:package.json",
"//integration/pre_apf_project:pnpm-workspace.yaml",
],
npmrc = "//:.npmrc",
verify_node_modules_ignored = "//:.bazelignore",
)
Expand All @@ -127,7 +135,11 @@ 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",
pnpm_lock = "//integration/project:pnpm-lock.yaml",
data = [
"//integration/project:package.json",
"//integration/project:pnpm-workspace.yaml",
],
npmrc = "//:.npmrc",
verify_node_modules_ignored = "//:.bazelignore",
)
Expand Down
Loading