Skip to content

Commit 596a85f

Browse files
committed
build: update @angular/bazel to support .d.ts code splitting
This will unblock the fixit where we'll introduce relative imports that currently (without this commit) result in duplicated `d.ts` declarations between entry-points.
1 parent 4d8f3aa commit 596a85f

File tree

4 files changed

+37
-13
lines changed

4 files changed

+37
-13
lines changed

WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ 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",
94+
"//:tools/postinstall/patches/@angular+bazel+20.0.0-next.1.patch",
9595
"//:tools/postinstall/patches/@bazel+concatjs+5.8.1.patch",
9696
],
9797
# Currently disabled due to:

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"@angular-devkit/build-angular": "^19.2.0",
7474
"@angular-devkit/core": "^19.2.0",
7575
"@angular-devkit/schematics": "^19.2.0",
76-
"@angular/bazel": "https://github.com/angular/bazel-builds.git#d9a8ea4f9e62cb475eff89519426a38631b2704d",
76+
"@angular/bazel": "https://github.com/angular/bazel-builds.git#87091472fecf0232c16c385e9183b328bea984f6",
7777
"@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#74e0e7b090c6e16056290836b2d936ca7820b86f",
7878
"@angular/build": "^19.2.0",
7979
"@angular/cli": "^19.2.0",
@@ -158,6 +158,7 @@
158158
"reflect-metadata": "^0.1.13",
159159
"requirejs": "^2.3.6",
160160
"rollup": "^2.66.1",
161+
"rollup-plugin-dts": "^6.1.1",
161162
"rollup-plugin-sourcemaps": "^0.6.3",
162163
"sass": "^1.80.6",
163164
"selenium-webdriver": "^3.6.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

Lines changed: 5 additions & 5 deletions
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 { globSync } from 'tinyglobby';
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

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,13 @@
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#87091472fecf0232c16c385e9183b328bea984f6":
143+
version "20.0.0-next.1"
144+
resolved "https://github.com/angular/bazel-builds.git#87091472fecf0232c16c385e9183b328bea984f6"
145145
dependencies:
146146
"@microsoft/api-extractor" "^7.24.2"
147147
magic-string "^0.30.0"
148+
tinyglobby "^0.2.12"
148149
tslib "^2.3.0"
149150

150151
"@angular/benchpress@0.3.0":
@@ -410,7 +411,7 @@
410411
"@babel/highlight" "^7.24.7"
411412
picocolors "^1.0.0"
412413

413-
"@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.2":
414+
"@babel/code-frame@^7.24.2", "@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.2":
414415
version "7.26.2"
415416
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85"
416417
integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==
@@ -8022,6 +8023,11 @@ faye-websocket@^0.11.3:
80228023
dependencies:
80238024
websocket-driver ">=0.5.1"
80248025

8026+
fdir@^6.4.3:
8027+
version "6.4.3"
8028+
resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.3.tgz#011cdacf837eca9b811c89dbb902df714273db72"
8029+
integrity sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==
8030+
80258031
fecha@^4.2.0:
80268032
version "4.2.3"
80278033
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:
1093910945
dependencies:
1094010946
"@jridgewell/sourcemap-codec" "^1.4.15"
1094110947

10942-
magic-string@0.30.17:
10948+
magic-string@0.30.17, magic-string@^0.30.10:
1094310949
version "0.30.17"
1094410950
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.17.tgz#450a449673d2460e5bbcfba9a61916a1714c7453"
1094510951
integrity sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==
@@ -12404,7 +12410,7 @@ picocolors@^1.1.1:
1240412410
resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
1240512411
integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
1240612412

12407-
picomatch@4.0.2:
12413+
picomatch@4.0.2, picomatch@^4.0.2:
1240812414
version "4.0.2"
1240912415
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.2.tgz#77c742931e8f3b8820946c76cd0c1f13730d1dab"
1241012416
integrity sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==
@@ -13504,6 +13510,15 @@ rimraf@~2.5.2:
1350413510
dependencies:
1350513511
glob "^7.0.5"
1350613512

13513+
rollup-plugin-dts@^6.1.1:
13514+
version "6.1.1"
13515+
resolved "https://registry.yarnpkg.com/rollup-plugin-dts/-/rollup-plugin-dts-6.1.1.tgz#46b33f4d1d7f4e66f1171ced9b282ac11a15a254"
13516+
integrity sha512-aSHRcJ6KG2IHIioYlvAOcEq6U99sVtqDDKVhnwt70rW6tsz3tv5OSjEiWcgzfsHdLyGXZ/3b/7b/+Za3Y6r1XA==
13517+
dependencies:
13518+
magic-string "^0.30.10"
13519+
optionalDependencies:
13520+
"@babel/code-frame" "^7.24.2"
13521+
1350713522
rollup-plugin-sourcemaps@^0.6.3:
1350813523
version "0.6.3"
1350913524
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:
1501215027
es5-ext "^0.10.64"
1501315028
next-tick "^1.1.0"
1501415029

15030+
tinyglobby@^0.2.12:
15031+
version "0.2.12"
15032+
resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.12.tgz#ac941a42e0c5773bd0b5d08f32de82e74a1a61b5"
15033+
integrity sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==
15034+
dependencies:
15035+
fdir "^6.4.3"
15036+
picomatch "^4.0.2"
15037+
1501515038
title-case@^2.1.0:
1501615039
version "2.1.1"
1501715040
resolved "https://registry.yarnpkg.com/title-case/-/title-case-2.1.1.tgz#3e127216da58d2bc5becf137ab91dae3a7cd8faa"

0 commit comments

Comments
 (0)