Skip to content

Commit 158774a

Browse files
committed
refactor(@angular/build): move vite plugins into a seperate directory
Improve code structure
1 parent 92209dd commit 158774a

File tree

7 files changed

+29
-16
lines changed

7 files changed

+29
-16
lines changed

packages/angular/build/src/builders/dev-server/vite-server.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ import { readFile } from 'node:fs/promises';
1414
import { builtinModules, isBuiltin } from 'node:module';
1515
import { join } from 'node:path';
1616
import type { Connect, DepOptimizationConfig, InlineConfig, ViteDevServer } from 'vite';
17-
import { createAngularMemoryPlugin } from '../../tools/vite/angular-memory-plugin';
18-
import { createAngularLocaleDataPlugin } from '../../tools/vite/i18n-locale-plugin';
19-
import { createRemoveIdPrefixPlugin } from '../../tools/vite/id-prefix-plugin';
2017
import {
2118
ServerSsrMode,
19+
createAngularLocaleDataPlugin,
20+
createAngularMemoryPlugin,
2221
createAngularSetupMiddlewaresPlugin,
23-
} from '../../tools/vite/setup-middlewares-plugin';
24-
import { createAngularSsrServerPlugin } from '../../tools/vite/ssr-server-plugin';
22+
createAngularSsrTransformPlugin,
23+
createRemoveIdPrefixPlugin,
24+
} from '../../tools/vite/plugins';
2525
import { loadProxyConfiguration, normalizeSourceMaps } from '../../utils';
2626
import { loadEsmModule } from '../../utils/load-esm';
2727
import { Result, ResultFile, ResultKind } from '../application/results';
@@ -662,7 +662,7 @@ export async function setupServer(
662662
ssrMode,
663663
}),
664664
createRemoveIdPrefixPlugin(externalMetadata.explicitBrowser),
665-
await createAngularSsrServerPlugin(serverOptions.workspaceRoot),
665+
await createAngularSsrTransformPlugin(serverOptions.workspaceRoot),
666666
await createAngularMemoryPlugin({
667667
virtualProjectRoot,
668668
outputFiles,

packages/angular/build/src/tools/vite/angular-memory-plugin.ts packages/angular/build/src/tools/vite/plugins/angular-memory-plugin.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import assert from 'node:assert';
1010
import { readFile } from 'node:fs/promises';
1111
import { basename, dirname, join, relative } from 'node:path';
1212
import type { Plugin } from 'vite';
13-
import { loadEsmModule } from '../../utils/load-esm';
14-
import { AngularMemoryOutputFiles } from './utils';
13+
import { loadEsmModule } from '../../../utils/load-esm';
14+
import { AngularMemoryOutputFiles } from '../utils';
1515

16-
export interface AngularMemoryPluginOptions {
16+
interface AngularMemoryPluginOptions {
1717
virtualProjectRoot: string;
1818
outputFiles: AngularMemoryOutputFiles;
1919
external?: string[];

packages/angular/build/src/tools/vite/i18n-locale-plugin.ts packages/angular/build/src/tools/vite/plugins/i18n-locale-plugin.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import type { Plugin } from 'vite';
1111
/**
1212
* The base module location used to search for locale specific data.
1313
*/
14-
export const LOCALE_DATA_BASE_MODULE = '@angular/common/locales/global';
14+
const LOCALE_DATA_BASE_MODULE = '@angular/common/locales/global';
1515

1616
/**
1717
* Creates a Vite plugin that resolves Angular locale data files from `@angular/common`.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/**
2+
* @license
3+
* Copyright Google LLC All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.dev/license
7+
*/
8+
9+
export { createAngularMemoryPlugin } from './angular-memory-plugin';
10+
export { createAngularLocaleDataPlugin } from './i18n-locale-plugin';
11+
export { createRemoveIdPrefixPlugin } from './id-prefix-plugin';
12+
export { createAngularSetupMiddlewaresPlugin, ServerSsrMode } from './setup-middlewares-plugin';
13+
export { createAngularSsrTransformPlugin } from './ssr-transform-plugin';

packages/angular/build/src/tools/vite/setup-middlewares-plugin.ts packages/angular/build/src/tools/vite/plugins/setup-middlewares-plugin.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import {
1414
createAngularIndexHtmlMiddleware,
1515
createAngularSsrExternalMiddleware,
1616
createAngularSsrInternalMiddleware,
17-
} from './middlewares';
18-
import { AngularMemoryOutputFiles } from './utils';
17+
} from '../middlewares';
18+
import { AngularMemoryOutputFiles } from '../utils';
1919

2020
export enum ServerSsrMode {
2121
/**
@@ -42,7 +42,7 @@ export enum ServerSsrMode {
4242
ExternalSsrMiddleware,
4343
}
4444

45-
export interface AngularSetupMiddlewaresPluginOptions {
45+
interface AngularSetupMiddlewaresPluginOptions {
4646
outputFiles: AngularMemoryOutputFiles;
4747
assets: Map<string, string>;
4848
extensionMiddleware?: Connect.NextHandleFunction[];

packages/angular/build/src/tools/vite/ssr-server-plugin.ts packages/angular/build/src/tools/vite/plugins/ssr-transform-plugin.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
import remapping, { SourceMapInput } from '@ampproject/remapping';
1010
import type { Plugin } from 'vite';
11-
import { loadEsmModule } from '../../utils/load-esm';
11+
import { loadEsmModule } from '../../../utils/load-esm';
1212

13-
export async function createAngularSsrServerPlugin(workspaceRoot: string): Promise<Plugin> {
13+
export async function createAngularSsrTransformPlugin(workspaceRoot: string): Promise<Plugin> {
1414
const { normalizePath } = await loadEsmModule<typeof import('vite')>('vite');
1515

1616
return {
17-
name: 'vite:angular-ssr-server',
17+
name: 'vite:angular-ssr-transform',
1818
enforce: 'pre',
1919
async configureServer(server) {
2020
const originalssrTransform = server.ssrTransform;

0 commit comments

Comments
 (0)