diff --git a/.npmrc b/.npmrc deleted file mode 100644 index 7c7738880a15..000000000000 --- a/.npmrc +++ /dev/null @@ -1,12 +0,0 @@ -# Yarn Berry doesn't check engines at all, so pnpm shouldn't either. -engine-strict = false - -# Disabling pnpm [hoisting](https://pnpm.io/npmrc#hoist) by setting `hoist=false` is recommended on -# projects using rules_js so that pnpm outside of Bazel lays out a node_modules tree similar to what -# rules_js lays out under Bazel (without a hidden node_modules/.pnpm/node_modules) -hoist=false - -# Avoid pnpm auto-installing peer dependencies. We want to be explicit about our versions used -# for peer dependencies, avoiding potential mismatches. In addition, it ensures we can continue -# to rely on peer dependency placeholders substituted via Bazel. -auto-install-peers=false diff --git a/MODULE.bazel b/MODULE.bazel index 7e6d7b2ad288..d822eeb1f75b 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -73,8 +73,8 @@ use_repo(node, "nodejs_toolchains") 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") @@ -108,7 +108,6 @@ npm.npm_translate_lock( "//src/universal-app:package.json", "//src/youtube-player:package.json", ], - npmrc = "//:.npmrc", package_visibility = { "@angular/aria": [ "//integration:__subpackages__", @@ -167,6 +166,7 @@ npm.npm_translate_lock( "@angular/material-date-fns-adapter": [ "//integration:__subpackages__", "//docs:__subpackages__", + "//src/components-examples:__subpackages__", ], "@angular/material-luxon-adapter": [ "//integration:__subpackages__", diff --git a/docs/.npmrc b/docs/.npmrc deleted file mode 100644 index 319e41e69dc9..000000000000 --- a/docs/.npmrc +++ /dev/null @@ -1 +0,0 @@ -strict-peer-dependencies=false diff --git a/integration/ng-add-standalone/package.json b/integration/ng-add-standalone/package.json index dd28ec41ffdb..ca2c092b924a 100644 --- a/integration/ng-add-standalone/package.json +++ b/integration/ng-add-standalone/package.json @@ -8,6 +8,7 @@ "watch": "ng build --watch --configuration development", "test": "ng test" }, + "packageManager": "pnpm@11.1.2", "private": true, "dependencies": { "@angular/cdk": "next", diff --git a/integration/ng-add-standalone/pnpm-workspace.yaml b/integration/ng-add-standalone/pnpm-workspace.yaml index 0c05f1cdad26..fc2bc0f8e87c 100644 --- a/integration/ng-add-standalone/pnpm-workspace.yaml +++ b/integration/ng-add-standalone/pnpm-workspace.yaml @@ -1,6 +1,12 @@ packages: - . +allowBuilds: + '@parcel/watcher': 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 diff --git a/integration/ng-add/package.json b/integration/ng-add/package.json index 698d010853a5..185c6ef6106e 100644 --- a/integration/ng-add/package.json +++ b/integration/ng-add/package.json @@ -8,6 +8,7 @@ "watch": "ng build --watch --configuration development", "test": "ng test" }, + "packageManager": "pnpm@11.1.2", "private": true, "dependencies": { "@angular/cdk": "next", diff --git a/integration/ng-add/pnpm-workspace.yaml b/integration/ng-add/pnpm-workspace.yaml index 0c05f1cdad26..fc2bc0f8e87c 100644 --- a/integration/ng-add/pnpm-workspace.yaml +++ b/integration/ng-add/pnpm-workspace.yaml @@ -1,6 +1,12 @@ packages: - . +allowBuilds: + '@parcel/watcher': 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 diff --git a/integration/vitest/package.json b/integration/vitest/package.json index 0c2a2d698500..82fa3577913d 100644 --- a/integration/vitest/package.json +++ b/integration/vitest/package.json @@ -8,6 +8,7 @@ "watch": "ng build --watch --configuration development", "test": "ng test" }, + "packageManager": "pnpm@11.1.2", "private": true, "dependencies": { "@angular/cdk": "next", diff --git a/integration/vitest/pnpm-workspace.yaml b/integration/vitest/pnpm-workspace.yaml index 39e9203b9a8e..fc2bc0f8e87c 100644 --- a/integration/vitest/pnpm-workspace.yaml +++ b/integration/vitest/pnpm-workspace.yaml @@ -1,6 +1,12 @@ packages: - . +allowBuilds: + '@parcel/watcher': 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 @@ -8,5 +14,6 @@ minimumReleaseAge: 1440 minimumReleaseAgeExclude: - '@angular-devkit/*' - '@angular/*' + - '@ngtools/webpack' - '@schematics/*' - 'ng-packagr' diff --git a/package.json b/package.json index 534c3e27e5b3..055fffdba6aa 100644 --- a/package.json +++ b/package.json @@ -8,11 +8,11 @@ "url": "https://github.com/angular/components.git" }, "license": "MIT", - "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": { "ng-dev": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only node_modules/@angular/ng-dev/bundles/cli.mjs", @@ -150,59 +150,5 @@ "yaml": "^2.8.1", "yargs": "^18.0.0", "zx": "^8.0.0" - }, - "pnpm": { - "overrides": { - "typescript": "6.0.2" - }, - "onlyBuiltDependencies": [], - "packageExtensions": { - "dgeni-packages": { - "dependencies": { - "clonedeep": "*" - } - }, - "grpc-gcp": { - "dependencies": { - "protobufjs": "7.4.0" - } - }, - "@angular-eslint/eslint-plugin-template@19.3.0": { - "peerDependencies": { - "@typescript-eslint/parser": "*", - "@angular-eslint/template-parser": "*" - } - }, - "@angular/common": { - "dependencies": { - "@nginfra/angular-linking": "1.0.11" - } - }, - "@angular/forms": { - "dependencies": { - "@nginfra/angular-linking": "1.0.11" - } - }, - "@angular/platform-browser": { - "dependencies": { - "@nginfra/angular-linking": "1.0.11" - } - }, - "@angular/router": { - "dependencies": { - "@nginfra/angular-linking": "1.0.11" - } - }, - "@angular/localize": { - "dependencies": { - "@nginfra/angular-linking": "1.0.11" - } - }, - "@angular/platform-server": { - "dependencies": { - "@nginfra/angular-linking": "1.0.11" - } - } - } } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 09c48a554566..92ab5455c663 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -570,6 +570,9 @@ importers: '@angular/material': specifier: workspace:* version: link:../material + '@angular/material-date-fns-adapter': + specifier: workspace:* + version: link:../material-date-fns-adapter '@angular/material-experimental': specifier: workspace:* version: link:../material-experimental @@ -9209,6 +9212,9 @@ packages: third-party-web@0.29.0: resolution: {integrity: sha512-nBDSJw5B7Sl1YfsATG2XkW5qgUPODbJhXw++BKygi9w6O/NKS98/uY/nR/DxDq2axEjL6halHW1v+jhm/j1DBQ==} + third-party-web@0.29.2: + resolution: {integrity: sha512-fegtha91tq2DHphyoiBXVHjVi2YG9zFaRnboT9C28tO1en9Y3wJsfspuy40F+u5wl3hHVbw7cnd1b67kEGHb8g==} + through2@2.0.5: resolution: {integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==} @@ -13211,7 +13217,7 @@ snapshots: '@paulirish/trace_engine@0.0.64': dependencies: legacy-javascript: 0.0.1 - third-party-web: 0.29.0 + third-party-web: 0.29.2 '@peculiar/asn1-cms@2.7.0': dependencies: @@ -20041,6 +20047,8 @@ snapshots: third-party-web@0.29.0: {} + third-party-web@0.29.2: {} + through2@2.0.5: dependencies: readable-stream: 2.3.8 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index afba07df2990..28717925c9f4 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -47,3 +47,48 @@ minimumReleaseAgeExclude: - '@ngtools/webpack' - '@schematics/*' - 'ng-packagr' +overrides: + typescript: 6.0.2 +packageExtensions: + dgeni-packages: + dependencies: + clonedeep: '*' + grpc-gcp: + dependencies: + protobufjs: 7.4.0 + '@angular-eslint/eslint-plugin-template@19.3.0': + peerDependencies: + '@typescript-eslint/parser': '*' + '@angular-eslint/template-parser': '*' + '@angular/common': + dependencies: + '@nginfra/angular-linking': 1.0.11 + '@angular/forms': + dependencies: + '@nginfra/angular-linking': 1.0.11 + '@angular/platform-browser': + dependencies: + '@nginfra/angular-linking': 1.0.11 + '@angular/router': + dependencies: + '@nginfra/angular-linking': 1.0.11 + '@angular/localize': + dependencies: + '@nginfra/angular-linking': 1.0.11 + '@angular/platform-server': + dependencies: + '@nginfra/angular-linking': 1.0.11 +engineStrict: false +hoist: false +autoInstallPeers: false +allowBuilds: + '@firebase/util': false + '@google/genai': false + '@parcel/watcher': false + bufferutil: false + esbuild: false + lmdb: false + msgpackr-extract: false + protobufjs: false + re2: false + utf-8-validate: false diff --git a/src/components-examples/package.json b/src/components-examples/package.json index c9c98b42e466..e24b2187a042 100644 --- a/src/components-examples/package.json +++ b/src/components-examples/package.json @@ -40,7 +40,8 @@ "@angular/cdk-experimental": "workspace:*", "@angular/material": "workspace:*", "@angular/material-experimental": "workspace:*", - "@angular/material-luxon-adapter": "workspace:*" + "@angular/material-luxon-adapter": "workspace:*", + "@angular/material-date-fns-adapter": "workspace:*" }, "dependencies": { "tslib": "^2.3.0"