Skip to content

build: update @angular/bazel for relative imports in ng_package #30598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 6, 2025
Merged

build: update @angular/bazel for relative imports in ng_package #30598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions ...atches/@angular+bazel+16.0.0-next.6.patch → ...atches/@angular+bazel+20.0.0-next.1.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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;
}
Expand Down
9 changes: 5 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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==
Expand Down
Loading