nx 14.8.2 → 14.8.3

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/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.8.2](https://github.com/nrwl/nx/compare/14.8.1...14.8.2) (2022-09-29)
6
+ ## [14.8.3](https://github.com/nrwl/nx/compare/14.8.2...14.8.3) (2022-10-04)
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.8.2",
3
+ "version": "14.8.3",
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,12 +32,13 @@
32
32
  },
33
33
  "homepage": "https://nx.dev",
34
34
  "dependencies": {
35
- "@nrwl/cli": "14.8.2",
36
- "@nrwl/tao": "14.8.2",
35
+ "@nrwl/cli": "14.8.3",
36
+ "@nrwl/tao": "14.8.3",
37
37
  "@parcel/watcher": "2.0.4",
38
38
  "@yarnpkg/lockfile": "^1.1.0",
39
39
  "@yarnpkg/parsers": "^3.0.0-rc.18",
40
40
  "@zkochan/js-yaml": "0.0.6",
41
+ "axios": "0.21.1",
41
42
  "chalk": "4.1.0",
42
43
  "chokidar": "^3.5.1",
43
44
  "cli-cursor": "3.1.0",
@@ -119,5 +120,5 @@
119
120
  },
120
121
  "main": "./bin/nx.js",
121
122
  "types": "./bin/nx.d.ts",
122
- "gitHead": "d294c770d0ee447233619bba4654b45eeabefb13"
123
+ "gitHead": "c30d39a028f495c54811a8cd9cc09b84ac5130c8"
123
124
  }
@@ -1,4 +1,4 @@
1
1
  export declare function connectToNxCloudIfExplicitlyAsked(opts: {
2
2
  [k: string]: any;
3
3
  }): Promise<void>;
4
- export declare function connectToNxCloudCommand(promptOverride?: string): Promise<void>;
4
+ export declare function connectToNxCloudCommand(promptOverride?: string): Promise<boolean>;
@@ -37,16 +37,17 @@ function connectToNxCloudCommand(promptOverride) {
37
37
  output_1.output.log({
38
38
  title: 'This workspace is already connected to Nx Cloud.',
39
39
  });
40
- return;
40
+ return false;
41
41
  }
42
42
  const res = yield connectToNxCloudPrompt(promptOverride);
43
43
  if (!res)
44
- return;
44
+ return false;
45
45
  const pmc = (0, package_manager_1.getPackageManagerCommand)();
46
46
  (0, child_process_1.execSync)(`${pmc.addDev} @nrwl/nx-cloud@latest`);
47
47
  (0, child_process_1.execSync)(`${pmc.exec} nx g @nrwl/nx-cloud:init`, {
48
48
  stdio: [0, 1, 2],
49
49
  });
50
+ return true;
50
51
  });
51
52
  }
52
53
  exports.connectToNxCloudCommand = connectToNxCloudCommand;
@@ -1 +1 @@
1
- {"version":3,"file":"connect-to-nx-cloud.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/connect-to-nx-cloud.ts"],"names":[],"mappings":";;;;AAAA,4CAAyC;AACzC,8DAAoE;AACpE,iDAAyC;AACzC,2DAAqD;AAErD,SAAsB,iCAAiC,CAAC,IAEvD;;QACC,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;YAC1B,MAAM,MAAM,GAAG,IAAA,0BAAU,GAAE,CAAC;YAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;YACzD,MAAM,uBAAuB,GAC3B,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,0BAA0B,CAAC;YAC3E,IAAI,CAAC,uBAAuB;gBAAE,OAAO;YAErC,eAAM,CAAC,GAAG,CAAC;gBACT,KAAK,EAAE,6DAA6D;aACrE,CAAC,CAAC;YACH,MAAM,GAAG,GAAG,IAAA,0CAAwB,GAAE,CAAC;YACvC,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,IAAI,yBAAyB,EAAE;gBAC7C,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aACjB,CAAC,CAAC;YACH,eAAM,CAAC,OAAO,CAAC;gBACb,KAAK,EAAE,6DAA6D;aACrE,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC;CAAA;AAtBD,8EAsBC;AAED,SAAsB,uBAAuB,CAC3C,cAAuB;;QAEvB,MAAM,MAAM,GAAG,IAAA,0BAAU,GAAE,CAAC;QAC5B,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAC/D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,gBAAgB,CACpC,CAAC;QACF,IAAI,WAAW,EAAE;YACf,eAAM,CAAC,GAAG,CAAC;gBACT,KAAK,EAAE,kDAAkD;aAC1D,CAAC,CAAC;YACH,OAAO;SACR;QAED,MAAM,GAAG,GAAG,MAAM,sBAAsB,CAAC,cAAc,CAAC,CAAC;QACzD,IAAI,CAAC,GAAG;YAAE,OAAO;QACjB,MAAM,GAAG,GAAG,IAAA,0CAAwB,GAAE,CAAC;QACvC,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,MAAM,wBAAwB,CAAC,CAAC;QAChD,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,IAAI,2BAA2B,EAAE;YAC/C,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACjB,CAAC,CAAC;IACL,CAAC;CAAA;AArBD,0DAqBC;AAED,SAAe,sBAAsB,CAAC,MAAe;;QACnD,OAAO,MAAM,CACX,2CAAa,UAAU,EAAC,CACzB;aACE,MAAM,CAAC;YACN;gBACE,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,mDAAmD;gBACtE,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,KAAK;wBACX,IAAI,EAAE,sBAAsB;qBAC7B;oBACD;wBACE,IAAI,EAAE,IAAI;qBACX;iBACF;gBACD,OAAO,EAAE,KAAY;aACtB;SACF,CAAC;aACD,IAAI,CAAC,CAAC,CAA4B,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC;IACjE,CAAC;CAAA"}
1
+ {"version":3,"file":"connect-to-nx-cloud.js","sourceRoot":"","sources":["../../../../../packages/nx/src/command-line/connect-to-nx-cloud.ts"],"names":[],"mappings":";;;;AAAA,4CAAyC;AACzC,8DAAoE;AACpE,iDAAyC;AACzC,2DAAqD;AAErD,SAAsB,iCAAiC,CAAC,IAEvD;;QACC,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;YAC1B,MAAM,MAAM,GAAG,IAAA,0BAAU,GAAE,CAAC;YAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;YACzD,MAAM,uBAAuB,GAC3B,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,0BAA0B,CAAC;YAC3E,IAAI,CAAC,uBAAuB;gBAAE,OAAO;YAErC,eAAM,CAAC,GAAG,CAAC;gBACT,KAAK,EAAE,6DAA6D;aACrE,CAAC,CAAC;YACH,MAAM,GAAG,GAAG,IAAA,0CAAwB,GAAE,CAAC;YACvC,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,IAAI,yBAAyB,EAAE;gBAC7C,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aACjB,CAAC,CAAC;YACH,eAAM,CAAC,OAAO,CAAC;gBACb,KAAK,EAAE,6DAA6D;aACrE,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC;CAAA;AAtBD,8EAsBC;AAED,SAAsB,uBAAuB,CAC3C,cAAuB;;QAEvB,MAAM,MAAM,GAAG,IAAA,0BAAU,GAAE,CAAC;QAC5B,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAC/D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,gBAAgB,CACpC,CAAC;QACF,IAAI,WAAW,EAAE;YACf,eAAM,CAAC,GAAG,CAAC;gBACT,KAAK,EAAE,kDAAkD;aAC1D,CAAC,CAAC;YACH,OAAO,KAAK,CAAC;SACd;QAED,MAAM,GAAG,GAAG,MAAM,sBAAsB,CAAC,cAAc,CAAC,CAAC;QACzD,IAAI,CAAC,GAAG;YAAE,OAAO,KAAK,CAAC;QACvB,MAAM,GAAG,GAAG,IAAA,0CAAwB,GAAE,CAAC;QACvC,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,MAAM,wBAAwB,CAAC,CAAC;QAChD,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,IAAI,2BAA2B,EAAE;YAC/C,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACjB,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AAtBD,0DAsBC;AAED,SAAe,sBAAsB,CAAC,MAAe;;QACnD,OAAO,MAAM,CACX,2CAAa,UAAU,EAAC,CACzB;aACE,MAAM,CAAC;YACN;gBACE,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,mDAAmD;gBACtE,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,KAAK;wBACX,IAAI,EAAE,sBAAsB;qBAC7B;oBACD;wBACE,IAAI,EAAE,IAAI;qBACX;iBACF;gBACD,OAAO,EAAE,KAAY;aACtB;SACF,CAAC;aACD,IAAI,CAAC,CAAC,CAA4B,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC;IACjE,CAAC;CAAA"}
@@ -15,6 +15,8 @@ const package_manager_1 = require("../utils/package-manager");
15
15
  const params_1 = require("../utils/params");
16
16
  const connect_to_nx_cloud_1 = require("./connect-to-nx-cloud");
17
17
  const output_1 = require("../utils/output");
18
+ const ab_testing_1 = require("nx/src/utils/ab-testing");
19
+ const versions_1 = require("../utils/versions");
18
20
  const execAsync = (0, util_1.promisify)(child_process_1.exec);
19
21
  function normalizeVersion(version) {
20
22
  const [semver, prereleaseTag] = version.split('-');
@@ -540,7 +542,13 @@ function generateMigrationsJsonAndUpdatePackageJson(root, opts) {
540
542
  try {
541
543
  if (['nx', '@nrwl/workspace'].includes(opts.targetPackage) &&
542
544
  (yield isMigratingToNewMajor(readNxVersion(originalPackageJson), opts.targetVersion))) {
543
- 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?');
545
+ const useCloud = yield (0, connect_to_nx_cloud_1.connectToNxCloudCommand)(ab_testing_1.messages.getPromptMessage('nxCloudMigration'));
546
+ yield (0, ab_testing_1.recordStat)({
547
+ command: 'migrate',
548
+ nxVersion: versions_1.nxVersion,
549
+ useCloud,
550
+ meta: ab_testing_1.messages.codeOfSelectedPromptMessage('nxCloudMigration'),
551
+ });
544
552
  originalPackageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(root, 'package.json'));
545
553
  }
546
554
  }
@@ -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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"}
@@ -5,6 +5,8 @@ const git_based_file_hasher_1 = require("./git-based-file-hasher");
5
5
  const workspace_root_1 = require("../utils/workspace-root");
6
6
  const node_based_file_hasher_1 = require("./node-based-file-hasher");
7
7
  const child_process_1 = require("child_process");
8
+ const fs_1 = require("fs");
9
+ const path_1 = require("path");
8
10
  function createFileHasher() {
9
11
  // special case for unit tests
10
12
  if (workspace_root_1.workspaceRoot === '/root') {
@@ -12,7 +14,13 @@ function createFileHasher() {
12
14
  }
13
15
  try {
14
16
  (0, child_process_1.execSync)('git rev-parse --is-inside-work-tree', { stdio: 'ignore' });
15
- return new git_based_file_hasher_1.GitBasedFileHasher();
17
+ // we don't use git based hasher when the repo uses git submodules
18
+ if (!(0, fs_1.existsSync)((0, path_1.join)(workspace_root_1.workspaceRoot, '.git', 'modules'))) {
19
+ return new git_based_file_hasher_1.GitBasedFileHasher();
20
+ }
21
+ else {
22
+ return new node_based_file_hasher_1.NodeBasedFileHasher();
23
+ }
16
24
  }
17
25
  catch (_a) {
18
26
  return new node_based_file_hasher_1.NodeBasedFileHasher();
@@ -1 +1 @@
1
- {"version":3,"file":"file-hasher.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/file-hasher.ts"],"names":[],"mappings":";;;AAAA,mEAA6D;AAC7D,4DAAwD;AACxD,qEAA+D;AAE/D,iDAAyC;AAEzC,SAAS,gBAAgB;IACvB,8BAA8B;IAC9B,IAAI,8BAAa,KAAK,OAAO,EAAE;QAC7B,OAAO,IAAI,4CAAmB,EAAE,CAAC;KAClC;IACD,IAAI;QACF,IAAA,wBAAQ,EAAC,qCAAqC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QACrE,OAAO,IAAI,0CAAkB,EAAE,CAAC;KACjC;IAAC,WAAM;QACN,OAAO,IAAI,4CAAmB,EAAE,CAAC;KAClC;AACH,CAAC;AAEY,QAAA,iBAAiB,GAAG,gBAAgB,EAAE,CAAC"}
1
+ {"version":3,"file":"file-hasher.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/file-hasher.ts"],"names":[],"mappings":";;;AAAA,mEAA6D;AAC7D,4DAAwD;AACxD,qEAA+D;AAE/D,iDAAyC;AACzC,2BAAgC;AAChC,+BAA4B;AAE5B,SAAS,gBAAgB;IACvB,8BAA8B;IAC9B,IAAI,8BAAa,KAAK,OAAO,EAAE;QAC7B,OAAO,IAAI,4CAAmB,EAAE,CAAC;KAClC;IACD,IAAI;QACF,IAAA,wBAAQ,EAAC,qCAAqC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QACrE,kEAAkE;QAClE,IAAI,CAAC,IAAA,eAAU,EAAC,IAAA,WAAI,EAAC,8BAAa,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,EAAE;YACvD,OAAO,IAAI,0CAAkB,EAAE,CAAC;SACjC;aAAM;YACL,OAAO,IAAI,4CAAmB,EAAE,CAAC;SAClC;KACF;IAAC,WAAM;QACN,OAAO,IAAI,4CAAmB,EAAE,CAAC;KAClC;AACH,CAAC;AAEY,QAAA,iBAAiB,GAAG,gBAAgB,EAAE,CAAC"}
@@ -83,7 +83,7 @@ function spawnProcess(command, args, cwd) {
83
83
  }
84
84
  function getStagedFiles(path) {
85
85
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
86
- const { stdout: staged } = yield spawnProcess('git', ['ls-files', '--recurse-submodules', '-s', '-z', '--exclude-standard', '.'], path);
86
+ const { stdout: staged } = yield spawnProcess('git', ['ls-files', '-s', '-z', '--exclude-standard', '.'], path);
87
87
  const res = new Map();
88
88
  for (const line of staged.split('\0')) {
89
89
  if (!line) {
@@ -98,36 +98,16 @@ function getStagedFiles(path) {
98
98
  }
99
99
  function getUnstagedFiles(path) {
100
100
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
101
- //this command will list all parent repo's modefied files
102
101
  const { stdout: unstaged } = yield spawnProcess('git', ['ls-files', '-m', '-z', '--exclude-standard', '.'], path);
103
- //and this command will only list nested submodules modefied files
104
- const { stdout: unstagedInSubModules } = yield spawnProcess('git', [
105
- 'submodule',
106
- 'foreach',
107
- '--recursive',
108
- '--quiet',
109
- 'git ls-files -m -z --exclude-standard .',
110
- ], path);
111
102
  const lines = unstaged.split('\0').filter((f) => !!f);
112
- const additionalLines = unstagedInSubModules.split('\0').filter((f) => !!f);
113
- return getGitHashForFiles([...lines, ...additionalLines], path);
103
+ return getGitHashForFiles(lines, path);
114
104
  });
115
105
  }
116
106
  function getUntrackedFiles(path) {
117
107
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
118
- //this command will list all parent repo's untracked files
119
108
  const { stdout: untracked } = yield spawnProcess('git', ['ls-files', '--other', '-z', '--exclude-standard', '.'], path);
120
- //and this command will only list nested submodules untracked files
121
- const { stdout: untrackedInSubModules } = yield spawnProcess('git', [
122
- 'submodule',
123
- 'foreach',
124
- '--recursive',
125
- '--quiet',
126
- 'git ls-files --other -z --exclude-standard .',
127
- ], path);
128
109
  const lines = untracked.split('\0').filter((f) => !!f);
129
- const additionalLines = untrackedInSubModules.split('\0').filter((f) => !!f);
130
- return getGitHashForFiles([...lines, ...additionalLines], path);
110
+ return getGitHashForFiles(lines, path);
131
111
  });
132
112
  }
133
113
  function getFileHashes(path) {
@@ -1 +1 @@
1
- {"version":3,"file":"git-hasher.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/git-hasher.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"git-hasher.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/git-hasher.ts"],"names":[],"mappings":"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"}
@@ -47,7 +47,7 @@ class NodeBasedFileHasher extends file_hasher_base_1.FileHasherBase {
47
47
  }
48
48
  try {
49
49
  const s = (0, fs_1.statSync)(absoluteChild);
50
- if (!s.isDirectory()) {
50
+ if (s.isFile()) {
51
51
  this.fileHashes.set((0, path_2.normalizePath)(relChild), this.hashFile(relChild));
52
52
  }
53
53
  else if (s.isDirectory() && recurse) {
@@ -1 +1 @@
1
- {"version":3,"file":"node-based-file-hasher.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/node-based-file-hasher.ts"],"names":[],"mappings":";;;;AAAA,4DAAwD;AACxD,2CAAyC;AAEzC,+BAAsC;AACtC,2BAAqE;AACrE,yDAAoD;AACpD,0DAAsD;AACtD,mCAA4B;AAC5B,wCAA8C;AAE9C,MAAa,mBAAoB,SAAQ,iCAAc;IAAvD;;QACE,iBAAY,GAAG,eAAe,EAAE,CAAC;IAqDnC,CAAC;IAnDO,IAAI;;YACR,wBAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACvC,IAAI,CAAC,KAAK,EAAE,CAAC;YAEb,IAAI,CAAC,aAAa,CAAC,8BAAa,EAAE,IAAI,CAAC,CAAC;YAExC,wBAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YACrC,wBAAW,CAAC,OAAO,CACjB,cAAc,EACd,oBAAoB,EACpB,kBAAkB,CACnB,CAAC;QACJ,CAAC;KAAA;IAEK,SAAS,CAAC,KAAe;;YAC7B,MAAM,CAAC,GAAG,IAAI,GAAG,EAAkB,CAAC;YACpC,KAAK,IAAI,CAAC,IAAI,KAAK,EAAE;gBACnB,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;aAC5B;YACD,OAAO,CAAC,CAAC;QACX,CAAC;KAAA;IAEO,aAAa,CACnB,eAAuB,EACvB,UAAmB,IAAI;QAEvB,MAAM,UAAU,GAAG,IAAA,eAAQ,EAAC,8BAAa,EAAE,eAAe,CAAC,CAAC;QAC5D,IAAI,UAAU,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACvD,OAAO;SACR;QACD,IAAI;YACF,IAAA,gBAAW,EAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACzC,MAAM,aAAa,GAAG,IAAA,WAAI,EAAC,eAAe,EAAE,CAAC,CAAC,CAAC;gBAC/C,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,8BAAa,EAAE,aAAa,CAAC,CAAC;gBACxD,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;oBACvC,OAAO;iBACR;gBACD,IAAI;oBACF,MAAM,CAAC,GAAG,IAAA,aAAQ,EAAC,aAAa,CAAC,CAAC;oBAClC,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE;wBACpB,IAAI,CAAC,UAAU,CAAC,GAAG,CACjB,IAAA,oBAAa,EAAC,QAAQ,CAAC,EACvB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CACxB,CAAC;qBACH;yBAAM,IAAI,CAAC,CAAC,WAAW,EAAE,IAAI,OAAO,EAAE;wBACrC,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;qBACzC;iBACF;gBAAC,WAAM,GAAE;YACZ,CAAC,CAAC,CAAC;SACJ;QAAC,WAAM,GAAE;IACZ,CAAC;CACF;AAtDD,kDAsDC;AAED,SAAS,eAAe;IACtB,MAAM,EAAE,GAAG,IAAA,gBAAM,GAAE,CAAC;IACpB,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,8BAAa,aAAa,CAAC,CAAC,CAAC;IAC1D,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,8BAAa,YAAY,CAAC,CAAC,CAAC;IACzD,EAAE,CAAC,GAAG,CAAC,IAAA,4BAAY,EAAA;;;;;KAKhB,CAAC,CAAC;IACL,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAY;IACtC,OAAO,IAAA,eAAU,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC7D,CAAC"}
1
+ {"version":3,"file":"node-based-file-hasher.js","sourceRoot":"","sources":["../../../../../packages/nx/src/hasher/node-based-file-hasher.ts"],"names":[],"mappings":";;;;AAAA,4DAAwD;AACxD,2CAAyC;AAEzC,+BAAsC;AACtC,2BAAqE;AACrE,yDAAoD;AACpD,0DAAsD;AACtD,mCAA4B;AAC5B,wCAA8C;AAE9C,MAAa,mBAAoB,SAAQ,iCAAc;IAAvD;;QACE,iBAAY,GAAG,eAAe,EAAE,CAAC;IAqDnC,CAAC;IAnDO,IAAI;;YACR,wBAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACvC,IAAI,CAAC,KAAK,EAAE,CAAC;YAEb,IAAI,CAAC,aAAa,CAAC,8BAAa,EAAE,IAAI,CAAC,CAAC;YAExC,wBAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YACrC,wBAAW,CAAC,OAAO,CACjB,cAAc,EACd,oBAAoB,EACpB,kBAAkB,CACnB,CAAC;QACJ,CAAC;KAAA;IAEK,SAAS,CAAC,KAAe;;YAC7B,MAAM,CAAC,GAAG,IAAI,GAAG,EAAkB,CAAC;YACpC,KAAK,IAAI,CAAC,IAAI,KAAK,EAAE;gBACnB,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;aAC5B;YACD,OAAO,CAAC,CAAC;QACX,CAAC;KAAA;IAEO,aAAa,CACnB,eAAuB,EACvB,UAAmB,IAAI;QAEvB,MAAM,UAAU,GAAG,IAAA,eAAQ,EAAC,8BAAa,EAAE,eAAe,CAAC,CAAC;QAC5D,IAAI,UAAU,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACvD,OAAO;SACR;QACD,IAAI;YACF,IAAA,gBAAW,EAAC,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACzC,MAAM,aAAa,GAAG,IAAA,WAAI,EAAC,eAAe,EAAE,CAAC,CAAC,CAAC;gBAC/C,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,8BAAa,EAAE,aAAa,CAAC,CAAC;gBACxD,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;oBACvC,OAAO;iBACR;gBACD,IAAI;oBACF,MAAM,CAAC,GAAG,IAAA,aAAQ,EAAC,aAAa,CAAC,CAAC;oBAClC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;wBACd,IAAI,CAAC,UAAU,CAAC,GAAG,CACjB,IAAA,oBAAa,EAAC,QAAQ,CAAC,EACvB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CACxB,CAAC;qBACH;yBAAM,IAAI,CAAC,CAAC,WAAW,EAAE,IAAI,OAAO,EAAE;wBACrC,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;qBACzC;iBACF;gBAAC,WAAM,GAAE;YACZ,CAAC,CAAC,CAAC;SACJ;QAAC,WAAM,GAAE;IACZ,CAAC;CACF;AAtDD,kDAsDC;AAED,SAAS,eAAe;IACtB,MAAM,EAAE,GAAG,IAAA,gBAAM,GAAE,CAAC;IACpB,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,8BAAa,aAAa,CAAC,CAAC,CAAC;IAC1D,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,GAAG,8BAAa,YAAY,CAAC,CAAC,CAAC;IACzD,EAAE,CAAC,GAAG,CAAC,IAAA,4BAAY,EAAA;;;;;KAKhB,CAAC,CAAC;IACL,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAY;IACtC,OAAO,IAAA,eAAU,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,iBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC7D,CAAC"}
@@ -139,6 +139,10 @@ class Cache {
139
139
  }
140
140
  copy(src, destination) {
141
141
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
142
+ // 'cp -a /path/dir/ dest/' operates differently to 'cp -a /path/dir dest/'
143
+ // --> which means actual build works but subsequent populate from cache (using cp -a) does not
144
+ // --> the fix is to remove trailing slashes to ensure consistent & expected behaviour
145
+ src = src.replace(/[\/\\]$/, '');
142
146
  if (this.useFsExtraToCopyAndRemove) {
143
147
  return (0, fs_extra_1.copy)(src, destination);
144
148
  }
@@ -1 +1 @@
1
- {"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/cache.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/cache.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,17 @@
1
+ export declare class PromptMessages {
2
+ private messages;
3
+ private selectedMessages;
4
+ getPromptMessage(key: string): string;
5
+ codeOfSelectedPromptMessage(key: string): string;
6
+ }
7
+ export declare const messages: PromptMessages;
8
+ /**
9
+ * We are incrementing a counter to track how often create-nx-workspace is used in CI
10
+ * vs dev environments. No personal information is collected.
11
+ */
12
+ export declare function recordStat(opts: {
13
+ command: string;
14
+ nxVersion: string;
15
+ useCloud: boolean;
16
+ meta: string;
17
+ }): Promise<void>;
@@ -0,0 +1,85 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.recordStat = exports.messages = exports.PromptMessages = void 0;
4
+ const tslib_1 = require("tslib");
5
+ const axios_1 = require("axios");
6
+ const is_ci_1 = require("./is-ci");
7
+ class PromptMessages {
8
+ constructor() {
9
+ this.messages = {
10
+ nxCloudCreation: [
11
+ {
12
+ code: 'set-up-distributed-caching-ci',
13
+ message: `Enable distributed caching to make your CI faster`,
14
+ },
15
+ ],
16
+ nxCloudMigration: [
17
+ {
18
+ code: 'we-noticed',
19
+ message: `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?`,
20
+ },
21
+ {
22
+ code: 'not-leveraging-caching',
23
+ message: `You're not leveraging distributed caching yet. Do you want to enable it and speed up your CI?`,
24
+ },
25
+ {
26
+ code: 'make-ci-faster',
27
+ message: `Enable distributed caching to make your CI faster?`,
28
+ },
29
+ ],
30
+ };
31
+ this.selectedMessages = {};
32
+ }
33
+ getPromptMessage(key) {
34
+ if (this.selectedMessages[key] === undefined) {
35
+ if (process.env.NX_GENERATE_DOCS_PROCESS === 'true') {
36
+ this.selectedMessages[key] = 0;
37
+ }
38
+ else {
39
+ this.selectedMessages[key] = Math.floor(Math.random() * this.messages[key].length);
40
+ }
41
+ }
42
+ return this.messages[key][this.selectedMessages[key]].message;
43
+ }
44
+ codeOfSelectedPromptMessage(key) {
45
+ if (this.selectedMessages[key] === undefined)
46
+ return null;
47
+ return this.messages[key][this.selectedMessages[key]].code;
48
+ }
49
+ }
50
+ exports.PromptMessages = PromptMessages;
51
+ exports.messages = new PromptMessages();
52
+ /**
53
+ * We are incrementing a counter to track how often create-nx-workspace is used in CI
54
+ * vs dev environments. No personal information is collected.
55
+ */
56
+ function recordStat(opts) {
57
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
58
+ try {
59
+ const major = Number(opts.nxVersion.split('.')[0]);
60
+ if (process.env.NX_VERBOSE_LOGGING === 'true') {
61
+ console.log(`Record stat. Major: ${major}`);
62
+ }
63
+ if (major < 10 || major > 14)
64
+ return; // test version, skip it
65
+ yield axios_1.default
66
+ .create({
67
+ baseURL: 'https://cloud.nx.app',
68
+ timeout: 400,
69
+ })
70
+ .post('/nx-cloud/stats', {
71
+ command: opts.command,
72
+ isCI: (0, is_ci_1.isCI)(),
73
+ useCloud: opts.useCloud,
74
+ meta: opts.meta,
75
+ });
76
+ }
77
+ catch (e) {
78
+ if (process.env.NX_VERBOSE_LOGGING === 'true') {
79
+ console.error(e);
80
+ }
81
+ }
82
+ });
83
+ }
84
+ exports.recordStat = recordStat;
85
+ //# sourceMappingURL=ab-testing.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ab-testing.js","sourceRoot":"","sources":["../../../../../packages/nx/src/utils/ab-testing.ts"],"names":[],"mappings":";;;;AAAA,iCAA0B;AAC1B,mCAA+B;AAE/B,MAAa,cAAc;IAA3B;QACU,aAAQ,GAAG;YACjB,eAAe,EAAE;gBACf;oBACE,IAAI,EAAE,+BAA+B;oBACrC,OAAO,EAAE,mDAAmD;iBAC7D;aACF;YACD,gBAAgB,EAAE;gBAChB;oBACE,IAAI,EAAE,YAAY;oBAClB,OAAO,EAAE,6MAA6M;iBACvN;gBACD;oBACE,IAAI,EAAE,wBAAwB;oBAC9B,OAAO,EAAE,+FAA+F;iBACzG;gBACD;oBACE,IAAI,EAAE,gBAAgB;oBACtB,OAAO,EAAE,oDAAoD;iBAC9D;aACF;SACF,CAAC;QAEM,qBAAgB,GAAG,EAAE,CAAC;IAmBhC,CAAC;IAjBC,gBAAgB,CAAC,GAAW;QAC1B,IAAI,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE;YAC5C,IAAI,OAAO,CAAC,GAAG,CAAC,wBAAwB,KAAK,MAAM,EAAE;gBACnD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;aAChC;iBAAM;gBACL,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CACrC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,CAC1C,CAAC;aACH;SACF;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC;IAChE,CAAC;IAED,2BAA2B,CAAC,GAAW;QACrC,IAAI,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QAC1D,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;IAC7D,CAAC;CACF;AA3CD,wCA2CC;AAEY,QAAA,QAAQ,GAAG,IAAI,cAAc,EAAE,CAAC;AAE7C;;;GAGG;AACH,SAAsB,UAAU,CAAC,IAKhC;;QACC,IAAI;YACF,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACnD,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,MAAM,EAAE;gBAC7C,OAAO,CAAC,GAAG,CAAC,uBAAuB,KAAK,EAAE,CAAC,CAAC;aAC7C;YACD,IAAI,KAAK,GAAG,EAAE,IAAI,KAAK,GAAG,EAAE;gBAAE,OAAO,CAAC,wBAAwB;YAC9D,MAAM,eAAK;iBACR,MAAM,CAAC;gBACN,OAAO,EAAE,sBAAsB;gBAC/B,OAAO,EAAE,GAAG;aACb,CAAC;iBACD,IAAI,CAAC,iBAAiB,EAAE;gBACvB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,IAAI,EAAE,IAAA,YAAI,GAAE;gBACZ,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,IAAI,EAAE,IAAI,CAAC,IAAI;aAChB,CAAC,CAAC;SACN;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,MAAM,EAAE;gBAC7C,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aAClB;SACF;IACH,CAAC;CAAA;AA5BD,gCA4BC"}