Skip to content
Merged
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
7 changes: 1 addition & 6 deletions .github/ng-renovate/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
{
"name": "ng-renovate",
"type": "commonjs",
"packageManager": "pnpm@10.33.4",
"packageManager": "pnpm@11.1.2",
"dependencies": {
"renovate": "43.150.0"
},
"pnpm": {
"onlyBuiltDependencies": [
"re2"
]
}
}
6 changes: 6 additions & 0 deletions .github/ng-renovate/pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# The minimum age of a release to be considered for dependency installation.
# The value is in minutes (1440 minutes = 1 day).
minimumReleaseAge: 1440
allowBuilds:
better-sqlite3: false
core-js-pure: false
dtrace-provider: false
protobufjs: false
re2: true
12 changes: 0 additions & 12 deletions .npmrc

This file was deleted.

5 changes: 2 additions & 3 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ use_repo(rules_angular, rules_angular_configurable_deps = "dev_infra_rules_angul
pnpm = use_extension("@aspect_rules_js//npm:extensions.bzl", "pnpm")
pnpm.pnpm(
name = "pnpm",
pnpm_version = "10.33.4",
pnpm_version_integrity = "sha512-HGezs1my1AgRm6HtKJ80uPw8aHNBK+xv0mT73IJInlEPy+y5zp0i2ufzt2Jp2EQQRgFL3KU7mXnNelYa1jG4AA==",
pnpm_version = "11.1.2",
pnpm_version_integrity = "sha512-QVocwll0cx51RVwUaDcb50xapft2IbUNQFbSIkUWCfEUEvI/1gLmFp8eBgRmZB95hZfhvpYaEGiINqZ7FlaUmQ==",
)
use_repo(pnpm, "pnpm")

Expand Down Expand Up @@ -110,7 +110,6 @@ npm.npm_translate_lock(
"@devinfra//github-actions/unified-status-check:package.json",
"@devinfra//ng-dev:package.json",
],
npmrc = "@devinfra//:.npmrc",
pnpm_lock = "@devinfra//:pnpm-lock.yaml",
)
use_repo(npm, "devinfra_npm")
2 changes: 1 addition & 1 deletion bazel/integration/tests/angular-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"test": "ng test"
},
"private": true,
"packageManager": "pnpm@10.33.4",
"packageManager": "pnpm@11.1.2",
"dependencies": {
"@angular/animations": "22.0.0-next.12",
"@angular/common": "22.0.0-next.12",
Expand Down
6 changes: 6 additions & 0 deletions bazel/integration/tests/angular-cli/pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
allowBuilds:
'@parcel/watcher': false
chromedriver: false
esbuild: false
lmdb: false
msgpackr-extract: false
# The minimum age of a release to be considered for dependency installation.
# The value is in minutes (1440 minutes = 1 day).
minimumReleaseAge: 1440
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"scripts": {
"test": "bazelisk test ..."
},
"packageManager": "pnpm@10.33.4",
"packageManager": "pnpm@11.1.2",
"devDependencies": {
"@bazel/bazelisk": "^1.11.0"
}
Expand Down
2 changes: 1 addition & 1 deletion bazel/integration/tests/package_mappings/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "1.0.0",
"main": "index.js",
"license": "MIT",
"packageManager": "pnpm@10.33.4",
"packageManager": "pnpm@11.1.2",
"dependencies": {
"fake_pkg": "link:./in-existing-linked-by-bazel"
},
Expand Down
2 changes: 1 addition & 1 deletion bazel/integration/tests/playwright_chromium/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
"@playwright/test": "^1.16.3",
"typescript": "^6.0.2"
},
"packageManager": "pnpm@10.33.4"
"packageManager": "pnpm@11.1.2"
}
11 changes: 0 additions & 11 deletions bazel/rules/rules_angular/.npmrc

This file was deleted.

10 changes: 5 additions & 5 deletions bazel/rules/rules_angular/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,19 @@ node.toolchain(
pnpm = use_extension("@aspect_rules_js//npm:extensions.bzl", "pnpm")
pnpm.pnpm(
name = "pnpm",
pnpm_version = "10.33.4",
pnpm_version_integrity = "sha512-HGezs1my1AgRm6HtKJ80uPw8aHNBK+xv0mT73IJInlEPy+y5zp0i2ufzt2Jp2EQQRgFL3KU7mXnNelYa1jG4AA==",
pnpm_version = "11.1.2",
pnpm_version_integrity = "sha512-QVocwll0cx51RVwUaDcb50xapft2IbUNQFbSIkUWCfEUEvI/1gLmFp8eBgRmZB95hZfhvpYaEGiINqZ7FlaUmQ==",
)
use_repo(pnpm, "pnpm")

npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
npm.npm_translate_lock(
name = "rules_angular_npm",
data = [
"@rules_angular//:package.json",
"//:package.json",
"//:pnpm-workspace.yaml",
],
npmrc = "//:.npmrc",
pnpm_lock = "@rules_angular//:pnpm-lock.yaml",
pnpm_lock = "//:pnpm-lock.yaml",
)
use_repo(npm, "rules_angular_npm")

Expand Down
14 changes: 2 additions & 12 deletions bazel/rules/rules_angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,11 @@
"keywords": [],
"author": "",
"license": "ISC",
"pnpm": {
"onlyBuiltDependencies": [],
"packageExtensions": {
"grpc-gcp": {
"peerDependencies": {
"protobufjs": "*"
}
}
}
},
"packageManager": "pnpm@10.33.4",
"packageManager": "pnpm@11.1.2",
"engines": {
"npm": "Please use pnpm instead of NPM to install dependencies",
"yarn": "Please use pnpm instead of Yarn to install dependencies",
"pnpm": "10.33.4"
"pnpm": "11.1.2"
},
"dependencies": {
"@angular/compiler-cli": "22.0.0-next.12",
Expand Down
8 changes: 8 additions & 0 deletions bazel/rules/rules_angular/pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,11 @@ minimumReleaseAgeExclude:
- '@angular-devkit/*'
- '@angular/*'
- '@schematics/*'
packageExtensions:
grpc-gcp:
peerDependencies:
protobufjs: '*'
engineStrict: true
hoist: false
autoInstallPeers: false
allowBuilds: {'@parcel/watcher': false, esbuild: false, lmdb: false, msgpackr-extract: false}
6 changes: 0 additions & 6 deletions bazel/rules/rules_browsers/.npmrc

This file was deleted.

6 changes: 3 additions & 3 deletions bazel/rules/rules_browsers/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ bazel_dep(name = "aspect_rules_js", version = "3.1.1")
pnpm = use_extension("@aspect_rules_js//npm:extensions.bzl", "pnpm")
pnpm.pnpm(
name = "pnpm",
pnpm_version = "10.33.4",
pnpm_version_integrity = "sha512-HGezs1my1AgRm6HtKJ80uPw8aHNBK+xv0mT73IJInlEPy+y5zp0i2ufzt2Jp2EQQRgFL3KU7mXnNelYa1jG4AA==",
pnpm_version = "11.1.2",
pnpm_version_integrity = "sha512-QVocwll0cx51RVwUaDcb50xapft2IbUNQFbSIkUWCfEUEvI/1gLmFp8eBgRmZB95hZfhvpYaEGiINqZ7FlaUmQ==",
)
use_repo(pnpm, "pnpm")

Expand All @@ -73,8 +73,8 @@ npm.npm_translate_lock(
name = "npm_rules_browsers",
data = [
"//:package.json",
"//:pnpm-workspace.yaml",
],
npmrc = "//:.npmrc",
pnpm_lock = "//:pnpm-lock.yaml",
)
use_repo(npm, "npm_rules_browsers")
Expand Down
18 changes: 2 additions & 16 deletions bazel/rules/rules_browsers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
"scripts": {
"ng-dev": "bash ../../../tools/local-dev.sh"
},
"packageManager": "pnpm@10.33.4",
"packageManager": "pnpm@11.1.2",
"engines": {
"npm": "Please use pnpm instead of NPM to install dependencies",
"yarn": "Please use pnpm instead of Yarn to install dependencies",
"pnpm": "10.33.4"
"pnpm": "11.1.2"
},
"keywords": [],
"author": "",
Expand All @@ -30,19 +30,5 @@
"tinyglobby": "^0.2.12",
"typescript": "6.0.3",
"web-test-runner-jasmine": "0.2.0"
},
"pnpm": {
"onlyBuiltDependencies": [],
"overrides": {
"puppeteer": "24.43.1",
"puppeteer-core": "24.43.1"
},
"packageExtensions": {
"grpc-gcp": {
"peerDependencies": {
"protobufjs": "*"
}
}
}
}
}
10 changes: 10 additions & 0 deletions bazel/rules/rules_browsers/pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,13 @@ minimumReleaseAgeExclude:
- '@angular-devkit/*'
- '@angular/*'
- '@schematics/*'
overrides:
puppeteer: 24.43.1
puppeteer-core: 24.43.1
packageExtensions:
grpc-gcp:
peerDependencies:
protobufjs: '*'
engineStrict: true
hoist: false
allowBuilds: {puppeteer: false}
17 changes: 2 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"name": "@angular/build-tooling",
"version": "0.0.0-{SCM_HEAD_SHA}",
"private": true,
"packageManager": "pnpm@10.33.4",
"packageManager": "pnpm@11.1.2",
"engines": {
"npm": "Please use pnpm instead of NPM to install dependencies",
"yarn": "Please use pnpm instead of Yarn to install dependencies",
"pnpm": "10.33.4"
"pnpm": "11.1.2"
},
"scripts": {
"prepare": "husky",
Expand Down Expand Up @@ -36,18 +36,5 @@
"tslib": "^2.5.2",
"tslint": "6.1.3",
"tsx": "^4.15.7"
},
"pnpm": {
"packageExtensions": {
"grpc-gcp": {
"peerDependencies": {
"protobufjs": "*"
}
}
},
"onlyBuiltDependencies": [
"firebase-functions",
"tsx"
]
}
}
16 changes: 16 additions & 0 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,19 @@ minimumReleaseAgeExclude:
- '@ngtools/webpack'
- '@schematics/*'
- 'ng-packagr'
packageExtensions:
grpc-gcp:
peerDependencies:
protobufjs: '*'
engineStrict: false
hoist: false
autoInstallPeers: false
allowBuilds:
'@apollo/protobufjs': false
'@firebase/util': false
'@google/genai': false
bufferutil: false
esbuild: false
protobufjs: false
re2: false
utf-8-validate: false
Comment thread
alan-agius4 marked this conversation as resolved.
1 change: 0 additions & 1 deletion renovate-presets/default.json5
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
matchDepNames: ['pnpm', 'typescript', 'node'],
postUpgradeTasks: {
commands: [
'bash -c "git restore .npmrc || true"', // If `.npmrc` doesn't exist, avoid a hard error.
'pnpm install --frozen-lockfile',
'bash -c "pnpm ng-dev misc sync-module-bazel || true"', // If `ng-dev` doesn't exist, avoid a hard error.
],
Expand Down