Merge pull request #806 from Nicoss54/feature/implement-@angular-build

feat(nf): compatibility with @angular/build package

Author: manfredsteyer

libs/mf/src/schematics/init-webpack/schematic.ts

@@ -1,16 +1,16 @@
 import {
+  apply,
   chain,
+  mergeWith,
+  move,
   Rule,
+  template,
   Tree,
   url,
-  apply,
-  mergeWith,
-  template,
-  move,
 } from '@angular-devkit/schematics';
 
-import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import { strings } from '@angular-devkit/core';
+import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import * as json5 from 'json5';
 import * as semver from 'semver';
 
@@ -234,7 +234,8 @@ export default function config(options: MfSchematicSchema): Rule {
 
     const buildConfig = projectConfig?.architect?.build;
     const isApplicationBuilder =
-      buildConfig?.builder === '@angular-devkit/build-angular:application';
+      buildConfig?.builder === '@angular-devkit/build-angular:application' ||
+      buildConfig?.builder === '@angular/build:application';
 
     if (isApplicationBuilder && !options.skipConfirmation) {
       console.warn(

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

@@ -1,4 +1,5 @@
 import * as fs from 'fs';
+import { existsSync, mkdirSync, rmSync } from 'fs';
 import * as mrmime from 'mrmime';
 import * as path from 'path';
 
@@ -12,10 +13,12 @@ import {
   BuilderContext,
   BuilderOutput,
   createBuilder,
+  targetFromTargetString,
 } from '@angular-devkit/architect';
 
 import { normalizeOptions } from '@angular-devkit/build-angular/src/builders/dev-server/options';
 
+
 import { logger, setLogLevel } from '@softarc/native-federation/build';
 
 import { targetFromTargetString } from '@angular-devkit/architect';
@@ -24,13 +27,19 @@ import {
   FederationOptions,
   getExternals,
   loadFederationConfig,
+  logger,
   setBuildAdapter,
+  setLogLevel,
 } from '@softarc/native-federation/build';
 import {
   createAngularBuildAdapter,
   setMemResultHandler,
 } from '../../utils/angular-esbuild-adapter';
 
+import { NfBuilderSchema } from './schema';
+import { RebuildHubs } from '../../utils/rebuild-events';
+import { updateScriptTags } from '../../utils/updateIndexHtml';
+import { JsonObject } from '@angular-devkit/core';
 import { JsonObject } from '@angular-devkit/core';
 import { FederationInfo } from '@softarc/native-federation-runtime';
 import { PluginBuild } from 'esbuild';
@@ -42,6 +51,11 @@ import {
   MemResults,
   NgCliAssetResult,
 } from '../../utils/mem-resuts';
+import { createSharedMappingsPlugin } from '../../utils/shared-mappings-plugin';
+// import { NextHandleFunction } from 'vite';
+import { FederationInfo } from '@softarc/native-federation-runtime';
+import { PluginBuild } from 'esbuild';
+import { getI18nConfig, translateFederationArtefacts } from '../../utils/i18n';
 import { RebuildHubs } from '../../utils/rebuild-events';
 import { createSharedMappingsPlugin } from '../../utils/shared-mappings-plugin';
 import { updateScriptTags } from '../../utils/updateIndexHtml';
@@ -135,10 +149,6 @@ export async function* runBuilder(
 
   setLogLevel(options.verbose ? 'verbose' : 'info');
 
-  if (!options.outputPath) {
-    options.outputPath = `dist/${context.target.project}`;
-  }
-
   const outputPath = options.outputPath;
   const outputOptions: Required<
     Exclude<ApplicationBuilderOptions['outputPath'], string>
@@ -283,10 +293,7 @@ export async function* runBuilder(
   try {
     federationResult = await buildForFederation(config, fedOptions, externals);
   } catch (e) {
-    console.error(e);
-    if (!watch) {
-      process.exit(1);
-    }
+    process.exit(1);
   }
 
   if (activateSsr) {
@@ -305,7 +312,7 @@ export async function* runBuilder(
 
   options.deleteOutputPath = false;
 
-  const appBuilderName = '@angular-devkit/build-angular:application';
+  const appBuilderName = '@angular/build:application';
 
   const builderRun = runServer
     ? serveWithVite(

libs/native-federation/src/schematics/appbuilder/schematic.ts

@@ -40,8 +40,8 @@ function updateWorkspaceConfig(
   }
 
   if (projectConfig.architect.esbuild) {
-    projectConfig.architect.esbuild.builder =
-      '@angular-devkit/build-angular:application';
+    projectConfig.architect.esbuild.builder = '@angular/build:application';
+
     projectConfig.architect.esbuild.options.browser =
       projectConfig.architect.esbuild.options.main;
     delete projectConfig.architect.esbuild.options.main;

libs/native-federation/src/schematics/init/schematic.ts

@@ -1,17 +1,17 @@
 import {
-  chain,
-  Rule,
-  Tree,
-  url,
   apply,
+  chain,
   mergeWith,
-  template,
   move,
   noop,
+  Rule,
+  template,
+  Tree,
+  url,
 } from '@angular-devkit/schematics';
 
-import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import { strings } from '@angular-devkit/core';
+import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import { MfSchematicSchema } from './schema';
 
 import {
@@ -234,11 +234,14 @@ function updateWorkspaceConfig(
 
   const originalBuild = projectConfig.architect.build;
 
-  if (originalBuild.builder !== '@angular-devkit/build-angular:application') {
+  if (
+    originalBuild.builder !== '@angular-devkit/build-angular:application' ||
+    originalBuild.builder !== '@angular/build:application'
+  ) {
     console.log(
       'Switching project to the application builder using esbuild ...'
     );
-    originalBuild.builder = '@angular-devkit/build-angular:application';
+    originalBuild.builder = '@angular/build:application';
     delete originalBuild.configurations?.development?.buildOptimizer;
     delete originalBuild.configurations?.development?.vendorChunk;
   }
@@ -524,7 +527,7 @@ function makeServerAsync(
 
     const cors = `import { createRequire } from "module";
 const require = createRequire(import.meta.url);
-const cors = require("cors"); 
+const cors = require("cors");
 `;
     const mainContent = tree.read(server).toString('utf8');
     const updatedContent = (cors + mainContent)
@@ -553,7 +556,7 @@ console.log('Starting SSR for Shell');
     remotesOrManifestUrl: '../browser/federation.manifest.json',
     relBundlePath: '../browser/',
   });
-  
+
   await import('./bootstrap-server');
 
 })();
@@ -570,7 +573,7 @@ console.log('Starting SSR for Shell');
     remotesOrManifestUrl: ${manifest},
     relBundlePath: '../browser/',
   });
-  
+
   await import('./bootstrap-server');
 
 })();
@@ -583,7 +586,7 @@ console.log('Starting SSR for Shell');
   await initNodeFederation({
     relBundlePath: '../browser/'
   });
-  
+
   await import('./bootstrap-server');
 
 })();