nx 16.3.0 → 16.3.1

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "nx",
3
- "version": "16.3.0",
3
+ "version": "16.3.1",
4
4
  "private": false,
5
5
  "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
6
6
  "repository": {
@@ -32,7 +32,7 @@
32
32
  },
33
33
  "homepage": "https://nx.dev",
34
34
  "dependencies": {
35
- "@nrwl/tao": "16.3.0",
35
+ "@nrwl/tao": "16.3.1",
36
36
  "@parcel/watcher": "2.0.4",
37
37
  "@yarnpkg/lockfile": "^1.1.0",
38
38
  "@yarnpkg/parsers": "^3.0.0-rc.18",
@@ -80,16 +80,16 @@
80
80
  }
81
81
  },
82
82
  "optionalDependencies": {
83
- "@nx/nx-darwin-arm64": "16.3.0",
84
- "@nx/nx-darwin-x64": "16.3.0",
85
- "@nx/nx-freebsd-x64": "16.3.0",
86
- "@nx/nx-linux-arm-gnueabihf": "16.3.0",
87
- "@nx/nx-linux-arm64-gnu": "16.3.0",
88
- "@nx/nx-linux-arm64-musl": "16.3.0",
89
- "@nx/nx-linux-x64-gnu": "16.3.0",
90
- "@nx/nx-linux-x64-musl": "16.3.0",
91
- "@nx/nx-win32-arm64-msvc": "16.3.0",
92
- "@nx/nx-win32-x64-msvc": "16.3.0"
83
+ "@nx/nx-darwin-arm64": "16.3.1",
84
+ "@nx/nx-darwin-x64": "16.3.1",
85
+ "@nx/nx-freebsd-x64": "16.3.1",
86
+ "@nx/nx-linux-arm-gnueabihf": "16.3.1",
87
+ "@nx/nx-linux-arm64-gnu": "16.3.1",
88
+ "@nx/nx-linux-arm64-musl": "16.3.1",
89
+ "@nx/nx-linux-x64-gnu": "16.3.1",
90
+ "@nx/nx-linux-x64-musl": "16.3.1",
91
+ "@nx/nx-win32-arm64-msvc": "16.3.1",
92
+ "@nx/nx-win32-x64-msvc": "16.3.1"
93
93
  },
94
94
  "nx-migrations": {
95
95
  "migrations": "./migrations.json",
@@ -175,5 +175,5 @@
175
175
  },
176
176
  "main": "./bin/nx.js",
177
177
  "types": "./bin/nx.d.ts",
178
- "gitHead": "103353a446d41b5fff7cf0f7ac5f8dadbbd336eb"
178
+ "gitHead": "29dc4bd6d069abfd91d8f4e0640047b23ceafac5"
179
179
  }
@@ -126,3 +126,7 @@ export { hashArray } from './hasher/impl';
126
126
  * @category Utils
127
127
  */
128
128
  export { cacheDir } from './utils/cache-directory';
129
+ /**
130
+ * @category Utils
131
+ */
132
+ export { createProjectFileMapUsingProjectGraph } from './project-graph/file-map-utils';
@@ -4,7 +4,7 @@
4
4
  * Try hard to not add to this API to reduce the surface area we need to maintain.
5
5
  */
6
6
  Object.defineProperty(exports, "__esModule", { value: true });
7
- exports.cacheDir = exports.hashArray = exports.defaultTasksRunner = exports.getOutputsForTargetAndConfiguration = exports.readCachedProjectGraph = exports.createProjectGraphAsync = exports.reverse = exports.appRootPath = exports.workspaceRoot = exports.normalizePath = exports.joinPathFragments = exports.stripIndents = exports.writeJsonFile = exports.readJsonFile = exports.stripJsonComments = exports.serializeJson = exports.parseJson = exports.updateJson = exports.writeJson = exports.readJson = exports.ProjectGraphBuilder = exports.DependencyType = exports.updateNxJson = exports.readNxJson = exports.getWorkspacePath = exports.isStandaloneProject = exports.updateWorkspaceConfiguration = exports.readWorkspaceConfiguration = exports.getProjects = exports.updateProjectConfiguration = exports.removeProjectConfiguration = exports.readProjectConfiguration = exports.addProjectConfiguration = exports.runExecutor = exports.getPackageManagerVersion = exports.detectPackageManager = exports.getPackageManagerCommand = exports.output = exports.logger = exports.workspaceLayout = exports.readAllWorkspaceConfiguration = exports.Workspaces = void 0;
7
+ exports.createProjectFileMapUsingProjectGraph = exports.cacheDir = exports.hashArray = exports.defaultTasksRunner = exports.getOutputsForTargetAndConfiguration = exports.readCachedProjectGraph = exports.createProjectGraphAsync = exports.reverse = exports.appRootPath = exports.workspaceRoot = exports.normalizePath = exports.joinPathFragments = exports.stripIndents = exports.writeJsonFile = exports.readJsonFile = exports.stripJsonComments = exports.serializeJson = exports.parseJson = exports.updateJson = exports.writeJson = exports.readJson = exports.ProjectGraphBuilder = exports.DependencyType = exports.updateNxJson = exports.readNxJson = exports.getWorkspacePath = exports.isStandaloneProject = exports.updateWorkspaceConfiguration = exports.readWorkspaceConfiguration = exports.getProjects = exports.updateProjectConfiguration = exports.removeProjectConfiguration = exports.readProjectConfiguration = exports.addProjectConfiguration = exports.runExecutor = exports.getPackageManagerVersion = exports.detectPackageManager = exports.getPackageManagerCommand = exports.output = exports.logger = exports.workspaceLayout = exports.readAllWorkspaceConfiguration = exports.Workspaces = void 0;
8
8
  /**
9
9
  * @category Workspace
10
10
  */
@@ -132,4 +132,9 @@ Object.defineProperty(exports, "hashArray", { enumerable: true, get: function ()
132
132
  */
133
133
  var cache_directory_1 = require("./utils/cache-directory");
134
134
  Object.defineProperty(exports, "cacheDir", { enumerable: true, get: function () { return cache_directory_1.cacheDir; } });
135
+ /**
136
+ * @category Utils
137
+ */
138
+ var file_map_utils_1 = require("./project-graph/file-map-utils");
139
+ Object.defineProperty(exports, "createProjectFileMapUsingProjectGraph", { enumerable: true, get: function () { return file_map_utils_1.createProjectFileMapUsingProjectGraph; } });
135
140
  //# sourceMappingURL=devkit-exports.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"devkit-exports.js","sourceRoot":"","sources":["../../../../packages/nx/src/devkit-exports.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAoCH;;GAEG;AACH,kDAAiD;AAAxC,wGAAA,UAAU,OAAA;AAEnB,kEAAkE;AAClE,yDAGoC;AAFlC,2HAAA,6BAA6B,OAAA;AAC7B,6GAAA,eAAe,OAAA;AAoBjB;;GAEG;AACH,yCAAwC;AAA/B,gGAAA,MAAM,OAAA;AAEf;;GAEG;AACH,yCAAwC;AAA/B,gGAAA,MAAM,OAAA;AAOf;;GAEG;AACH,2DAIiC;AAH/B,2HAAA,wBAAwB,OAAA;AACxB,uHAAA,oBAAoB,OAAA;AACpB,2HAAA,wBAAwB,OAAA;AAO1B;;GAEG;AACH,8CAAqD;AAA5C,kGAAA,WAAW,OAAA;AAEpB;;GAEG;AACH,kFAMkD;AALhD,gIAAA,uBAAuB,OAAA;AACvB,iIAAA,wBAAwB,OAAA;AACxB,mIAAA,0BAA0B,OAAA;AAC1B,mIAAA,0BAA0B,OAAA;AAC1B,oHAAA,WAAW,OAAA;AAGb;;GAEG;AACH,4DAMuC;AALrC,wHAAA,0BAA0B,OAAA;AAC1B,0HAAA,4BAA4B,OAAA;AAC5B,iHAAA,mBAAmB,OAAA;AAEnB,8GAAA,gBAAgB,OAAA;AAGlB,kFAGkD;AAFhD,mHAAA,UAAU,OAAA;AACV,qHAAA,YAAY,OAAA;AAiBd;;GAEG;AACH,wDAAwD;AAA/C,+GAAA,cAAc,OAAA;AAEvB;;GAEG;AACH,+EAA4E;AAAnE,4HAAA,mBAAmB,OAAA;AAE5B;;GAEG;AACH,gDAA0E;AAAjE,gGAAA,QAAQ,OAAA;AAAE,iGAAA,SAAS,OAAA;AAAE,kGAAA,UAAU,OAAA;AAExC;;GAEG;AACH,qCAA2E;AAAlE,iGAAA,SAAS,OAAA;AAAE,qGAAA,aAAa,OAAA;AAAE,yGAAA,iBAAiB,OAAA;AAOpD;;GAEG;AACH,+CAAgE;AAAvD,yGAAA,YAAY,OAAA;AAAE,0GAAA,aAAa,OAAA;AAEpC;;GAEG;AACH,uDAAqD;AAA5C,6GAAA,YAAY,OAAA;AAErB;;GAEG;AACH,qCAAgE;AAAvD,yGAAA,iBAAiB,OAAA;AAAE,qGAAA,aAAa,OAAA;AAEzC,iEAAiE;AACjE;;GAEG;AACH,6CAA8D;AAArD,yGAAA,aAAa,OAAA;AAAE,uGAAA,WAAW,OAAA;AAEnC;;GAEG;AACH,uDAAoD;AAA3C,oGAAA,OAAO,OAAA;AAChB;;GAEG;AACH,+DAGuC;AAFrC,wHAAA,uBAAuB,OAAA;AACvB,uHAAA,sBAAsB,OAAA;AAGxB;;GAEG;AACH,8CAA2E;AAAlE,4HAAA,mCAAmC,OAAA;AAE5C;;GAEG;AACH,4EAI6C;AAH3C,0HAAA,kBAAkB,OAAA;AASpB,sCAA0C;AAAjC,iGAAA,SAAS,OAAA;AAElB;;GAEG;AACH,2DAAmD;AAA1C,2GAAA,QAAQ,OAAA"}
1
+ {"version":3,"file":"devkit-exports.js","sourceRoot":"","sources":["../../../../packages/nx/src/devkit-exports.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAoCH;;GAEG;AACH,kDAAiD;AAAxC,wGAAA,UAAU,OAAA;AAEnB,kEAAkE;AAClE,yDAGoC;AAFlC,2HAAA,6BAA6B,OAAA;AAC7B,6GAAA,eAAe,OAAA;AAoBjB;;GAEG;AACH,yCAAwC;AAA/B,gGAAA,MAAM,OAAA;AAEf;;GAEG;AACH,yCAAwC;AAA/B,gGAAA,MAAM,OAAA;AAOf;;GAEG;AACH,2DAIiC;AAH/B,2HAAA,wBAAwB,OAAA;AACxB,uHAAA,oBAAoB,OAAA;AACpB,2HAAA,wBAAwB,OAAA;AAO1B;;GAEG;AACH,8CAAqD;AAA5C,kGAAA,WAAW,OAAA;AAEpB;;GAEG;AACH,kFAMkD;AALhD,gIAAA,uBAAuB,OAAA;AACvB,iIAAA,wBAAwB,OAAA;AACxB,mIAAA,0BAA0B,OAAA;AAC1B,mIAAA,0BAA0B,OAAA;AAC1B,oHAAA,WAAW,OAAA;AAGb;;GAEG;AACH,4DAMuC;AALrC,wHAAA,0BAA0B,OAAA;AAC1B,0HAAA,4BAA4B,OAAA;AAC5B,iHAAA,mBAAmB,OAAA;AAEnB,8GAAA,gBAAgB,OAAA;AAGlB,kFAGkD;AAFhD,mHAAA,UAAU,OAAA;AACV,qHAAA,YAAY,OAAA;AAiBd;;GAEG;AACH,wDAAwD;AAA/C,+GAAA,cAAc,OAAA;AAEvB;;GAEG;AACH,+EAA4E;AAAnE,4HAAA,mBAAmB,OAAA;AAE5B;;GAEG;AACH,gDAA0E;AAAjE,gGAAA,QAAQ,OAAA;AAAE,iGAAA,SAAS,OAAA;AAAE,kGAAA,UAAU,OAAA;AAExC;;GAEG;AACH,qCAA2E;AAAlE,iGAAA,SAAS,OAAA;AAAE,qGAAA,aAAa,OAAA;AAAE,yGAAA,iBAAiB,OAAA;AAOpD;;GAEG;AACH,+CAAgE;AAAvD,yGAAA,YAAY,OAAA;AAAE,0GAAA,aAAa,OAAA;AAEpC;;GAEG;AACH,uDAAqD;AAA5C,6GAAA,YAAY,OAAA;AAErB;;GAEG;AACH,qCAAgE;AAAvD,yGAAA,iBAAiB,OAAA;AAAE,qGAAA,aAAa,OAAA;AAEzC,iEAAiE;AACjE;;GAEG;AACH,6CAA8D;AAArD,yGAAA,aAAa,OAAA;AAAE,uGAAA,WAAW,OAAA;AAEnC;;GAEG;AACH,uDAAoD;AAA3C,oGAAA,OAAO,OAAA;AAChB;;GAEG;AACH,+DAGuC;AAFrC,wHAAA,uBAAuB,OAAA;AACvB,uHAAA,sBAAsB,OAAA;AAGxB;;GAEG;AACH,8CAA2E;AAAlE,4HAAA,mCAAmC,OAAA;AAE5C;;GAEG;AACH,4EAI6C;AAH3C,0HAAA,kBAAkB,OAAA;AASpB,sCAA0C;AAAjC,iGAAA,SAAS,OAAA;AAElB;;GAEG;AACH,2DAAmD;AAA1C,2GAAA,QAAQ,OAAA;AAEjB;;GAEG;AACH,iEAAuF;AAA9E,uIAAA,qCAAqC,OAAA"}
@@ -1,5 +1,6 @@
1
- import { FileData, ProjectFileMap } from '../config/project-graph';
1
+ import { FileData, ProjectFileMap, ProjectGraph } from '../config/project-graph';
2
2
  import { ProjectsConfigurations } from '../config/workspace-json-project-json';
3
+ export declare function createProjectFileMapUsingProjectGraph(graph: ProjectGraph): Promise<ProjectFileMap>;
3
4
  export declare function createProjectFileMap(projectsConfigurations: ProjectsConfigurations, allWorkspaceFiles: FileData[]): {
4
5
  projectFileMap: ProjectFileMap;
5
6
  allWorkspaceFiles: FileData[];
@@ -1,7 +1,21 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.updateProjectFileMap = exports.createProjectFileMap = void 0;
3
+ exports.updateProjectFileMap = exports.createProjectFileMap = exports.createProjectFileMapUsingProjectGraph = void 0;
4
+ const tslib_1 = require("tslib");
4
5
  const find_project_for_path_1 = require("./utils/find-project-for-path");
6
+ const client_1 = require("../daemon/client/client");
7
+ const project_graph_1 = require("./project-graph");
8
+ const impl_1 = require("../hasher/impl");
9
+ function createProjectFileMapUsingProjectGraph(graph) {
10
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
11
+ const configs = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(graph);
12
+ const files = client_1.daemonClient.enabled()
13
+ ? yield client_1.daemonClient.getAllFileData()
14
+ : impl_1.fileHasher.allFileData();
15
+ return createProjectFileMap(configs, files).projectFileMap;
16
+ });
17
+ }
18
+ exports.createProjectFileMapUsingProjectGraph = createProjectFileMapUsingProjectGraph;
5
19
  function createProjectFileMap(projectsConfigurations, allWorkspaceFiles) {
6
20
  var _a;
7
21
  const projectFileMap = {};
@@ -1 +1 @@
1
- {"version":3,"file":"file-map-utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/file-map-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"file-map-utils.js","sourceRoot":"","sources":["../../../../../packages/nx/src/project-graph/file-map-utils.ts"],"names":[],"mappings":"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"}