-
- We’ll be sharing new features and content daily during launch - week, so be sure to keep an eye on this space for all the latest - info! -
+
+
+
+
+
+ {/* MONDAY */}
+ {
return;
}
- const repoRoot = process.cwd();
- const cacheableOperations: string[] = [];
- createNxJsonFile(repoRoot, [], cacheableOperations, {});
-
- const pmc = getPackageManagerCommand();
-
- updateGitIgnore(repoRoot);
-
const detectPluginsResponse = await detectPlugins();
if (!detectPluginsResponse?.plugins.length) {
// If no plugins are detected/chosen, guide users to setup
// their targetDefaults correctly so their package scripts will work.
- await addNxToNpmRepo({
- interactive: options.interactive,
- });
+ const packageJson: PackageJson = readJsonFile('package.json');
+ if (isMonorepo(packageJson)) {
+ await addNxToMonorepo({ interactive: options.interactive });
+ } else {
+ await addNxToNpmRepo({ interactive: options.interactive });
+ }
} else {
const useNxCloud =
options.nxCloud ??
@@ -82,6 +79,12 @@ export async function initHandler(options: InitArgs): Promise {
? await connectExistingRepoToNxCloudPrompt()
: false);
+ const repoRoot = process.cwd();
+ const pmc = getPackageManagerCommand();
+
+ createNxJsonFile(repoRoot, [], [], {});
+ updateGitIgnore(repoRoot);
+
addDepsToPackageJson(repoRoot, detectPluginsResponse?.plugins ?? []);
output.log({ title: '📦 Installing Nx' });
diff --git a/packages/nx/src/plugins/target-defaults/target-defaults-plugin.spec.ts b/packages/nx/src/plugins/target-defaults/target-defaults-plugin.spec.ts
index a13cd539042a3..5dfd18ddf023b 100644
--- a/packages/nx/src/plugins/target-defaults/target-defaults-plugin.spec.ts
+++ b/packages/nx/src/plugins/target-defaults/target-defaults-plugin.spec.ts
@@ -2,7 +2,7 @@ import * as memfs from 'memfs';
import '../../../src/internal-testing-utils/mock-fs';
-import { TargetDefaultsPlugin } from './target-defaults-plugin';
+import { getTargetInfo, TargetDefaultsPlugin } from './target-defaults-plugin';
import { CreateNodesContext } from '../../utils/nx-plugin';
const {
createNodes: [, createNodesFn],
@@ -74,6 +74,7 @@ describe('target-defaults plugin', () => {
"dependsOn": [
"^build",
],
+ "executor": "nx:run-commands",
},
},
},
@@ -114,6 +115,10 @@ describe('target-defaults plugin', () => {
"targets": {
"test": {
"command": "jest",
+ "executor": "nx:run-script",
+ "options": {
+ "script": "test",
+ },
},
},
},
@@ -156,6 +161,10 @@ describe('target-defaults plugin', () => {
"targets": {
"test": {
"command": "jest",
+ "executor": "nx:run-script",
+ "options": {
+ "script": "test",
+ },
},
},
},
@@ -225,6 +234,10 @@ describe('target-defaults plugin', () => {
"targets": {
"test": {
"command": "jest",
+ "executor": "nx:run-script",
+ "options": {
+ "script": "test",
+ },
Symbol(ONLY_MODIFIES_EXISTING_TARGET): true,
},
},
@@ -274,11 +287,13 @@ describe('target-defaults plugin', () => {
".": {
"targets": {
"echo": {
+ "executor": "nx:run-commands",
"options": {
"cwd": "{projectRoot}",
},
},
"echo2": {
+ "executor": "nx:run-commands",
"options": {
"cwd": "{projectRoot}",
},
@@ -336,11 +351,13 @@ describe('target-defaults plugin', () => {
".": {
"targets": {
"echo": {
+ "executor": "nx:run-commands",
"options": {
"cwd": "{projectRoot}",
},
},
"echo2": {
+ "executor": "nx:run-commands",
"options": {
"cwd": "{projectRoot}",
},
@@ -358,4 +375,93 @@ describe('target-defaults plugin', () => {
`);
});
});
+
+ describe('get target info', () => {
+ it('should include command for single command', () => {
+ const result = getTargetInfo(
+ 'echo',
+ {
+ targets: {
+ echo: {
+ command: 'echo hi',
+ },
+ },
+ },
+ null
+ );
+ expect(result).toMatchInlineSnapshot(`
+ {
+ "command": "echo hi",
+ }
+ `);
+ });
+
+ it('should include command for run-commands', () => {
+ const result = getTargetInfo(
+ 'echo',
+ {
+ targets: {
+ echo: {
+ executor: 'nx:run-commands',
+ options: {
+ command: 'echo hi',
+ cwd: '{projectRoot}',
+ },
+ },
+ },
+ },
+ null
+ );
+ expect(result).toMatchInlineSnapshot(`
+ {
+ "executor": "nx:run-commands",
+ "options": {
+ "command": "echo hi",
+ },
+ }
+ `);
+ });
+
+ it('should include script for run-script', () => {
+ expect(
+ getTargetInfo('build', null, {
+ scripts: {
+ build: 'echo hi',
+ },
+ })
+ ).toMatchInlineSnapshot(`
+ {
+ "executor": "nx:run-script",
+ "options": {
+ "script": "build",
+ },
+ }
+ `);
+
+ expect(
+ getTargetInfo('echo', null, {
+ scripts: {
+ build: 'echo hi',
+ },
+ nx: {
+ targets: {
+ echo: {
+ executor: 'nx:run-script',
+ options: {
+ script: 'build',
+ },
+ },
+ },
+ },
+ })
+ ).toMatchInlineSnapshot(`
+ {
+ "executor": "nx:run-script",
+ "options": {
+ "script": "build",
+ },
+ }
+ `);
+ });
+ });
});
diff --git a/packages/nx/src/plugins/target-defaults/target-defaults-plugin.ts b/packages/nx/src/plugins/target-defaults/target-defaults-plugin.ts
index 72d16da42604d..884140531a244 100644
--- a/packages/nx/src/plugins/target-defaults/target-defaults-plugin.ts
+++ b/packages/nx/src/plugins/target-defaults/target-defaults-plugin.ts
@@ -88,9 +88,13 @@ export const TargetDefaultsPlugin: NxPluginV2 = {
// Prevents `build` from overwriting `@nx/js:tsc` if both are present
// and build is specified later in the ordering.
if (!modifiedTargets[targetName] || targetName !== defaultSpecifier) {
- modifiedTargets[targetName] = JSON.parse(
+ const defaults = JSON.parse(
JSON.stringify(targetDefaults[defaultSpecifier])
);
+ modifiedTargets[targetName] = {
+ ...getTargetInfo(targetName, projectJson, packageJson),
+ ...defaults,
+ };
}
// TODO: Remove this after we figure out a way to define new targets
// in target defaults
@@ -140,3 +144,93 @@ function readJsonOrNull(path: string) {
return null;
}
}
+
+/**
+ * This fn gets target info that would make a target uniquely compatible
+ * with what is described by project.json or package.json. As the merge process
+ * for config happens, without this, the target defaults may be compatible
+ * with a config from a plugin and then that combined target be incompatible
+ * with the project json configuration resulting in the target default values
+ * being scrapped. By adding enough information from the project.json / package.json,
+ * we can make sure that the target after merging is compatible with the defined target.
+ */
+export function getTargetInfo(
+ target: string,
+ projectJson: Pick,
+ packageJson: Pick
+) {
+ const projectJsonTarget = projectJson?.targets?.[target];
+ const packageJsonTarget = packageJson?.nx?.targets?.[target];
+
+ const executor = getTargetExecutor(target, projectJson, packageJson);
+ const targetOptions = {
+ ...packageJsonTarget?.options,
+ ...projectJsonTarget?.options,
+ };
+
+ if (projectJsonTarget?.command) {
+ return {
+ command: projectJsonTarget?.command,
+ };
+ }
+
+ if (executor === 'nx:run-commands') {
+ if (targetOptions?.command) {
+ return {
+ executor: 'nx:run-commands',
+ options: {
+ command: projectJsonTarget.options?.command,
+ },
+ };
+ } else if (targetOptions?.commands) {
+ return {
+ executor: 'nx:run-commands',
+ options: {
+ commands: targetOptions.commands,
+ },
+ };
+ }
+ return {
+ executor: 'nx:run-commands',
+ };
+ }
+
+ if (executor === 'nx:run-script') {
+ return {
+ executor: 'nx:run-script',
+ options: {
+ script: targetOptions?.script ?? target,
+ },
+ };
+ }
+
+ if (executor) {
+ return { executor };
+ }
+
+ return {};
+}
+
+function getTargetExecutor(
+ target: string,
+ projectJson: Pick,
+ packageJson: Pick
+) {
+ const projectJsonTarget = projectJson?.targets?.[target];
+ const packageJsonTarget = packageJson?.nx?.targets?.[target];
+ const packageJsonScript = packageJson?.scripts?.[target];
+
+ if (projectJsonTarget?.command) {
+ return 'nx:run-commands';
+ }
+
+ if (
+ !projectJsonTarget?.executor &&
+ !packageJsonTarget?.executor &&
+ packageJsonScript
+ ) {
+ return 'nx:run-script';
+ }
+
+ return projectJsonTarget?.executor ?? packageJsonTarget?.executor;
+}
diff --git a/packages/webpack/src/plugins/nx-webpack-plugin/lib/apply-base-config.ts b/packages/webpack/src/plugins/nx-webpack-plugin/lib/apply-base-config.ts
index 9d02cc12a8fa2..3ab32b13511a3 100644
--- a/packages/webpack/src/plugins/nx-webpack-plugin/lib/apply-base-config.ts
+++ b/packages/webpack/src/plugins/nx-webpack-plugin/lib/apply-base-config.ts
@@ -19,7 +19,6 @@ import { createLoaderFromCompiler } from './compiler-loaders';
import { NormalizedNxWebpackPluginOptions } from '../nx-webpack-plugin-options';
import TerserPlugin = require('terser-webpack-plugin');
import nodeExternals = require('webpack-node-externals');
-import ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
const IGNORED_WEBPACK_WARNINGS = [
/The comment file/i,
@@ -223,6 +222,7 @@ function applyNxDependentConfig(
};
if (!options?.skipTypeChecking) {
+ const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
plugins.push(
new ForkTsCheckerWebpackPlugin({
typescript: {
+
+ + We’ll be sharing new features and content daily during launch + week, so be sure to keep an eye on this space for all the latest + info! +
+
+
+
diff --git a/packages/angular/src/generators/setup-mf/__snapshots__/setup-mf.spec.ts.snap b/packages/angular/src/generators/setup-mf/__snapshots__/setup-mf.spec.ts.snap
index 82a3007966170..0fbe81c63e318 100644
--- a/packages/angular/src/generators/setup-mf/__snapshots__/setup-mf.spec.ts.snap
+++ b/packages/angular/src/generators/setup-mf/__snapshots__/setup-mf.spec.ts.snap
@@ -6,7 +6,7 @@ exports[`Init MF --federationType=dynamic should create a host with the correct
fetch('/assets/module-federation.manifest.json')
.then((res) => res.json())
.then(definitions => setRemoteDefinitions(definitions))
- .then(() => import('./bootstrap').catch(err => console.error(err));)"
+ .then(() => import('./bootstrap').catch(err => console.error(err)));"
`;
exports[`Init MF --federationType=dynamic should create a host with the correct configurations when --typescriptConfiguration=true 1`] = `
@@ -15,7 +15,7 @@ exports[`Init MF --federationType=dynamic should create a host with the correct
fetch('/assets/module-federation.manifest.json')
.then((res) => res.json())
.then(definitions => setRemoteDefinitions(definitions))
- .then(() => import('./bootstrap').catch(err => console.error(err));)"
+ .then(() => import('./bootstrap').catch(err => console.error(err)));"
`;
exports[`Init MF should add a remote application and add it to a specified host applications router config 1`] = `
diff --git a/packages/angular/src/generators/setup-mf/lib/add-cypress-workaround.ts b/packages/angular/src/generators/setup-mf/lib/add-cypress-workaround.ts
index f3201fe91ea40..8d7b7560b5c76 100644
--- a/packages/angular/src/generators/setup-mf/lib/add-cypress-workaround.ts
+++ b/packages/angular/src/generators/setup-mf/lib/add-cypress-workaround.ts
@@ -2,8 +2,10 @@
// as Angular attempt to figure out how to fix HMR when styles.js
// is attached to the index.html with type=module
+import { CYPRESS_CONFIG_FILE_NAME_PATTERN } from '@nx/cypress/src/utils/config';
import type { ProjectConfiguration, Tree } from '@nx/devkit';
import {
+ glob,
joinPathFragments,
logger,
readProjectConfiguration,
@@ -31,8 +33,9 @@ export function addCypressOnErrorWorkaround(tree: Tree, schema: Schema) {
}
if (
- e2eProject.targets.e2e.executor !== '@nx/cypress:cypress' &&
- e2eProject.targets.e2e.executor !== '@nx/cypress:cypress'
+ e2eProject.targets?.e2e?.executor !== '@nx/cypress:cypress' &&
+ !glob(tree, [`${e2eProject.root}/${CYPRESS_CONFIG_FILE_NAME_PATTERN}`])
+ .length
) {
// Not a cypress e2e project, skip
return;
diff --git a/packages/angular/src/generators/setup-mf/lib/fix-bootstrap.ts b/packages/angular/src/generators/setup-mf/lib/fix-bootstrap.ts
index 1394f82edcedd..78246735d822d 100644
--- a/packages/angular/src/generators/setup-mf/lib/fix-bootstrap.ts
+++ b/packages/angular/src/generators/setup-mf/lib/fix-bootstrap.ts
@@ -11,20 +11,20 @@ export function fixBootstrap(tree: Tree, appRoot: string, options: Schema) {
tree.write(joinPathFragments(appRoot, 'src/bootstrap.ts'), bootstrapCode);
}
- const bootstrapImportCode = `import('./bootstrap').catch(err => console.error(err));`;
+ const bootstrapImportCode = `import('./bootstrap').catch(err => console.error(err))`;
const fetchMFManifestCode = `import { setRemoteDefinitions } from '@nx/angular/mf';
fetch('/assets/module-federation.manifest.json')
.then((res) => res.json())
.then(definitions => setRemoteDefinitions(definitions))
- .then(() => ${bootstrapImportCode})`;
+ .then(() => ${bootstrapImportCode});`;
tree.write(
mainFilePath,
options.mfType === 'host' && options.federationType === 'dynamic'
? fetchMFManifestCode
- : bootstrapImportCode
+ : `${bootstrapImportCode};`
);
}
diff --git a/packages/next/src/plugins/plugin.ts b/packages/next/src/plugins/plugin.ts
index b1a6ae76ff754..dcc2d5c1e140c 100644
--- a/packages/next/src/plugins/plugin.ts
+++ b/packages/next/src/plugins/plugin.ts
@@ -15,7 +15,6 @@ import { existsSync, readdirSync } from 'fs';
import { projectGraphCacheDirectory } from 'nx/src/utils/cache-directory';
import { calculateHashForCreateNodes } from '@nx/devkit/src/utils/calculate-hash-for-create-nodes';
-import { PHASE_PRODUCTION_BUILD } from 'next/constants';
import { getLockFileName } from '@nx/js';
export interface NextPluginOptions {
@@ -155,6 +154,7 @@ function getStartTargetConfig(options: NextPluginOptions, projectRoot: string) {
async function getOutputs(projectRoot, nextConfig) {
let dir = '.next';
+ const { PHASE_PRODUCTION_BUILD } = require('next/constants');
if (typeof nextConfig === 'function') {
// Works for both async and sync functions.
diff --git a/packages/nx/bin/init-local.ts b/packages/nx/bin/init-local.ts
index 6a82c9bbaebd4..34c96fc3ed690 100644
--- a/packages/nx/bin/init-local.ts
+++ b/packages/nx/bin/init-local.ts
@@ -13,27 +13,6 @@ import * as Mod from 'module';
*/
export function initLocal(workspace: WorkspaceTypeAndRoot) {
- // If module.register is not available, we need to restart the process with the experimental ESM loader.
- // Otherwise, usage of `registerTsProject` will not work for `.ts` files using ESM.
- // TODO: Remove this once Node 18 is out of LTS (March 2024).
- if (shouldRestartWithExperimentalTsEsmLoader()) {
- const child = require('child_process').fork(
- require.resolve('./nx'),
- process.argv.slice(2),
- {
- env: {
- ...process.env,
- RESTARTED_WITH_EXPERIMENTAL_TS_ESM_LOADER: '1',
- },
- execArgv: execArgvWithExperimentalLoaderOptions(),
- }
- );
- child.on('close', (code: number | null) => {
- if (code !== 0 && code !== null) process.exit(code);
- });
- return;
- }
-
process.env.NX_CLI_SET = 'true';
try {
@@ -215,36 +194,3 @@ function monkeyPatchRequire() {
// do some side-effect of your own
};
}
-
-function shouldRestartWithExperimentalTsEsmLoader(): boolean {
- // Already restarted with experimental loader
- if (process.env.RESTARTED_WITH_EXPERIMENTAL_TS_ESM_LOADER === '1')
- return false;
- const nodeVersion = parseInt(process.versions.node.split('.')[0]);
- // `--experimental-loader` is only supported in Nodejs >= 16 so there is no point restarting for older versions
- if (nodeVersion < 16) return false;
- // Node 20.6.0 adds `module.register`, otherwise we need to restart process with "--experimental-loader ts-node/esm".
- return (
- !require('node:module').register &&
- moduleResolves('ts-node/esm') &&
- moduleResolves('typescript')
- );
-}
-
-function execArgvWithExperimentalLoaderOptions() {
- return [
- ...process.execArgv,
- '--no-warnings',
- '--experimental-loader',
- 'ts-node/esm',
- ];
-}
-
-function moduleResolves(packageName: string) {
- try {
- require.resolve(packageName);
- return true;
- } catch {
- return false;
- }
-}
diff --git a/packages/nx/src/command-line/init/implementation/utils.ts b/packages/nx/src/command-line/init/implementation/utils.ts
index 4f51fb17f0f9f..40f624709fc34 100644
--- a/packages/nx/src/command-line/init/implementation/utils.ts
+++ b/packages/nx/src/command-line/init/implementation/utils.ts
@@ -16,7 +16,7 @@ import {
} from '../../../utils/package-manager';
import { joinPathFragments } from '../../../utils/path';
import { nxVersion } from '../../../utils/versions';
-import { readFileSync, writeFileSync } from 'fs';
+import { existsSync, readFileSync, writeFileSync } from 'fs';
export function createNxJsonFile(
repoRoot: string,
@@ -223,3 +223,14 @@ export function printFinalMessage({
].filter(Boolean),
});
}
+
+export function isMonorepo(packageJson: PackageJson) {
+ if (!!packageJson.workspaces) return true;
+
+ if (existsSync('pnpm-workspace.yaml') || existsSync('pnpm-workspace.yml'))
+ return true;
+
+ if (existsSync('lerna.json')) return true;
+
+ return false;
+}
diff --git a/packages/nx/src/command-line/init/init-v1.ts b/packages/nx/src/command-line/init/init-v1.ts
index 4ffac5738d9d4..468f2207dc3a0 100644
--- a/packages/nx/src/command-line/init/init-v1.ts
+++ b/packages/nx/src/command-line/init/init-v1.ts
@@ -12,6 +12,7 @@ import { runNxSync } from '../../utils/child-process';
import { directoryExists, readJsonFile } from '../../utils/fileutils';
import { PackageJson } from '../../utils/package-json';
import { nxVersion } from '../../utils/versions';
+import { isMonorepo } from './implementation/utils';
export interface InitArgs {
addE2e: boolean;
@@ -106,17 +107,6 @@ function isNestCLI(packageJson: PackageJson) {
);
}
-function isMonorepo(packageJson: PackageJson) {
- if (!!packageJson.workspaces) return true;
-
- if (existsSync('pnpm-workspace.yaml') || existsSync('pnpm-workspace.yml'))
- return true;
-
- if (existsSync('lerna.json')) return true;
-
- return false;
-}
-
function setupDotNxInstallation(version: string) {
if (process.platform !== 'win32') {
console.log(
diff --git a/packages/nx/src/command-line/init/init-v2.ts b/packages/nx/src/command-line/init/init-v2.ts
index 011fddb2ea296..30f6a955e84e3 100644
--- a/packages/nx/src/command-line/init/init-v2.ts
+++ b/packages/nx/src/command-line/init/init-v2.ts
@@ -10,6 +10,7 @@ import { nxVersion } from '../../utils/versions';
import {
addDepsToPackageJson,
createNxJsonFile,
+ isMonorepo,
runInstall,
updateGitIgnore,
} from './implementation/utils';
@@ -19,6 +20,7 @@ import { addNxToAngularCliRepo } from './implementation/angular';
import { globWithWorkspaceContext } from '../../utils/workspace-context';
import { connectExistingRepoToNxCloudPrompt } from '../connect/connect-to-nx-cloud';
import { addNxToNpmRepo } from './implementation/add-nx-to-npm-repo';
+import { addNxToMonorepo } from './implementation/add-nx-to-monorepo';
export interface InitArgs {
interactive: boolean;
@@ -59,22 +61,17 @@ export async function initHandler(options: InitArgs): Promise
+
+
+
+ Monday
+
+
+ Announcing Project Crystal
+
+
+
+
+
+
+ When working on the next iteration of Nx, one idea
+ consistently emerged: Nx Plugins are powerful and have
+ proven to help large enterprises adopt monorepos,
+ successfully maintaining and scaling them. However, there's
+ definitely a barrier to entry. So, what if Nx Plugins
+ functioned more like VSCode extensions? You simply add them,
+ and they instantly enhance the experience of working with a
+ given tool or technology.
+
+ This is what Nx Project Crystal is all about.
+
+
+ Read the blog post
+
+
+ Watch the video
+
+
+ 
+