nx 14.3.6 → 14.4.0-beta.0

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 (15) hide show
  1. package/CHANGELOG.md +1 -1
  2. package/package.json +4 -4
  3. package/schemas/nx-schema.json +30 -0
  4. package/schemas/project-schema.json +30 -0
  5. package/src/config/nx-json.d.ts +8 -1
  6. package/src/config/project-graph.d.ts +6 -0
  7. package/src/config/workspace-json-project-json.d.ts +17 -0
  8. package/src/generators/utils/project-configuration.js +2 -1
  9. package/src/generators/utils/project-configuration.js.map +1 -1
  10. package/src/hasher/hasher.d.ts +3 -4
  11. package/src/hasher/hasher.js +203 -150
  12. package/src/hasher/hasher.js.map +1 -1
  13. package/src/utils/package-json.d.ts +1 -0
  14. package/src/utils/versions.d.ts +1 -1
  15. package/src/utils/versions.js +1 -1
package/CHANGELOG.md CHANGED
@@ -3,6 +3,6 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
- ## [14.3.6](https://github.com/nrwl/nx/compare/14.3.5...14.3.6) (2022-06-16)
6
+ # [14.4.0-beta.0](https://github.com/nrwl/nx/compare/14.3.6...14.4.0-beta.0) (2022-06-21)
7
7
 
8
8
  **Note:** Version bump only for package nx
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "nx",
3
- "version": "14.3.6",
3
+ "version": "14.4.0-beta.0",
4
4
  "description": "Smart, Fast and Extensible Build System",
5
5
  "repository": {
6
6
  "type": "git",
@@ -31,8 +31,8 @@
31
31
  },
32
32
  "homepage": "https://nx.dev",
33
33
  "dependencies": {
34
- "@nrwl/cli": "14.3.6",
35
- "@nrwl/tao": "14.3.6",
34
+ "@nrwl/cli": "14.4.0-beta.0",
35
+ "@nrwl/tao": "14.4.0-beta.0",
36
36
  "@parcel/watcher": "2.0.4",
37
37
  "chalk": "4.1.0",
38
38
  "chokidar": "^3.5.1",
@@ -106,5 +106,5 @@
106
106
  "executors": "./executors.json",
107
107
  "main": "./bin/nx.js",
108
108
  "typings": "./bin/nx.d.ts",
109
- "gitHead": "cc2a1d55bb3dd51e655cc8da7af4e633d24b40a3"
109
+ "gitHead": "6a65101ec239f1b3eae28734e4109b56a3700599"
110
110
  }
package/schemas/nx-schema.json CHANGED
@@ -111,6 +111,11 @@
111
111
  },
112
112
  "additionalProperties": false
113
113
  },
114
+ "filesets": {
115
+ "type": "object",
116
+ "description": "Default filesets",
117
+ "additionalProperties": true
118
+ },
114
119
  "targetDependencyConfig": {
115
120
  "type": "array",
116
121
  "items": {
@@ -140,6 +145,31 @@
140
145
  "type": "object",
141
146
  "description": "Target defaults",
142
147
  "properties": {
148
+ "dependsOnFilesets": {
149
+ "type": "array",
150
+ "items": {
151
+ "oneOf": [
152
+ {
153
+ "type": "string"
154
+ },
155
+ {
156
+ "type": "object",
157
+ "properties": {
158
+ "projects": {
159
+ "type": "string",
160
+ "description": "The projects that the targets belong to.",
161
+ "enum": ["self", "dependencies"]
162
+ },
163
+ "fileset": {
164
+ "type": "string",
165
+ "description": "The name of the target."
166
+ }
167
+ },
168
+ "additionalProperties": false
169
+ }
170
+ ]
171
+ }
172
+ },
143
173
  "dependsOn": {
144
174
  "type": "array",
145
175
  "items": {
package/schemas/project-schema.json CHANGED
@@ -4,6 +4,11 @@
4
4
  "title": "JSON schema for Nx projects",
5
5
  "type": "object",
6
6
  "properties": {
7
+ "filesets": {
8
+ "type": "object",
9
+ "description": "Filesets used by Nx to hash relevant files to a given target",
10
+ "additionalProperties": true
11
+ },
7
12
  "targets": {
8
13
  "type": "object",
9
14
  "description": "Configures all the targets which define what tasks you can run against the project",
@@ -30,6 +35,31 @@
30
35
  "type": "object"
31
36
  }
32
37
  },
38
+ "dependsOnFilesets": {
39
+ "type": "array",
40
+ "items": {
41
+ "oneOf": [
42
+ {
43
+ "type": "string"
44
+ },
45
+ {
46
+ "type": "object",
47
+ "properties": {
48
+ "projects": {
49
+ "type": "string",
50
+ "description": "The projects that the targets belong to.",
51
+ "enum": ["self", "dependencies"]
52
+ },
53
+ "fileset": {
54
+ "type": "string",
55
+ "description": "The name of the target."
56
+ }
57
+ },
58
+ "additionalProperties": false
59
+ }
60
+ ]
61
+ }
62
+ },
33
63
  "dependsOn": {
34
64
  "type": "array",
35
65
  "items": {
package/src/config/nx-json.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { PackageManager } from '../utils/package-manager';
2
- import { TargetDependencyConfig } from './workspace-json-project-json';
2
+ import { FilesetDependencyConfig, TargetDependencyConfig } from './workspace-json-project-json';
3
3
  export declare type ImplicitDependencyEntry<T = '*' | string[]> = {
4
4
  [key: string]: T | ImplicitJsonSubsetDependency<T>;
5
5
  };
@@ -15,6 +15,7 @@ export interface NxAffectedConfig {
15
15
  export declare type TargetDefaults = Record<string, {
16
16
  outputs?: string[];
17
17
  dependsOn?: (TargetDependencyConfig | string)[];
18
+ dependsOnFilesets?: (FilesetDependencyConfig | string)[];
18
19
  }>;
19
20
  export declare type TargetDependencies = Record<string, (TargetDependencyConfig | string)[]>;
20
21
  /**
@@ -34,6 +35,12 @@ export interface NxJsonConfiguration<T = '*' | string[]> {
34
35
  * Dependencies between different target names across all projects
35
36
  */
36
37
  targetDependencies?: TargetDependencies;
38
+ /**
39
+ * Default filesets used when no project-specific fileset is defined;
40
+ */
41
+ filesets?: {
42
+ [filesetName: string]: string[];
43
+ };
37
44
  /**
38
45
  * Dependencies between different target names across all projects
39
46
  */
package/src/config/project-graph.d.ts CHANGED
@@ -67,6 +67,12 @@ export interface ProjectGraphProjectNode<T = any> {
67
67
  */
68
68
  root: string;
69
69
  sourceRoot?: string;
70
+ /**
71
+ * Filesets associated with the project
72
+ */
73
+ filesets?: {
74
+ [filesetName: string]: string[];
75
+ };
70
76
  /**
71
77
  * Targets associated to the project
72
78
  */
package/src/config/workspace-json-project-json.d.ts CHANGED
@@ -100,6 +100,19 @@ export interface TargetDependencyConfig {
100
100
  */
101
101
  target: string;
102
102
  }
103
+ export interface FilesetDependencyConfig {
104
+ /**
105
+ * This the projects that the filesets belong to
106
+ *
107
+ * 'self': This target depends on a fileset of the same project
108
+ * 'deps': This target depends on the deps' filesets.
109
+ */
110
+ projects: 'self' | 'dependencies';
111
+ /**
112
+ * The name of the fileset
113
+ */
114
+ fileset: string;
115
+ }
103
116
  /**
104
117
  * Target's configuration
105
118
  */
@@ -119,6 +132,10 @@ export interface TargetConfiguration<T = any> {
119
132
  * This describes other targets that a target depends on.
120
133
  */
121
134
  dependsOn?: (TargetDependencyConfig | string)[];
135
+ /**
136
+ * This describes filesets that a target depends on.
137
+ */
138
+ dependsOnFilesets?: (FilesetDependencyConfig | string)[];
122
139
  /**
123
140
  * Target's options. They are passed in to the executor.
124
141
  */
package/src/generators/utils/project-configuration.js CHANGED
@@ -80,12 +80,13 @@ exports.readWorkspaceConfiguration = readWorkspaceConfiguration;
80
80
  function updateWorkspaceConfiguration(tree, workspaceConfig) {
81
81
  const {
82
82
  // Nx Json Properties
83
- cli, defaultProject, generators, implicitDependencies, plugins, pluginsConfig, npmScope, targetDefaults, targetDependencies, workspaceLayout, tasksRunnerOptions, affected, extends: ext, } = workspaceConfig;
83
+ cli, defaultProject, generators, implicitDependencies, plugins, pluginsConfig, npmScope, filesets, targetDefaults, targetDependencies, workspaceLayout, tasksRunnerOptions, affected, extends: ext, } = workspaceConfig;
84
84
  const nxJson = {
85
85
  implicitDependencies,
86
86
  plugins,
87
87
  pluginsConfig,
88
88
  npmScope,
89
+ filesets,
89
90
  targetDefaults,
90
91
  targetDependencies,
91
92
  workspaceLayout,
package/src/generators/utils/project-configuration.js.map CHANGED
@@ -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":"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"}
package/src/hasher/hasher.d.ts CHANGED
@@ -42,20 +42,19 @@ export declare class Hasher {
42
42
  static version: string;
43
43
  private implicitDependencies;
44
44
  private runtimeInputs;
45
- private projectHashes;
45
+ private taskHasher;
46
46
  private hashing;
47
47
  constructor(projectGraph: ProjectGraph, nxJson: NxJsonConfiguration, options: any, hashing?: HashingImpl);
48
- hashTaskWithDepsAndContext(task: Task, filter?: 'all-files' | 'exclude-tests-of-all' | 'exclude-tests-of-deps'): Promise<Hash>;
49
- hashCommand(task: Task): string;
48
+ hashTaskWithDepsAndContext(task: Task): Promise<Hash>;
50
49
  hashContext(): Promise<{
51
50
  implicitDeps: ImplicitHashResult;
52
51
  runtime: RuntimeHashResult;
53
52
  }>;
53
+ hashCommand(task: Task): Promise<string>;
54
54
  hashSource(task: Task): Promise<string>;
55
55
  hashArray(values: string[]): string;
56
56
  hashFile(path: string): string;
57
57
  private runtimeInputsHash;
58
58
  private implicitDepsHash;
59
- private hashNxJson;
60
59
  }
61
60
  export {};
package/src/hasher/hasher.js CHANGED
@@ -2,7 +2,6 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Hasher = void 0;
4
4
  const tslib_1 = require("tslib");
5
- const workspaces_1 = require("../config/workspaces");
6
5
  const child_process_1 = require("child_process");
7
6
  const fs_1 = require("fs");
8
7
  const minimatch = require("minimatch");
@@ -10,9 +9,9 @@ const path_1 = require("path");
10
9
  const perf_hooks_1 = require("perf_hooks");
11
10
  const typescript_1 = require("../utils/typescript");
12
11
  const workspace_root_1 = require("../utils/workspace-root");
13
- const file_utils_1 = require("../project-graph/file-utils");
14
12
  const hashing_impl_1 = require("./hashing-impl");
15
13
  const fileutils_1 = require("../utils/fileutils");
14
+ const configuration_1 = require("../config/configuration");
16
15
  /**
17
16
  * The default hasher used by executors.
18
17
  */
@@ -29,27 +28,25 @@ class Hasher {
29
28
  // this is only used for testing
30
29
  this.hashing = hashing;
31
30
  }
32
- this.projectHashes = new ProjectHasher(this.projectGraph, this.hashing, {
31
+ this.taskHasher = new TaskHasher(this.projectGraph, this.hashing, {
33
32
  selectivelyHashTsConfig: (_a = this.options.selectivelyHashTsConfig) !== null && _a !== void 0 ? _a : false,
34
33
  });
35
34
  }
36
- hashTaskWithDepsAndContext(task, filter = 'all-files') {
35
+ hashTaskWithDepsAndContext(task) {
37
36
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
38
- const command = this.hashCommand(task);
39
37
  const values = (yield Promise.all([
40
- this.projectHashes.hashProject(task.target.project, [task.target.project], filter),
38
+ this.taskHasher.hashTask(task, [task.target.project]),
41
39
  this.implicitDepsHash(),
42
40
  this.runtimeInputsHash(),
43
41
  ]));
44
42
  const value = this.hashing.hashArray([
45
43
  Hasher.version,
46
- command,
47
44
  ...values.map((v) => v.value),
48
45
  ]);
49
46
  return {
50
47
  value,
51
48
  details: {
52
- command,
49
+ command: values[0].command,
53
50
  nodes: values[0].nodes,
54
51
  implicitDeps: values[1].files,
55
52
  runtime: values[2].runtime,
@@ -57,21 +54,6 @@ class Hasher {
57
54
  };
58
55
  });
59
56
  }
60
- hashCommand(task) {
61
- var _a, _b, _c;
62
- const overrides = Object.assign({}, task.overrides);
63
- delete overrides['__overrides_unparsed__'];
64
- const sortedOverrides = {};
65
- for (let k of Object.keys(overrides).sort()) {
66
- sortedOverrides[k] = overrides[k];
67
- }
68
- return this.hashing.hashArray([
69
- (_a = task.target.project) !== null && _a !== void 0 ? _a : '',
70
- (_b = task.target.target) !== null && _b !== void 0 ? _b : '',
71
- (_c = task.target.configuration) !== null && _c !== void 0 ? _c : '',
72
- JSON.stringify(sortedOverrides),
73
- ]);
74
- }
75
57
  hashContext() {
76
58
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
77
59
  const values = (yield Promise.all([
@@ -84,9 +66,15 @@ class Hasher {
84
66
  };
85
67
  });
86
68
  }
69
+ hashCommand(task) {
70
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
71
+ return (yield this.taskHasher.hashTask(task, [task.target.project]))
72
+ .command;
73
+ });
74
+ }
87
75
  hashSource(task) {
88
76
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
89
- return this.projectHashes.hashProjectNodeSource(task.target.project, 'all-files');
77
+ return (yield this.taskHasher.hashTask(task, [task.target.project])).value;
90
78
  });
91
79
  }
92
80
  hashArray(values) {
@@ -151,6 +139,7 @@ class Hasher {
151
139
  const fileNames = [
152
140
  ...filesWithoutPatterns,
153
141
  ...implicitDepsFromPatterns,
142
+ 'nx.json',
154
143
  //TODO: vsavkin move the special cases into explicit ts support
155
144
  'package-lock.json',
156
145
  'yarn.lock',
@@ -174,7 +163,6 @@ class Hasher {
174
163
  const hash = this.hashing.hashFile(file);
175
164
  return { file, hash };
176
165
  }),
177
- ...this.hashNxJson(),
178
166
  ];
179
167
  const combinedHash = this.hashing.hashArray(fileHashes.map((v) => v.hash));
180
168
  perf_hooks_1.performance.mark('hasher:implicit deps hash:end');
@@ -187,142 +175,214 @@ class Hasher {
187
175
  return this.implicitDependencies;
188
176
  });
189
177
  }
190
- hashNxJson() {
191
- const nxJsonPath = (0, path_1.join)(workspace_root_1.workspaceRoot, 'nx.json');
192
- if (!(0, fs_1.existsSync)(nxJsonPath)) {
193
- return [];
194
- }
195
- let nxJsonContents = '{}';
196
- try {
197
- const nxJson = (0, fileutils_1.readJsonFile)(nxJsonPath);
198
- delete nxJson.projects;
199
- nxJsonContents = JSON.stringify(nxJson);
200
- }
201
- catch (_a) { }
202
- return [
203
- {
204
- hash: this.hashing.hashArray([nxJsonContents]),
205
- file: 'nx.json',
206
- },
207
- ];
208
- }
209
178
  }
210
179
  exports.Hasher = Hasher;
211
- Hasher.version = '2.0';
212
- class ProjectHasher {
180
+ Hasher.version = '3.0';
181
+ class TaskHasher {
213
182
  constructor(projectGraph, hashing, options) {
214
183
  this.projectGraph = projectGraph;
215
184
  this.hashing = hashing;
216
185
  this.options = options;
217
- this.sourceHashes = {};
218
- this.workspaceJson = this.readWorkspaceConfigFile((0, file_utils_1.workspaceFileName)());
219
- this.nxJson = this.readNxJsonConfigFile('nx.json');
186
+ this.DEFAULT_FILESET_CONFIG = [
187
+ {
188
+ projects: 'self',
189
+ fileset: 'default',
190
+ },
191
+ {
192
+ projects: 'dependencies',
193
+ fileset: 'default',
194
+ },
195
+ ];
196
+ this.filesetHashes = {};
220
197
  this.tsConfigJson = this.readTsConfig();
198
+ this.nxJson = (0, configuration_1.readNxJson)();
221
199
  }
222
- hashProject(projectName, visited, filter) {
200
+ hashTask(task, visited) {
223
201
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
224
202
  return Promise.resolve().then(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
225
203
  var _a;
226
- const deps = (_a = this.projectGraph.dependencies[projectName]) !== null && _a !== void 0 ? _a : [];
227
- const depHashes = (yield Promise.all(deps.map((d) => tslib_1.__awaiter(this, void 0, void 0, function* () {
204
+ const projectNode = this.projectGraph.nodes[task.target.project];
205
+ if (!projectNode) {
206
+ return this.hashExternalDependency(task);
207
+ }
208
+ const projectGraphDeps = (_a = this.projectGraph.dependencies[task.target.project]) !== null && _a !== void 0 ? _a : [];
209
+ const filesetConfigs = this.filesetConfigs(task, projectNode);
210
+ const self = yield this.hashSelfFilesets(filesetConfigs, projectNode);
211
+ const deps = yield this.hashDepsTasks(filesetConfigs, projectGraphDeps, visited);
212
+ const command = this.hashCommand(task);
213
+ const nodes = deps.reduce((m, c) => {
214
+ return Object.assign(Object.assign({}, m), c.nodes);
215
+ }, {});
216
+ self.forEach((r) => (nodes[r.taskId] = r.value));
217
+ const value = this.hashing.hashArray([
218
+ command,
219
+ ...self.map((d) => d.value),
220
+ ...deps.map((d) => d.value),
221
+ ]);
222
+ return { value, command, nodes };
223
+ }));
224
+ });
225
+ }
226
+ hashDepsTasks(config, projectGraphDeps, visited) {
227
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
228
+ return (yield Promise.all(config
229
+ .filter((fileset) => fileset.projects === 'dependencies')
230
+ .map((fileset) => tslib_1.__awaiter(this, void 0, void 0, function* () {
231
+ return yield Promise.all(projectGraphDeps.map((d) => tslib_1.__awaiter(this, void 0, void 0, function* () {
228
232
  if (visited.indexOf(d.target) > -1) {
229
233
  return null;
230
234
  }
231
235
  else {
232
236
  visited.push(d.target);
233
- return yield this.hashProject(d.target, visited, filter);
237
+ return yield this.hashTask({
238
+ id: `${d.target}:$fileset:${fileset.fileset}`,
239
+ target: {
240
+ project: d.target,
241
+ target: '$fileset',
242
+ configuration: fileset.fileset,
243
+ },
244
+ overrides: {},
245
+ }, visited);
234
246
  }
235
- })))).filter((r) => !!r);
236
- const filterForProject = filter === 'all-files'
237
- ? 'all-files'
238
- : filter === 'exclude-tests-of-deps' && visited[0] === projectName
239
- ? 'all-files'
240
- : 'exclude-tests';
241
- const projectHash = yield this.hashProjectNodeSource(projectName, filterForProject);
242
- const nodes = depHashes.reduce((m, c) => {
243
- return Object.assign(Object.assign({}, m), c.nodes);
244
- }, { [projectName]: projectHash });
245
- const value = this.hashing.hashArray([
246
- ...depHashes.map((d) => d.value),
247
- projectHash,
248
- ]);
249
- return { value, nodes };
250
- }));
247
+ })));
248
+ }))))
249
+ .flat()
250
+ .filter((r) => !!r);
251
+ });
252
+ }
253
+ hashSelfFilesets(config, projectNode) {
254
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
255
+ return yield Promise.all(config
256
+ .filter((fileset) => fileset.projects === 'self')
257
+ .map((fileset) => this.hashFilesetSource(projectNode.name, fileset.fileset)));
251
258
  });
252
259
  }
253
- hashProjectNodeSource(projectName, filter) {
260
+ filesetConfigs(task, projectNode) {
261
+ if (task.target.target === '$fileset') {
262
+ return [
263
+ {
264
+ fileset: task.target.configuration,
265
+ projects: 'self',
266
+ },
267
+ {
268
+ fileset: task.target.configuration,
269
+ projects: 'dependencies',
270
+ },
271
+ ];
272
+ }
273
+ else {
274
+ const targetData = projectNode.data.targets[task.target.target];
275
+ const targetDefaults = this.nxJson.targetDefaults[task.target.target];
276
+ // task from TaskGraph can be added here
277
+ return expandFilesetConfigSyntaxSugar(targetData.dependsOnFilesets ||
278
+ (targetDefaults === null || targetDefaults === void 0 ? void 0 : targetDefaults.dependsOnFilesets) ||
279
+ this.DEFAULT_FILESET_CONFIG);
280
+ }
281
+ }
282
+ hashExternalDependency(task) {
283
+ var _a;
284
+ const n = this.projectGraph.externalNodes[task.target.project];
285
+ const version = (_a = n === null || n === void 0 ? void 0 : n.data) === null || _a === void 0 ? void 0 : _a.version;
286
+ let hash;
287
+ if (version) {
288
+ hash = this.hashing.hashArray([version]);
289
+ }
290
+ else {
291
+ // unknown dependency
292
+ // this may occur if a file has a dependency to a npm package
293
+ // which is not directly registestered in package.json
294
+ // but only indirectly through dependencies of registered
295
+ // npm packages
296
+ // when it is at a later stage registered in package.json
297
+ // the cache project graph will not know this module but
298
+ // the new project graph will know it
299
+ // The actual checksum added here is of no importance as
300
+ // the version is unknown and may only change when some
301
+ // other change occurs in package.json and/or package-lock.json
302
+ hash = `__${task.target.project}__`;
303
+ }
304
+ return {
305
+ value: hash,
306
+ command: '',
307
+ nodes: {
308
+ [task.target.project]: version || hash,
309
+ },
310
+ };
311
+ }
312
+ hashCommand(task) {
313
+ var _a, _b, _c;
314
+ const overrides = Object.assign({}, task.overrides);
315
+ delete overrides['__overrides_unparsed__'];
316
+ const sortedOverrides = {};
317
+ for (let k of Object.keys(overrides).sort()) {
318
+ sortedOverrides[k] = overrides[k];
319
+ }
320
+ return this.hashing.hashArray([
321
+ (_a = task.target.project) !== null && _a !== void 0 ? _a : '',
322
+ (_b = task.target.target) !== null && _b !== void 0 ? _b : '',
323
+ (_c = task.target.configuration) !== null && _c !== void 0 ? _c : '',
324
+ JSON.stringify(sortedOverrides),
325
+ ]);
326
+ }
327
+ hashFilesetSource(projectName, filesetName) {
254
328
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
255
- const mapKey = `${projectName}-${filter}`;
256
- if (!this.sourceHashes[mapKey]) {
257
- this.sourceHashes[mapKey] = new Promise((res) => tslib_1.__awaiter(this, void 0, void 0, function* () {
258
- var _a, _b;
329
+ const mapKey = `${projectName}:$fileset:${filesetName}`;
330
+ if (!this.filesetHashes[mapKey]) {
331
+ this.filesetHashes[mapKey] = new Promise((res) => tslib_1.__awaiter(this, void 0, void 0, function* () {
259
332
  const p = this.projectGraph.nodes[projectName];
260
- if (!p) {
261
- const n = this.projectGraph.externalNodes[projectName];
262
- const version = (_a = n === null || n === void 0 ? void 0 : n.data) === null || _a === void 0 ? void 0 : _a.version;
263
- let hash;
264
- if (version) {
265
- hash = this.hashing.hashArray([version]);
266
- }
267
- else {
268
- // unknown dependency
269
- // this may occur if a file has a dependency to a npm package
270
- // which is not directly registestered in package.json
271
- // but only indirectly through dependencies of registered
272
- // npm packages
273
- // when it is at a later stage registered in package.json
274
- // the cache project graph will not know this module but
275
- // the new project graph will know it
276
- // The actual checksum added here is of no importance as
277
- // the version is unknown and may only change when some
278
- // other change occurs in package.json and/or package-lock.json
279
- hash = `__${projectName}__`;
280
- }
281
- res(hash);
282
- return;
283
- }
284
- const filteredFiles = filter === 'all-files'
285
- ? p.data.files
286
- : p.data.files.filter((f) => !this.isSpec(f.file));
333
+ const filesetPatterns = this.selectFilesetPatterns(p, filesetName);
334
+ const filteredFiles = this.filterFiles(p.data.files, filesetPatterns);
287
335
  const fileNames = filteredFiles.map((f) => f.file);
288
336
  const values = filteredFiles.map((f) => f.hash);
289
- const workspaceJson = JSON.stringify((_b = this.workspaceJson.projects[projectName]) !== null && _b !== void 0 ? _b : '');
290
337
  let tsConfig;
291
- if (this.options.selectivelyHashTsConfig) {
292
- tsConfig = this.removeOtherProjectsPathRecords(projectName);
293
- }
294
- else {
295
- tsConfig = JSON.stringify(this.tsConfigJson);
296
- }
297
- res(this.hashing.hashArray([
298
- ...fileNames,
299
- ...values,
300
- workspaceJson,
301
- tsConfig,
302
- ]));
338
+ tsConfig = this.hashTsConfig(p);
339
+ res({
340
+ taskId: mapKey,
341
+ value: this.hashing.hashArray([
342
+ ...fileNames,
343
+ ...values,
344
+ JSON.stringify(Object.assign(Object.assign({}, p.data), { files: undefined })),
345
+ tsConfig,
346
+ ]),
347
+ });
303
348
  }));
304
349
  }
305
- return this.sourceHashes[mapKey];
350
+ return this.filesetHashes[mapKey];
306
351
  });
307
352
  }
308
- isSpec(file) {
309
- return (file.endsWith('.spec.tsx') ||
310
- file.endsWith('.test.tsx') ||
311
- file.endsWith('-test.tsx') ||
312
- file.endsWith('-spec.tsx') ||
313
- file.endsWith('.spec.ts') ||
314
- file.endsWith('.test.ts') ||
315
- file.endsWith('-test.ts') ||
316
- file.endsWith('-spec.ts') ||
317
- file.endsWith('.spec.js') ||
318
- file.endsWith('.test.js') ||
319
- file.endsWith('-test.js') ||
320
- file.endsWith('-spec.js'));
353
+ selectFilesetPatterns(p, filesetName) {
354
+ if (filesetName == undefined) {
355
+ filesetName = 'default';
356
+ }
357
+ const projectFilesets = p.data.filesets
358
+ ? p.data.filesets[filesetName]
359
+ : null;
360
+ const defaultFilesets = this.nxJson.filesets
361
+ ? this.nxJson.filesets[filesetName]
362
+ : null;
363
+ if (projectFilesets)
364
+ return projectFilesets;
365
+ if (defaultFilesets)
366
+ return defaultFilesets;
367
+ return null;
321
368
  }
322
- removeOtherProjectsPathRecords(projectName) {
369
+ filterFiles(files, patterns) {
370
+ if (patterns === null)
371
+ return files;
372
+ return files.filter((f) => !!patterns.find((pattern) => minimatch(f.file, pattern)));
373
+ }
374
+ hashTsConfig(p) {
375
+ if (this.options.selectivelyHashTsConfig) {
376
+ return this.removeOtherProjectsPathRecords(p);
377
+ }
378
+ else {
379
+ return JSON.stringify(this.tsConfigJson);
380
+ }
381
+ }
382
+ removeOtherProjectsPathRecords(p) {
323
383
  var _a;
324
384
  const _b = this.tsConfigJson.compilerOptions, { paths } = _b, compilerOptions = tslib_1.__rest(_b, ["paths"]);
325
- const rootPath = this.workspaceJson.projects[projectName].root.split('/');
385
+ const rootPath = p.data.root.split('/');
326
386
  rootPath.shift();
327
387
  const pathAlias = `@${this.nxJson.npmScope}/${rootPath.join('/')}`;
328
388
  return JSON.stringify({
@@ -345,27 +405,20 @@ class ProjectHasher {
345
405
  };
346
406
  }
347
407
  }
348
- readWorkspaceConfigFile(path) {
349
- var _a;
350
- try {
351
- const res = (0, fileutils_1.readJsonFile)(path);
352
- (_a = res.projects) !== null && _a !== void 0 ? _a : (res.projects = {});
353
- return (0, workspaces_1.resolveNewFormatWithInlineProjects)(res);
354
- }
355
- catch (_b) {
356
- return { projects: {}, version: 2 };
357
- }
358
- }
359
- readNxJsonConfigFile(path) {
360
- var _a;
361
- try {
362
- const res = (0, fileutils_1.readJsonFile)(path);
363
- (_a = res.projects) !== null && _a !== void 0 ? _a : (res.projects = {});
364
- return res;
408
+ }
409
+ function expandFilesetConfigSyntaxSugar(deps) {
410
+ return deps.map((d) => {
411
+ if (typeof d === 'string') {
412
+ if (d.startsWith('^')) {
413
+ return { projects: 'dependencies', fileset: d.substring(1) };
414
+ }
415
+ else {
416
+ return { projects: 'self', fileset: d };
417
+ }
365
418
  }
366
- catch (_b) {
367
- return {};
419
+ else {
420
+ return d;
368
421
  }
369
- }
422
+ });
370
423
  }
371
424
  //# sourceMappingURL=hasher.js.map
package/src/hasher/hasher.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"hasher.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/hasher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"hasher.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/hasher.ts"],"names":[],"mappings":"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"}
package/src/utils/package-json.d.ts CHANGED
@@ -47,6 +47,7 @@ export declare function buildTargetFromScript(script: string, nx: NxProjectPacka
47
47
  options: any;
48
48
  outputs?: string[];
49
49
  dependsOn?: (string | import("../config/workspace-json-project-json").TargetDependencyConfig)[];
50
+ dependsOnFilesets?: (string | import("../config/workspace-json-project-json").FilesetDependencyConfig)[];
50
51
  configurations?: {
51
52
  [config: string]: any;
52
53
  };
package/src/utils/versions.d.ts CHANGED
@@ -3,7 +3,7 @@ export declare const angularCliVersion = "~14.0.0";
3
3
  export declare const typescriptVersion = "~4.7.2";
4
4
  export declare const prettierVersion = "^2.6.2";
5
5
  export declare const tslintVersion = "~6.1.0";
6
- export declare const typescriptESLintVersion = "~5.24.0";
6
+ export declare const typescriptESLintVersion = "^5.29.0";
7
7
  export declare const eslintVersion = "~8.15.0";
8
8
  export declare const eslintConfigPrettierVersion = "8.1.0";
9
9
  export declare const swcNodeVersion = "^1.4.2";
package/src/utils/versions.js CHANGED
@@ -6,7 +6,7 @@ exports.angularCliVersion = '~14.0.0';
6
6
  exports.typescriptVersion = '~4.7.2';
7
7
  exports.prettierVersion = '^2.6.2';
8
8
  exports.tslintVersion = '~6.1.0';
9
- exports.typescriptESLintVersion = '~5.24.0';
9
+ exports.typescriptESLintVersion = '^5.29.0';
10
10
  exports.eslintVersion = '~8.15.0';
11
11
  exports.eslintConfigPrettierVersion = '8.1.0';
12
12
  exports.swcNodeVersion = '^1.4.2';