nx 16.7.0-beta.1 → 16.7.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "16.7.0-beta.1",
+  "version": "16.7.0-beta.3",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -32,7 +32,7 @@
   },
   "homepage": "https://nx.dev",
   "dependencies": {
-    "@nrwl/tao": "16.7.0-beta.1",
+    "@nrwl/tao": "16.7.0-beta.3",
     "@parcel/watcher": "2.0.4",
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "3.0.0-rc.46",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "16.7.0-beta.1",
-    "@nx/nx-darwin-x64": "16.7.0-beta.1",
-    "@nx/nx-freebsd-x64": "16.7.0-beta.1",
-    "@nx/nx-linux-arm-gnueabihf": "16.7.0-beta.1",
-    "@nx/nx-linux-arm64-gnu": "16.7.0-beta.1",
-    "@nx/nx-linux-arm64-musl": "16.7.0-beta.1",
-    "@nx/nx-linux-x64-gnu": "16.7.0-beta.1",
-    "@nx/nx-linux-x64-musl": "16.7.0-beta.1",
-    "@nx/nx-win32-arm64-msvc": "16.7.0-beta.1",
-    "@nx/nx-win32-x64-msvc": "16.7.0-beta.1"
+    "@nx/nx-darwin-arm64": "16.7.0-beta.3",
+    "@nx/nx-darwin-x64": "16.7.0-beta.3",
+    "@nx/nx-freebsd-x64": "16.7.0-beta.3",
+    "@nx/nx-linux-arm-gnueabihf": "16.7.0-beta.3",
+    "@nx/nx-linux-arm64-gnu": "16.7.0-beta.3",
+    "@nx/nx-linux-arm64-musl": "16.7.0-beta.3",
+    "@nx/nx-linux-x64-gnu": "16.7.0-beta.3",
+    "@nx/nx-linux-x64-musl": "16.7.0-beta.3",
+    "@nx/nx-win32-arm64-msvc": "16.7.0-beta.3",
+    "@nx/nx-win32-x64-msvc": "16.7.0-beta.3"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",
@@ -177,5 +177,5 @@
   },
   "main": "./bin/nx.js",
   "types": "./bin/nx.d.ts",
-  "gitHead": "50a145bb64edcf76985184a9a83d1449dcd4f3d9"
+  "gitHead": "118faf4e432667fd041954d96aa6c9c99fea5ebd"
 }

package/src/command-line/generate/generate.js

@@ -4,8 +4,8 @@ exports.workspaceGenerators = exports.generate = exports.printGenHelp = exports.
 const tslib_1 = require("tslib");
 const chalk = require("chalk");
 const enquirer_1 = require("enquirer");
+const path_1 = require("path");
 const configuration_1 = require("../../config/configuration");
-const workspaces_1 = require("../../config/workspaces");
 const tree_1 = require("../../generators/tree");
 const project_graph_1 = require("../../project-graph/project-graph");
 const logger_1 = require("../../utils/logger");
@@ -31,9 +31,9 @@ function printChanges(fileChanges) {
     });
 }
 exports.printChanges = printChanges;
-function promptForCollection(generatorName, ws, interactive, projectsConfiguration) {
+function promptForCollection(generatorName, interactive, projectsConfiguration) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const localPlugins = yield (0, local_plugins_1.getLocalWorkspacePlugins)(projectsConfiguration);
+        const localPlugins = yield (0, local_plugins_1.getLocalWorkspacePlugins)(projectsConfiguration, (0, configuration_1.readNxJson)());
         const installedCollections = Array.from(new Set((0, installed_plugins_1.findInstalledPlugins)().map((x) => x.name)));
         const choicesMap = new Set();
         const deprecatedChoices = new Set();
@@ -148,7 +148,7 @@ function parseGeneratorString(value) {
         };
     }
 }
-function convertToGenerateOptions(generatorOptions, ws, defaultCollectionName, mode, projectsConfiguration) {
+function convertToGenerateOptions(generatorOptions, defaultCollectionName, mode, projectsConfiguration) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         let collectionName = null;
         let generatorName = null;
@@ -161,7 +161,7 @@ function convertToGenerateOptions(generatorOptions, ws, defaultCollectionName, m
                 generatorName = generator;
             }
             else if (!defaultCollectionName) {
-                const generatorString = yield promptForCollection(generatorDescriptor, ws, interactive, projectsConfiguration);
+                const generatorString = yield promptForCollection(generatorDescriptor, interactive, projectsConfiguration);
                 const parsedGeneratorString = parseGeneratorString(generatorString);
                 collectionName = parsedGeneratorString.collection;
                 generatorName = parsedGeneratorString.generator;
@@ -220,12 +220,11 @@ function generate(cwd, args) {
             process.env.NX_VERBOSE_LOGGING = 'true';
         }
         const verbose = process.env.NX_VERBOSE_LOGGING === 'true';
-        const ws = new workspaces_1.Workspaces(workspace_root_1.workspaceRoot);
         const nxJsonConfiguration = (0, configuration_1.readNxJson)();
         const projectGraph = yield (0, project_graph_1.createProjectGraphAsync)({ exitOnError: true });
         const projectsConfigurations = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
         return (0, params_1.handleErrors)(verbose, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const opts = yield convertToGenerateOptions(args, ws, readDefaultCollection(nxJsonConfiguration), 'generate', projectsConfigurations);
+            const opts = yield convertToGenerateOptions(args, readDefaultCollection(nxJsonConfiguration), 'generate', projectsConfigurations);
             const { normalizedGeneratorName, schema, implementationFactory, generatorConfiguration: { aliases, hidden, ['x-deprecated']: deprecated, ['x-use-standalone-layout']: isStandalonePreset, }, } = (0, generator_utils_1.getGeneratorInformation)(opts.collectionName, opts.generatorName, workspace_root_1.workspaceRoot);
             if (deprecated) {
                 logger_1.logger.warn([
@@ -240,7 +239,7 @@ function generate(cwd, args) {
                 printGenHelp(opts, schema, normalizedGeneratorName, aliases);
                 return 0;
             }
-            const combinedOpts = yield (0, params_1.combineOptionsForGenerator)(opts.generatorOptions, opts.collectionName, normalizedGeneratorName, projectsConfigurations, nxJsonConfiguration, schema, opts.interactive, (0, calculate_default_project_name_1.calculateDefaultProjectName)(cwd, workspace_root_1.workspaceRoot, projectsConfigurations, nxJsonConfiguration), ws.relativeCwd(cwd), verbose);
+            const combinedOpts = yield (0, params_1.combineOptionsForGenerator)(opts.generatorOptions, opts.collectionName, normalizedGeneratorName, projectsConfigurations, nxJsonConfiguration, schema, opts.interactive, (0, calculate_default_project_name_1.calculateDefaultProjectName)(cwd, workspace_root_1.workspaceRoot, projectsConfigurations, nxJsonConfiguration), (0, path_1.relative)(cwd, workspace_root_1.workspaceRoot), verbose);
             if ((0, generator_utils_1.getGeneratorInformation)(opts.collectionName, normalizedGeneratorName, workspace_root_1.workspaceRoot).isNxGenerator) {
                 const host = new tree_1.FsTree(workspace_root_1.workspaceRoot, verbose, `generating (${opts.collectionName}:${normalizedGeneratorName})`);
                 const implementation = implementationFactory();

package/src/command-line/init/command-object.js

@@ -14,7 +14,7 @@ exports.yargsInitCommand = {
 };
 function withInitOptions(yargs) {
     return yargs
-        .options('nxCloud', {
+        .option('nxCloud', {
         type: 'boolean',
         description: 'Set up distributed caching with Nx Cloud.',
     })
@@ -32,18 +32,23 @@ function withInitOptions(yargs) {
         describe: 'Set up Cypress E2E tests in integrated workspaces. Only for CRA projects.',
         type: 'boolean',
         default: false,
+    })
+        .option('useDotNxInstallation', {
+        type: 'boolean',
+        description: 'Initialize an Nx workspace setup in the .nx directory of the current repository.',
+        default: false,
     })
         .option('force', {
         describe: 'Force the migration to continue and ignore custom webpack setup or uncommitted changes. Only for CRA projects.',
         type: 'boolean',
         default: false,
     })
-        .options('vite', {
+        .option('vite', {
         type: 'boolean',
         description: 'Use Vite as the bundler. Only for CRA projects.',
         default: true,
     })
-        .options('cacheable', {
+        .option('cacheable', {
         type: 'string',
         description: 'Comma-separated list of cacheable operations. Only used for internal testing.',
         coerce: shared_options_1.parseCSV,

package/src/command-line/init/implementation/angular/standalone-workspace.js

@@ -48,7 +48,9 @@ function createNxJson(repoRoot, angularJson, cacheableOperations, { eslintProjec
                     karmaProjectConfigFile ? '!{projectRoot}/karma.conf.js' : undefined,
                 ].filter(Boolean)
                 : []),
-            eslintProjectConfigFile ? '!{projectRoot}/.eslintrc.json' : undefined,
+            ...(eslintProjectConfigFile
+                ? ['!{projectRoot}/.eslintrc.json', '!{projectRoot}/eslint.config.js']
+                : []),
         ].filter(Boolean),
     };
     nxJson.targetDefaults = {};
@@ -73,6 +75,9 @@ function createNxJson(repoRoot, angularJson, cacheableOperations, { eslintProjec
         if ((0, fileutils_1.fileExists)((0, path_1.join)(repoRoot, '.eslintrc.json'))) {
             inputs.push('{workspaceRoot}/.eslintrc.json');
         }
+        if ((0, fileutils_1.fileExists)((0, path_1.join)(repoRoot, 'eslint.config.js'))) {
+            inputs.push('{workspaceRoot}/eslint.config.js');
+        }
         nxJson.targetDefaults.lint = { inputs };
     }
     if (workspaceTargets.includes('e2e')) {

package/src/command-line/init/implementation/dot-nx/add-nx-scripts.js

@@ -46,10 +46,15 @@ function writeMinimalNxJson(host, version) {
                 default: {
                     runner: 'nx/tasks-runners/default',
                     options: {
-                        cacheableOperations: [],
+                        cacheableOperations: ['build', 'lint', 'test', 'e2e'],
                     },
                 },
             },
+            targetDefaults: {
+                build: {
+                    dependsOn: ['^build'],
+                },
+            },
             installation: {
                 version: version.trimEnd(),
             },

package/src/command-line/init/implementation/react/index.js

@@ -14,7 +14,6 @@ const check_for_uncommitted_changes_1 = require("./check-for-uncommitted-changes
 const clean_up_files_1 = require("./clean-up-files");
 const read_name_from_package_json_1 = require("./read-name-from-package-json");
 const rename_js_to_jsx_1 = require("./rename-js-to-jsx");
-const setup_e2e_project_1 = require("./setup-e2e-project");
 const tsconfig_setup_1 = require("./tsconfig-setup");
 const write_craco_config_1 = require("./write-craco-config");
 const write_vite_config_1 = require("./write-vite-config");
@@ -129,7 +128,7 @@ function reorgnizeWorkspaceStructure(options) {
 }
 function createTempWorkspace(options) {
     (0, fs_extra_1.removeSync)('temp-workspace');
-    (0, child_process_1.execSync)(`npx ${options.npxYesFlagNeeded ? '-y' : ''} create-nx-workspace@latest temp-workspace --appName=${options.reactAppName} --preset=react-monorepo --style=css --bundler=${options.isVite ? 'vite' : 'webpack'} --packageManager=${options.packageManager} ${options.nxCloud ? '--nxCloud' : '--nxCloud=false'}`, { stdio: [0, 1, 2] });
+    (0, child_process_1.execSync)(`npx ${options.npxYesFlagNeeded ? '-y' : ''} create-nx-workspace@latest temp-workspace --appName=${options.reactAppName} --preset=react-monorepo --style=css --bundler=${options.isVite ? 'vite' : 'webpack'} --packageManager=${options.packageManager} ${options.nxCloud ? '--nxCloud' : '--nxCloud=false'} ${options.addE2e ? '--e2eTestRunner=cypress' : '--e2eTestRunner=none'}`, { stdio: [0, 1, 2] });
     output_1.output.log({ title: '👋 Welcome to Nx!' });
     output_1.output.log({ title: '🧹 Clearing unused files' });
     (0, fs_extra_1.copySync)((0, path_1.join)('temp-workspace', 'apps', options.reactAppName, 'project.json'), 'project.json');
@@ -228,14 +227,6 @@ function cleanUpUnusedFilesAndAddConfigFiles(options) {
     (0, clean_up_files_1.cleanUpFiles)(options.reactAppName, options.isStandalone);
     output_1.output.log({ title: "📃 Extend the app's tsconfig.json from the base" });
     (0, tsconfig_setup_1.setupTsConfig)(options.reactAppName, options.isStandalone);
-    if (options.addE2e && !options.isStandalone) {
-        output_1.output.log({ title: '📃 Setup e2e tests' });
-        (0, setup_e2e_project_1.setupE2eProject)(options.reactAppName);
-    }
-    else {
-        (0, fs_extra_1.removeSync)((0, path_1.join)('apps', `${options.reactAppName}-e2e`));
-        (0, child_process_1.execSync)(`${options.pmc.rm} cypress @nx/cypress eslint-plugin-cypress`);
-    }
     if (options.isStandalone) {
         (0, fs_extra_1.removeSync)('apps');
     }

package/src/command-line/init/init.d.ts

@@ -6,5 +6,6 @@ export interface InitArgs {
     vite: boolean;
     nxCloud?: boolean;
     cacheable?: string[];
+    useDotNxInstallation?: boolean;
 }
 export declare function initHandler(options: InitArgs): Promise<void>;

package/src/command-line/init/init.js

@@ -6,7 +6,6 @@ const child_process_1 = require("child_process");
 const enquirer_1 = require("enquirer");
 const fs_1 = require("fs");
 const semver_1 = require("semver");
-const parser = require("yargs-parser");
 const add_nx_to_monorepo_1 = require("./implementation/add-nx-to-monorepo");
 const add_nx_to_nest_1 = require("./implementation/add-nx-to-nest");
 const add_nx_to_npm_repo_1 = require("./implementation/add-nx-to-npm-repo");
@@ -21,20 +20,11 @@ function initHandler(options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         // strip the 'init' command itself so we don't forward it
         const args = process.argv.slice(3).join(' ');
-        const flags = parser(args, {
-            boolean: ['useDotNxInstallation'],
-            alias: {
-                useDotNxInstallation: ['encapsulated'],
-            },
-            default: {
-                useDotNxInstallation: false,
-            },
-        });
         const version = (_a = process.env.NX_VERSION) !== null && _a !== void 0 ? _a : ((0, semver_1.prerelease)(versions_1.nxVersion) ? 'next' : 'latest');
         if (process.env.NX_VERSION) {
             console.log(`Using version ${process.env.NX_VERSION}`);
         }
-        if (flags.useDotNxInstallation === true) {
+        if (options.useDotNxInstallation === true) {
             setupDotNxInstallation(version);
         }
         else if ((0, fs_1.existsSync)('package.json')) {

package/src/command-line/list/list.js

@@ -7,6 +7,7 @@ const output_1 = require("../../utils/output");
 const plugins_1 = require("../../utils/plugins");
 const local_plugins_1 = require("../../utils/plugins/local-plugins");
 const project_graph_1 = require("../../project-graph/project-graph");
+const nx_json_1 = require("../../config/nx-json");
 /**
  * List available plugins or capabilities within a specific plugin
  *
@@ -21,9 +22,10 @@ function listHandler(args) {
             yield (0, plugins_1.listPluginCapabilities)(args.plugin);
         }
         else {
+            const nxJson = (0, nx_json_1.readNxJson)();
             const corePlugins = (0, plugins_1.fetchCorePlugins)();
             const projectGraph = yield (0, project_graph_1.createProjectGraphAsync)({ exitOnError: true });
-            const localPlugins = yield (0, local_plugins_1.getLocalWorkspacePlugins)((0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph));
+            const localPlugins = yield (0, local_plugins_1.getLocalWorkspacePlugins)((0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph), nxJson);
             const installedPlugins = yield (0, plugins_1.getInstalledPluginsAndCapabilities)(workspace_root_1.workspaceRoot);
             if (localPlugins.size) {
                 (0, local_plugins_1.listLocalWorkspacePlugins)(localPlugins);

package/src/command-line/report/report.js

@@ -13,6 +13,7 @@ const project_graph_1 = require("../../project-graph/project-graph");
 const semver_1 = require("semver");
 const installed_plugins_1 = require("../../utils/plugins/installed-plugins");
 const installation_directory_1 = require("../../utils/installation-directory");
+const nx_json_1 = require("../../config/nx-json");
 const nxPackageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(__dirname, '../../../package.json'));
 exports.packagesWeCareAbout = [
     'lerna',
@@ -89,7 +90,7 @@ function getReportData() {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const pm = (0, package_manager_1.detectPackageManager)();
         const pmVersion = (0, package_manager_1.getPackageManagerVersion)(pm);
-        const localPlugins = yield findLocalPlugins();
+        const localPlugins = yield findLocalPlugins((0, nx_json_1.readNxJson)());
         const communityPlugins = findInstalledCommunityPlugins();
         let projectGraphError = null;
         if (isNativeAvailable()) {
@@ -124,11 +125,11 @@ function getReportData() {
     });
 }
 exports.getReportData = getReportData;
-function findLocalPlugins() {
+function findLocalPlugins(nxJson) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         try {
             const projectGraph = yield (0, project_graph_1.createProjectGraphAsync)({ exitOnError: true });
-            const localPlugins = yield (0, local_plugins_1.getLocalWorkspacePlugins)((0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph));
+            const localPlugins = yield (0, local_plugins_1.getLocalWorkspacePlugins)((0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph), nxJson);
             return Array.from(localPlugins.keys());
         }
         catch (_a) {

package/src/command-line/run/run.js

@@ -4,7 +4,6 @@ exports.run = exports.printTargetRunHelp = exports.runExecutor = exports.validat
 const tslib_1 = require("tslib");
 const params_1 = require("../../utils/params");
 const print_help_1 = require("../../utils/print-help");
-const workspaces_1 = require("../../config/workspaces");
 const fileutils_1 = require("../../utils/fileutils");
 const package_json_1 = require("../../utils/package-json");
 const path_1 = require("path");
@@ -64,7 +63,7 @@ function createImplicitTargetConfig(root, proj, targetName) {
     }
     return (0, package_json_1.buildTargetFromScript)(targetName, nx);
 }
-function parseExecutorAndTarget(ws, { project, target, configuration }, root, projectsConfigurations, nxJsonConfiguration) {
+function parseExecutorAndTarget({ project, target, configuration }, root, projectsConfigurations, nxJsonConfiguration) {
     var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const proj = projectsConfigurations.projects[project];
@@ -81,8 +80,7 @@ function parseExecutorAndTarget(ws, { project, target, configuration }, root, pr
 }
 function printTargetRunHelpInternal({ project, target, configuration }, root, projectsConfigurations, nxJsonConfiguration) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const ws = new workspaces_1.Workspaces(root);
-        const { executor, nodeModule, schema } = yield parseExecutorAndTarget(ws, { project, target, configuration }, root, projectsConfigurations, nxJsonConfiguration);
+        const { executor, nodeModule, schema } = yield parseExecutorAndTarget({ project, target, configuration }, root, projectsConfigurations, nxJsonConfiguration);
         printRunHelp({ project, target }, schema, {
             plugin: nodeModule,
             entity: executor,
@@ -93,10 +91,9 @@ function printTargetRunHelpInternal({ project, target, configuration }, root, pr
 function runExecutorInternal({ project, target, configuration }, overrides, root, cwd, projectsConfigurations, nxJsonConfiguration, projectGraph, taskGraph, isVerbose) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         validateProject(projectsConfigurations, project);
-        const ws = new workspaces_1.Workspaces(root);
-        const { executor, implementationFactory, nodeModule, schema, targetConfig } = yield parseExecutorAndTarget(ws, { project, target, configuration }, root, projectsConfigurations, nxJsonConfiguration);
+        const { executor, implementationFactory, nodeModule, schema, targetConfig } = yield parseExecutorAndTarget({ project, target, configuration }, root, projectsConfigurations, nxJsonConfiguration);
         configuration !== null && configuration !== void 0 ? configuration : (configuration = targetConfig.defaultConfiguration);
-        const combinedOptions = (0, params_1.combineOptionsForExecutor)(overrides, configuration, targetConfig, schema, project, ws.relativeCwd(cwd), isVerbose);
+        const combinedOptions = (0, params_1.combineOptionsForExecutor)(overrides, configuration, targetConfig, schema, project, (0, path_1.relative)(cwd, root), isVerbose);
         if ((0, executor_utils_1.getExecutorInformation)(nodeModule, executor, root).isNxExecutor) {
             const implementation = implementationFactory();
             const r = implementation(combinedOptions, {

package/src/config/workspaces.d.ts

@@ -4,7 +4,6 @@ export declare class Workspaces {
     private root;
     private cachedProjectsConfig;
     constructor(root: string);
-    relativeCwd(cwd: string): string;
     /**
      * @deprecated
      */
@@ -45,5 +44,6 @@ export declare function inferProjectFromNonStandardFile(file: string): ProjectCo
 export declare function buildProjectsConfigurationsFromProjectPaths(nxJson: NxJsonConfiguration, projectFiles: string[], // making this parameter allows devkit to pick up newly created projects
 readJson?: <T extends Object>(string: any) => T): Record<string, ProjectConfiguration>;
 export declare function mergeTargetConfigurations(projectConfiguration: ProjectConfiguration, target: string, targetDefaults: TargetDefaults[string]): TargetConfiguration;
+export declare function resolveNxTokensInOptions<T extends Object | Array<unknown>>(object: T, project: ProjectConfiguration, key: string): T;
 export declare function readTargetDefaultsForTarget(targetName: string, targetDefaults: TargetDefaults, executor?: string): TargetDefaults[string];
 export declare function renamePropertyWithStableKeys(obj: any, from: string, to: string): void;

package/src/config/workspaces.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renamePropertyWithStableKeys = exports.readTargetDefaultsForTarget = exports.mergeTargetConfigurations = exports.buildProjectsConfigurationsFromProjectPaths = exports.inferProjectFromNonStandardFile = exports.deduplicateProjectFiles = exports.getGlobPatternsFromPackageManagerWorkspaces = exports.getGlobPatternsFromPluginsAsync = exports.getGlobPatternsFromPlugins = exports.toProjectName = exports.Workspaces = void 0;
+exports.renamePropertyWithStableKeys = exports.readTargetDefaultsForTarget = exports.resolveNxTokensInOptions = exports.mergeTargetConfigurations = exports.buildProjectsConfigurationsFromProjectPaths = exports.inferProjectFromNonStandardFile = exports.deduplicateProjectFiles = exports.getGlobPatternsFromPackageManagerWorkspaces = exports.getGlobPatternsFromPluginsAsync = exports.getGlobPatternsFromPlugins = exports.toProjectName = exports.Workspaces = void 0;
 const tslib_1 = require("tslib");
 const fs_1 = require("fs");
-const path = require("path");
 const path_1 = require("path");
 const workspace_root_1 = require("../utils/workspace-root");
 const fileutils_1 = require("../utils/fileutils");
@@ -18,9 +17,6 @@ class Workspaces {
     constructor(root) {
         this.root = root;
     }
-    relativeCwd(cwd) {
-        return path.relative(this.root, cwd).replace(/\\/g, '/') || null;
-    }
     /**
      * @deprecated
      */
@@ -49,9 +45,10 @@ class Workspaces {
         return Object.assign(Object.assign({}, this.readProjectsConfigurations(opts)), nxJson);
     }
     mergeTargetDefaultsIntoProjectDescriptions(projects, nxJson) {
+        var _a;
         for (const proj of Object.values(projects)) {
             if (proj.targets) {
-                for (const targetName of Object.keys(proj.targets)) {
+                for (const targetName of Object.keys((_a = proj.targets) !== null && _a !== void 0 ? _a : {})) {
                     const projectTargetDefinition = proj.targets[targetName];
                     const defaults = readTargetDefaultsForTarget(targetName, nxJson.targetDefaults, projectTargetDefinition.executor);
                     if (defaults) {
@@ -265,7 +262,7 @@ readJson = (string) => (0, fileutils_1.readJsonFile)(string) // making this an a
 }
 exports.buildProjectsConfigurationsFromProjectPaths = buildProjectsConfigurationsFromProjectPaths;
 function mergeTargetConfigurations(projectConfiguration, target, targetDefaults) {
-    var _a, _b;
+    var _a;
     const targetConfiguration = (_a = projectConfiguration.targets) === null || _a === void 0 ? void 0 : _a[target];
     if (!targetConfiguration) {
         throw new Error(`Attempted to merge targetDefaults for ${projectConfiguration.name}.${target}, which doesn't exist.`);
@@ -277,28 +274,31 @@ function mergeTargetConfigurations(projectConfiguration, target, targetDefaults)
     if (!targetDefaults.executor ||
         !targetConfiguration.executor ||
         targetDefaults.executor === targetConfiguration.executor) {
-        result.options = mergeOptions(defaultOptions, (_b = targetConfiguration.options) !== null && _b !== void 0 ? _b : {}, projectConfiguration, target);
-        result.configurations = mergeConfigurations(defaultConfigurations, targetConfiguration.configurations, projectConfiguration, target);
+        result.options = Object.assign(Object.assign({}, defaultOptions), targetConfiguration === null || targetConfiguration === void 0 ? void 0 : targetConfiguration.options);
+        result.configurations = mergeConfigurations(defaultConfigurations, targetConfiguration.configurations);
     }
     return result;
 }
 exports.mergeTargetConfigurations = mergeTargetConfigurations;
-function mergeOptions(defaults, options, project, key) {
-    return Object.assign(Object.assign({}, resolvePathTokensInOptions(defaults, project, key)), options);
-}
-function mergeConfigurations(defaultConfigurations, projectDefinedConfigurations, project, targetName) {
-    const configurations = Object.assign({}, projectDefinedConfigurations);
-    for (const configuration in defaultConfigurations) {
-        configurations[configuration] = mergeOptions(defaultConfigurations[configuration], configurations[configuration], project, `${targetName}.${configuration}`);
+function mergeConfigurations(defaultConfigurations, projectDefinedConfigurations) {
+    var _a, _b;
+    const result = {};
+    const configurations = new Set([
+        ...Object.keys(defaultConfigurations !== null && defaultConfigurations !== void 0 ? defaultConfigurations : {}),
+        ...Object.keys(projectDefinedConfigurations !== null && projectDefinedConfigurations !== void 0 ? projectDefinedConfigurations : {}),
+    ]);
+    for (const configuration of configurations) {
+        result[configuration] = Object.assign(Object.assign({}, ((_a = defaultConfigurations === null || defaultConfigurations === void 0 ? void 0 : defaultConfigurations[configuration]) !== null && _a !== void 0 ? _a : {})), ((_b = projectDefinedConfigurations === null || projectDefinedConfigurations === void 0 ? void 0 : projectDefinedConfigurations[configuration]) !== null && _b !== void 0 ? _b : {}));
     }
-    return configurations;
+    return result;
 }
-function resolvePathTokensInOptions(object, project, key) {
+function resolveNxTokensInOptions(object, project, key) {
     const result = Array.isArray(object) ? [...object] : Object.assign({}, object);
     for (let [opt, value] of Object.entries(object !== null && object !== void 0 ? object : {})) {
         if (typeof value === 'string') {
-            if (value.startsWith('{workspaceRoot}/')) {
-                value = value.replace(/^\{workspaceRoot\}\//, '');
+            const workspaceRootMatch = /^(\{workspaceRoot\}\/?)/.exec(value);
+            if (workspaceRootMatch === null || workspaceRootMatch === void 0 ? void 0 : workspaceRootMatch.length) {
+                value = value.replace(workspaceRootMatch[0], '');
             }
             if (value.includes('{workspaceRoot}')) {
                 throw new Error(`${logger_1.NX_PREFIX} The {workspaceRoot} token is only valid at the beginning of an option. (${key})`);
@@ -307,11 +307,12 @@ function resolvePathTokensInOptions(object, project, key) {
             result[opt] = value.replace(/\{projectName\}/g, project.name);
         }
         else if (typeof value === 'object' && value) {
-            result[opt] = resolvePathTokensInOptions(value, project, [key, opt].join('.'));
+            result[opt] = resolveNxTokensInOptions(value, project, [key, opt].join('.'));
         }
     }
     return result;
 }
+exports.resolveNxTokensInOptions = resolveNxTokensInOptions;
 function readTargetDefaultsForTarget(targetName, targetDefaults, executor) {
     if (executor) {
         // If an executor is defined in project.json, defaults should be read