@nrwl/workspace 12.8.0-beta.0 → 12.8.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.
- package/README.md +5 -4
- package/generators.d.ts +1 -0
- package/generators.js +3 -1
- package/generators.js.map +1 -1
- package/generators.json +12 -0
- package/package.json +5 -5
- package/presets/npm.json +21 -0
- package/src/command-line/nx-commands.js +14 -10
- package/src/command-line/nx-commands.js.map +1 -1
- package/src/command-line/print-affected.js +1 -4
- package/src/command-line/print-affected.js.map +1 -1
- package/src/core/dep-graph/main.es5.js +1 -1
- package/src/core/dep-graph/main.esm.js +1 -1
- package/src/core/file-utils.d.ts +1 -1
- package/src/core/file-utils.js +23 -3
- package/src/core/file-utils.js.map +1 -1
- package/src/generators/move/lib/update-project-root-files.js +3 -0
- package/src/generators/move/lib/update-project-root-files.js.map +1 -1
- package/src/generators/new/new.d.ts +1 -13
- package/src/generators/new/new.js +16 -31
- package/src/generators/new/new.js.map +1 -1
- package/src/generators/npm-package/files/index.js.template +1 -0
- package/src/generators/npm-package/npm-package.d.ts +6 -0
- package/src/generators/npm-package/npm-package.js +38 -0
- package/src/generators/npm-package/npm-package.js.map +1 -0
- package/src/generators/npm-package/schema.json +20 -0
- package/src/generators/preset/preset.js +12 -11
- package/src/generators/preset/preset.js.map +1 -1
- package/src/generators/preset/schema.d.ts +3 -12
- package/src/generators/utils/presets.d.ts +13 -0
- package/src/generators/utils/presets.js +18 -0
- package/src/generators/utils/presets.js.map +1 -0
- package/src/generators/workspace/files/package.json__tmpl__ +0 -28
- package/src/generators/workspace/schema.d.ts +1 -1
- package/src/generators/workspace/schema.json +2 -4
- package/src/generators/workspace/workspace.js +41 -8
- package/src/generators/workspace/workspace.js.map +1 -1
- package/src/tasks-runner/task-orchestrator.js +1 -1
- package/src/tasks-runner/task-orchestrator.js.map +1 -1
- package/src/tasks-runner/utils.d.ts +2 -2
- package/src/tasks-runner/utils.js +13 -9
- package/src/tasks-runner/utils.js.map +1 -1
- package/src/utilities/cache-directory.js +4 -4
- package/src/utilities/cache-directory.js.map +1 -1
- package/src/utils/versions.js +1 -1
- package/project.json +0 -89
|
@@ -44,11 +44,9 @@
|
|
|
44
44
|
"description": "The directory name to create the workspace in.",
|
|
45
45
|
"default": ""
|
|
46
46
|
},
|
|
47
|
-
"
|
|
47
|
+
"preset": {
|
|
48
48
|
"type": "string",
|
|
49
|
-
"description": "
|
|
50
|
-
"default": "apps-and-libs",
|
|
51
|
-
"enum": ["apps-and-libs", "packages"]
|
|
49
|
+
"description": "Preset of the workspace"
|
|
52
50
|
},
|
|
53
51
|
"npmScope": {
|
|
54
52
|
"type": "string",
|
|
@@ -7,6 +7,7 @@ const versions_1 = require("../../utils/versions");
|
|
|
7
7
|
const fs_1 = require("fs");
|
|
8
8
|
const path_1 = require("path");
|
|
9
9
|
const workspace_1 = require("@nrwl/tao/src/shared/workspace");
|
|
10
|
+
const presets_1 = require("../utils/presets");
|
|
10
11
|
exports.DEFAULT_NRWL_PRETTIER_CONFIG = {
|
|
11
12
|
singleQuote: true,
|
|
12
13
|
};
|
|
@@ -14,19 +15,19 @@ function decorateAngularClI(host, options) {
|
|
|
14
15
|
const decorateCli = fs_1.readFileSync(path_1.join(__dirname, '..', 'utils', 'decorate-angular-cli.js__tmpl__')).toString();
|
|
15
16
|
host.write(path_1.join(options.directory, 'decorate-angular-cli.js'), decorateCli);
|
|
16
17
|
}
|
|
17
|
-
function
|
|
18
|
+
function setPresetProperty(tree, options) {
|
|
18
19
|
devkit_1.updateJson(tree, path_1.join(options.directory, 'nx.json'), (json) => {
|
|
19
|
-
if (options.
|
|
20
|
-
json
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
20
|
+
if (options.preset === presets_1.Preset.NPM) {
|
|
21
|
+
addPropertyWithStableKeys(json, 'extends', '@nrwl/workspace/presets/npm.json');
|
|
22
|
+
delete json.implicitDependencies;
|
|
23
|
+
delete json.targetDependencies;
|
|
24
|
+
delete json.workspaceLayout;
|
|
24
25
|
}
|
|
25
26
|
return json;
|
|
26
27
|
});
|
|
27
28
|
}
|
|
28
29
|
function createAppsAndLibsFolders(host, options) {
|
|
29
|
-
if (options.
|
|
30
|
+
if (options.preset === presets_1.Preset.NPM) {
|
|
30
31
|
host.write(path_1.join(options.directory, 'packages/.gitkeep'), '');
|
|
31
32
|
}
|
|
32
33
|
else {
|
|
@@ -63,6 +64,27 @@ function formatWorkspaceJson(host, options) {
|
|
|
63
64
|
console.error(e);
|
|
64
65
|
}
|
|
65
66
|
}
|
|
67
|
+
function addNpmScripts(host, options) {
|
|
68
|
+
if (options.cli === 'angular') {
|
|
69
|
+
devkit_1.updateJson(host, path_1.join(options.directory, 'package.json'), (json) => {
|
|
70
|
+
Object.assign(json.scripts, {
|
|
71
|
+
ng: 'nx',
|
|
72
|
+
postinstall: 'node ./decorate-angular-cli.js',
|
|
73
|
+
});
|
|
74
|
+
return json;
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
if (options.preset !== presets_1.Preset.NPM) {
|
|
78
|
+
devkit_1.updateJson(host, path_1.join(options.directory, 'package.json'), (json) => {
|
|
79
|
+
Object.assign(json.scripts, {
|
|
80
|
+
start: 'nx serve',
|
|
81
|
+
build: 'nx build',
|
|
82
|
+
test: 'nx test',
|
|
83
|
+
});
|
|
84
|
+
return json;
|
|
85
|
+
});
|
|
86
|
+
}
|
|
87
|
+
}
|
|
66
88
|
function workspaceGenerator(host, options) {
|
|
67
89
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
68
90
|
if (!options.name) {
|
|
@@ -73,7 +95,8 @@ function workspaceGenerator(host, options) {
|
|
|
73
95
|
if (options.cli === 'angular') {
|
|
74
96
|
decorateAngularClI(host, options);
|
|
75
97
|
}
|
|
76
|
-
|
|
98
|
+
setPresetProperty(host, options);
|
|
99
|
+
addNpmScripts(host, options);
|
|
77
100
|
createAppsAndLibsFolders(host, options);
|
|
78
101
|
yield devkit_1.formatFiles(host);
|
|
79
102
|
formatWorkspaceJson(host, options);
|
|
@@ -81,4 +104,14 @@ function workspaceGenerator(host, options) {
|
|
|
81
104
|
}
|
|
82
105
|
exports.workspaceGenerator = workspaceGenerator;
|
|
83
106
|
exports.workspaceSchematic = devkit_1.convertNxGenerator(workspaceGenerator);
|
|
107
|
+
function addPropertyWithStableKeys(obj, key, value) {
|
|
108
|
+
const copy = Object.assign({}, obj);
|
|
109
|
+
Object.keys(obj).forEach((k) => {
|
|
110
|
+
delete obj[k];
|
|
111
|
+
});
|
|
112
|
+
obj[key] = value;
|
|
113
|
+
Object.keys(copy).forEach((k) => {
|
|
114
|
+
obj[k] = copy[k];
|
|
115
|
+
});
|
|
116
|
+
}
|
|
84
117
|
//# sourceMappingURL=workspace.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/workspace/workspace.ts"],"names":[],"mappings":";;;;AAAA,yCAQsB;AAEtB,mDAK8B;AAC9B,2BAAkC;AAClC,+BAA8C;AAC9C,8DAAgF;
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/workspace/workspace.ts"],"names":[],"mappings":"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"}
|
|
@@ -100,7 +100,7 @@ class TaskOrchestrator {
|
|
|
100
100
|
applyCachedResult(t) {
|
|
101
101
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
102
102
|
const outputs = utils_1.getOutputs(this.projectGraph.nodes, t.task);
|
|
103
|
-
const shouldCopyOutputsFromCache = this.cache.shouldCopyOutputsFromCache(t, outputs);
|
|
103
|
+
const shouldCopyOutputsFromCache = !!outputs.length && this.cache.shouldCopyOutputsFromCache(t, outputs);
|
|
104
104
|
if (shouldCopyOutputsFromCache) {
|
|
105
105
|
this.cache.copyFilesFromCache(t.task.hash, t.cachedResult, outputs);
|
|
106
106
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-orchestrator.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/task-orchestrator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"task-orchestrator.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/task-orchestrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ProjectGraph, ProjectGraphNode, TargetDependencyConfig, Task, TaskGraph } from '@nrwl/devkit';
|
|
2
2
|
import { Workspaces } from '@nrwl/tao/src/shared/workspace';
|
|
3
|
-
export declare function getCommandAsString(
|
|
4
|
-
export declare function getCommand(
|
|
3
|
+
export declare function getCommandAsString(task: Task): string;
|
|
4
|
+
export declare function getCommand(task: Task): string[];
|
|
5
5
|
export declare function getDependencyConfigs({ project, target }: {
|
|
6
6
|
project: string;
|
|
7
7
|
target: string;
|
|
@@ -1,23 +1,25 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getCommandArgsForTask = exports.getCliPath = exports.calculateReverseDeps = exports.removeTasksFromTaskGraph = exports.getCustomHasher = exports.getExecutorForTask = exports.getExecutorNameForTask = exports.unparse = exports.getOutputsForTargetAndConfiguration = exports.getOutputs = exports.getDependencyConfigs = exports.getCommand = exports.getCommandAsString = void 0;
|
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
4
5
|
const flat_1 = require("flat");
|
|
5
6
|
const output_1 = require("../utilities/output");
|
|
6
7
|
const build_nodes_1 = require("@nrwl/workspace/src/core/project-graph/build-nodes");
|
|
7
8
|
const commonCommands = ['build', 'test', 'lint', 'e2e', 'deploy'];
|
|
8
|
-
function getCommandAsString(
|
|
9
|
-
return getCommand(
|
|
9
|
+
function getCommandAsString(task) {
|
|
10
|
+
return getCommand(task).join(' ').trim();
|
|
10
11
|
}
|
|
11
12
|
exports.getCommandAsString = getCommandAsString;
|
|
12
|
-
function getCommand(
|
|
13
|
+
function getCommand(task) {
|
|
13
14
|
const args = Object.entries(task.overrides || {}).map(([prop, value]) => `--${prop}=${value}`);
|
|
15
|
+
const execCommand = devkit_1.getPackageManagerCommand().exec;
|
|
14
16
|
if (commonCommands.includes(task.target.target)) {
|
|
15
17
|
const config = task.target.configuration
|
|
16
18
|
? [`--configuration`, task.target.configuration]
|
|
17
19
|
: [];
|
|
18
20
|
return [
|
|
19
|
-
|
|
20
|
-
|
|
21
|
+
execCommand,
|
|
22
|
+
'nx',
|
|
21
23
|
task.target.target,
|
|
22
24
|
task.target.project,
|
|
23
25
|
...config,
|
|
@@ -29,8 +31,8 @@ function getCommand(cliCommand, isYarn, task) {
|
|
|
29
31
|
? `:${task.target.configuration} `
|
|
30
32
|
: '';
|
|
31
33
|
return [
|
|
32
|
-
|
|
33
|
-
|
|
34
|
+
execCommand,
|
|
35
|
+
'nx',
|
|
34
36
|
'run',
|
|
35
37
|
`${task.target.project}:${task.target.target}${config}`,
|
|
36
38
|
...args,
|
|
@@ -67,7 +69,9 @@ function getOutputsForTargetAndConfiguration(task, node) {
|
|
|
67
69
|
const targets = node.data.targets[target];
|
|
68
70
|
const options = Object.assign(Object.assign(Object.assign({}, targets.options), (_a = targets === null || targets === void 0 ? void 0 : targets.configurations) === null || _a === void 0 ? void 0 : _a[configuration]), task.overrides);
|
|
69
71
|
if (targets === null || targets === void 0 ? void 0 : targets.outputs) {
|
|
70
|
-
return targets.outputs
|
|
72
|
+
return targets.outputs
|
|
73
|
+
.map((output) => interpolateOutputs(output, options))
|
|
74
|
+
.filter((output) => !!output);
|
|
71
75
|
}
|
|
72
76
|
// Keep backwards compatibility in case `outputs` doesn't exist
|
|
73
77
|
if (options.outputPath) {
|
|
@@ -131,7 +135,7 @@ function interpolateOutputs(template, data) {
|
|
|
131
135
|
let path = match.slice(1, -1).trim().split('.').slice(1);
|
|
132
136
|
for (let idx = 0; idx < path.length; idx++) {
|
|
133
137
|
if (!value[path[idx]]) {
|
|
134
|
-
|
|
138
|
+
return;
|
|
135
139
|
}
|
|
136
140
|
value = value[path[idx]];
|
|
137
141
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,10 +4,6 @@ exports.cacheDirectory = exports.readCacheDirectoryProperty = void 0;
|
|
|
4
4
|
const path_1 = require("path");
|
|
5
5
|
const fileutils_1 = require("./fileutils");
|
|
6
6
|
function readCacheDirectoryProperty(root) {
|
|
7
|
-
const cacheDir = process.env.NX_CACHE_DIRECTORY;
|
|
8
|
-
if (cacheDir) {
|
|
9
|
-
return cacheDir;
|
|
10
|
-
}
|
|
11
7
|
try {
|
|
12
8
|
const nxJson = fileutils_1.readJsonFile(path_1.join(root, 'nx.json'));
|
|
13
9
|
return nxJson.tasksRunnerOptions.default.options.cacheDirectory;
|
|
@@ -18,6 +14,10 @@ function readCacheDirectoryProperty(root) {
|
|
|
18
14
|
}
|
|
19
15
|
exports.readCacheDirectoryProperty = readCacheDirectoryProperty;
|
|
20
16
|
function cacheDirectory(root, cacheDirectory) {
|
|
17
|
+
const cacheDirFromEnv = process.env.NX_CACHE_DIRECTORY;
|
|
18
|
+
if (cacheDirFromEnv) {
|
|
19
|
+
cacheDirectory = cacheDirFromEnv;
|
|
20
|
+
}
|
|
21
21
|
if (cacheDirectory) {
|
|
22
22
|
if (cacheDirectory.startsWith('./')) {
|
|
23
23
|
return path_1.join(root, cacheDirectory);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-directory.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/cache-directory.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,2CAA2C;AAE3C,SAAgB,0BAA0B,CAAC,IAAY;IACrD,
|
|
1
|
+
{"version":3,"file":"cache-directory.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/cache-directory.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,2CAA2C;AAE3C,SAAgB,0BAA0B,CAAC,IAAY;IACrD,IAAI;QACF,MAAM,MAAM,GAAG,wBAAY,CAAC,WAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;QACnD,OAAO,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC;KACjE;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AAPD,gEAOC;AAED,SAAgB,cAAc,CAAC,IAAY,EAAE,cAAsB;IACjE,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;IACvD,IAAI,eAAe,EAAE;QACnB,cAAc,GAAG,eAAe,CAAC;KAClC;IACD,IAAI,cAAc,EAAE;QAClB,IAAI,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACnC,OAAO,WAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;SACnC;aAAM;YACL,OAAO,cAAc,CAAC;SACvB;KACF;SAAM;QACL,OAAO,WAAI,CAAC,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;KACnD;AACH,CAAC;AAdD,wCAcC"}
|
package/src/utils/versions.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.tslintVersion = exports.typescriptESLintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '12.8.0
|
|
4
|
+
exports.nxVersion = '12.8.0';
|
|
5
5
|
exports.angularCliVersion = '~12.1.0';
|
|
6
6
|
exports.typescriptVersion = '~4.3.5';
|
|
7
7
|
exports.prettierVersion = '^2.3.1';
|
package/project.json
DELETED
|
@@ -1,89 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"root": "packages/workspace",
|
|
3
|
-
"sourceRoot": "packages/workspace",
|
|
4
|
-
"projectType": "library",
|
|
5
|
-
"implicitDependencies": ["dep-graph-dep-graph"],
|
|
6
|
-
"targets": {
|
|
7
|
-
"test": {
|
|
8
|
-
"executor": "@nrwl/jest:jest",
|
|
9
|
-
"options": {
|
|
10
|
-
"jestConfig": "packages/workspace/jest.config.js",
|
|
11
|
-
"passWithNoTests": true
|
|
12
|
-
},
|
|
13
|
-
"outputs": ["coverage/packages/workspace"]
|
|
14
|
-
},
|
|
15
|
-
"build-base": {
|
|
16
|
-
"executor": "@nrwl/node:package",
|
|
17
|
-
"options": {
|
|
18
|
-
"outputPath": "build/packages/workspace",
|
|
19
|
-
"tsConfig": "packages/workspace/tsconfig.lib.json",
|
|
20
|
-
"packageJson": "packages/workspace/package.json",
|
|
21
|
-
"main": "packages/workspace/index.ts",
|
|
22
|
-
"updateBuildableProjectDepsInPackageJson": false,
|
|
23
|
-
"assets": [
|
|
24
|
-
{
|
|
25
|
-
"input": "packages/workspace",
|
|
26
|
-
"glob": "**/files/**",
|
|
27
|
-
"output": "/"
|
|
28
|
-
},
|
|
29
|
-
{
|
|
30
|
-
"input": "packages/workspace",
|
|
31
|
-
"glob": "**/files/**/.gitkeep",
|
|
32
|
-
"output": "/"
|
|
33
|
-
},
|
|
34
|
-
{
|
|
35
|
-
"input": "packages/workspace",
|
|
36
|
-
"glob": "**/**/decorate-angular-cli.js__tmpl__",
|
|
37
|
-
"output": "/"
|
|
38
|
-
},
|
|
39
|
-
{
|
|
40
|
-
"input": "packages/workspace",
|
|
41
|
-
"glob": "**/*.json",
|
|
42
|
-
"ignore": ["**/tsconfig*.json"],
|
|
43
|
-
"output": "/"
|
|
44
|
-
},
|
|
45
|
-
{
|
|
46
|
-
"input": "packages/workspace",
|
|
47
|
-
"glob": "**/*.{js,css,html,svg}",
|
|
48
|
-
"output": "/"
|
|
49
|
-
},
|
|
50
|
-
{
|
|
51
|
-
"input": "packages/workspace",
|
|
52
|
-
"glob": "**/*.d.ts",
|
|
53
|
-
"output": "/"
|
|
54
|
-
},
|
|
55
|
-
"LICENSE"
|
|
56
|
-
]
|
|
57
|
-
},
|
|
58
|
-
"outputs": ["{options.outputPath}"]
|
|
59
|
-
},
|
|
60
|
-
"build": {
|
|
61
|
-
"executor": "@nrwl/workspace:run-commands",
|
|
62
|
-
"outputs": ["build/packages/workspace"],
|
|
63
|
-
"options": {
|
|
64
|
-
"commands": [
|
|
65
|
-
{
|
|
66
|
-
"command": "node ./scripts/copy-dep-graph.js"
|
|
67
|
-
},
|
|
68
|
-
{
|
|
69
|
-
"command": "node ./scripts/copy-readme.js workspace"
|
|
70
|
-
}
|
|
71
|
-
],
|
|
72
|
-
"parallel": false
|
|
73
|
-
}
|
|
74
|
-
},
|
|
75
|
-
"lint": {
|
|
76
|
-
"executor": "@nrwl/linter:eslint",
|
|
77
|
-
"options": {
|
|
78
|
-
"lintFilePatterns": [
|
|
79
|
-
"packages/workspace/**/*.ts",
|
|
80
|
-
"packages/workspace/**/*.spec.ts",
|
|
81
|
-
"packages/workspace/**/*.spec.tsx",
|
|
82
|
-
"packages/workspace/**/*.spec.js",
|
|
83
|
-
"packages/workspace/**/*.spec.jsx",
|
|
84
|
-
"packages/workspace/**/*.d.ts"
|
|
85
|
-
]
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
}
|
|
89
|
-
}
|