npm - nx - Versions diffs - 14.1.4 → 14.1.6 - Mend

nx 14.1.4 → 14.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (25) hide show

package/migrations.json +6 -0
package/package.json +4 -4
package/schemas/nx-schema.json +127 -0
package/schemas/project-schema.json +68 -0
package/schemas/workspace-schema.json +134 -0
package/src/command-line/format.js +1 -1
package/src/command-line/format.js.map +1 -1
package/src/command-line/migrate.js +14 -5
package/src/command-line/migrate.js.map +1 -1
package/src/generators/utils/project-configuration.d.ts +2 -1
package/src/generators/utils/project-configuration.js +11 -4
package/src/generators/utils/project-configuration.js.map +1 -1
package/src/hasher/git-hasher.d.ts +1 -0
package/src/hasher/git-hasher.js +23 -24
package/src/hasher/git-hasher.js.map +1 -1
package/src/migrations/update-14-0-6/remove-roots.js +4 -1
package/src/migrations/update-14-0-6/remove-roots.js.map +1 -1
package/src/migrations/update-14-2-0/add-json-schema.d.ts +2 -0
package/src/migrations/update-14-2-0/add-json-schema.js +38 -0
package/src/migrations/update-14-2-0/add-json-schema.js.map +1 -0
package/src/project-graph/build-nodes/workspace-projects.js +11 -0
package/src/project-graph/build-nodes/workspace-projects.js.map +1 -1
package/src/utils/package-json.d.ts +2 -0
package/src/utils/package-json.js.map +1 -1
package/src/utils/versions.js +1 -1

package/migrations.json CHANGED Viewed

@@ -5,6 +5,12 @@
       "version": "14.0.6",
       "description": "Remove root property from project.json files",
       "factory": "./src/migrations/update-14-0-6/remove-roots"
+    },
+    "14-2-0-add-json-schema": {
+      "cli": "nx",
+      "version": "14.2.0-beta.0",
+      "description": "Add JSON Schema to Nx configuration files",
+      "factory": "./src/migrations/update-14-2-0/add-json-schema"
     }
   }
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "14.1.4",
+  "version": "14.1.6",
   "description": "Smart, Fast and Extensible Build System",
   "repository": {
     "type": "git",
@@ -42,7 +42,7 @@
     "chokidar": "^3.5.1",
     "cli-cursor": "3.1.0",
     "cli-spinners": "2.6.1",
-    "fs-extra": "^9.1.0",
+    "fs-extra": "^10.1.0",
     "dotenv": "~10.0.0",
     "figures": "3.2.0",
     "glob": "7.1.4",
@@ -62,8 +62,8 @@
     "minimatch": "3.0.4",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
-    "@nrwl/cli": "14.1.4",
-    "@nrwl/tao": "14.1.4"
+    "@nrwl/cli": "14.1.6",
+    "@nrwl/tao": "14.1.6"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/schemas/nx-schema.json ADDED Viewed

@@ -0,0 +1,127 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "https://nx.dev/core-concepts/configuration#nxjson",
+  "title": "JSON schema for Nx configuration",
+  "type": "object",
+  "properties": {
+    "implicitDependencies": {
+      "type": "object",
+      "description": "Map of files to projects that implicitly depend on them."
+    },
+    "affected": {
+      "type": "object",
+      "description": "Default options for `nx affected`.",
+      "properties": {
+        "defaultBase": {
+          "type": "string",
+          "description": "Default based branch used by affected commands."
+        }
+      },
+      "additionalProperties": false
+    },
+    "npmScope": {
+      "type": "string",
+      "description": "NPM Scope that the workspace uses."
+    },
+    "tasksRunnerOptions": {
+      "type": "object",
+      "additionalProperties": {
+        "$ref": "#/definitions/tasksRunnerOptions"
+      }
+    },
+    "targetDependencies": {
+      "type": "object",
+      "description": "Dependencies between different target names across all projects.",
+      "additionalProperties": {
+        "$ref": "#/definitions/targetDependencyConfig"
+      }
+    },
+    "workspaceLayout": {
+      "type": "object",
+      "description": "Where new apps + libs should be placed.",
+      "properties": {
+        "libsDir": {
+          "type": "string",
+          "description": "Default folder name for libs."
+        },
+        "appsDir": {
+          "type": "string",
+          "description": "Default folder name for apps."
+        }
+      },
+      "additionalProperties": false
+    },
+    "cli": {
+      "$ref": "#/definitions/cliOptions"
+    },
+    "generators": {
+      "$ref": "#/definitions/generatorOptions"
+    },
+    "plugins": {
+      "type": "array",
+      "description": "Plugins for extending the project graph.",
+      "items": {
+        "type": "string"
+      }
+    },
+    "defaultProject": {
+      "type": "string",
+      "description": "Default project. When project isn't provided, the default project will be used."
+    }
+  },
+  "definitions": {
+    "cliOptions": {
+      "type": "object",
+      "description": "Default generator collection.",
+      "properties": {
+        "packageManager": {
+          "type": "string",
+          "description": "The default package manager to use.",
+          "enum": ["yarn", "pnpm", "npm"]
+        },
+        "defaultCollection": {
+          "type": "string",
+          "description": "The default schematics collection to use."
+        }
+      }
+    },
+    "generatorOptions": {
+      "type": "object",
+      "description": "List of default values used by generators."
+    },
+    "tasksRunnerOptions": {
+      "type": "object",
+      "description": "Available Task Runners.",
+      "properties": {
+        "runner": {
+          "type": "string",
+          "description": "Path to resolve the runner."
+        },
+        "options": {
+          "type": "object",
+          "description": "Default options for the runner."
+        }
+      },
+      "additionalProperties": false
+    },
+    "targetDependencyConfig": {
+      "type": "array",
+      "description": "Target dependency.",
+      "items": {
+        "type": "object",
+        "properties": {
+          "projects": {
+            "type": "string",
+            "description": "The projects that the targets belong to.",
+            "enum": ["self", "dependencies"]
+          },
+          "target": {
+            "type": "string",
+            "description": "The name of the target."
+          }
+        },
+        "additionalProperties": false
+      }
+    }
+  }
+}

package/schemas/project-schema.json ADDED Viewed

@@ -0,0 +1,68 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "https://nx.dev/project-schema",
+  "title": "JSON schema for Nx projects",
+  "type": "object",
+  "properties": {
+    "targets": {
+      "type": "object",
+      "description": "Configures all the targets which define what tasks you can run against the project",
+      "additionalProperties": {
+        "type": "object",
+        "properties": {
+          "executor": {
+            "description": "The function that Nx will invoke when you run this target",
+            "type": "string"
+          },
+          "options": {
+            "type": "object"
+          },
+          "outputs": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "configurations": {
+            "type": "object",
+            "description": "provides extra sets of values that will be merged into the options map",
+            "additionalProperties": {
+              "type": "object"
+            }
+          },
+          "dependsOn": {
+            "type": "array",
+            "description": "Target dependency.",
+            "items": {
+              "type": "object",
+              "properties": {
+                "projects": {
+                  "type": "string",
+                  "description": "The projects that the targets belong to.",
+                  "enum": ["self", "dependencies"]
+                },
+                "target": {
+                  "type": "string",
+                  "description": "The name of the target."
+                }
+              },
+              "additionalProperties": false
+            }
+          }
+        }
+      }
+    },
+    "tags": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "implicitDependencies": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    }
+  }
+}

package/schemas/workspace-schema.json ADDED Viewed

@@ -0,0 +1,134 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "$id": "https://nx.dev",
+  "title": "JSON schema for Nx workspaces",
+  "type": "object",
+  "properties": {
+    "version": {
+      "type": "number",
+      "enum": [1, 2]
+    }
+  },
+  "allOf": [
+    {
+      "if": {
+        "properties": { "version": { "const": 2 } },
+        "required": ["version"]
+      },
+      "then": {
+        "properties": {
+          "projects": {
+            "type": "object",
+            "additionalProperties": {
+              "oneOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "object",
+                  "properties": {
+                    "targets": {
+                      "type": "object",
+                      "description": "Configures all the targets which define what tasks you can run against the project",
+                      "additionalProperties": {
+                        "type": "object",
+                        "properties": {
+                          "executor": {
+                            "description": "The function that Nx will invoke when you run this target",
+                            "type": "string"
+                          },
+                          "options": {
+                            "type": "object"
+                          },
+                          "outputs": {
+                            "type": "array",
+                            "items": {
+                              "type": "string"
+                            }
+                          },
+                          "configurations": {
+                            "type": "object",
+                            "description": "provides extra sets of values that will be merged into the options map",
+                            "additionalProperties": {
+                              "type": "object"
+                            }
+                          },
+                          "dependsOn": {
+                            "type": "array",
+                            "description": "Target dependency.",
+                            "items": {
+                              "type": "object",
+                              "properties": {
+                                "projects": {
+                                  "type": "string",
+                                  "description": "The projects that the targets belong to.",
+                                  "enum": ["self", "dependencies"]
+                                },
+                                "target": {
+                                  "type": "string",
+                                  "description": "The name of the target."
+                                }
+                              },
+                              "additionalProperties": false
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "tags": {
+                      "type": "array",
+                      "items": {
+                        "type": "string"
+                      }
+                    },
+                    "implicitDependencies": {
+                      "type": "array",
+                      "items": {
+                        "type": "string"
+                      }
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        }
+      },
+      "else": {
+        "properties": {
+          "projects": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object",
+              "properties": {
+                "architect": {
+                  "type": "object",
+                  "description": "Configures all the targets which define what tasks you can run against the project",
+                  "additionalProperties": {
+                    "type": "object",
+                    "properties": {
+                      "builder": {
+                        "description": "The function that Nx will invoke when you run this architect",
+                        "type": "string"
+                      },
+                      "options": {
+                        "type": "object"
+                      },
+                      "configurations": {
+                        "type": "object",
+                        "description": "provides extra sets of values that will be merged into the options map",
+                        "additionalProperties": {
+                          "type": "object"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  ]
+}

package/src/command-line/format.js CHANGED Viewed

@@ -110,7 +110,7 @@ function chunkify(target, size) {
 }
 function write(patterns) {
     if (patterns.length > 0) {
-        (0, child_process_1.execSync)(`node "${PRETTIER_PATH}" --write ${patterns.join(' ')}`, {
+        (0, child_process_1.execSync)(`node "${PRETTIER_PATH}" --write --list-different ${patterns.join(' ')}`, {
             stdio: [0, 1, 2],
         });
     }

package/src/command-line/format.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/format.ts"],"names":[],"mappings":"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~~EAAC~~,SAAS,aAAa,~~aAAa~~,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,~~EAAE~~;~~YAChE~~,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACjB,~~CAAC~~,CAAC;~~KACJ~~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"}
1	+ {"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/format.ts"],"names":[],"mappings":"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"}

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

@@ -543,16 +543,25 @@ function isMigratingToNewMajor(from, to) {
         return (0, semver_1.major)(from) < (0, semver_1.major)(to);
     });
 }
+function readNxVersion(packageJson) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    return ((_f = (_d = (_b = (_a = packageJson === null || packageJson === void 0 ? void 0 : packageJson.devDependencies) === null || _a === void 0 ? void 0 : _a['nx']) !== null && _b !== void 0 ? _b : (_c = packageJson === null || packageJson === void 0 ? void 0 : packageJson.dependencies) === null || _c === void 0 ? void 0 : _c['nx']) !== null && _d !== void 0 ? _d : (_e = packageJson === null || packageJson === void 0 ? void 0 : packageJson.devDependencies) === null || _e === void 0 ? void 0 : _e['@nrwl/workspace']) !== null && _f !== void 0 ? _f : (_g = packageJson === null || packageJson === void 0 ? void 0 : packageJson.dependencies) === null || _g === void 0 ? void 0 : _g['@nrwl/workspace']);
+}
 function generateMigrationsJsonAndUpdatePackageJson(root, opts) {
-    var _a, _b, _c;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const pmc = (0, package_manager_1.getPackageManagerCommand)();
         try {
             let originalPackageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(root, 'package.json'));
-            if (['nx', '@nrwl/workspace'].includes(opts.targetPackage) &&
-                (yield isMigratingToNewMajor((_b = (_a = originalPackageJson.devDependencies) === null || _a === void 0 ? void 0 : _a['nx']) !== null && _b !== void 0 ? _b : (_c = originalPackageJson.devDependencies) === null || _c === void 0 ? void 0 : _c['@nrwl/workspace'], opts.targetVersion))) {
-                yield (0, connect_to_nx_cloud_1.connectToNxCloudCommand)('We noticed you are migrating to a new major version, but are not taking advantage of Nx Cloud. Nx Cloud can make your CI up to 10 times faster. Learn more about it here: nx.app. Would you like to add it?');
-                originalPackageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(root, 'package.json'));
+            try {
+                if (['nx', '@nrwl/workspace'].includes(opts.targetPackage) &&
+                    (yield isMigratingToNewMajor(readNxVersion(originalPackageJson), opts.targetVersion))) {
+                    yield (0, connect_to_nx_cloud_1.connectToNxCloudCommand)('We noticed you are migrating to a new major version, but are not taking advantage of Nx Cloud. Nx Cloud can make your CI up to 10 times faster. Learn more about it here: nx.app. Would you like to add it?');
+                    originalPackageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(root, 'package.json'));
+                }
+            }
+            catch (_a) {
+                // The above code is to remind folks when updating to a new major and not currently using Nx cloud.
+                // If for some reason it fails, it shouldn't affect the overall migration process
             }
             logger_1.logger.info(`Fetching meta data about packages.`);
             logger_1.logger.info(`It may take a few minutes.`);

package/src/command-line/migrate.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/migrate.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/migrate.ts"],"names":[],"mappings":"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"}

package/src/generators/utils/project-configuration.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
-import type { Tree } from '../tree';
 import type { NxJsonConfiguration } from '../../config/nx-json';
 import { ProjectConfiguration, WorkspaceJsonConfiguration } from '../../config/workspace-json-project-json';
+import type { Tree } from '../tree';
 export declare type WorkspaceConfiguration = Omit<WorkspaceJsonConfiguration, 'projects'> & Partial<NxJsonConfiguration>;
 /**
  * Adds project configuration to the Nx workspace.
@@ -69,6 +69,7 @@ export declare function readNxJson(tree: Tree): NxJsonConfiguration | null;
  * @param project - the project name
  */
 export declare function isStandaloneProject(tree: Tree, project: string): boolean;
+export declare function getRelativeProjectJsonSchemaPath(tree: Tree, project: ProjectConfiguration): string;
 /**
  * Read the workspace configuration, including projects.
  */

package/src/generators/utils/project-configuration.js CHANGED Viewed

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWorkspacePath = exports.shouldDefaultToUsingStandaloneConfigs = exports.readWorkspace = exports.isStandaloneProject = exports.readNxJson = exports.readProjectConfiguration = exports.updateWorkspaceConfiguration = exports.readWorkspaceConfiguration = exports.getProjects = exports.removeProjectConfiguration = exports.updateProjectConfiguration = exports.addProjectConfiguration = void 0;
+exports.getWorkspacePath = exports.shouldDefaultToUsingStandaloneConfigs = exports.readWorkspace = exports.getRelativeProjectJsonSchemaPath = exports.isStandaloneProject = exports.readNxJson = exports.readProjectConfiguration = exports.updateWorkspaceConfiguration = exports.readWorkspaceConfiguration = exports.getProjects = exports.removeProjectConfiguration = exports.updateProjectConfiguration = exports.addProjectConfiguration = void 0;
 const tslib_1 = require("tslib");
-const workspaces_1 = require("../../config/workspaces");
 const path_1 = require("path");
-const json_1 = require("./json");
+const workspaces_1 = require("../../config/workspaces");
 const path_2 = require("../../utils/path");
+const json_1 = require("./json");
 /**
  * Adds project configuration to the Nx workspace.
  *
@@ -202,6 +202,10 @@ function setProjectConfiguration(tree, projectName, projectConfiguration, mode,
     }
     addProjectToWorkspaceJson(tree, projectName, projectConfiguration, mode, standalone);
 }
+function getRelativeProjectJsonSchemaPath(tree, project) {
+    return (0, path_1.relative)((0, path_1.join)(tree.root, project.root), (0, path_1.join)(tree.root, 'node_modules/nx/schemas/project-schema.json'));
+}
+exports.getRelativeProjectJsonSchemaPath = getRelativeProjectJsonSchemaPath;
 function addProjectToWorkspaceJson(tree, projectName, project, mode, standalone = false) {
     var _a;
     const workspaceConfigPath = getWorkspacePath(tree);
@@ -215,6 +219,9 @@ function addProjectToWorkspaceJson(tree, projectName, project, mode, standalone
     const configFile = (mode === 'create' && standalone) || !workspaceConfigPath
         ? (0, path_2.joinPathFragments)(project.root, 'project.json')
         : getProjectFileLocation(tree, projectName);
+    const jsonSchema = configFile && mode === 'create'
+        ? { $schema: getRelativeProjectJsonSchemaPath(tree, project) }
+        : {};
     if (configFile) {
         if (mode === 'delete') {
             tree.delete(configFile);
@@ -226,7 +233,7 @@ function addProjectToWorkspaceJson(tree, projectName, project, mode, standalone
                 workspaceJson.projects[projectName] = project.root;
             }
             // update the project.json file
-            (0, json_1.writeJson)(tree, configFile, Object.assign(Object.assign({}, project), { root: undefined }));
+            (0, json_1.writeJson)(tree, configFile, Object.assign(Object.assign(Object.assign({}, jsonSchema), project), { root: undefined }));
         }
     }
     else if (mode === 'delete') {

package/src/generators/utils/project-configuration.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"project-configuration.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/generators/utils/project-configuration.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"project-configuration.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/generators/utils/project-configuration.ts"],"names":[],"mappings":";;;;AAAA,+BAAyD;AAOzD,wDAMiC;AACjC,2CAAqD;AAIrD,iCAAyD;AAQzD;;;;;;;;;;GAUG;AACH,SAAgB,uBAAuB,CACrC,IAAU,EACV,WAAmB,EACnB,oBAA0C,EAC1C,UAAoB;IAEpB,UAAU,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,qCAAqC,CAAC,IAAI,CAAC,CAAC;IACvE,uBAAuB,CACrB,IAAI,EACJ,WAAW,EACX,oBAAoB,EACpB,QAAQ,EACR,UAAU,CACX,CAAC;AACJ,CAAC;AAdD,0DAcC;AAED;;;;;;;;;GASG;AACH,SAAgB,0BAA0B,CACxC,IAAU,EACV,WAAmB,EACnB,oBAA0C;IAE1C,uBAAuB,CAAC,IAAI,EAAE,WAAW,EAAE,oBAAoB,EAAE,QAAQ,CAAC,CAAC;AAC7E,CAAC;AAND,gEAMC;AAED;;;;;GAKG;AACH,SAAgB,0BAA0B,CACxC,IAAU,EACV,WAAmB;IAEnB,uBAAuB,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;AAClE,CAAC;AALD,gEAKC;AAED;;;;GAIG;AACH,SAAgB,WAAW,CAAC,IAAU;IACpC,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IAEtC,OAAO,IAAI,GAAG,CACZ,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE;QACxD,OAAO,CAAC,WAAW,EAAE,uBAAuB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC;IACxE,CAAC,CAAC,CACH,CAAC;AACJ,CAAC;AARD,kCAQC;AAED;;;;GAIG;AACH,SAAgB,0BAA0B,CAAC,IAAU;IACnD,MAAM,KAA6B,oBAAoB,CAAC,IAAI,CAAC,EAAvD,EAAE,QAAQ,OAA6C,EAAxC,SAAS,sBAAxB,YAA0B,CAA6B,CAAC,CAAC,wCAAwC;IAEvG,IAAI,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAC9B,IAAI,MAAM,KAAK,IAAI,EAAE;QACnB,OAAO,SAAS,CAAC;KAClB;IAED,uCACK,SAAS,GACT,MAAM,EACT;AACJ,CAAC;AAZD,gEAYC;AAED;;;;GAIG;AACH,SAAgB,4BAA4B,CAC1C,IAAU,EACV,eAAuC;IAEvC,MAAM;IACJ,qBAAqB;IACrB,GAAG,EACH,cAAc,EACd,UAAU,EACV,oBAAoB,EACpB,OAAO,EACP,aAAa,EACb,QAAQ,EACR,kBAAkB,EAClB,eAAe,EACf,kBAAkB,EAClB,QAAQ,EACR,OAAO,EAAE,GAAG,GACb,GAAG,eAAe,CAAC;IAEpB,MAAM,MAAM,GAAkC;QAC5C,oBAAoB;QACpB,OAAO;QACP,aAAa;QACb,QAAQ;QACR,kBAAkB;QAClB,eAAe;QACf,kBAAkB;QAClB,QAAQ;QACR,GAAG;QACH,UAAU;QACV,cAAc;QACd,OAAO,EAAE,GAAG;KACb,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC1B,IAAA,iBAAU,EAAsB,IAAI,EAAE,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;YACxD,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,MAAM,aAAa,GAAG,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC5D,MAAM,oBAAoB,GAAG,EAAE,CAAC;gBAChC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;oBACnC,IACE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;wBACrC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EAC5C;wBACA,oBAAoB,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;qBAC3C;gBACH,CAAC,CAAC,CAAC;gBACH,uCAAY,IAAI,GAAK,oBAAoB,EAAG;aAC7C;iBAAM;gBACL,uCAAY,IAAI,GAAK,MAAM,EAAG;aAC/B;QACH,CAAC,CAAC,CAAC;KACJ;IAED,yDAAyD;IACzD,yDAAyD;IACzD,qBAAqB;IACrB,MAAM,aAAa,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC7C,IAAI,aAAa,EAAE;QACjB,IAAA,iBAAU,EAA6B,IAAI,EAAE,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;YACnE,MAAM,MAAM,mCACP,IAAI,KACP,OAAO,EAAE,eAAe,CAAC,OAAO,GACjC,CAAC;YACF,IAAI,CAAE,eAAuB,CAAC,cAAc,EAAE;gBAC5C,OAAQ,MAAc,CAAC,cAAc,CAAC;aACvC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AAvED,oEAuEC;AAED,SAAS,iBAAiB,CAAC,IAAU,EAAE,WAAmB;IACxD,IAAI;QACF,OAAO,IAAA,eAAQ,EACb,IAAI,EACJ,IAAA,eAAQ,EACN,IAAI,CAAC,IAAI,EACT,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE;YAC3B,KAAK,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;SACnB,CAAC,CACH,CACF,CAAC;KACH;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;KAC3E;AACH,CAAC;AAED;;;;;;;;;GASG;AACH,SAAgB,wBAAwB,CACtC,IAAU,EACV,WAAmB;IAEnB,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IACtC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QACpC,MAAM,IAAI,KAAK,CACb,kCAAkC,WAAW,QAAQ,gBAAgB,CACnE,IAAI,CACL,GAAG,CACL,CAAC;KACH;IAED,OAAO,uBAAuB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;AACzD,CAAC;AAdD,4DAcC;AAED,SAAgB,UAAU,CAAC,IAAU;IACnC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAC3B,OAAO,IAAI,CAAC;KACb;IACD,IAAI,MAAM,GAAG,IAAA,eAAQ,EAAsB,IAAI,EAAE,SAAS,CAAC,CAAC;IAC5D,IAAI,MAAM,CAAC,OAAO,EAAE;QAClB,MAAM,mCAAQ,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,GAAK,MAAM,CAAE,CAAC;KACpE;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AATD,gCASC;AAED;;;;;GAKG;AACH,SAAgB,mBAAmB,CAAC,IAAU,EAAE,OAAe;;IAC7D,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,YAAY,GAChB,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;QACvB,CAAC,CAAC,IAAA,eAAQ,EAAgC,IAAI,EAAE,IAAI,CAAC;QACrD,CAAC,CAAC,IAAI,CAAC;IACX,IAAI,YAAY,EAAE;QAChB,MAAM,aAAa,GAAG,MAAA,YAAY,CAAC,QAAQ,0CAAG,OAAO,CAAC,CAAC;QACvD,OAAO,OAAO,aAAa,KAAK,QAAQ,CAAC;KAC1C;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAXD,kDAWC;AAED,SAAS,uBAAuB,CAC9B,WAAmB,EACnB,SAAqC;IAErC,yBACK,oBAAoB,CAAC,SAAS,EAAE,WAAW,CAAC,EAC/C;AACJ,CAAC;AAED,SAAS,oBAAoB,CAC3B,SAAqC,EACrC,WAAmB;IAEnB,OAAO,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,uBAAuB,CAC9B,IAAU,EACV,WAAmB,EACnB,oBAA0C,EAC1C,IAAoC,EACpC,aAAsB,KAAK;IAE3B,IAAI,IAAI,KAAK,QAAQ,EAAE;QACrB,yBAAyB,CACvB,IAAI,EACJ,WAAW,EACX,wBAAwB,CAAC,IAAI,EAAE,WAAW,CAAC,EAC3C,IAAI,CACL,CAAC;QACF,OAAO;KACR;IAED,IAAI,CAAC,oBAAoB,EAAE;QACzB,MAAM,IAAI,KAAK,CACb,UAAU,IAAI,KAAK,WAAW,gBAAgB,oBAAoB,EAAE,CACrE,CAAC;KACH;IAED,yBAAyB,CACvB,IAAI,EACJ,WAAW,EACX,oBAAoB,EACpB,IAAI,EACJ,UAAU,CACX,CAAC;AACJ,CAAC;AAED,SAAgB,gCAAgC,CAC9C,IAAU,EACV,OAA6B;IAE7B,OAAO,IAAA,eAAQ,EACb,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EAC7B,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,6CAA6C,CAAC,CAC/D,CAAC;AACJ,CAAC;AARD,4EAQC;AAED,SAAS,yBAAyB,CAChC,IAAU,EACV,WAAmB,EACnB,OAA6B,EAC7B,IAAoC,EACpC,aAAsB,KAAK;;IAE3B,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACnD,MAAM,aAAa,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;IACjD,IAAI,mBAAmB,EAAE;QACvB,wDAAwD,CACtD,IAAI,EACJ,aAAa,EACb,WAAW,CACZ,CAAC;KACH;SAAM;QACL,0DAA0D,CACxD,IAAI,EACJ,WAAW,EACX,OAAO,CAAC,IAAI,EACZ,IAAI,CACL,CAAC;KACH;IAED,MAAM,UAAU,GACd,CAAC,IAAI,KAAK,QAAQ,IAAI,UAAU,CAAC,IAAI,CAAC,mBAAmB;QACvD,CAAC,CAAC,IAAA,wBAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC;QACjD,CAAC,CAAC,sBAAsB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAChD,MAAM,UAAU,GACd,UAAU,IAAI,IAAI,KAAK,QAAQ;QAC7B,CAAC,CAAC,EAAE,OAAO,EAAE,gCAAgC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE;QAC9D,CAAC,CAAC,EAAE,CAAC;IAET,IAAI,UAAU,EAAE;QACd,IAAI,IAAI,KAAK,QAAQ,EAAE;YACrB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YACxB,OAAO,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;SAC5C;aAAM;YACL,iCAAiC;YACjC,IAAI,mBAAmB,IAAI,IAAI,KAAK,QAAQ,EAAE;gBAC5C,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;aACpD;YAED,+BAA+B;YAC/B,IAAA,gBAAS,EAAC,IAAI,EAAE,UAAU,gDACrB,UAAU,GACV,OAAO,KACV,IAAI,EAAE,SAAS,IACf,CAAC;SACJ;KACF;SAAM,IAAI,IAAI,KAAK,QAAQ,EAAE;QAC5B,OAAO,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;KAC5C;SAAM;QACL,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC;KAC/C;IACD,IAAI,mBAAmB,IAAI,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE;QAC3D,IAAA,gBAAS,EACP,IAAI,EACJ,mBAAmB,EACnB,MAAA,IAAA,2CAA8B,EAAC,aAAa,CAAC,mCAAI,aAAa,CAC/D,CAAC;KACH;AACH,CAAC;AAED;;GAEG;AACH,SAAgB,aAAa,CAAC,IAAU;IACtC,MAAM,aAAa,GAAG,mCAAmC,CAAC,IAAI,CAAC,CAAC;IAChE,MAAM,eAAe,GAAG,aAAa,CAAC,OAAO,CAAC;IAC9C,uCACK,IAAA,wBAAW,EAAC,aAAa,CAAC,KAC7B,OAAO,EAAE,eAAe,IACxB;AACJ,CAAC;AAPD,sCAOC;AAED;;;;;GAKG;AACH,SAAS,mCAAmC,CAC1C,IAAU;IAEV,MAAM,aAAa,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;IACjD,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,EAAE;QACzE,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YAC9B,MAAM,kBAAkB,GAAG,IAAA,wBAAiB,EAAC,MAAM,EAAE,cAAc,CAAC,CAAC;YACrE,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,mBAC7B,IAAI,EAAE,MAAM,IACT,IAAA,eAAQ,EAAuB,IAAI,EAAE,kBAAkB,CAAC,CAC5D,CAAC;SACH;IACH,CAAC,CAAC,CAAC;IACH,OAAO,aAA2C,CAAC;AACrD,CAAC;AAED;;;;;GAKG;AACH,SAAS,mBAAmB,CAAC,IAAU;IACrC,MAAM,KAAK,GAAG,IAAI;SACf,WAAW,EAAE;SACb,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QACZ,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAClC,OAAO,CACL,CAAC,CAAC,IAAI,KAAK,QAAQ;YACnB,CAAC,QAAQ,KAAK,cAAc,IAAI,QAAQ,KAAK,cAAc,CAAC,CAC7D,CAAC;IACJ,CAAC,CAAC;SACD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACtB,OAAO,IAAA,oCAAuB,EAAC,KAAK,CAAC,CAAC;AACxC,CAAC;AAED;;;;;GAKG;AACH,SAAS,mBAAmB,CAAC,IAAU;IACrC,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QACrC,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAClC,OAAO,CACL,CAAC,CAAC,IAAI,KAAK,QAAQ;YACnB,CAAC,QAAQ,KAAK,cAAc,IAAI,QAAQ,KAAK,cAAc,CAAC,CAC7D,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,IAAI,iBAAgD,CAAC;AACrD,SAAS,oBAAoB,CAAC,IAAU;IACtC,MAAM,IAAI,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QAC7B,mCAAmC;QACnC,OAAO,IAAA,eAAQ,EAAgC,IAAI,EAAE,IAAI,CAAC,CAAC;KAC5D;SAAM;QACL,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QAChC,MAAM,eAAe,GAAG,IAAA,iDAAoC,EAC1D,MAAM,EACN,mBAAmB,CAAC,IAAI,CAAC,EACzB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,eAAQ,EAAC,IAAI,EAAE,IAAI,CAAC,CAC/B,CAAC,QAAQ,CAAC;QACX,gCAAgC;QAChC,IAAI,CAAC,iBAAiB,EAAE;YACtB,iBAAiB,GAAG,IAAA,iDAAoC,EACtD,MAAM,EACN,CAAC,GAAG,IAAA,gCAAmB,EAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,EAC3C,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,eAAQ,EAAC,IAAI,EAAE,IAAI,CAAC,CAC/B,CAAC;SACH;QACD,MAAM,QAAQ,mCAAQ,iBAAiB,CAAC,QAAQ,GAAK,eAAe,CAAE,CAAC;QACvE,mBAAmB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACzC,MAAM,qBAAqB,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CACzD,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,EAAE,CACb,OAAO,MAAM,KAAK,QAAQ;gBACxB,CAAC,CAAC,MAAM,KAAK,IAAA,cAAO,EAAC,IAAI,CAAC,IAAI,CAAC;gBAC/B,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,IAAA,cAAO,EAAC,IAAI,CAAC,IAAI,CAAC,CACzC,CAAC;YAEF,IAAI,qBAAqB,EAAE;gBACzB,OAAO,QAAQ,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC;aAC3C;QACH,CAAC,CAAC,CAAC;QACH,uCACK,iBAAiB,KACpB,QAAQ,IACR;KACH;AACH,CAAC;AAED;;;GAGG;AACH,SAAS,sBAAsB,CAAC,IAAU,EAAE,OAAe;;IACzD,MAAM,YAAY,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAChD,MAAM,aAAa,GAAG,MAAA,YAAY,CAAC,QAAQ,0CAAG,OAAO,CAAC,CAAC;IACvD,OAAO,OAAO,aAAa,KAAK,QAAQ;QACtC,CAAC,CAAC,IAAA,wBAAiB,EAAC,aAAa,EAAE,cAAc,CAAC;QAClD,CAAC,CAAC,IAAI,CAAC;AACX,CAAC;AAED,SAAS,wDAAwD,CAC/D,IAAoC,EACpC,aAGQ,EACR,WAAmB;IAEnB,IAAI,IAAI,IAAI,QAAQ,IAAI,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QAC3D,MAAM,IAAI,KAAK,CACb,0BAA0B,WAAW,uBAAuB,CAC7D,CAAC;KACH;IACD,IAAI,IAAI,IAAI,QAAQ,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QAC5D,MAAM,IAAI,KAAK,CACb,0BAA0B,WAAW,uBAAuB,CAC7D,CAAC;KACH;IACD,IAAI,IAAI,IAAI,QAAQ,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QAC5D,MAAM,IAAI,KAAK,CACb,0BAA0B,WAAW,uBAAuB,CAC7D,CAAC;KACH;AACH,CAAC;AAED,SAAS,0DAA0D,CACjE,IAAoC,EACpC,WAAmB,EACnB,WAAmB,EACnB,IAAU;IAEV,IACE,IAAI,IAAI,QAAQ;QAChB,IAAI,CAAC,MAAM,CAAC,IAAA,wBAAiB,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC,EAC3D;QACA,MAAM,IAAI,KAAK,CACb,kCAAkC,WAAW,sBAAsB,CACpE,CAAC;KACH;IACD,IACE,IAAI,IAAI,QAAQ;QAChB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAA,wBAAiB,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC,EAC5D;QACA,MAAM,IAAI,KAAK,CACb,yBAAyB,WAAW,OAAO,WAAW,wDAAwD,CAC/G,CAAC;KACH;IACD,IAAI,IAAI,IAAI,QAAQ,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAA,wBAAiB,EAAC,WAAW,CAAC,CAAC,EAAE;QACpE,MAAM,IAAI,KAAK,CACb,yBAAyB,WAAW,wDAAwD,CAC7F,CAAC;KACH;AACH,CAAC;AAED,SAAgB,qCAAqC,CAAC,IAAU;IAC9D,MAAM,aAAa,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC7C,MAAM,YAAY,GAChB,aAAa,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;QACzC,CAAC,CAAC,IAAA,eAAQ,EAAgC,IAAI,EAAE,aAAa,CAAC;QAC9D,CAAC,CAAC,IAAI,CAAC;IACX,OAAO,CAAC,YAAY;QAClB,CAAC,CAAC,IAAI,CAAC,uEAAuE;QAC9E,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,MAAM;QACzC,gGAAgG;QAChG,6FAA6F;QAC7F,CAAC,aAAa,EAAE,IAAI,EAAE,EAAE,CACtB,aAAa;YACb,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,gBAAgB,IAAI,IAAI,CAAC;QAExD,8DAA8D;QAC9D,YAAY,CAAC,OAAO,GAAG,CAAC,CACzB,CAAC;AACR,CAAC;AAlBD,sFAkBC;AAED,SAAgB,gBAAgB,CAC9B,IAAU;IAEV,MAAM,aAAa,GAA4C;QAC7D,eAAe;QACf,iBAAiB;KAClB,CAAC;IACF,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9D,CAAC;AARD,4CAQC"}

package/src/hasher/git-hasher.d.ts CHANGED Viewed

@@ -2,6 +2,7 @@ export declare function getGitHashForFiles(potentialFilesToHash: string[], path:
     hashes: Map<string, string>;
     deleted: string[];
 }>;
+export declare function getGitHashForBatch(filesToHash: string[], path: any): Promise<Map<string, string>>;
 export declare function getFileHashes(path: string): Promise<{
     allFiles: Map<string, string>;
 }>;

package/src/hasher/git-hasher.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFileHashes = exports.getGitHashForFiles = void 0;
+exports.getFileHashes = exports.getGitHashForBatch = exports.getGitHashForFiles = void 0;
 const tslib_1 = require("tslib");
 const child_process_1 = require("child_process");
 const fileutils_1 = require("../utils/fileutils");
@@ -32,10 +32,10 @@ exports.getGitHashForFiles = getGitHashForFiles;
 function getGitHashForBatch(filesToHash, path) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const res = new Map();
-        const hashStdout = yield spawnProcess('git', ['hash-object', ...filesToHash], path);
+        const { stdout: hashStdout, stderr: hashStderr } = yield spawnProcess('git', ['hash-object', ...filesToHash], path);
         const hashes = hashStdout.split('\n').filter((s) => !!s);
         if (hashes.length !== filesToHash.length) {
-            throw new Error(`Passed ${filesToHash.length} file paths to Git to hash, but received ${hashes.length} hashes.`);
+            throw new Error(`Passed ${filesToHash.length} file paths to Git to hash, but received ${hashes.length} hashes.\n${hashStderr}`);
         }
         for (let i = 0; i < hashes.length; i++) {
             const hash = hashes[i];
@@ -45,10 +45,11 @@ function getGitHashForBatch(filesToHash, path) {
         return res;
     });
 }
+exports.getGitHashForBatch = getGitHashForBatch;
 function getActualFilesToHash(potentialFilesToHash, path) {
     const filesToHash = [];
     const deleted = [];
-    for (let file of potentialFilesToHash) {
+    for (const file of potentialFilesToHash) {
         if ((0, fileutils_1.fileExists)((0, path_1.joinPathFragments)(path, file))) {
             filesToHash.push(file);
         }
@@ -59,7 +60,6 @@ function getActualFilesToHash(potentialFilesToHash, path) {
     return { filesToHash, deleted };
 }
 function spawnProcess(command, args, cwd) {
-    var e_1, _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const cp = (0, child_process_1.spawn)(command, args, {
             windowsHide: true,
@@ -67,29 +67,28 @@ function spawnProcess(command, args, cwd) {
             cwd,
         });
         let stdout = '';
-        try {
-            for (var _b = tslib_1.__asyncValues(cp.stdout), _c; _c = yield _b.next(), !_c.done;) {
-                const data = _c.value;
-                stdout += data;
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) yield _a.call(_b);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-        return stdout;
+        let stderr = '';
+        cp.stdout.on('data', (data) => {
+            stdout += data;
+        });
+        cp.stderr.on('data', (data) => {
+            stderr += data;
+        });
+        return new Promise((resolve) => {
+            cp.on('close', (code) => {
+                resolve({ code, stdout, stderr });
+            });
+        });
     });
 }
 function getStagedFiles(path) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const staged = yield spawnProcess('git', ['ls-files', '-s', '-z', '--exclude-standard', '.'], path);
+        const { stdout: staged } = yield spawnProcess('git', ['ls-files', '-s', '-z', '--exclude-standard', '.'], path);
         const res = new Map();
-        for (let line of staged.split('\0')) {
-            if (!line)
+        for (const line of staged.split('\0')) {
+            if (!line) {
                 continue;
+            }
             const [_, hash, __, ...fileParts] = line.split(/\s/);
             const fileName = fileParts.join(' ');
             res.set(fileName, hash);
@@ -99,14 +98,14 @@ function getStagedFiles(path) {
 }
 function getUnstagedFiles(path) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const unstaged = yield spawnProcess('git', ['ls-files', '-m', '-z', '--exclude-standard', '.'], path);
+        const { stdout: unstaged } = yield spawnProcess('git', ['ls-files', '-m', '-z', '--exclude-standard', '.'], path);
         const lines = unstaged.split('\0').filter((f) => !!f);
         return getGitHashForFiles(lines, path);
     });
 }
 function getUntrackedFiles(path) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const untracked = yield spawnProcess('git', ['ls-files', '--other', '-z', '--exclude-standard', '.'], path);
+        const { stdout: untracked } = yield spawnProcess('git', ['ls-files', '--other', '-z', '--exclude-standard', '.'], path);
         const lines = untracked.split('\0').filter((f) => !!f);
         return getGitHashForFiles(lines, path);
     });

package/src/hasher/git-hasher.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"git-hasher.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/git-hasher.ts"],"names":[],"mappings":";;;;AAAA,iDAAsC;AACtC,kDAAgD;AAChD,wCAAkD;AAElD,SAAsB,kBAAkB,CACtC,oBAA8B,EAC9B,IAAY;;QAEZ,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,oBAAoB,CACnD,oBAAoB,EACpB,IAAI,CACL,CAAC;QAEF,MAAM,GAAG,GAAwB,IAAI,GAAG,EAAkB,CAAC;QAC3D,MAAM,QAAQ,GAAmC,EAAE,CAAC;QACpD,IAAI,WAAW,CAAC,MAAM,EAAE;YACtB,wDAAwD;YACxD,2DAA2D;YAC3D,6DAA6D;YAC7D,8BAA8B;YAC9B,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;YAC5D,KACE,IAAI,UAAU,GAAG,CAAC,EAClB,UAAU,GAAG,WAAW,CAAC,MAAM,EAC/B,UAAU,IAAI,SAAS,EACvB;gBACA,QAAQ,CAAC,IAAI,CACX,kBAAkB,CAChB,WAAW,CAAC,KAAK,CAAC,UAAU,EAAE,UAAU,GAAG,SAAS,CAAC,EACrD,IAAI,CACL,CACF,CAAC;aACH;SACF;QACD,4CAA4C;QAC5C,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACjD,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE;YAChC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;SACxC;QACD,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;IAClC,CAAC;CAAA;AApCD,gDAoCC;AAED,~~SAAe~~,kBAAkB,CAAC,WAAqB,EAAE,IAAI;;~~QAC3D~~,MAAM,GAAG,GAAwB,IAAI,GAAG,EAAkB,CAAC;QAC3D,MAAM,UAAU,GAAG,MAAM,YAAY,~~CACnC~~,KAAK,EACL,CAAC,aAAa,EAAE,GAAG,WAAW,CAAC,EAC/B,IAAI,CACL,CAAC;QACF,MAAM,MAAM,GAAa,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACnE,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,CAAC,MAAM,EAAE;YACxC,MAAM,IAAI,KAAK,CACb,UAAU,WAAW,CAAC,MAAM,4CAA4C,MAAM,CAAC,MAAM,UAAU,~~CAChG~~,CAAC;SACH;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACtC,MAAM,IAAI,GAAW,MAAM,CAAC,CAAC,CAAC,CAAC;YAC/B,MAAM,QAAQ,GAAW,WAAW,CAAC,CAAC,CAAC,CAAC;YACxC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;SACzB;QACD,OAAO,GAAG,CAAC;IACb,CAAC;CAAA;AAED,SAAS,oBAAoB,CAC3B,oBAA8B,EAC9B,IAAY;IAEZ,MAAM,WAAW,GAAG,EAAE,CAAC;IACvB,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,KAAK,~~IAAI~~,IAAI,IAAI,oBAAoB,EAAE;~~QACrC~~,IAAI,IAAA,sBAAU,EAAC,IAAA,wBAAiB,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE;YAC7C,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACxB;aAAM;YACL,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACpB;KACF;IACD,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;AAClC,CAAC;AAED,SAAe,YAAY,~~CAAC~~,OAAe,~~EAAE~~,IAAc,~~EAAE~~,GAAW~~;;;QACtE~~,MAAM,EAAE,GAAG,IAAA,qBAAK,EAAC,OAAO,EAAE,IAAI,EAAE;YAC9B,WAAW,EAAE,IAAI;YACjB,KAAK,EAAE,KAAK;YACZ,GAAG;SACJ,CAAC,CAAC;QACH,IAAI,MAAM,GAAG,EAAE,CAAC~~;;YAChB~~,~~KAAyB~~,~~IAAA~~,~~KAAA~~,~~sBAAA~~,EAAE,CAAC,MAAM,~~CAAA~~,~~IAAA~~;~~gBAAvB~~,MAAM,IAAI,~~WAAA~~,~~CAAA~~;~~gBACnB~~,MAAM,IAAI,IAAI,CAAC;~~aAChB;;;;;;;;;QACD~~,OAAO,MAAM,CAAC~~;;CACf~~;AAED,SAAe,cAAc,CAAC,IAAY;;QACxC,MAAM,MAAM,GAAG,MAAM,YAAY,~~CAC/B~~,KAAK,EACL,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,oBAAoB,EAAE,GAAG,CAAC,EACnD,IAAI,CACL,CAAC;QACF,MAAM,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;QACtB,KAAK,~~IAAI~~,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;~~YACnC~~,IAAI,CAAC,IAAI;~~gBAAE~~,SAAS;~~YACpB~~,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACrD,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACrC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;SACzB;QACD,OAAO,GAAG,CAAC;IACb,CAAC;CAAA;AAED,SAAe,gBAAgB,CAAC,IAAY;;QAC1C,MAAM,QAAQ,GAAG,MAAM,YAAY,~~CACjC~~,KAAK,EACL,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,oBAAoB,EAAE,GAAG,CAAC,EACnD,IAAI,CACL,CAAC;QACF,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACtD,OAAO,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACzC,CAAC;CAAA;AAED,SAAe,iBAAiB,CAAC,IAAY;;QAC3C,MAAM,SAAS,GAAG,MAAM,YAAY,~~CAClC~~,KAAK,EACL,CAAC,UAAU,EAAE,SAAS,EAAE,IAAI,EAAE,oBAAoB,EAAE,GAAG,CAAC,EACxD,IAAI,CACL,CAAC;QACF,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACvD,OAAO,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACzC,CAAC;CAAA;AAED,SAAsB,aAAa,CAAC,IAAY;;QAG9C,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACtD,cAAc,CAAC,IAAI,CAAC;YACpB,gBAAgB,CAAC,IAAI,CAAC;YACtB,iBAAiB,CAAC,IAAI,CAAC;SACxB,CAAC,CAAC;QAEH,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,QAAgB,EAAE,EAAE;YACzD,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YACpC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,QAAgB,EAAE,EAAE;YAC1D,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;IAC9B,CAAC;CAAA;AAtBD,sCAsBC"}
1	+ {"version":3,"file":"git-hasher.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/git-hasher.ts"],"names":[],"mappings":"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"}

package/src/migrations/update-14-0-6/remove-roots.js CHANGED Viewed

@@ -3,11 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const project_configuration_1 = require("../../generators/utils/project-configuration");
 const format_changed_files_with_prettier_if_available_1 = require("../../generators/internal-utils/format-changed-files-with-prettier-if-available");
+const path_1 = require("path");
 function default_1(tree) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         // This looks like it does nothing, but this will actually effectively migrate over all the configs that need to be moved over, but won't touch configs that don't need to be moved
         for (const [projName, projConfig] of (0, project_configuration_1.getProjects)(tree)) {
-            (0, project_configuration_1.updateProjectConfiguration)(tree, projName, projConfig);
+            if (tree.exists((0, path_1.join)(projConfig.root, 'project.json'))) {
+                (0, project_configuration_1.updateProjectConfiguration)(tree, projName, projConfig);
+            }
         }
         yield (0, format_changed_files_with_prettier_if_available_1.formatChangedFilesWithPrettierIfAvailable)(tree);
     });

package/src/migrations/update-14-0-6/remove-roots.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"remove-roots.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-14-0-6/remove-roots.ts"],"names":[],"mappings":";;;AACA,wFAGsD;AACtD,qJAA4I;~~AAE5I~~,mBAA+B,IAAU;;QACvC,mLAAmL;QACnL,KAAK,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,IAAA,mCAAW,EAAC,IAAI,CAAC,EAAE;YACtD,IAAA,kDAA0B,EAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;~~SACxD~~;QAED,MAAM,IAAA,2FAAyC,EAAC,IAAI,CAAC,CAAC;IACxD,CAAC;CAAA;~~AAPD~~,~~4BAOC~~"}
1	+ {"version":3,"file":"remove-roots.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-14-0-6/remove-roots.ts"],"names":[],"mappings":";;;AACA,wFAGsD;AACtD,qJAA4I;AAC5I,+BAA4B;AAE5B,mBAA+B,IAAU;;QACvC,mLAAmL;QACnL,KAAK,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,IAAA,mCAAW,EAAC,IAAI,CAAC,EAAE;YACtD,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,UAAU,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,EAAE;gBACtD,IAAA,kDAA0B,EAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;aACxD;SACF;QAED,MAAM,IAAA,2FAAyC,EAAC,IAAI,CAAC,CAAC;IACxD,CAAC;CAAA;AATD,4BASC"}

package/src/migrations/update-14-2-0/add-json-schema.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ import type { Tree } from '../../generators/tree';
2	+ export default function (tree: Tree): Promise<void>;

package/src/migrations/update-14-2-0/add-json-schema.js ADDED Viewed

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const json_1 = require("../../generators/utils/json");
+const project_configuration_1 = require("../../generators/utils/project-configuration");
+function default_1(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        // update nx.json $schema
+        const isNxJsonExist = tree.exists('nx.json');
+        if (isNxJsonExist) {
+            (0, json_1.updateJson)(tree, 'nx.json', (json) => {
+                if (!json['$schema']) {
+                    json['$schema'] = './node_modules/nx/schemas/nx-schema.json';
+                }
+                return json;
+            });
+        }
+        // update workspace.json $schema
+        const isWorkspaceJsonExist = tree.exists('workspace.json');
+        if (isWorkspaceJsonExist) {
+            (0, json_1.updateJson)(tree, 'workspace.json', (json) => {
+                if (!json['$schema']) {
+                    json['$schema'] = './node_modules/nx/schemas/workspace-schema.json';
+                }
+                return json;
+            });
+        }
+        // update projects $schema
+        for (const [projName, projConfig] of (0, project_configuration_1.getProjects)(tree)) {
+            if (projConfig['$schema'])
+                continue;
+            const relativeProjectJsonSchemaPath = (0, project_configuration_1.getRelativeProjectJsonSchemaPath)(tree, projConfig);
+            (0, project_configuration_1.updateProjectConfiguration)(tree, projName, Object.assign({ $schema: relativeProjectJsonSchemaPath }, projConfig));
+        }
+    });
+}
+exports.default = default_1;
+//# sourceMappingURL=add-json-schema.js.map

package/src/migrations/update-14-2-0/add-json-schema.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"add-json-schema.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/migrations/update-14-2-0/add-json-schema.ts"],"names":[],"mappings":";;;AAEA,sDAAyD;AACzD,wFAIsD;AAEtD,mBAA+B,IAAU;;QACvC,yBAAyB;QACzB,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC7C,IAAI,aAAa,EAAE;YACjB,IAAA,iBAAU,EAAC,IAAI,EAAE,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;gBACnC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;oBACpB,IAAI,CAAC,SAAS,CAAC,GAAG,0CAA0C,CAAC;iBAC9D;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;SACJ;QAED,gCAAgC;QAChC,MAAM,oBAAoB,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAC3D,IAAI,oBAAoB,EAAE;YACxB,IAAA,iBAAU,EAAC,IAAI,EAAE,gBAAgB,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC1C,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;oBACpB,IAAI,CAAC,SAAS,CAAC,GAAG,iDAAiD,CAAC;iBACrE;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;SACJ;QAED,0BAA0B;QAC1B,KAAK,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,IAAA,mCAAW,EAAC,IAAI,CAAC,EAAE;YACtD,IAAI,UAAU,CAAC,SAAS,CAAC;gBAAE,SAAS;YAEpC,MAAM,6BAA6B,GAAG,IAAA,wDAAgC,EACpE,IAAI,EACJ,UAAU,CACX,CAAC;YACF,IAAA,kDAA0B,EAAC,IAAI,EAAE,QAAQ,EAAE,gBACzC,OAAO,EAAE,6BAA6B,IACnC,UAAU,CACU,CAAC,CAAC;SAC5B;IACH,CAAC;CAAA;AApCD,4BAoCC"}

package/src/project-graph/build-nodes/workspace-projects.js CHANGED Viewed

@@ -6,6 +6,7 @@ const fs_1 = require("fs");
 const app_root_1 = require("nx/src/utils/app-root");
 const nx_plugin_1 = require("nx/src/utils/nx-plugin");
 const project_graph_utils_1 = require("nx/src/utils/project-graph-utils");
+const fileutils_1 = require("nx/src/utils/fileutils");
 function buildWorkspaceProjectNodes(ctx, builder) {
     const toAdd = [];
     Object.keys(ctx.workspace.projects).forEach((key) => {
@@ -13,6 +14,16 @@ function buildWorkspaceProjectNodes(ctx, builder) {
         const projectRoot = (0, path_1.join)(app_root_1.workspaceRoot, p.root);
         if ((0, fs_1.existsSync)((0, path_1.join)(projectRoot, 'package.json'))) {
             p.targets = (0, project_graph_utils_1.mergeNpmScriptsWithTargets)(projectRoot, p.targets);
+            const { nx } = (0, fileutils_1.readJsonFile)((0, path_1.join)(projectRoot, 'package.json'));
+            if (nx === null || nx === void 0 ? void 0 : nx.tags) {
+                p.tags = [...(p.tags || []), ...nx.tags];
+            }
+            if (nx === null || nx === void 0 ? void 0 : nx.implicitDependencies) {
+                p.implicitDependencies = [
+                    ...(p.implicitDependencies || []),
+                    ...nx.implicitDependencies,
+                ];
+            }
         }
         p.targets = (0, nx_plugin_1.mergePluginTargetsWithNxTargets)(p.root, p.targets, (0, nx_plugin_1.loadNxPlugins)(ctx.workspace.plugins));
         const projectType = p.projectType === 'application'

package/src/project-graph/build-nodes/workspace-projects.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"workspace-projects.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/build-nodes/workspace-projects.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,2BAAgC;AAChC,oDAAsD;AACtD,sDAGgC;AAEhC,0EAA8E;AAG9E,SAAgB,0BAA0B,CACxC,GAAiC,EACjC,OAA4B;IAE5B,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAClD,MAAM,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACtC,MAAM,WAAW,GAAG,IAAA,WAAI,EAAC,wBAAa,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,IAAA,eAAU,EAAC,IAAA,WAAI,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC,EAAE;YACjD,CAAC,CAAC,OAAO,GAAG,IAAA,gDAA0B,EAAC,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;~~SAChE~~;QACD,CAAC,CAAC,OAAO,GAAG,IAAA,2CAA+B,EACzC,CAAC,CAAC,IAAI,EACN,CAAC,CAAC,OAAO,EACT,IAAA,yBAAa,EAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,CACrC,CAAC;QACF,MAAM,WAAW,GACf,CAAC,CAAC,WAAW,KAAK,aAAa;YAC7B,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC;gBACpB,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,KAAK;YACT,CAAC,CAAC,KAAK,CAAC;QACZ,MAAM,IAAI,GACR,GAAG,CAAC,SAAS,CAAC,QAAQ,IAAI,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC;YACnD,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,EAAE;YACxC,CAAC,CAAC,EAAE,CAAC;QAET,KAAK,CAAC,IAAI,CAAC;YACT,IAAI,EAAE,GAAG;YACT,IAAI,EAAE,WAAW;YACjB,IAAI,kCACC,CAAC,KACJ,IAAI,EACJ,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GACxB;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,mDAAmD;IACnD,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAClB,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,CAAC,CAAC;QAC5B,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,CAAC,CAAC;QAC5B,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAClB,OAAO,CAAC,OAAO,CAAC;YACd,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,IAAI,EAAE,CAAC,CAAC,IAAI;SACb,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;~~AApDD~~,~~gEAoDC~~"}
1	+ {"version":3,"file":"workspace-projects.js","sourceRoot":"","sources":["../../../../../../packages/nx/src/project-graph/build-nodes/workspace-projects.ts"],"names":[],"mappings":"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"}

package/src/utils/package-json.d.ts CHANGED Viewed

@@ -1,6 +1,8 @@
 import { TargetConfiguration } from '../config/workspace-json-project-json';
 export declare type PackageJsonTargetConfiguration = Omit<TargetConfiguration, 'executor'>;
 export interface NxProjectPackageJsonConfiguration {
+    implicitDependencies?: string[];
+    tags?: string[];
     targets?: Record<string, PackageJsonTargetConfiguration>;
 }
 export declare type PackageGroup = (string | {

package/src/utils/package-json.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-json.ts"],"names":[],"mappings":";;;~~AA8CA~~,SAAgB,qBAAqB,CACnC,MAAc,EACd,EAAqC;;IAErC,MAAM,qBAAqB,GAAG,CAAA,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,OAAO,0CAAG,MAAM,CAAC,KAAI,EAAE,CAAC;IAE1D,uCACK,qBAAqB,KACxB,QAAQ,EAAE,eAAe,EACzB,OAAO,kCACF,CAAC,qBAAqB,CAAC,OAAO,IAAI,EAAE,CAAC,KACxC,MAAM,OAER;AACJ,CAAC;AAdD,sDAcC"}
1	+ {"version":3,"file":"package-json.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/package-json.ts"],"names":[],"mappings":";;;AAgDA,SAAgB,qBAAqB,CACnC,MAAc,EACd,EAAqC;;IAErC,MAAM,qBAAqB,GAAG,CAAA,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,OAAO,0CAAG,MAAM,CAAC,KAAI,EAAE,CAAC;IAE1D,uCACK,qBAAqB,KACxB,QAAQ,EAAE,eAAe,EACzB,OAAO,kCACF,CAAC,qBAAqB,CAAC,OAAO,IAAI,EAAE,CAAC,KACxC,MAAM,OAER;AACJ,CAAC;AAdD,sDAcC"}

package/src/utils/versions.js CHANGED Viewed

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.typescriptESLintVersion = exports.tslintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
-exports.nxVersion = '14.1.4';
+exports.nxVersion = '14.1.6';
 exports.angularCliVersion = '~13.2.0';
 exports.typescriptVersion = '~4.5.2';
 exports.prettierVersion = '^2.5.1';