Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 26 additions & 13 deletions libs/native-federation/src/builders/build/builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,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';

const originalWrite = process.stderr.write.bind(process.stderr);

Expand Down Expand Up @@ -89,7 +90,7 @@ export async function* runBuilder(
): AsyncIterable<BuilderOutput> {
let target = targetFromTargetString(nfOptions.target);

let _options = (await context.getTargetOptions(
let targetOptions = (await context.getTargetOptions(
target
)) as unknown as JsonObject & ApplicationBuilderOptions;

Expand Down Expand Up @@ -117,28 +118,40 @@ export async function* runBuilder(
}

let options = (await context.validateOptions(
_options,
targetOptions,
builder
)) as JsonObject & ApplicationBuilderOptions;

const outerOptions = options as any;
const normOuterOptions = nfOptions.dev
? await normalizeOptions(context, context.target.project, outerOptions)
: null;
/**
* Explicitly defined as devServer or if the target contains "serve"
*/
const runServer =
typeof nfOptions.devServer !== 'undefined'
? !!nfOptions.devServer
: target.target.includes('serve');

let serverOptions = null;

const runServer = nfOptions.dev && nfOptions.devServer !== false;
const write = true;
const watch = nfOptions.watch;

if (runServer) {
target = targetFromTargetString(outerOptions.buildTarget);
_options = (await context.getTargetOptions(
if (!!options['buildTarget']) {
serverOptions = await normalizeOptions(
context,
context.target.project,
options as unknown as DevServerSchema
);

target = targetFromTargetString(options['buildTarget'] as string);
targetOptions = (await context.getTargetOptions(
target
)) as unknown as JsonObject & ApplicationBuilderOptions;

builder = await context.getBuilderNameForTarget(target);
options = (await context.validateOptions(_options, builder)) as JsonObject &
ApplicationBuilderOptions;
options = (await context.validateOptions(
targetOptions,
builder
)) as JsonObject & ApplicationBuilderOptions;
}

options.watch = watch;
Expand Down Expand Up @@ -329,7 +342,7 @@ export async function* runBuilder(

const builderRun = runServer
? serveWithVite(
normOuterOptions,
serverOptions,
appBuilderName,
_buildApplication,
context,
Expand Down
Loading