Skip to content

Commit 1b721a0

Browse files
authored
build: update @angular/bazel for relative imports in ng_package (#30598)
See: angular/angular@1f10394
1 parent db090ca commit 1b721a0

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

WORKSPACE

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ yarn_install(
9191
"//:.yarn/releases/yarn-1.22.17.cjs",
9292
"//:.yarnrc",
9393
"//:tools/postinstall/apply-patches.js",
94-
"//:tools/postinstall/patches/@angular+bazel+16.0.0-next.6.patch",
95-
"//:tools/postinstall/patches/@bazel+concatjs+5.8.1.patch",
94+
"//:tools/postinstall/patches/@angular+bazel+20.0.0-next.1.patch",
9695
"//:tools/postinstall/patches/@angular+build-tooling+0.0.0-1ebf18a3a60b182a3dbad12e9a149fd93af5c29b.patch",
96+
"//:tools/postinstall/patches/@bazel+concatjs+5.8.1.patch",
9797
],
9898
# Currently disabled due to:
9999
# 1. Missing Windows support currently.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"@angular-devkit/build-angular": "^20.0.0-next.0",
7474
"@angular-devkit/core": "^20.0.0-next.0",
7575
"@angular-devkit/schematics": "^20.0.0-next.0",
76-
"@angular/bazel": "https://github.com/angular/bazel-builds.git#d9a8ea4f9e62cb475eff89519426a38631b2704d",
76+
"@angular/bazel": "https://github.com/angular/bazel-builds.git#39090691c79c5756f5d0579ee685aa1fdaf86743",
7777
"@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#74e0e7b090c6e16056290836b2d936ca7820b86f",
7878
"@angular/build": "^20.0.0-next.0",
7979
"@angular/cli": "^20.0.0-next.0",

tools/postinstall/patches/@angular+bazel+16.0.0-next.6.patch renamed to tools/postinstall/patches/@angular+bazel+20.0.0-next.1.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -61,20 +61,20 @@ index 5e82bcb..3c239f8 100755
6161

6262
return ts_providers_dict_to_struct(ts_providers)
6363
diff --git a/node_modules/@angular/bazel/src/ng_package/packager.mjs b/node_modules/@angular/bazel/src/ng_package/packager.mjs
64-
index 7184fd9..ef3e508 100755
64+
index dd6ec61..c2a0acf 100755
6565
--- a/node_modules/@angular/bazel/src/ng_package/packager.mjs
6666
+++ b/node_modules/@angular/bazel/src/ng_package/packager.mjs
67-
@@ -7,7 +7,7 @@
68-
*/
67+
@@ -8,7 +8,7 @@
6968
import * as fs from 'fs';
7069
import * as path from 'path';
70+
import fastGlob from 'fast-glob';
7171
-import { analyzeFileAndEnsureNoCrossImports } from './cross_entry_points_imports';
7272
+import { analyzeFileAndEnsureNoCrossImports } from './cross_entry_points_imports.mjs';
7373
/**
7474
* List of known `package.json` fields which provide information about
7575
* supported package formats and their associated entry paths.
7676
diff --git a/node_modules/@angular/bazel/src/ngc-wrapped/index.mjs b/node_modules/@angular/bazel/src/ngc-wrapped/index.mjs
77-
index def2972..3de33ba 100755
77+
index 47aab66..3305d94 100755
7878
--- a/node_modules/@angular/bazel/src/ngc-wrapped/index.mjs
7979
+++ b/node_modules/@angular/bazel/src/ngc-wrapped/index.mjs
8080
@@ -12,7 +12,7 @@ import tscw from '@bazel/concatjs/internal/tsc_wrapped/index.js';
@@ -86,7 +86,7 @@ index def2972..3de33ba 100755
8686
// FIXME: we should be able to add the assets to the tsconfig so FileLoader
8787
// knows about them
8888
const NGC_ASSETS = /\.(css|html)$/;
89-
@@ -349,6 +349,12 @@ function gatherDiagnosticsForInputsOnly(options, bazelOpts, ngProgram) {
89+
@@ -350,6 +350,12 @@ function gatherDiagnosticsForInputsOnly(options, bazelOpts, ngProgram) {
9090
}
9191
return diagnostics;
9292
}

yarn.lock

+5-4
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,12 @@
139139
dependencies:
140140
tslib "^2.3.0"
141141

142-
"@angular/bazel@https://github.com/angular/bazel-builds.git#d9a8ea4f9e62cb475eff89519426a38631b2704d":
143-
version "19.1.0-next.0"
144-
resolved "https://github.com/angular/bazel-builds.git#d9a8ea4f9e62cb475eff89519426a38631b2704d"
142+
"@angular/bazel@https://github.com/angular/bazel-builds.git#39090691c79c5756f5d0579ee685aa1fdaf86743":
143+
version "20.0.0-next.1"
144+
resolved "https://github.com/angular/bazel-builds.git#39090691c79c5756f5d0579ee685aa1fdaf86743"
145145
dependencies:
146146
"@microsoft/api-extractor" "^7.24.2"
147+
fast-glob "^3.3.3"
147148
magic-string "^0.30.0"
148149
tslib "^2.3.0"
149150

@@ -7892,7 +7893,7 @@ [email protected], fast-glob@^3.2.12, fast-glob@^3.2.9, fast-glob@^3.3.0:
78927893
merge2 "^1.3.0"
78937894
micromatch "^4.0.4"
78947895

7895-
7896+
[email protected], fast-glob@^3.3.3:
78967897
version "3.3.3"
78977898
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.3.tgz#d06d585ce8dba90a16b0505c543c3ccfb3aeb818"
78987899
integrity sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==

0 commit comments

Comments
 (0)