refactor(@angular/build): move vite plugins into a seperate directory

Improve code structure
angular · Sep 23, 2024 · 158774a · 158774a
1 parent 92209dd
commit 158774a
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 16 deletions.
diff --git a/packages/angular/build/src/builders/dev-server/vite-server.ts b/packages/angular/build/src/builders/dev-server/vite-server.ts
@@ -14,14 +14,14 @@ import { readFile } from 'node:fs/promises';
 import { builtinModules, isBuiltin } from 'node:module';
 import { join } from 'node:path';
 import type { Connect, DepOptimizationConfig, InlineConfig, ViteDevServer } from 'vite';
-import { createAngularMemoryPlugin } from '../../tools/vite/angular-memory-plugin';
-import { createAngularLocaleDataPlugin } from '../../tools/vite/i18n-locale-plugin';
-import { createRemoveIdPrefixPlugin } from '../../tools/vite/id-prefix-plugin';
 import {
   ServerSsrMode,
+  createAngularLocaleDataPlugin,
+  createAngularMemoryPlugin,
   createAngularSetupMiddlewaresPlugin,
-} from '../../tools/vite/setup-middlewares-plugin';
-import { createAngularSsrServerPlugin } from '../../tools/vite/ssr-server-plugin';
+  createAngularSsrTransformPlugin,
+  createRemoveIdPrefixPlugin,
+} from '../../tools/vite/plugins';
 import { loadProxyConfiguration, normalizeSourceMaps } from '../../utils';
 import { loadEsmModule } from '../../utils/load-esm';
 import { Result, ResultFile, ResultKind } from '../application/results';
@@ -662,7 +662,7 @@ export async function setupServer(
         ssrMode,
       }),
       createRemoveIdPrefixPlugin(externalMetadata.explicitBrowser),
-      await createAngularSsrServerPlugin(serverOptions.workspaceRoot),
+      await createAngularSsrTransformPlugin(serverOptions.workspaceRoot),
       await createAngularMemoryPlugin({
         virtualProjectRoot,
         outputFiles,

diff --git a/...d/src/tools/vite/angular-memory-plugin.ts → ...ols/vite/plugins/angular-memory-plugin.ts b/...d/src/tools/vite/angular-memory-plugin.ts → ...ols/vite/plugins/angular-memory-plugin.ts
@@ -10,10 +10,10 @@ import assert from 'node:assert';
 import { readFile } from 'node:fs/promises';
 import { basename, dirname, join, relative } from 'node:path';
 import type { Plugin } from 'vite';
-import { loadEsmModule } from '../../utils/load-esm';
-import { AngularMemoryOutputFiles } from './utils';
+import { loadEsmModule } from '../../../utils/load-esm';
+import { AngularMemoryOutputFiles } from '../utils';
 
-export interface AngularMemoryPluginOptions {
+interface AngularMemoryPluginOptions {
   virtualProjectRoot: string;
   outputFiles: AngularMemoryOutputFiles;
   external?: string[];

diff --git a/...uild/src/tools/vite/i18n-locale-plugin.ts → .../tools/vite/plugins/i18n-locale-plugin.ts b/...uild/src/tools/vite/i18n-locale-plugin.ts → .../tools/vite/plugins/i18n-locale-plugin.ts
@@ -11,7 +11,7 @@ import type { Plugin } from 'vite';
 /**
  * The base module location used to search for locale specific data.
  */
-export const LOCALE_DATA_BASE_MODULE = '@angular/common/locales/global';
+const LOCALE_DATA_BASE_MODULE = '@angular/common/locales/global';
 
 /**
  * Creates a Vite plugin that resolves Angular locale data files from `@angular/common`.

diff --git a/.../build/src/tools/vite/id-prefix-plugin.ts → ...rc/tools/vite/plugins/id-prefix-plugin.ts b/.../build/src/tools/vite/id-prefix-plugin.ts → ...rc/tools/vite/plugins/id-prefix-plugin.ts
diff --git a/packages/angular/build/src/tools/vite/plugins/index.ts b/packages/angular/build/src/tools/vite/plugins/index.ts
@@ -0,0 +1,13 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+
+export { createAngularMemoryPlugin } from './angular-memory-plugin';
+export { createAngularLocaleDataPlugin } from './i18n-locale-plugin';
+export { createRemoveIdPrefixPlugin } from './id-prefix-plugin';
+export { createAngularSetupMiddlewaresPlugin, ServerSsrMode } from './setup-middlewares-plugin';
+export { createAngularSsrTransformPlugin } from './ssr-transform-plugin';
diff --git a/...rc/tools/vite/setup-middlewares-plugin.ts → .../vite/plugins/setup-middlewares-plugin.ts b/...rc/tools/vite/setup-middlewares-plugin.ts → .../vite/plugins/setup-middlewares-plugin.ts
@@ -14,8 +14,8 @@ import {
   createAngularIndexHtmlMiddleware,
   createAngularSsrExternalMiddleware,
   createAngularSsrInternalMiddleware,
-} from './middlewares';
-import { AngularMemoryOutputFiles } from './utils';
+} from '../middlewares';
+import { AngularMemoryOutputFiles } from '../utils';
 
 export enum ServerSsrMode {
   /**
@@ -42,7 +42,7 @@ export enum ServerSsrMode {
   ExternalSsrMiddleware,
 }
 
-export interface AngularSetupMiddlewaresPluginOptions {
+interface AngularSetupMiddlewaresPluginOptions {
   outputFiles: AngularMemoryOutputFiles;
   assets: Map<string, string>;
   extensionMiddleware?: Connect.NextHandleFunction[];

diff --git a/...build/src/tools/vite/ssr-server-plugin.ts → ...ools/vite/plugins/ssr-transform-plugin.ts b/...build/src/tools/vite/ssr-server-plugin.ts → ...ools/vite/plugins/ssr-transform-plugin.ts
@@ -8,13 +8,13 @@
 
 import remapping, { SourceMapInput } from '@ampproject/remapping';
 import type { Plugin } from 'vite';
-import { loadEsmModule } from '../../utils/load-esm';
+import { loadEsmModule } from '../../../utils/load-esm';
 
-export async function createAngularSsrServerPlugin(workspaceRoot: string): Promise<Plugin> {
+export async function createAngularSsrTransformPlugin(workspaceRoot: string): Promise<Plugin> {
   const { normalizePath } = await loadEsmModule<typeof import('vite')>('vite');
 
   return {
-    name: 'vite:angular-ssr-server',
+    name: 'vite:angular-ssr-transform',
     enforce: 'pre',
     async configureServer(server) {
       const originalssrTransform = server.ssrTransform;