Skip to content

refactor: simplify dynamic import type assertions and remove resolution mode hints #31929

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
alan-agius4 merged 1 commit into from
Nov 24, 2025
Merged

refactor: simplify dynamic import type assertions and remove resolution mode hints #31929

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
6 changes: 2 additions & 4 deletions packages/angular/build/src/tools/vite/middlewares/ssr-middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ export function createAngularSsrInternalMiddleware(
// which must be processed by the runtime linker, even if they are not used.
await import('@angular/compiler');
const { writeResponseToNodeResponse, createWebRequestFromNodeRequest } = (await import(
// eslint-disable-next-line @typescript-eslint/no-explicit-any
'@angular/ssr/node' as any
'@angular/ssr/node' as string
)) as typeof import('@angular/ssr/node', { with: { 'resolution-mode': 'import' } });

const { ɵgetOrCreateAngularServerApp } = (await server.ssrLoadModule('/main.server.mjs')) as {
Expand Down Expand Up @@ -88,8 +87,7 @@ export async function createAngularSsrExternalMiddleware(
await import('@angular/compiler');

const { createWebRequestFromNodeRequest, writeResponseToNodeResponse } = (await import(
// eslint-disable-next-line @typescript-eslint/no-explicit-any
'@angular/ssr/node' as any
'@angular/ssr/node' as string
)) as typeof import('@angular/ssr/node', { with: { 'resolution-mode': 'import' } });

return function angularSsrExternalMiddleware(
Expand Down
3 changes: 1 addition & 2 deletions packages/angular/build/src/utils/server-rendering/launch-server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ export const DEFAULT_URL = new URL('http://ng-localhost/');
export async function launchServer(): Promise<URL> {
const { reqHandler } = await loadEsmModuleFromMemory('./server.mjs');
const { createWebRequestFromNodeRequest, writeResponseToNodeResponse } = (await import(
// eslint-disable-next-line @typescript-eslint/no-explicit-any
'@angular/ssr/node' as any
'@angular/ssr/node' as string
)) as typeof import('@angular/ssr/node', { with: { 'resolution-mode': 'import' } });

if (!isSsrNodeRequestHandler(reqHandler) && !isSsrRequestHandler(reqHandler)) {
Expand Down
3 changes: 1 addition & 2 deletions packages/angular/cli/src/command-builder/command-module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ import type {
Argv,
CamelCaseKey,
CommandModule as YargsCommandModule,
// Resolution mode is required due to CamelCaseKey missing from esm types
} from 'yargs' with { 'resolution-mode': 'require' };
} from 'yargs';
import { Parser as yargsParser } from 'yargs/helpers';
import { getAnalyticsUserId } from '../analytics/analytics';
import { AnalyticsCollector } from '../analytics/analytics-collector';
Expand Down