nx 21.0.0-canary.20250501-8f50358 → 21.0.0-canary.20250503-675e6ed

package/src/utils/ignore.d.ts

@@ -1,8 +1,2 @@
 import ignore from 'ignore';
-/**
- * An array of glob patterns that should always be ignored.
- */
-export declare const ALWAYS_IGNORE: string[];
-export declare function getIgnoredGlobs(root?: string, prependRoot?: boolean): string[];
-export declare function getAlwaysIgnore(root?: string): string[];
 export declare function getIgnoreObject(root?: string): ReturnType<typeof ignore>;

package/src/utils/ignore.js

@@ -1,75 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ALWAYS_IGNORE = void 0;
-exports.getIgnoredGlobs = getIgnoredGlobs;
-exports.getAlwaysIgnore = getAlwaysIgnore;
 exports.getIgnoreObject = getIgnoreObject;
-const node_fs_1 = require("node:fs");
 const ignore_1 = require("ignore");
 const fileutils_1 = require("./fileutils");
-const path_1 = require("./path");
 const workspace_root_1 = require("./workspace-root");
-/**
- * An array of glob patterns that should always be ignored.
- */
-exports.ALWAYS_IGNORE = getAlwaysIgnore();
-function getIgnoredGlobs(root = workspace_root_1.workspaceRoot, prependRoot = true) {
-    const files = ['.gitignore', '.nxignore'];
-    if (prependRoot) {
-        return [
-            ...getAlwaysIgnore(root),
-            ...files.flatMap((f) => getIgnoredGlobsFromFile((0, path_1.joinPathFragments)(root, f), root)),
-        ];
-    }
-    else {
-        return [
-            ...getAlwaysIgnore(),
-            ...files.flatMap((f) => getIgnoredGlobsFromFile((0, path_1.joinPathFragments)(root, f))),
-        ];
-    }
-}
-function getAlwaysIgnore(root) {
-    const paths = [
-        'node_modules',
-        '**/node_modules',
-        '.git',
-        '.nx',
-        '.vscode',
-        '.yarn/cache',
-    ];
-    return root ? paths.map((x) => (0, path_1.joinPathFragments)(root, x)) : paths;
-}
 function getIgnoreObject(root = workspace_root_1.workspaceRoot) {
     const ig = (0, ignore_1.default)();
     ig.add((0, fileutils_1.readFileIfExisting)(`${root}/.gitignore`));
     ig.add((0, fileutils_1.readFileIfExisting)(`${root}/.nxignore`));
     return ig;
 }
-function getIgnoredGlobsFromFile(file, root) {
-    try {
-        const results = [];
-        const contents = (0, node_fs_1.readFileSync)(file, 'utf-8');
-        const lines = contents.split('\n');
-        for (const line of lines) {
-            const trimmed = line.trim();
-            if (!trimmed || trimmed.startsWith('#')) {
-                continue;
-            }
-            else if (trimmed.startsWith('/')) {
-                if (root) {
-                    results.push((0, path_1.joinPathFragments)(root, trimmed));
-                }
-                else {
-                    results.push((0, path_1.joinPathFragments)('.', trimmed));
-                }
-            }
-            else {
-                results.push(trimmed);
-            }
-        }
-        return results;
-    }
-    catch (e) {
-        return [];
-    }
-}

package/src/utils/params.js

@@ -349,15 +349,11 @@ function setDefaultsInObject(opts, properties, definitions) {
     });
 }
 function setPropertyDefault(opts, propName, schema, definitions) {
+    let defaultValueToSet;
     if (schema.$ref) {
         schema = resolveDefinition(schema.$ref, definitions);
     }
-    if (schema.type !== 'object' && schema.type !== 'array') {
-        if (opts[propName] === undefined && schema.default !== undefined) {
-            opts[propName] = schema.default;
-        }
-    }
-    else if (schema.type === 'array') {
+    if (schema.type === 'array') {
         const items = schema.items || {};
         if (opts[propName] &&
             Array.isArray(opts[propName]) &&
@@ -365,19 +361,29 @@ function setPropertyDefault(opts, propName, schema, definitions) {
             opts[propName].forEach((valueInArray) => setDefaultsInObject(valueInArray, items.properties || {}, definitions));
         }
         else if (!opts[propName] && schema.default) {
-            opts[propName] = schema.default;
+            defaultValueToSet = schema.default;
         }
     }
     else {
-        const wasUndefined = opts[propName] === undefined;
-        if (wasUndefined) {
-            // We need an object to set values onto
-            opts[propName] = {};
-        }
-        setDefaultsInObject(opts[propName], schema.properties || {}, definitions);
-        // If the property was initially undefined but no properties were added, we remove it again instead of having an {}
-        if (wasUndefined && Object.keys(opts[propName]).length === 0) {
-            delete opts[propName];
+        if (opts[propName] === undefined && schema.default !== undefined) {
+            defaultValueToSet = schema.default;
+        }
+        if (schema.type === 'object') {
+            const wasUndefined = opts[propName] === undefined;
+            if (!wasUndefined) {
+                setDefaultsInObject(opts[propName], schema.properties || {}, definitions);
+            }
+        }
+    }
+    if (defaultValueToSet !== undefined) {
+        try {
+            validateProperty(propName, defaultValueToSet, schema, definitions);
+            opts[propName] = defaultValueToSet;
+        }
+        catch (e) {
+            // If the default value is invalid, we don't set it...
+            // this should honestly never be needed... but some notable
+            // 3rd party schema's are invalid.
         }
     }
 }