diff --git a/WORKSPACE b/WORKSPACE index 98a9da1e70aa..b5e97b346d14 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -91,9 +91,9 @@ 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/@bazel+concatjs+5.8.1.patch", + "//:tools/postinstall/patches/@angular+bazel+20.0.0-next.1.patch", "//:tools/postinstall/patches/@angular+build-tooling+0.0.0-1ebf18a3a60b182a3dbad12e9a149fd93af5c29b.patch", + "//:tools/postinstall/patches/@bazel+concatjs+5.8.1.patch", ], # Currently disabled due to: # 1. Missing Windows support currently. diff --git a/package.json b/package.json index c70e38ed20d1..9ec52423e721 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "@angular-devkit/build-angular": "^20.0.0-next.0", "@angular-devkit/core": "^20.0.0-next.0", "@angular-devkit/schematics": "^20.0.0-next.0", - "@angular/bazel": "https://github.com/angular/bazel-builds.git#d9a8ea4f9e62cb475eff89519426a38631b2704d", + "@angular/bazel": "https://github.com/angular/bazel-builds.git#39090691c79c5756f5d0579ee685aa1fdaf86743", "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#74e0e7b090c6e16056290836b2d936ca7820b86f", "@angular/build": "^20.0.0-next.0", "@angular/cli": "^20.0.0-next.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..9c1079ce5e77 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 fastGlob from 'fast-glob'; -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 84b877da3993..8ab069e8da96 100644 --- a/yarn.lock +++ b/yarn.lock @@ -139,11 +139,12 @@ 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#39090691c79c5756f5d0579ee685aa1fdaf86743": + version "20.0.0-next.1" + resolved "https://github.com/angular/bazel-builds.git#39090691c79c5756f5d0579ee685aa1fdaf86743" dependencies: "@microsoft/api-extractor" "^7.24.2" + fast-glob "^3.3.3" magic-string "^0.30.0" tslib "^2.3.0" @@ -7892,7 +7893,7 @@ fast-glob@3.3.2, fast-glob@^3.2.12, fast-glob@^3.2.9, fast-glob@^3.3.0: merge2 "^1.3.0" micromatch "^4.0.4" -fast-glob@3.3.3: +fast-glob@3.3.3, fast-glob@^3.3.3: version "3.3.3" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.3.tgz#d06d585ce8dba90a16b0505c543c3ccfb3aeb818" integrity sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==