diff --git a/libs/native-federation/package.json b/libs/native-federation/package.json index fba85397..82c593f0 100644 --- a/libs/native-federation/package.json +++ b/libs/native-federation/package.json @@ -24,7 +24,6 @@ "@softarc/native-federation-runtime": "~3.5.1", "@chialab/esbuild-plugin-commonjs": "^0.19.0", "@angular/build": "^21.1.0", - "@angular-devkit/build-angular": "^21.1.0", "esbuild": "^0.25.1", "mrmime": "^1.0.1", "signale": "^1.4.0", diff --git a/libs/native-federation/src/builders/build/builder.ts b/libs/native-federation/src/builders/build/builder.ts index 2b608e31..3e1c583a 100644 --- a/libs/native-federation/src/builders/build/builder.ts +++ b/libs/native-federation/src/builders/build/builder.ts @@ -15,7 +15,7 @@ import { targetFromTargetString, } from '@angular-devkit/architect'; -import { normalizeOptions } from '@angular-devkit/build-angular/src/builders/dev-server/options'; +import { normalizeOptions } from '@angular/build/src/builders/dev-server/options'; import { buildForFederation, @@ -49,7 +49,7 @@ import { createSharedMappingsPlugin } from '../../utils/shared-mappings-plugin'; import { updateScriptTags } from '../../utils/updateIndexHtml'; import { federationBuildNotifier } from './federation-build-notifier'; import { NfBuilderSchema } from './schema'; -import { Schema as DevServerSchema } from '@angular-devkit/build-angular/src/builders/dev-server/schema'; +import { Schema as DevServerSchema } from '@angular/build/src/builders/dev-server/schema'; const originalWrite = process.stderr.write.bind(process.stderr); diff --git a/libs/native-federation/src/schematics/init/schematic.ts b/libs/native-federation/src/schematics/init/schematic.ts index 07df3ef9..e1d8d384 100644 --- a/libs/native-federation/src/schematics/init/schematic.ts +++ b/libs/native-federation/src/schematics/init/schematic.ts @@ -156,14 +156,6 @@ export default function config(options: MfSchematicSchema): Rule { overwrite: false, }); - addPackageJsonDependency(tree, { - name: '@angular-devkit/build-angular', - type: NodeDependencyType.Dev, - version: - getPackageJsonDependency(tree, '@angular/build')?.version || 'latest', - overwrite: false, - }); - addPackageJsonDependency(tree, { name: 'es-module-shims', type: NodeDependencyType.Default, diff --git a/libs/native-federation/src/utils/angular-esbuild-adapter.ts b/libs/native-federation/src/utils/angular-esbuild-adapter.ts index c87a26a1..8d69bcb0 100644 --- a/libs/native-federation/src/utils/angular-esbuild-adapter.ts +++ b/libs/native-federation/src/utils/angular-esbuild-adapter.ts @@ -8,7 +8,6 @@ import { import * as esbuild from 'esbuild'; import { - createCompilerPlugin, transformSupportedBrowsersToTargets, getSupportedBrowsers, generateSearchDirectories, @@ -19,10 +18,8 @@ import { import { createCompilerPluginOptions } from './create-compiler-options'; import { BuilderContext } from '@angular-devkit/architect'; -import { - normalizeOptimization, - normalizeSourceMaps, -} from '@angular-devkit/build-angular/src/utils'; +import { normalizeOptimization } from '@angular/build/src/utils/normalize-optimization'; +import { normalizeSourceMaps } from '@angular/build/src/utils/normalize-source-maps'; import { createRequire } from 'node:module'; import { ApplicationBuilderOptions } from '@angular/build'; diff --git a/tsconfig.base.json b/tsconfig.base.json index cd242712..8bf31aad 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -51,7 +51,19 @@ "@softarc/native-federation/build": [ "libs/native-federation-core/build.ts" ], - "mf-rsbuild": ["mf-rsbuild/src/index.ts"] + "mf-rsbuild": ["mf-rsbuild/src/index.ts"], + "@angular/build/src/builders/dev-server/options": [ + "node_modules/@angular/build/src/builders/dev-server/options" + ], + "@angular/build/src/builders/dev-server/schema": [ + "node_modules/@angular/build/src/builders/dev-server/schema" + ], + "@angular/build/src/utils/normalize-optimization": [ + "node_modules/@angular/build/src/utils/normalize-optimization" + ], + "@angular/build/src/utils/normalize-source-maps": [ + "node_modules/@angular/build/src/utils/normalize-source-maps" + ] } }, "exclude": ["node_modules", "tmp"]