@nrwl/workspace 13.9.3 → 13.10.0-beta.1
Sign up to get free protection for your applications and to get access to all the features.
- package/generators.json +0 -14
- package/index.js +1 -1
- package/index.js.map +1 -1
- package/package.json +5 -5
- package/src/command-line/affected.js +1 -1
- package/src/command-line/connect-to-nx-cloud.js +3 -3
- package/src/command-line/daemon.js +1 -1
- package/src/command-line/dep-graph.js +5 -5
- package/src/command-line/format.js +3 -3
- package/src/command-line/lint.js +1 -1
- package/src/command-line/list.js +1 -1
- package/src/command-line/nx-commands.js +20 -20
- package/src/command-line/nx-commands.js.map +1 -1
- package/src/command-line/print-affected.js +2 -2
- package/src/command-line/run-many.js +1 -1
- package/src/command-line/run-one.js +1 -1
- package/src/command-line/workspace-generators.js +1 -1
- package/src/core/affected-project-graph/index.js +2 -2
- package/src/core/affected-project-graph/index.js.map +1 -1
- package/src/core/hasher/file-hasher-base.js +1 -1
- package/src/core/hasher/git-based-file-hasher.js +2 -2
- package/src/core/hasher/git-hasher.js +15 -15
- package/src/core/hasher/git-hasher.js.map +1 -1
- package/src/core/hasher/hasher.d.ts +8 -3
- package/src/core/hasher/hasher.js +21 -17
- package/src/core/hasher/hasher.js.map +1 -1
- package/src/core/hasher/node-based-file-hasher.js +2 -2
- package/src/core/project-graph/build-dependencies/index.js +3 -3
- package/src/core/project-graph/build-dependencies/index.js.map +1 -1
- package/src/core/project-graph/build-nodes/index.js +2 -2
- package/src/core/project-graph/build-nodes/index.js.map +1 -1
- package/src/core/project-graph/build-project-graph.js +3 -3
- package/src/core/project-graph/daemon/cache.js +3 -3
- package/src/core/project-graph/daemon/client/client.js +4 -4
- package/src/core/project-graph/daemon/client/exec-is-server-available.js +1 -1
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js +6 -6
- package/src/core/project-graph/daemon/server/server.js +7 -7
- package/src/core/project-graph/daemon/server/shutdown-utils.js +1 -1
- package/src/core/project-graph/daemon/server/start.js +1 -1
- package/src/core/project-graph/daemon/server/stop.js +1 -1
- package/src/core/project-graph/daemon/server/watcher.js +1 -1
- package/src/core/project-graph/index.js +2 -2
- package/src/core/project-graph/index.js.map +1 -1
- package/src/core/project-graph/project-graph.js +3 -3
- package/src/core/project-graph/project-graph.js.map +1 -1
- package/src/executors/counter/counter.impl.js +7 -7
- package/src/executors/counter/counter.impl.js.map +1 -1
- package/src/executors/run-commands/run-commands.impl.js +4 -4
- package/src/executors/run-script/run-script.impl.js +1 -1
- package/src/generators/convert-to-nx-project/convert-to-nx-project.js +2 -2
- package/src/generators/library/library.js +2 -2
- package/src/generators/move/move.js +1 -1
- package/src/generators/new/new.js +3 -3
- package/src/generators/npm-package/npm-package.js +1 -1
- package/src/generators/preset/preset.js +2 -2
- package/src/generators/remove/lib/check-dependencies.js +1 -1
- package/src/generators/remove/remove.js +1 -1
- package/src/generators/run-commands/run-commands.js +1 -1
- package/src/generators/workspace/workspace.js +1 -1
- package/src/generators/workspace-generator/workspace-generator.js +1 -1
- package/src/init/init.js +1 -1
- package/src/migrations/update-12-5-0/add-target-dependencies.js +1 -1
- package/src/migrations/update-13-0-0/config-locations/config-locations.js +1 -1
- package/src/migrations/update-13-0-0/set-default-base-if-not-set.js +1 -1
- package/src/migrations/update-13-2-0/set-parallel-default.js +1 -1
- package/src/migrations/update-13-3-0/update-tsc-executor-location.js +1 -1
- package/src/tasks-runner/batch/run-batch.js +2 -2
- package/src/tasks-runner/cache.js +17 -17
- package/src/tasks-runner/cache.js.map +1 -1
- package/src/tasks-runner/default-tasks-runner.js +2 -2
- package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js +1 -1
- package/src/tasks-runner/life-cycles/dynamic-run-one-terminal-output-life-cycle.js +1 -1
- package/src/tasks-runner/run-command.js +5 -5
- package/src/tasks-runner/run-command.js.map +1 -1
- package/src/tasks-runner/task-orchestrator.js +11 -11
- package/src/tasks-runner/tasks-schedule.js +3 -3
- package/src/utilities/assets.js +1 -1
- package/src/utilities/plugins/community-plugins.js +1 -1
- package/src/utilities/prettier.js +1 -1
- package/src/utilities/run-tasks-in-serial.js +1 -1
- package/src/utilities/typescript/compilation.d.ts +1 -1
- package/src/utilities/typescript/compilation.js +1 -1
- package/src/utilities/typescript/compilation.js.map +1 -1
- package/src/utilities/typescript.d.ts +3 -2
- package/src/utilities/typescript.js.map +1 -1
- package/src/utils/lint.js +1 -1
- package/src/utils/lint.js.map +1 -1
- package/src/utils/rules/format-files.js +1 -1
- package/src/utils/rules/rename-package-imports.js +1 -1
- package/src/utils/runtime-lint-utils.js +4 -1
- package/src/utils/runtime-lint-utils.js.map +1 -1
- package/src/utils/testing-utils.js +3 -3
- package/src/utils/testing.js +2 -2
- package/src/utils/version-utils.js +1 -1
- package/src/utils/version-utils.js.map +1 -1
- package/src/utils/versions.d.ts +2 -2
- package/src/utils/versions.js +3 -3
- package/src/utils/workspace.js +6 -6
- package/src/generators/init/files/prettier/__dot__prettierignore +0 -1
- package/src/generators/init/files/root/karma.conf.js__tmpl__ +0 -43
- package/src/generators/init/files/root/tools/schematics/__dot__gitkeep +0 -0
- package/src/generators/init/files/root/tools/tsconfig.tools.json__tmpl__ +0 -12
- package/src/generators/init/init.d.ts +0 -5
- package/src/generators/init/init.js +0 -650
- package/src/generators/init/init.js.map +0 -1
- package/src/generators/init/schema.d.ts +0 -7
- package/src/generators/init/schema.json +0 -35
@@ -8,7 +8,7 @@ const yargsParser = require("yargs-parser");
|
|
8
8
|
const npm_run_path_1 = require("npm-run-path");
|
9
9
|
exports.LARGE_BUFFER = 1024 * 1000000;
|
10
10
|
function loadEnvVars(path) {
|
11
|
-
return
|
11
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
12
12
|
if (path) {
|
13
13
|
const result = (yield Promise.resolve().then(() => require('dotenv'))).config({ path });
|
14
14
|
if (result.error) {
|
@@ -35,7 +35,7 @@ const propKeys = [
|
|
35
35
|
'outputPath',
|
36
36
|
];
|
37
37
|
function default_1(options, context) {
|
38
|
-
return
|
38
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
39
39
|
yield loadEnvVars(options.envFile);
|
40
40
|
const normalized = normalizeOptions(options);
|
41
41
|
if (options.readyWhen && !options.parallel) {
|
@@ -57,7 +57,7 @@ function default_1(options, context) {
|
|
57
57
|
}
|
58
58
|
exports.default = default_1;
|
59
59
|
function runInParallel(options, context) {
|
60
|
-
return
|
60
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
61
61
|
const procs = options.commands.map((c) => createProcess(c.command, options.readyWhen, options.color, calculateCwd(options.cwd, context)).then((result) => ({
|
62
62
|
result,
|
63
63
|
command: c.command,
|
@@ -103,7 +103,7 @@ function normalizeOptions(options) {
|
|
103
103
|
return options;
|
104
104
|
}
|
105
105
|
function runSerially(options, context) {
|
106
|
-
return
|
106
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
107
107
|
for (const c of options.commands) {
|
108
108
|
createSyncProcess(c.command, options.color, calculateCwd(options.cwd, context));
|
109
109
|
}
|
@@ -5,7 +5,7 @@ const child_process_1 = require("child_process");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
6
6
|
const path = require("path");
|
7
7
|
function default_1(options, context) {
|
8
|
-
return
|
8
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
9
9
|
const pm = (0, devkit_1.getPackageManagerCommand)();
|
10
10
|
const script = options.script;
|
11
11
|
delete options.script;
|
@@ -8,7 +8,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
8
8
|
const get_project_configuration_path_1 = require("./utils/get-project-configuration-path");
|
9
9
|
exports.SCHEMA_OPTIONS_ARE_MUTUALLY_EXCLUSIVE = '--project and --all are mutually exclusive';
|
10
10
|
function validateSchema(schema) {
|
11
|
-
return
|
11
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
12
12
|
if (schema.project && schema.all) {
|
13
13
|
throw exports.SCHEMA_OPTIONS_ARE_MUTUALLY_EXCLUSIVE;
|
14
14
|
}
|
@@ -25,7 +25,7 @@ function validateSchema(schema) {
|
|
25
25
|
}
|
26
26
|
exports.validateSchema = validateSchema;
|
27
27
|
function convertToNxProjectGenerator(host, schema) {
|
28
|
-
return
|
28
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
29
29
|
const workspace = (0, devkit_1.readWorkspaceConfiguration)(host);
|
30
30
|
if (workspace.version < 2) {
|
31
31
|
devkit_1.logger.error(`
|
@@ -93,7 +93,7 @@ function createFiles(tree, options) {
|
|
93
93
|
updateTsConfig(tree, options);
|
94
94
|
}
|
95
95
|
function addJest(tree, options) {
|
96
|
-
return
|
96
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
97
97
|
return yield jestProjectGenerator(tree, {
|
98
98
|
project: options.name,
|
99
99
|
setupFile: 'none',
|
@@ -106,7 +106,7 @@ function addJest(tree, options) {
|
|
106
106
|
});
|
107
107
|
}
|
108
108
|
function libraryGenerator(tree, schema) {
|
109
|
-
return
|
109
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
110
110
|
const options = normalizeOptions(tree, schema);
|
111
111
|
createFiles(tree, options);
|
112
112
|
if (!options.skipTsConfig) {
|
@@ -19,7 +19,7 @@ const update_readme_1 = require("./lib/update-readme");
|
|
19
19
|
const update_package_json_1 = require("./lib/update-package-json");
|
20
20
|
const normalize_schema_1 = require("./lib/normalize-schema");
|
21
21
|
function moveGenerator(tree, rawSchema) {
|
22
|
-
return
|
22
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
23
23
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, rawSchema.projectName);
|
24
24
|
(0, check_destination_1.checkDestination)(tree, rawSchema, projectConfig);
|
25
25
|
const schema = (0, normalize_schema_1.normalizeSchema)(tree, rawSchema, projectConfig);
|
@@ -77,7 +77,7 @@ function generatePreset(host, opts) {
|
|
77
77
|
}
|
78
78
|
}
|
79
79
|
function initializeGitRepo(host, rootDirectory, options) {
|
80
|
-
return
|
80
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
81
81
|
const execute = (args, ignoreErrorStream = false) => {
|
82
82
|
const outputStream = 'ignore';
|
83
83
|
const errorStream = ignoreErrorStream ? 'ignore' : process.stderr;
|
@@ -134,7 +134,7 @@ function initializeGitRepo(host, rootDirectory, options) {
|
|
134
134
|
});
|
135
135
|
}
|
136
136
|
function newGenerator(host, options) {
|
137
|
-
return
|
137
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
138
138
|
if (options.skipInstall &&
|
139
139
|
options.preset !== presets_1.Preset.Apps &&
|
140
140
|
options.preset !== presets_1.Preset.Core &&
|
@@ -160,7 +160,7 @@ function newGenerator(host, options) {
|
|
160
160
|
addPresetDependencies(host, options);
|
161
161
|
addCloudDependencies(host, options);
|
162
162
|
yield (0, devkit_1.formatFiles)(host);
|
163
|
-
return () =>
|
163
|
+
return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
164
164
|
(0, devkit_1.installPackagesTask)(host, false, options.directory, options.packageManager);
|
165
165
|
yield generatePreset(host, options);
|
166
166
|
if (!options.skipGit) {
|
@@ -20,7 +20,7 @@ function addFiles(projectRoot, tree, npmScope, options) {
|
|
20
20
|
(0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files'), projectRoot, {});
|
21
21
|
}
|
22
22
|
function npmPackageGenerator(tree, options) {
|
23
|
-
return
|
23
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
24
24
|
options = normalizeOptions(options);
|
25
25
|
const { libsDir, npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
|
26
26
|
const workspaceFile = (0, devkit_1.getWorkspacePath)(tree);
|
@@ -9,7 +9,7 @@ const insert_statement_1 = require("../utils/insert-statement");
|
|
9
9
|
const presets_1 = require("../utils/presets");
|
10
10
|
const path_1 = require("path");
|
11
11
|
function presetGenerator(tree, options) {
|
12
|
-
return
|
12
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
13
13
|
options = normalizeOptions(options);
|
14
14
|
yield createPreset(tree, options);
|
15
15
|
yield (0, devkit_1.formatFiles)(tree);
|
@@ -22,7 +22,7 @@ exports.presetGenerator = presetGenerator;
|
|
22
22
|
exports.presetSchematic = (0, devkit_1.convertNxGenerator)(presetGenerator);
|
23
23
|
exports.default = presetGenerator;
|
24
24
|
function createPreset(tree, options) {
|
25
|
-
return
|
25
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
26
26
|
if (options.preset === presets_1.Preset.Empty ||
|
27
27
|
options.preset === presets_1.Preset.Apps ||
|
28
28
|
options.preset === presets_1.Preset.TS) {
|
@@ -9,7 +9,7 @@ const project_graph_1 = require("../../../core/project-graph");
|
|
9
9
|
* Throws an error if the project is in use, unless the `--forceRemove` option is used.
|
10
10
|
*/
|
11
11
|
function checkDependencies(_, schema) {
|
12
|
-
return
|
12
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
13
13
|
if (schema.forceRemove) {
|
14
14
|
return;
|
15
15
|
}
|
@@ -10,7 +10,7 @@ const update_tsconfig_1 = require("./lib/update-tsconfig");
|
|
10
10
|
const remove_project_config_1 = require("./lib/remove-project-config");
|
11
11
|
const update_jest_config_1 = require("./lib/update-jest-config");
|
12
12
|
function removeGenerator(tree, schema) {
|
13
|
-
return
|
13
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
14
14
|
const project = (0, devkit_1.readProjectConfiguration)(tree, schema.projectName);
|
15
15
|
yield (0, check_dependencies_1.checkDependencies)(tree, schema);
|
16
16
|
(0, check_targets_1.checkTargets)(tree, schema, project);
|
@@ -4,7 +4,7 @@ exports.runCommandsSchematic = exports.runCommandsGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
6
6
|
function runCommandsGenerator(host, schema) {
|
7
|
-
return
|
7
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
8
8
|
const project = (0, devkit_1.readProjectConfiguration)(host, schema.project);
|
9
9
|
project.targets = project.targets || {};
|
10
10
|
project.targets[schema.name] = {
|
@@ -93,7 +93,7 @@ function addNpmScripts(host, options) {
|
|
93
93
|
}
|
94
94
|
}
|
95
95
|
function workspaceGenerator(host, options) {
|
96
|
-
return
|
96
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
97
97
|
if (!options.name) {
|
98
98
|
throw new Error(`Invalid options, "name" is required.`);
|
99
99
|
}
|
@@ -4,7 +4,7 @@ const tslib_1 = require("tslib");
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
5
5
|
const versions_1 = require("../../utils/versions");
|
6
6
|
function default_1(host, schema) {
|
7
|
-
return
|
7
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
8
8
|
const options = normalizeOptions(schema);
|
9
9
|
(0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, 'files'), (0, devkit_1.joinPathFragments)('tools/generators', schema.name), options);
|
10
10
|
const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
package/src/init/init.js
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
const tslib_1 = require("tslib");
|
4
4
|
const project_graph_1 = require("../core/project-graph/project-graph");
|
5
|
-
(() =>
|
5
|
+
(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
6
6
|
try {
|
7
7
|
yield (0, project_graph_1.createProjectGraphAsync)();
|
8
8
|
}
|
@@ -6,7 +6,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const output_1 = require("../../utilities/output");
|
7
7
|
function setTargetDependencies(host) {
|
8
8
|
var _a, _b, _c, _d, _e, _f, _g;
|
9
|
-
return
|
9
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
10
10
|
const config = (0, devkit_1.readWorkspaceConfiguration)(host);
|
11
11
|
const strictlyOrderedTargets = ((_c = (_b = (_a = config.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a['default']) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.strictlyOrderedTargets) || ['build'];
|
12
12
|
(_f = (_e = (_d = config.tasksRunnerOptions) === null || _d === void 0 ? void 0 : _d['default']) === null || _e === void 0 ? void 0 : _e.options) === null || _f === void 0 ? true : delete _f.strictlyOrderedTargets;
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
5
5
|
function update(host) {
|
6
|
-
return
|
6
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
7
7
|
const nxJson = (0, devkit_1.readJson)(host, 'nx.json');
|
8
8
|
// updateProjectConfiguration automatically saves the project opts into workspace/project.json
|
9
9
|
if (nxJson.projects) {
|
@@ -7,7 +7,7 @@ const output_1 = require("../../utilities/output");
|
|
7
7
|
function setDefaultBaseIfNotSet(host) {
|
8
8
|
var _a, _b, _c;
|
9
9
|
var _d;
|
10
|
-
return
|
10
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
11
11
|
const config = (0, devkit_1.readWorkspaceConfiguration)(host);
|
12
12
|
if (!((_a = config.affected) === null || _a === void 0 ? void 0 : _a.defaultBase)) {
|
13
13
|
(_b = config.affected) !== null && _b !== void 0 ? _b : (config.affected = {});
|
@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
6
6
|
function setParallelDefault(host) {
|
7
7
|
var _a, _b;
|
8
|
-
return
|
8
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
9
9
|
const config = (0, devkit_1.readWorkspaceConfiguration)(host);
|
10
10
|
const defaultTaskRunnerOptions = (_b = (_a = config.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a['default']) === null || _b === void 0 ? void 0 : _b.options;
|
11
11
|
if (defaultTaskRunnerOptions) {
|
@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
6
6
|
const versions_1 = require("../../utils/versions");
|
7
7
|
function updateTscExecutorLocation(host) {
|
8
|
-
return
|
8
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
9
9
|
const projects = (0, devkit_1.getProjects)(host);
|
10
10
|
let used = false;
|
11
11
|
for (const [project, projectConfig] of projects.entries()) {
|
@@ -11,7 +11,7 @@ function getBatchExecutor(executorName) {
|
|
11
11
|
return workspace.readExecutor(nodeModule, exportName);
|
12
12
|
}
|
13
13
|
function runTasks(executorName, taskGraph) {
|
14
|
-
return
|
14
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
15
15
|
const input = {};
|
16
16
|
const workspace = new workspace_1.Workspaces(app_root_1.appRootPath);
|
17
17
|
const workspaceConfig = workspace.readWorkspaceConfiguration();
|
@@ -42,7 +42,7 @@ function runTasks(executorName, taskGraph) {
|
|
42
42
|
}
|
43
43
|
});
|
44
44
|
}
|
45
|
-
process.on('message', (message) =>
|
45
|
+
process.on('message', (message) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
46
46
|
switch (message.type) {
|
47
47
|
case batch_messages_1.BatchMessageType.Tasks: {
|
48
48
|
const results = yield runTasks(message.executorName, message.taskGraph);
|
@@ -39,7 +39,7 @@ class Cache {
|
|
39
39
|
}
|
40
40
|
}
|
41
41
|
get(task) {
|
42
|
-
return
|
42
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
43
43
|
const res = yield this.getFromLocalDir(task);
|
44
44
|
if (res) {
|
45
45
|
return Object.assign(Object.assign({}, res), { remote: false });
|
@@ -58,8 +58,8 @@ class Cache {
|
|
58
58
|
});
|
59
59
|
}
|
60
60
|
put(task, terminalOutput, outputs, code) {
|
61
|
-
return
|
62
|
-
return this.tryAndRetry(() =>
|
61
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
62
|
+
return this.tryAndRetry(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
63
63
|
const td = (0, path_1.join)(this.cachePath, task.hash);
|
64
64
|
const tdCommit = (0, path_1.join)(this.cachePath, `${task.hash}.commit`);
|
65
65
|
// might be left overs from partially-completed cache invocations
|
@@ -68,7 +68,7 @@ class Cache {
|
|
68
68
|
yield (0, fs_extra_1.mkdir)(td);
|
69
69
|
yield (0, fs_extra_1.writeFile)((0, path_1.join)(td, 'terminalOutput'), terminalOutput !== null && terminalOutput !== void 0 ? terminalOutput : 'no terminal output');
|
70
70
|
yield (0, fs_extra_1.mkdir)((0, path_1.join)(td, 'outputs'));
|
71
|
-
yield Promise.all(outputs.map((f) =>
|
71
|
+
yield Promise.all(outputs.map((f) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
72
72
|
const src = (0, path_1.join)(this.root, f);
|
73
73
|
if (yield (0, fs_extra_1.pathExists)(src)) {
|
74
74
|
const cached = (0, path_1.join)(td, 'outputs', f);
|
@@ -96,10 +96,10 @@ class Cache {
|
|
96
96
|
});
|
97
97
|
}
|
98
98
|
copyFilesFromCache(hash, cachedResult, outputs) {
|
99
|
-
return
|
100
|
-
return this.tryAndRetry(() =>
|
99
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
100
|
+
return this.tryAndRetry(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
101
101
|
yield this.removeRecordedOutputsHashes(outputs);
|
102
|
-
yield Promise.all(outputs.map((f) =>
|
102
|
+
yield Promise.all(outputs.map((f) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
103
103
|
const cached = (0, path_1.join)(cachedResult.outputsPath, f);
|
104
104
|
if (yield (0, fs_extra_1.pathExists)(cached)) {
|
105
105
|
const isFile = (yield (0, fs_extra_1.lstat)(cached)).isFile();
|
@@ -119,7 +119,7 @@ class Cache {
|
|
119
119
|
return (0, path_1.join)(this.terminalOutputsDir, task.hash);
|
120
120
|
}
|
121
121
|
removeRecordedOutputsHashes(outputs) {
|
122
|
-
return
|
122
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
123
123
|
for (const output of outputs) {
|
124
124
|
const hashFile = this.getFileNameWithLatestRecordedHashForOutput(output);
|
125
125
|
try {
|
@@ -130,7 +130,7 @@ class Cache {
|
|
130
130
|
});
|
131
131
|
}
|
132
132
|
shouldCopyOutputsFromCache(taskWithCachedResult, outputs) {
|
133
|
-
return
|
133
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
134
134
|
return ((yield this.areLatestOutputsHashesDifferentThanTaskHash(outputs, taskWithCachedResult.task.hash)) ||
|
135
135
|
(yield this.isAnyOutputMissing(taskWithCachedResult.cachedResult, outputs)));
|
136
136
|
});
|
@@ -140,7 +140,7 @@ class Cache {
|
|
140
140
|
return (0, fs_extra_1.copy)(src, directory);
|
141
141
|
}
|
142
142
|
return new Promise((res, rej) => {
|
143
|
-
(0, child_process_1.
|
143
|
+
(0, child_process_1.execFile)('cp', ['-a', src, (0, path_1.dirname)(directory)], (error) => {
|
144
144
|
if (!error) {
|
145
145
|
res();
|
146
146
|
}
|
@@ -156,7 +156,7 @@ class Cache {
|
|
156
156
|
return (0, fs_extra_1.remove)(folder);
|
157
157
|
}
|
158
158
|
return new Promise((res, rej) => {
|
159
|
-
(0, child_process_1.
|
159
|
+
(0, child_process_1.execFile)('rm', ['-rf', folder], (error) => {
|
160
160
|
if (!error) {
|
161
161
|
res();
|
162
162
|
}
|
@@ -168,7 +168,7 @@ class Cache {
|
|
168
168
|
});
|
169
169
|
}
|
170
170
|
recordOutputsHash(outputs, hash) {
|
171
|
-
return
|
171
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
172
172
|
for (const output of outputs) {
|
173
173
|
const hashFile = this.getFileNameWithLatestRecordedHashForOutput(output);
|
174
174
|
try {
|
@@ -180,7 +180,7 @@ class Cache {
|
|
180
180
|
});
|
181
181
|
}
|
182
182
|
areLatestOutputsHashesDifferentThanTaskHash(outputs, hash) {
|
183
|
-
return
|
183
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
184
184
|
for (let output of outputs) {
|
185
185
|
if ((yield this.getLatestRecordedHashForTask(output)) !== hash)
|
186
186
|
return true;
|
@@ -189,7 +189,7 @@ class Cache {
|
|
189
189
|
});
|
190
190
|
}
|
191
191
|
getLatestRecordedHashForTask(output) {
|
192
|
-
return
|
192
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
193
193
|
try {
|
194
194
|
return yield (0, fs_extra_1.readFile)(this.getFileNameWithLatestRecordedHashForOutput(output), 'utf-8');
|
195
195
|
}
|
@@ -199,7 +199,7 @@ class Cache {
|
|
199
199
|
});
|
200
200
|
}
|
201
201
|
isAnyOutputMissing(cachedResult, outputs) {
|
202
|
-
return
|
202
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
203
203
|
for (let output of outputs) {
|
204
204
|
const cacheOutputPath = (0, path_1.join)(cachedResult.outputsPath, output);
|
205
205
|
const rootOutputPath = (0, path_1.join)(this.root, output);
|
@@ -225,7 +225,7 @@ class Cache {
|
|
225
225
|
return (0, path_1.join)(this.latestOutputsHashesDir, `${output.split(path_1.sep).join('-')}.hash`);
|
226
226
|
}
|
227
227
|
getFromLocalDir(task) {
|
228
|
-
return
|
228
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
229
229
|
const tdCommit = (0, path_1.join)(this.cachePath, `${task.hash}.commit`);
|
230
230
|
const td = (0, path_1.join)(this.cachePath, task.hash);
|
231
231
|
if (yield (0, fs_extra_1.pathExists)(tdCommit)) {
|
@@ -263,7 +263,7 @@ class Cache {
|
|
263
263
|
tryAndRetry(fn) {
|
264
264
|
let attempts = 0;
|
265
265
|
const baseTimeout = 100;
|
266
|
-
const _try = () =>
|
266
|
+
const _try = () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
267
267
|
try {
|
268
268
|
attempts++;
|
269
269
|
return yield fn();
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/cache.ts"],"names":[],"mappings":";;;;AAAA,oDAAoD;AAEpD,uCAWkB;AAClB,+BAAmD;AAEnD,
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/cache.ts"],"names":[],"mappings":"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"}
|
@@ -6,7 +6,7 @@ const task_orchestrator_1 = require("./task-orchestrator");
|
|
6
6
|
const perf_hooks_1 = require("perf_hooks");
|
7
7
|
const task_graph_creator_1 = require("./task-graph-creator");
|
8
8
|
const hasher_1 = require("../core/hasher/hasher");
|
9
|
-
const defaultTasksRunner = (tasks, options, context) =>
|
9
|
+
const defaultTasksRunner = (tasks, options, context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
10
10
|
if (options['parallel'] === 'false' ||
|
11
11
|
options['parallel'] === false) {
|
12
12
|
options['parallel'] = 1;
|
@@ -32,7 +32,7 @@ const defaultTasksRunner = (tasks, options, context) => (0, tslib_1.__awaiter)(v
|
|
32
32
|
exports.defaultTasksRunner = defaultTasksRunner;
|
33
33
|
function runAllTasks(tasks, options, context) {
|
34
34
|
var _a;
|
35
|
-
return
|
35
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
36
36
|
const defaultTargetDependencies = (_a = context.nxJson.targetDependencies) !== null && _a !== void 0 ? _a : {};
|
37
37
|
const taskGraphCreator = new task_graph_creator_1.TaskGraphCreator(context.projectGraph, defaultTargetDependencies);
|
38
38
|
const taskGraph = taskGraphCreator.createTaskGraph(tasks);
|
@@ -19,7 +19,7 @@ const pretty_time_1 = require("./pretty-time");
|
|
19
19
|
* is much more consistently readable across different terminal color themes.
|
20
20
|
*/
|
21
21
|
function createRunManyDynamicOutputRenderer({ projectNames, tasks, args, overrides, }) {
|
22
|
-
return
|
22
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
23
23
|
cliCursor.hide();
|
24
24
|
let resolveRenderIsDonePromise;
|
25
25
|
const renderIsDone = new Promise((resolve) => (resolveRenderIsDonePromise = resolve)).then(() => {
|
@@ -19,7 +19,7 @@ const pretty_time_1 = require("./pretty-time");
|
|
19
19
|
* is much more consistently readable across different terminal color themes.
|
20
20
|
*/
|
21
21
|
function createRunOneDynamicOutputRenderer({ initiatingProject, tasks, args, overrides, }) {
|
22
|
-
return
|
22
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
23
23
|
cliCursor.hide();
|
24
24
|
let resolveRenderIsDonePromise;
|
25
25
|
const renderIsDone = new Promise((resolve) => (resolveRenderIsDonePromise = resolve)).then(() => {
|
@@ -20,7 +20,7 @@ const task_profiling_life_cycle_1 = require("./life-cycles/task-profiling-life-c
|
|
20
20
|
const is_ci_1 = require("../utilities/is_ci");
|
21
21
|
const dynamic_run_one_terminal_output_life_cycle_1 = require("./life-cycles/dynamic-run-one-terminal-output-life-cycle");
|
22
22
|
function getTerminalOutputLifeCycle(initiatingProject, terminalOutputStrategy, projectNames, tasks, nxArgs, overrides, runnerOptions) {
|
23
|
-
return
|
23
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
24
24
|
const showVerboseOutput = !!overrides.verbose || process.env.NX_VERBOSE_LOGGING === 'true';
|
25
25
|
if (terminalOutputStrategy === 'run-one') {
|
26
26
|
if (shouldUseDynamicLifeCycle(tasks, runnerOptions) &&
|
@@ -63,7 +63,7 @@ function getTerminalOutputLifeCycle(initiatingProject, terminalOutputStrategy, p
|
|
63
63
|
});
|
64
64
|
}
|
65
65
|
function runCommand(projectsToRun, projectGraph, { nxJson }, nxArgs, overrides, terminalOutputStrategy, initiatingProject) {
|
66
|
-
return
|
66
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
67
67
|
const { tasksRunner, runnerOptions } = getRunner(nxArgs, nxJson);
|
68
68
|
// Doing this for backwards compatibility, should be removed in v14
|
69
69
|
ensureTargetDependenciesBackwardCompatibility(nxJson, nxArgs);
|
@@ -114,12 +114,12 @@ function runCommand(projectsToRun, projectGraph, { nxJson }, nxArgs, overrides,
|
|
114
114
|
}
|
115
115
|
exports.runCommand = runCommand;
|
116
116
|
function anyFailuresInPromise(promise) {
|
117
|
-
return
|
117
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
118
118
|
return Object.values(yield promise).some((v) => v === 'failure' || v === 'skipped');
|
119
119
|
});
|
120
120
|
}
|
121
121
|
function anyFailuresInObservable(obs) {
|
122
|
-
return
|
122
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
123
123
|
return yield new Promise((res) => {
|
124
124
|
let anyFailures = false;
|
125
125
|
obs.subscribe((t) => {
|
@@ -252,7 +252,7 @@ function addTasksForProjectDependencyConfig(project, { target, configuration, ov
|
|
252
252
|
}
|
253
253
|
}
|
254
254
|
}
|
255
|
-
else {
|
255
|
+
else if ((0, project_graph_utils_1.projectHasTarget)(project, dependencyConfig.target)) {
|
256
256
|
addTasksForProjectTarget({
|
257
257
|
project,
|
258
258
|
target: dependencyConfig.target,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/run-command.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/run-command.ts"],"names":[],"mappings":"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"}
|