diff --git a/e2e/react/src/react.module-federation.test.ts b/e2e/react/src/react.module-federation.test.ts index e971261e6cab9..6abda865ed768 100644 --- a/e2e/react/src/react.module-federation.test.ts +++ b/e2e/react/src/react.module-federation.test.ts @@ -8,6 +8,7 @@ import { readProjectConfig, runCLI, runCLIAsync, + runCommand, uniq, updateFile, } from '@nrwl/e2e/utils'; @@ -19,8 +20,7 @@ describe('React Module Federation', () => { afterEach(() => cleanupProject()); - // TODO: Re-enable this to work with pnpm - xit('should generate host and remote apps', async () => { + it('should generate host and remote apps', async () => { const shell = uniq('shell'); const remote1 = uniq('remote1'); const remote2 = uniq('remote2'); @@ -94,7 +94,7 @@ describe('React Module Federation', () => { ` ); - const e2eResults = runCLI(`e2e ${shell}-e2e --no-watch`); + const e2eResults = runCLI(`e2e ${shell}-e2e --no-watch --verbose`); expect(e2eResults).toContain('All specs passed!'); expect( await killPorts([ diff --git a/packages/react/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts b/packages/react/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts index 5d953a1776cd6..382996caddedb 100644 --- a/packages/react/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts +++ b/packages/react/src/executors/module-federation-dev-server/module-federation-dev-server.impl.ts @@ -2,6 +2,7 @@ import { ExecutorContext, logger, runExecutor } from '@nrwl/devkit'; import devServerExecutor from '@nrwl/webpack/src/executors/dev-server/dev-server.impl'; import { WebDevServerOptions } from '@nrwl/webpack/src/executors/dev-server/schema'; import { join } from 'path'; +import * as chalk from 'chalk'; import { combineAsyncIterators, tapAsyncIterator, @@ -66,7 +67,9 @@ export default async function* moduleFederationDevServer( numAwaiting--; if (numAwaiting === 0) { logger.info( - `Host is ready: ${options.host ?? 'localhost'}:${options.port ?? 4200}` + `[ ${chalk.green('ready')} ] http://${options.host ?? 'localhost'}:${ + options.port ?? 4200 + }` ); } }); diff --git a/packages/react/src/module-federation/webpack-utils.ts b/packages/react/src/module-federation/webpack-utils.ts index 84e887c7113fb..acb847ff35d19 100644 --- a/packages/react/src/module-federation/webpack-utils.ts +++ b/packages/react/src/module-federation/webpack-utils.ts @@ -90,7 +90,7 @@ export function getNpmPackageSharedConfig( return undefined; } - return { singleton: true, strictVersion: true, requiredVersion: version }; + return { singleton: true, requiredVersion: version }; } export function sharePackages( diff --git a/packages/web/package.json b/packages/web/package.json index 3fd8c66737d30..4121e536cc4a6 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -50,7 +50,7 @@ "babel-plugin-transform-typescript-metadata": "^0.3.1", "chalk": "4.1.0", "chokidar": "^3.5.1", - "http-server": "14.1.0", + "http-server": "^14.1.0", "ignore": "^5.0.4", "tslib": "^2.3.0" }, diff --git a/packages/web/src/executors/file-server/file-server.impl.ts b/packages/web/src/executors/file-server/file-server.impl.ts index 3f577ddc396ca..d57b4bb1773bd 100644 --- a/packages/web/src/executors/file-server/file-server.impl.ts +++ b/packages/web/src/executors/file-server/file-server.impl.ts @@ -159,8 +159,10 @@ export default async function* fileServerExecutor( const args = getHttpServerArgs(options); - const { path: pathToHttpServerPkgJson, packageJson } = - readModulePackageJson('http-server'); + const { path: pathToHttpServerPkgJson, packageJson } = readModulePackageJson( + 'http-server', + module.paths + ); const pathToHttpServerBin = packageJson.bin['http-server']; const pathToHttpServer = resolve( pathToHttpServerPkgJson.replace('package.json', ''),