Skip to content

Commit

Permalink
fix(angular): module-federation-ssr-dev-server should call correct bu…
Browse files Browse the repository at this point in the history
…ilder
  • Loading branch information
Coly010 committed Aug 16, 2024
1 parent 69c989e commit dcc5c69
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { createBuilderContext } from 'nx/src/adapter/ngcli-adapter';
import { normalizeOptions } from './lib/normalize-options';
import { waitForPortOpen } from '@nx/web/src/utils/wait-for-port-open';
import { startSsrRemoteProxies } from '@nx/webpack/src/utils/module-federation/start-ssr-remote-proxies';
import { executeDevServerBuilder } from '../../builders/dev-server/dev-server.impl';
import { getInstalledAngularVersionInfo } from '../utilities/angular-version-utils';

export async function* moduleFederationSsrDevServerExecutor(
schema: Schema,
Expand All @@ -34,8 +34,14 @@ export async function* moduleFederationSsrDevServerExecutor(
const nxBin = require.resolve('nx/bin/nx');
const options = normalizeOptions(schema);

const { major: angularMajorVersion } = getInstalledAngularVersionInfo();
const { executeSSRDevServerBuilder } =
angularMajorVersion >= 17
? require('@angular-devkit/build-angular')
: require('@nguniversal/builders');

const currIter = eachValueFrom(
executeDevServerBuilder(
executeSSRDevServerBuilder(
options,
await createBuilderContext(
{
Expand Down
4 changes: 2 additions & 2 deletions packages/nx/src/adapter/ngcli-adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ export async function createBuilderContext(
logger: getLogger(),
id: 1,
currentDirectory: process.cwd(),
scheduleTarget: architect.scheduleTarget,
scheduleBuilder: architect.scheduleBuilder,
scheduleTarget: (...args) => architect.scheduleTarget(...args),
scheduleBuilder: (...args) => architect.scheduleBuilder(...args),
addTeardown(teardown: () => Promise<void> | void) {
// No-op as Nx doesn't require an implementation of this function
return;
Expand Down

0 comments on commit dcc5c69

Please sign in to comment.