diff --git a/packages/angular/src/builders/module-federation-dev-server/module-federation-dev-server.impl.ts b/packages/angular/src/builders/module-federation-dev-server/module-federation-dev-server.impl.ts index 36e6dfc08c709..6d85996c79392 100644 --- a/packages/angular/src/builders/module-federation-dev-server/module-federation-dev-server.impl.ts +++ b/packages/angular/src/builders/module-federation-dev-server/module-federation-dev-server.impl.ts @@ -5,8 +5,6 @@ import { Workspaces, } from '@nrwl/devkit'; import { scheduleTarget } from 'nx/src/adapter/ngcli-adapter'; -import { BuilderContext, createBuilder } from '@angular-devkit/architect'; -import { JsonObject } from '@angular-devkit/core'; import { executeWebpackDevServerBuilder } from '../webpack-dev-server/webpack-dev-server.impl'; import { readProjectsConfigurationFromProjectGraph } from 'nx/src/project-graph/project-graph'; import { @@ -17,7 +15,7 @@ import { export function executeModuleFederationDevServerBuilder( schema: Schema, - context: BuilderContext + context: import('@angular-devkit/architect').BuilderContext ) { const { ...options } = schema; const projectGraph = readCachedProjectGraph(); @@ -95,6 +93,6 @@ export function executeModuleFederationDevServerBuilder( return executeWebpackDevServerBuilder(options, context); } -export default createBuilder( +export default require('@angular-devkit/architect').createBuilder( executeModuleFederationDevServerBuilder ); diff --git a/packages/angular/src/builders/utilities/buildable-libs.ts b/packages/angular/src/builders/utilities/buildable-libs.ts index 902d2ab84089f..3a7ac1e180a5a 100644 --- a/packages/angular/src/builders/utilities/buildable-libs.ts +++ b/packages/angular/src/builders/utilities/buildable-libs.ts @@ -1,4 +1,3 @@ -import { BuilderContext } from '@angular-devkit/architect'; import { calculateProjectDependencies, createTmpTsConfig, @@ -9,7 +8,7 @@ import { join } from 'path'; export function createTmpTsConfigForBuildableLibs( tsConfigPath: string, - context: BuilderContext, + context: import('@angular-devkit/architect').BuilderContext, target?: string ) { let dependencies: DependentBuildableProjectNode[]; diff --git a/packages/angular/src/builders/utilities/module-federation.ts b/packages/angular/src/builders/utilities/module-federation.ts index a1ccffefa82a8..cc1b58b18c39d 100644 --- a/packages/angular/src/builders/utilities/module-federation.ts +++ b/packages/angular/src/builders/utilities/module-federation.ts @@ -1,12 +1,11 @@ import { ProjectConfiguration } from 'nx/src/config/workspace-json-project-json'; -import { BuilderContext } from '@angular-devkit/architect'; import { join } from 'path'; import { existsSync, readFileSync } from 'fs'; import { Remotes } from '@nrwl/devkit'; export function getDynamicRemotes( project: ProjectConfiguration, - context: BuilderContext, + context: import('@angular-devkit/architect').BuilderContext, workspaceProjects: Record, remotesToSkip: Set ): string[] { @@ -67,7 +66,7 @@ export function getDynamicRemotes( export function getStaticRemotes( project: ProjectConfiguration, - context: BuilderContext, + context: import('@angular-devkit/architect').BuilderContext, workspaceProjects: Record, remotesToSkip: Set ): string[] { diff --git a/packages/angular/src/builders/utilities/webpack.ts b/packages/angular/src/builders/utilities/webpack.ts index a9ecf5d12179b..40cca5a00ff99 100644 --- a/packages/angular/src/builders/utilities/webpack.ts +++ b/packages/angular/src/builders/utilities/webpack.ts @@ -1,11 +1,10 @@ -import type { Target } from '@angular-devkit/architect'; import { merge } from 'webpack-merge'; export async function mergeCustomWebpackConfig( baseWebpackConfig: any, pathToWebpackConfig: string, options: { tsConfig: string; [k: string]: any }, - target: Target + target: import('@angular-devkit/architect').Target ) { const customWebpackConfiguration = resolveCustomWebpackConfig( pathToWebpackConfig,