Skip to content

Commit e3e47d0

Browse files
committed
build: update bazel dependencies
See associated pull request for more information. Closes angular#31313 as a pr takeover
1 parent 0922a03 commit e3e47d0

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ single_version_override(
2626
)
2727

2828
bazel_dep(name = "aspect_bazel_lib", version = "2.21.2")
29-
bazel_dep(name = "bazel_skylib", version = "1.8.1")
29+
bazel_dep(name = "bazel_skylib", version = "1.8.2")
3030
bazel_dep(name = "aspect_rules_esbuild", version = "0.22.1")
3131
bazel_dep(name = "aspect_rules_jasmine", version = "2.0.0")
3232
bazel_dep(name = "rules_angular")
3333
git_override(
3434
module_name = "rules_angular",
35-
commit = "4010ef96de0c46db7764adc2f262258c9de3d718",
35+
commit = "ccc29858902743325700b182992789e3b346658b",
3636
remote = "https://github.com/devversion/rules_angular.git",
3737
)
3838

MODULE.bazel.lock

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/angular/build/src/tools/vite/middlewares/ssr-middleware.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import type {
1010
AngularAppEngine as SSRAngularAppEngine,
1111
ɵgetOrCreateAngularServerApp as getOrCreateAngularServerApp,
1212
} from '@angular/ssr';
13+
import type * as AngularSsrNode from '@angular/ssr/node' with { 'resolution-mode': 'import' };
1314
import type { ServerResponse } from 'node:http';
1415
import type { Connect, ViteDevServer } from 'vite';
1516
import { loadEsmModule } from '../../../utils/load-esm';
@@ -38,7 +39,7 @@ export function createAngularSsrInternalMiddleware(
3839
// which must be processed by the runtime linker, even if they are not used.
3940
await loadEsmModule('@angular/compiler');
4041
const { writeResponseToNodeResponse, createWebRequestFromNodeRequest } =
41-
await loadEsmModule<typeof import('@angular/ssr/node')>('@angular/ssr/node');
42+
await loadEsmModule<typeof AngularSsrNode>('@angular/ssr/node');
4243

4344
const { ɵgetOrCreateAngularServerApp } = (await server.ssrLoadModule('/main.server.mjs')) as {
4445
ɵgetOrCreateAngularServerApp: typeof getOrCreateAngularServerApp;
@@ -93,7 +94,7 @@ export async function createAngularSsrExternalMiddleware(
9394
await loadEsmModule('@angular/compiler');
9495

9596
const { createWebRequestFromNodeRequest, writeResponseToNodeResponse } =
96-
await loadEsmModule<typeof import('@angular/ssr/node')>('@angular/ssr/node');
97+
await loadEsmModule<typeof AngularSsrNode>('@angular/ssr/node');
9798

9899
return function angularSsrExternalMiddleware(
99100
req: Connect.IncomingMessage,

packages/angular/build/src/utils/server-rendering/launch-server.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9+
import type * as AngularSsrNode from '@angular/ssr/node' with { 'resolution-mode': 'import' };
910
import assert from 'node:assert';
1011
import { createServer } from 'node:http';
1112
import { loadEsmModule } from '../load-esm';
@@ -22,7 +23,7 @@ export const DEFAULT_URL = new URL('http://ng-localhost/');
2223
export async function launchServer(): Promise<URL> {
2324
const { reqHandler } = await loadEsmModuleFromMemory('./server.mjs');
2425
const { createWebRequestFromNodeRequest, writeResponseToNodeResponse } =
25-
await loadEsmModule<typeof import('@angular/ssr/node')>('@angular/ssr/node');
26+
await loadEsmModule<typeof AngularSsrNode>('@angular/ssr/node');
2627

2728
if (!isSsrNodeRequestHandler(reqHandler) && !isSsrRequestHandler(reqHandler)) {
2829
return DEFAULT_URL;

packages/angular/build/src/utils/server-rendering/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
import type { createRequestHandler } from '@angular/ssr';
10-
import type { createNodeRequestHandler } from '@angular/ssr/node';
10+
import type { createNodeRequestHandler } from '@angular/ssr/node' with { 'resolution-mode': 'import' };
1111

1212
export function isSsrNodeRequestHandler(
1313
value: unknown,

0 commit comments

Comments
 (0)