diff --git a/WORKSPACE b/WORKSPACE index 4a699eedc643..6d36bbef61ff 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -91,7 +91,7 @@ yarn_install( "//:.yarn/releases/yarn-1.22.17.cjs", "//:.yarnrc", "//:tools/postinstall/apply-patches.js", - "//:tools/postinstall/patches/@angular+bazel+16.0.0-next.6.patch", + "//:tools/postinstall/patches/@angular+bazel+20.0.0-next.1.patch", "//:tools/postinstall/patches/@bazel+concatjs+5.8.1.patch", ], # Currently disabled due to: diff --git a/package.json b/package.json index 2eb849c79014..1a53afd17eb2 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "@angular-devkit/build-angular": "^19.2.0", "@angular-devkit/core": "^19.2.0", "@angular-devkit/schematics": "^19.2.0", - "@angular/bazel": "https://github.com/angular/bazel-builds.git#d9a8ea4f9e62cb475eff89519426a38631b2704d", + "@angular/bazel": "https://github.com/angular/bazel-builds.git#87091472fecf0232c16c385e9183b328bea984f6", "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#74e0e7b090c6e16056290836b2d936ca7820b86f", "@angular/build": "^19.2.0", "@angular/cli": "^19.2.0", @@ -158,6 +158,7 @@ "reflect-metadata": "^0.1.13", "requirejs": "^2.3.6", "rollup": "^2.66.1", + "rollup-plugin-dts": "^6.1.1", "rollup-plugin-sourcemaps": "^0.6.3", "sass": "^1.80.6", "selenium-webdriver": "^3.6.0", diff --git a/tools/postinstall/patches/@angular+bazel+16.0.0-next.6.patch b/tools/postinstall/patches/@angular+bazel+20.0.0-next.1.patch similarity index 96% rename from tools/postinstall/patches/@angular+bazel+16.0.0-next.6.patch rename to tools/postinstall/patches/@angular+bazel+20.0.0-next.1.patch index c253e05ab2dd..7c6370e51516 100644 --- a/tools/postinstall/patches/@angular+bazel+16.0.0-next.6.patch +++ b/tools/postinstall/patches/@angular+bazel+20.0.0-next.1.patch @@ -61,20 +61,20 @@ index 5e82bcb..3c239f8 100755 return ts_providers_dict_to_struct(ts_providers) diff --git a/node_modules/@angular/bazel/src/ng_package/packager.mjs b/node_modules/@angular/bazel/src/ng_package/packager.mjs -index 7184fd9..ef3e508 100755 +index dd6ec61..c2a0acf 100755 --- a/node_modules/@angular/bazel/src/ng_package/packager.mjs +++ b/node_modules/@angular/bazel/src/ng_package/packager.mjs -@@ -7,7 +7,7 @@ - */ +@@ -8,7 +8,7 @@ import * as fs from 'fs'; import * as path from 'path'; + import { globSync } from 'tinyglobby'; -import { analyzeFileAndEnsureNoCrossImports } from './cross_entry_points_imports'; +import { analyzeFileAndEnsureNoCrossImports } from './cross_entry_points_imports.mjs'; /** * List of known `package.json` fields which provide information about * supported package formats and their associated entry paths. diff --git a/node_modules/@angular/bazel/src/ngc-wrapped/index.mjs b/node_modules/@angular/bazel/src/ngc-wrapped/index.mjs -index def2972..3de33ba 100755 +index 47aab66..3305d94 100755 --- a/node_modules/@angular/bazel/src/ngc-wrapped/index.mjs +++ b/node_modules/@angular/bazel/src/ngc-wrapped/index.mjs @@ -12,7 +12,7 @@ import tscw from '@bazel/concatjs/internal/tsc_wrapped/index.js'; @@ -86,7 +86,7 @@ index def2972..3de33ba 100755 // FIXME: we should be able to add the assets to the tsconfig so FileLoader // knows about them const NGC_ASSETS = /\.(css|html)$/; -@@ -349,6 +349,12 @@ function gatherDiagnosticsForInputsOnly(options, bazelOpts, ngProgram) { +@@ -350,6 +350,12 @@ function gatherDiagnosticsForInputsOnly(options, bazelOpts, ngProgram) { } return diagnostics; } diff --git a/yarn.lock b/yarn.lock index 77dec207f5a8..80c0900f40ad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -139,12 +139,13 @@ dependencies: tslib "^2.3.0" -"@angular/bazel@https://github.com/angular/bazel-builds.git#d9a8ea4f9e62cb475eff89519426a38631b2704d": - version "19.1.0-next.0" - resolved "https://github.com/angular/bazel-builds.git#d9a8ea4f9e62cb475eff89519426a38631b2704d" +"@angular/bazel@https://github.com/angular/bazel-builds.git#87091472fecf0232c16c385e9183b328bea984f6": + version "20.0.0-next.1" + resolved "https://github.com/angular/bazel-builds.git#87091472fecf0232c16c385e9183b328bea984f6" dependencies: "@microsoft/api-extractor" "^7.24.2" magic-string "^0.30.0" + tinyglobby "^0.2.12" tslib "^2.3.0" "@angular/benchpress@0.3.0": @@ -410,7 +411,7 @@ "@babel/highlight" "^7.24.7" picocolors "^1.0.0" -"@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.2": +"@babel/code-frame@^7.24.2", "@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.2": version "7.26.2" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85" integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ== @@ -8022,6 +8023,11 @@ faye-websocket@^0.11.3: dependencies: websocket-driver ">=0.5.1" +fdir@^6.4.3: + version "6.4.3" + resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.3.tgz#011cdacf837eca9b811c89dbb902df714273db72" + integrity sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw== + fecha@^4.2.0: version "4.2.3" resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd" @@ -10939,7 +10945,7 @@ magic-string@0.30.10, magic-string@^0.30.0: dependencies: "@jridgewell/sourcemap-codec" "^1.4.15" -magic-string@0.30.17: +magic-string@0.30.17, magic-string@^0.30.10: version "0.30.17" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.17.tgz#450a449673d2460e5bbcfba9a61916a1714c7453" integrity sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA== @@ -12404,7 +12410,7 @@ picocolors@^1.1.1: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== -picomatch@4.0.2: +picomatch@4.0.2, picomatch@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.2.tgz#77c742931e8f3b8820946c76cd0c1f13730d1dab" integrity sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg== @@ -13504,6 +13510,15 @@ rimraf@~2.5.2: dependencies: glob "^7.0.5" +rollup-plugin-dts@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/rollup-plugin-dts/-/rollup-plugin-dts-6.1.1.tgz#46b33f4d1d7f4e66f1171ced9b282ac11a15a254" + integrity sha512-aSHRcJ6KG2IHIioYlvAOcEq6U99sVtqDDKVhnwt70rW6tsz3tv5OSjEiWcgzfsHdLyGXZ/3b/7b/+Za3Y6r1XA== + dependencies: + magic-string "^0.30.10" + optionalDependencies: + "@babel/code-frame" "^7.24.2" + rollup-plugin-sourcemaps@^0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.6.3.tgz#bf93913ffe056e414419607f1d02780d7ece84ed" @@ -15012,6 +15027,14 @@ timers-ext@^0.1.5, timers-ext@^0.1.7: es5-ext "^0.10.64" next-tick "^1.1.0" +tinyglobby@^0.2.12: + version "0.2.12" + resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.12.tgz#ac941a42e0c5773bd0b5d08f32de82e74a1a61b5" + integrity sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww== + dependencies: + fdir "^6.4.3" + picomatch "^4.0.2" + title-case@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/title-case/-/title-case-2.1.1.tgz#3e127216da58d2bc5becf137ab91dae3a7cd8faa"