Skip to content

Commit e54c033

Browse files
tjshiuangular-robotalan-agius4
authored
Pr takeover 33240 (#33263)
* build: update pnpm to v11 See associated pull request for more information. Closes #33240 as a pr takeover * build: resolve pnpm v11 installation and placeholder issues Address resolution failures for '0.0.0-NG' placeholders by adding overrides in the root package.json and adding missing devDependencies in sub-projects. Allow trusted build scripts in pnpm-workspace.yaml to satisfy pnpm v11 security defaults. Ensure a clean install can complete successfully. * build: fix package visibility for material-date-fns-adapter Address visibility violation in Bazel by adding components-examples to the visibility list in MODULE.bazel. * build: migrate pnpm configuration to workspace settings and upgrade to version 11.1.1 With pnpm 11 configuration is soley done via the workspace file. --------- Co-authored-by: Angular Robot <angular-robot@google.com> Co-authored-by: Alan Agius <17563226+alan-agius4@users.noreply.github.com>
1 parent 332f786 commit e54c033

13 files changed

Lines changed: 83 additions & 74 deletions

File tree

.npmrc

Lines changed: 0 additions & 12 deletions
This file was deleted.

MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ use_repo(node, "nodejs_toolchains")
7373
pnpm = use_extension("@aspect_rules_js//npm:extensions.bzl", "pnpm")
7474
pnpm.pnpm(
7575
name = "pnpm",
76-
pnpm_version = "10.33.4",
77-
pnpm_version_integrity = "sha512-HGezs1my1AgRm6HtKJ80uPw8aHNBK+xv0mT73IJInlEPy+y5zp0i2ufzt2Jp2EQQRgFL3KU7mXnNelYa1jG4AA==",
76+
pnpm_version = "11.1.2",
77+
pnpm_version_integrity = "sha512-QVocwll0cx51RVwUaDcb50xapft2IbUNQFbSIkUWCfEUEvI/1gLmFp8eBgRmZB95hZfhvpYaEGiINqZ7FlaUmQ==",
7878
)
7979
use_repo(pnpm, "pnpm")
8080

@@ -108,7 +108,6 @@ npm.npm_translate_lock(
108108
"//src/universal-app:package.json",
109109
"//src/youtube-player:package.json",
110110
],
111-
npmrc = "//:.npmrc",
112111
package_visibility = {
113112
"@angular/aria": [
114113
"//integration:__subpackages__",
@@ -167,6 +166,7 @@ npm.npm_translate_lock(
167166
"@angular/material-date-fns-adapter": [
168167
"//integration:__subpackages__",
169168
"//docs:__subpackages__",
169+
"//src/components-examples:__subpackages__",
170170
],
171171
"@angular/material-luxon-adapter": [
172172
"//integration:__subpackages__",

docs/.npmrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

integration/ng-add-standalone/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"watch": "ng build --watch --configuration development",
99
"test": "ng test"
1010
},
11+
"packageManager": "pnpm@11.1.2",
1112
"private": true,
1213
"dependencies": {
1314
"@angular/cdk": "next",

integration/ng-add-standalone/pnpm-workspace.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
packages:
22
- .
33

4+
allowBuilds:
5+
'@parcel/watcher': false
6+
esbuild: false
7+
lmdb: false
8+
msgpackr-extract: false
9+
410
# The minimum age of a release to be considered for dependency installation.
511
# The value is in minutes (1440 minutes = 1 day).
612
minimumReleaseAge: 1440

integration/ng-add/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"watch": "ng build --watch --configuration development",
99
"test": "ng test"
1010
},
11+
"packageManager": "pnpm@11.1.2",
1112
"private": true,
1213
"dependencies": {
1314
"@angular/cdk": "next",

integration/ng-add/pnpm-workspace.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
packages:
22
- .
33

4+
allowBuilds:
5+
'@parcel/watcher': false
6+
esbuild: false
7+
lmdb: false
8+
msgpackr-extract: false
9+
410
# The minimum age of a release to be considered for dependency installation.
511
# The value is in minutes (1440 minutes = 1 day).
612
minimumReleaseAge: 1440

integration/vitest/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"watch": "ng build --watch --configuration development",
99
"test": "ng test"
1010
},
11+
"packageManager": "pnpm@11.1.2",
1112
"private": true,
1213
"dependencies": {
1314
"@angular/cdk": "next",
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
packages:
22
- .
33

4+
allowBuilds:
5+
'@parcel/watcher': false
6+
esbuild: false
7+
lmdb: false
8+
msgpackr-extract: false
9+
410
# The minimum age of a release to be considered for dependency installation.
511
# The value is in minutes (1440 minutes = 1 day).
612
minimumReleaseAge: 1440
713
# List of packages to exclude from the minimum release age check.
814
minimumReleaseAgeExclude:
915
- '@angular-devkit/*'
1016
- '@angular/*'
17+
- '@ngtools/webpack'
1118
- '@schematics/*'
1219
- 'ng-packagr'

package.json

Lines changed: 2 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
"url": "https://github.com/angular/components.git"
99
},
1010
"license": "MIT",
11-
"packageManager": "pnpm@10.33.4",
11+
"packageManager": "pnpm@11.1.2",
1212
"engines": {
1313
"npm": "Please use pnpm instead of NPM to install dependencies",
1414
"yarn": "Please use pnpm instead of Yarn to install dependencies",
15-
"pnpm": "10.33.4"
15+
"pnpm": "11.1.2"
1616
},
1717
"scripts": {
1818
"ng-dev": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only node_modules/@angular/ng-dev/bundles/cli.mjs",
@@ -150,59 +150,5 @@
150150
"yaml": "^2.8.1",
151151
"yargs": "^18.0.0",
152152
"zx": "^8.0.0"
153-
},
154-
"pnpm": {
155-
"overrides": {
156-
"typescript": "6.0.2"
157-
},
158-
"onlyBuiltDependencies": [],
159-
"packageExtensions": {
160-
"dgeni-packages": {
161-
"dependencies": {
162-
"clonedeep": "*"
163-
}
164-
},
165-
"grpc-gcp": {
166-
"dependencies": {
167-
"protobufjs": "7.4.0"
168-
}
169-
},
170-
"@angular-eslint/eslint-plugin-template@19.3.0": {
171-
"peerDependencies": {
172-
"@typescript-eslint/parser": "*",
173-
"@angular-eslint/template-parser": "*"
174-
}
175-
},
176-
"@angular/common": {
177-
"dependencies": {
178-
"@nginfra/angular-linking": "1.0.11"
179-
}
180-
},
181-
"@angular/forms": {
182-
"dependencies": {
183-
"@nginfra/angular-linking": "1.0.11"
184-
}
185-
},
186-
"@angular/platform-browser": {
187-
"dependencies": {
188-
"@nginfra/angular-linking": "1.0.11"
189-
}
190-
},
191-
"@angular/router": {
192-
"dependencies": {
193-
"@nginfra/angular-linking": "1.0.11"
194-
}
195-
},
196-
"@angular/localize": {
197-
"dependencies": {
198-
"@nginfra/angular-linking": "1.0.11"
199-
}
200-
},
201-
"@angular/platform-server": {
202-
"dependencies": {
203-
"@nginfra/angular-linking": "1.0.11"
204-
}
205-
}
206-
}
207153
}
208154
}

0 commit comments

Comments
 (0)