Merge pull request #567 from GregOnNet/feature/angular-18-support

Feature: Add support for Angular 18

Author: manfredsteyer

.gitignore

@@ -38,5 +38,9 @@ testem.log
 .DS_Store
 Thumbs.db
 
+# Nx
 .nx/cache
+migrations.json
+
+# Angular
 .angular

libs/native-federation/src/builders/build/builder.ts

@@ -2,21 +2,21 @@ import * as path from 'path';
 import * as fs from 'fs';
 import * as mrmime from 'mrmime';
 
+import { ApplicationBuilderOptions } from '@angular/build/src/builders/application';
+import { Schema } from '@angular/build/src/builders/application/schema';
+
 import {
   BuilderContext,
   BuilderOutput,
   createBuilder,
 } from '@angular-devkit/architect';
 
-import { Schema } from '@angular-devkit/build-angular/src/builders/application/schema';
+import { buildApplication } from '@angular-devkit/build-angular';
 
 import {
-  buildApplication,
-  ApplicationBuilderOptions,
-} from '@angular-devkit/build-angular/src/builders/application';
-
-import { serveWithVite } from '@angular-devkit/build-angular/src/builders/dev-server/vite-server';
-import { DevServerBuilderOptions } from '@angular-devkit/build-angular/src/builders/dev-server';
+  executeDevServerBuilder,
+  DevServerBuilderOptions,
+} from '@angular-devkit/build-angular';
 import { normalizeOptions } from '@angular-devkit/build-angular/src/builders/dev-server/options';
 
 import { setLogLevel, logger } from '@softarc/native-federation/build';
@@ -215,18 +215,17 @@ export async function* runBuilder(
 
   options.deleteOutputPath = false;
 
-  const appBuilderName = '@angular-devkit/build-angular:application';
-
+  // TODO: Clarify how DevServer needs to be executed. Not sure if its right.
+  // TODO: Clarify if buildApplication is needed `executeDevServerBuilder` seems to choose the correct DevServer
   const builderRun = nfOptions.dev
-    ? serveWithVite(
-        normOuterOptions,
-        appBuilderName,
+    ? executeDevServerBuilder(
+        options,
         context,
-        nfOptions.skipHtmlTransform
-          ? {}
-          : {
-              indexHtml: transformIndexHtml(nfOptions),
-            },
+        {
+          indexHtml: nfOptions.skipHtmlTransform
+            ? {}
+            : { indexHtml: transformIndexHtml(nfOptions) },
+        },
         {
           buildPlugins: plugins,
           middleware,

libs/native-federation/src/utils/angular-esbuild-adapter.ts

@@ -3,42 +3,37 @@ import {
   logger,
   MappedPath,
 } from '@softarc/native-federation/build';
-import * as esbuild from 'esbuild';
-import { createCompilerPlugin } from '@angular-devkit/build-angular/src/tools/esbuild/angular/compiler-plugin';
-
-import { BuilderContext } from '@angular-devkit/architect';
 
-import { transformSupportedBrowsersToTargets } from './transform';
+import * as esbuild from 'esbuild';
 
-// TODO: Use this import instead in next version:
-// import {
-//   transformSupportedBrowsersToTargets
-// } from '@angular-devkit/build-angular/src/tools/esbuild/utils';
+import { createCompilerPlugin } from '@angular/build/src/tools/esbuild/angular/compiler-plugin';
+import { createCompilerPluginOptions } from '@angular/build/src/tools/esbuild/compiler-plugin-options';
+import { transformSupportedBrowsersToTargets } from '@angular/build/src/tools/esbuild/utils';
+import { getSupportedBrowsers } from '@angular/build/src/utils/supported-browsers';
 
-import { createCompilerPluginOptions } from '@angular-devkit/build-angular/src/tools/esbuild/compiler-plugin-options';
+import { BuilderContext } from '@angular-devkit/architect';
 
 import { findTailwindConfigurationFile } from '@angular-devkit/build-angular/src/utils/tailwind';
 
-import { getSupportedBrowsers } from '@angular-devkit/build-angular/src/utils/supported-browsers';
 import {
   normalizeOptimization,
   normalizeSourceMaps,
 } from '@angular-devkit/build-angular/src/utils';
 import { createRequire } from 'node:module';
 
-import { ApplicationBuilderOptions as AppBuilderSchema } from '@angular-devkit/build-angular/src/builders/application';
+import { ApplicationBuilderOptions } from '@angular/build/src/builders/application';
 
-import { createSharedMappingsPlugin } from './shared-mappings-plugin';
 import * as fs from 'fs';
 import * as path from 'path';
+import { createSharedMappingsPlugin } from './shared-mappings-plugin';
 
 import { PluginItem, transformAsync } from '@babel/core';
-import { RebuildEvents, RebuildHubs } from './rebuild-events';
 import {
   BuildKind,
   BuildResult,
   EntryPoint,
 } from '@softarc/native-federation/src/lib/core/build-adapter';
+import { RebuildEvents, RebuildHubs } from './rebuild-events';
 
 // const fesmFolderRegExp = /[/\\]fesm\d+[/\\]/;
 
@@ -54,7 +49,7 @@ export function setMemResultHandler(handler: MemResultHandler): void {
 }
 
 export function createAngularBuildAdapter(
-  builderOptions: AppBuilderSchema,
+  builderOptions: ApplicationBuilderOptions,
   context: BuilderContext,
   rebuildRequested: RebuildEvents = new RebuildHubs()
 ): BuildAdapter {
@@ -166,7 +161,7 @@ export function createAngularBuildAdapter(
 }
 
 async function runEsbuild(
-  builderOptions: AppBuilderSchema,
+  builderOptions: ApplicationBuilderOptions,
   context: BuilderContext,
   entryPoints: EntryPoint[],
   external: string[],