Skip to content

Commit a1f9cb2

Browse files
committed
build: update @angular/bazel to consume new format of APF
See: angular/angular#57559
1 parent 64cf19c commit a1f9cb2

File tree

3 files changed

+13
-21
lines changed

3 files changed

+13
-21
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"@angular-devkit/build-angular": "^18.2.0-next.2",
7474
"@angular-devkit/core": "^18.2.0-next.2",
7575
"@angular-devkit/schematics": "^18.2.0-next.2",
76-
"@angular/bazel": "https://github.com/angular/bazel-builds.git#bac9c1abe1e6ac1801fbbccb53353a1ed7126469",
76+
"@angular/bazel": "https://github.com/angular/bazel-builds.git#9e6140d1eef8ddf7113d00738f603e9cc3c310f1",
7777
"@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#74e0e7b090c6e16056290836b2d936ca7820b86f",
7878
"@angular/build": "^18.2.0-next.2",
7979
"@angular/cli": "^18.2.0-next.2",

tools/postinstall/patches/@angular+bazel+16.0.0-next.6.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,19 @@ index 99d7f6d..3ea60ea 100755
6161

6262
return ts_providers_dict_to_struct(ts_providers)
6363
diff --git a/node_modules/@angular/bazel/src/ngc-wrapped/index.mjs b/node_modules/@angular/bazel/src/ngc-wrapped/index.mjs
64-
index 8681a4c..e3b497a 100755
64+
index 09deff8..00d24be 100755
6565
--- a/node_modules/@angular/bazel/src/ngc-wrapped/index.mjs
6666
+++ b/node_modules/@angular/bazel/src/ngc-wrapped/index.mjs
67-
@@ -13,7 +13,7 @@ import * as fs from 'fs';
67+
@@ -12,7 +12,7 @@ import tscw from '@bazel/concatjs/internal/tsc_wrapped/index.js';
68+
import * as fs from 'fs';
6869
import * as path from 'path';
69-
import * as tsickle from 'tsickle';
7070
import ts from 'typescript';
7171
-import { EXT, patchNgHostWithFileNameToModuleName as patchNgHost, relativeToRootDirs } from './utils';
7272
+import { EXT, patchNgHostWithFileNameToModuleName as patchNgHost, relativeToRootDirs } from './utils.mjs';
7373
// FIXME: we should be able to add the assets to the tsconfig so FileLoader
7474
// knows about them
7575
const NGC_ASSETS = /\.(css|html)$/;
76-
@@ -351,6 +351,12 @@ function gatherDiagnosticsForInputsOnly(options, bazelOpts, ngProgram) {
76+
@@ -348,6 +348,12 @@ function gatherDiagnosticsForInputsOnly(options, bazelOpts, ngProgram) {
7777
}
7878
return diagnostics;
7979
}
@@ -87,7 +87,7 @@ index 8681a4c..e3b497a 100755
8787
* @deprecated
8888
* Kept here just for compatibility with 1P tools. To be removed soon after 1P update.
8989
diff --git a/node_modules/@angular/bazel/src/ngc-wrapped/ngc-wrapped-main.mjs b/node_modules/@angular/bazel/src/ngc-wrapped/ngc-wrapped-main.mjs
90-
index 3649c11..0f4af3c 100755
90+
index ccf82d2..daaa783 100755
9191
--- a/node_modules/@angular/bazel/src/ngc-wrapped/ngc-wrapped-main.mjs
9292
+++ b/node_modules/@angular/bazel/src/ngc-wrapped/ngc-wrapped-main.mjs
9393
@@ -5,7 +5,7 @@
@@ -96,6 +96,6 @@ index 3649c11..0f4af3c 100755
9696
*/
9797
-import { main } from './index';
9898
+import { main } from './index.mjs';
99-
main(process.argv.slice(2)).then(exitCode => process.exitCode = exitCode).catch(e => {
100-
console.error(e);
101-
process.exitCode = 1;
99+
main(process.argv.slice(2))
100+
.then((exitCode) => (process.exitCode = exitCode))
101+
.catch((e) => {

yarn.lock

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,12 @@
146146
dependencies:
147147
tslib "^2.3.0"
148148

149-
"@angular/bazel@https://github.com/angular/bazel-builds.git#bac9c1abe1e6ac1801fbbccb53353a1ed7126469":
150-
version "16.0.0-next.6"
151-
resolved "https://github.com/angular/bazel-builds.git#bac9c1abe1e6ac1801fbbccb53353a1ed7126469"
149+
"@angular/bazel@https://github.com/angular/bazel-builds.git#9e6140d1eef8ddf7113d00738f603e9cc3c310f1":
150+
version "19.0.0-next.1"
151+
resolved "https://github.com/angular/bazel-builds.git#9e6140d1eef8ddf7113d00738f603e9cc3c310f1"
152152
dependencies:
153153
"@microsoft/api-extractor" "^7.24.2"
154154
magic-string "^0.30.0"
155-
tsickle "^0.46.3"
156155
tslib "^2.3.0"
157156

158157
"@angular/[email protected]":
@@ -3744,7 +3743,7 @@
37443743
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
37453744
integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
37463745

3747-
"@types/minimist@^1.2.0", "@types/minimist@^1.2.1", "@types/minimist@^1.2.2":
3746+
"@types/minimist@^1.2.0", "@types/minimist@^1.2.2":
37483747
version "1.2.5"
37493748
resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e"
37503749
integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==
@@ -15407,13 +15406,6 @@ [email protected]:
1540715406
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.39.1.tgz#7ccf672cde5b430f5dd0b281ee49e170ef390ff9"
1540815407
integrity sha512-CCc9cZhZbKoNizVM+K3Uqgit/go8GacjpqTv1cpwG/n2P0gB9GMoWZbxrUULDE9Wz26Lh86CGf6QyIPUVV1lnQ==
1540915408

15410-
tsickle@^0.46.3:
15411-
version "0.46.3"
15412-
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.46.3.tgz#b74918a77e3ca1310a2ce4d019f5d6294360b56d"
15413-
integrity sha512-9PDXxOrtn2AdpvDin6FLGveXVGg8ec3ga8fh8mPR5lz9KtitW6riVgxgagicdfF1rgiBxDeH+5hVowPXhmZbYQ==
15414-
dependencies:
15415-
"@types/minimist" "^1.2.1"
15416-
1541715409
[email protected], tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.5.2:
1541815410
version "2.6.3"
1541915411
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"

0 commit comments

Comments
 (0)