nx 18.1.0-canary.20240215-d5e1451 → 18.1.0-canary.20240217-5b6d1b4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "18.1.0-canary.20240215-d5e1451",
+  "version": "18.1.0-canary.20240217-5b6d1b4",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -66,7 +66,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "18.1.0-canary.20240215-d5e1451"
+    "@nrwl/tao": "18.1.0-canary.20240217-5b6d1b4"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "18.1.0-canary.20240215-d5e1451",
-    "@nx/nx-darwin-arm64": "18.1.0-canary.20240215-d5e1451",
-    "@nx/nx-linux-x64-gnu": "18.1.0-canary.20240215-d5e1451",
-    "@nx/nx-linux-x64-musl": "18.1.0-canary.20240215-d5e1451",
-    "@nx/nx-win32-x64-msvc": "18.1.0-canary.20240215-d5e1451",
-    "@nx/nx-linux-arm64-gnu": "18.1.0-canary.20240215-d5e1451",
-    "@nx/nx-linux-arm64-musl": "18.1.0-canary.20240215-d5e1451",
-    "@nx/nx-linux-arm-gnueabihf": "18.1.0-canary.20240215-d5e1451",
-    "@nx/nx-win32-arm64-msvc": "18.1.0-canary.20240215-d5e1451",
-    "@nx/nx-freebsd-x64": "18.1.0-canary.20240215-d5e1451"
+    "@nx/nx-darwin-x64": "18.1.0-canary.20240217-5b6d1b4",
+    "@nx/nx-darwin-arm64": "18.1.0-canary.20240217-5b6d1b4",
+    "@nx/nx-linux-x64-gnu": "18.1.0-canary.20240217-5b6d1b4",
+    "@nx/nx-linux-x64-musl": "18.1.0-canary.20240217-5b6d1b4",
+    "@nx/nx-win32-x64-msvc": "18.1.0-canary.20240217-5b6d1b4",
+    "@nx/nx-linux-arm64-gnu": "18.1.0-canary.20240217-5b6d1b4",
+    "@nx/nx-linux-arm64-musl": "18.1.0-canary.20240217-5b6d1b4",
+    "@nx/nx-linux-arm-gnueabihf": "18.1.0-canary.20240217-5b6d1b4",
+    "@nx/nx-win32-arm64-msvc": "18.1.0-canary.20240217-5b6d1b4",
+    "@nx/nx-freebsd-x64": "18.1.0-canary.20240217-5b6d1b4"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

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

@@ -108,11 +108,11 @@ function runMigration() {
     }
 }
 function nxCliPath() {
+    const version = process.env.NX_MIGRATE_CLI_VERSION || 'latest';
     try {
         const packageManager = (0, package_manager_1.getPackageManagerCommand)();
         const { dirSync } = require('tmp');
         const tmpDir = dirSync().name;
-        const version = process.env.NX_MIGRATE_USE_NEXT === 'true' ? 'next' : 'latest';
         (0, fileutils_1.writeJsonFile)(path.join(tmpDir, 'package.json'), {
             dependencies: {
                 nx: version,
@@ -129,7 +129,7 @@ function nxCliPath() {
         return path.join(tmpDir, `node_modules`, '.bin', 'nx');
     }
     catch (e) {
-        console.error('Failed to install the latest version of the migration script. Using the current version.');
+        console.error(`Failed to install the ${version} version of the migration script. Using the current version.`);
         if (process.env.NX_VERBOSE_LOGGING) {
             console.error(e);
         }

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

@@ -430,13 +430,15 @@ async function parseTargetPackageAndVersion(args) {
     else {
         if (args === 'latest' ||
             args === 'next' ||
+            args === 'canary' ||
             (0, semver_1.valid)(args) ||
             args.match(/^\d+(?:\.\d+)?(?:\.\d+)?$/)) {
             // Passing `nx` here may seem wrong, but nx and @nrwl/workspace are synced in version.
             // We could duplicate the ternary below, but its not necessary since they are equivalent
             // on the registry
             const targetVersion = await normalizeVersionWithTagCheck('nx', args);
-            const targetPackage = !['latest', 'next'].includes(args) && (0, semver_1.lt)(targetVersion, '14.0.0-beta.0')
+            const targetPackage = !['latest', 'next', 'canary'].includes(args) &&
+                (0, semver_1.lt)(targetVersion, '14.0.0-beta.0')
                 ? '@nrwl/workspace'
                 : 'nx';
             return {
@@ -717,7 +719,7 @@ async function updateInstallationDetails(root, updatedPackages) {
 }
 async function isMigratingToNewMajor(from, to) {
     from = normalizeVersion(from);
-    to = ['latest', 'next'].includes(to) ? to : normalizeVersion(to);
+    to = ['latest', 'next', 'canary'].includes(to) ? to : normalizeVersion(to);
     if (!(0, semver_1.valid)(from)) {
         from = await (0, package_manager_1.resolvePackageVersionUsingRegistry)('nx', from);
     }

package/src/utils/params.d.ts

@@ -29,7 +29,7 @@ type PropertyDescription = {
     } | {
         $source: 'workingDirectory';
     };
-    additionalProperties?: boolean;
+    additionalProperties?: boolean | PropertyDescription;
     const?: any;
     'x-prompt'?: string | {
         message: string;
@@ -62,7 +62,7 @@ export type Schema = {
     oneOf?: Partial<Schema>[];
     description?: string;
     definitions?: Properties;
-    additionalProperties?: boolean;
+    additionalProperties?: boolean | PropertyDescription;
     examples?: {
         command: string;
         description?: string;

package/src/utils/params.js

@@ -188,7 +188,8 @@ function validateObject(opts, schema, definitions) {
             throw new SchemaError(`Required property '${p}' is missing`);
         }
     });
-    if (schema.additionalProperties === false) {
+    if (schema.additionalProperties !== undefined &&
+        schema.additionalProperties !== true) {
         Object.keys(opts).find((p) => {
             if (Object.keys(schema.properties).indexOf(p) === -1 &&
                 (!schema.patternProperties ||
@@ -196,9 +197,12 @@ function validateObject(opts, schema, definitions) {
                 if (p === '_') {
                     throw new SchemaError(`Schema does not support positional arguments. Argument '${opts[p]}' found`);
                 }
-                else {
+                else if (schema.additionalProperties === false) {
                     throw new SchemaError(`'${p}' is not found in schema`);
                 }
+                else if (typeof schema.additionalProperties === 'object') {
+                    validateProperty(p, opts[p], schema.additionalProperties, definitions);
+                }
             }
         });
     }
@@ -408,7 +412,7 @@ function resolveDefinition(ref, definitions) {
     return definitions[definition];
 }
 function applyVerbosity(options, schema, isVerbose) {
-    if ((schema.additionalProperties || 'verbose' in schema.properties) &&
+    if ((schema.additionalProperties === true || 'verbose' in schema.properties) &&
         isVerbose) {
         options['verbose'] = true;
     }