@nrwl/workspace 13.10.0-beta.6 → 13.10.0-beta.9
Sign up to get free protection for your applications and to get access to all the features.
- package/executors.json +5 -5
- package/generators.json +20 -20
- package/index.d.ts +1 -0
- package/index.js +4 -2
- package/index.js.map +1 -1
- package/package.json +8 -8
- package/src/core/file-utils.d.ts +1 -0
- package/src/core/file-utils.js +5 -0
- package/src/core/file-utils.js.map +1 -0
- package/src/core/project-graph.d.ts +1 -0
- package/src/core/project-graph.js +5 -0
- package/src/core/project-graph.js.map +1 -0
- package/src/executors/counter/schema.json +3 -3
- package/src/executors/run-commands/schema.json +23 -9
- package/src/executors/run-script/schema.json +1 -1
- package/src/generators/convert-to-nx-project/schema.json +6 -5
- package/src/generators/library/schema.json +17 -16
- package/src/generators/move/lib/update-project-root-files.js +2 -2
- package/src/generators/move/lib/update-project-root-files.js.map +1 -1
- package/src/generators/move/lib/update-storybook-config.js +2 -2
- package/src/generators/move/lib/update-storybook-config.js.map +1 -1
- package/src/generators/move/schema.json +6 -6
- package/src/generators/new/schema.json +4 -3
- package/src/generators/npm-package/schema.json +2 -1
- package/src/generators/preset/schema.json +2 -1
- package/src/generators/remove/lib/update-tsconfig.js +5 -3
- package/src/generators/remove/lib/update-tsconfig.js.map +1 -1
- package/src/generators/remove/schema.d.ts +1 -0
- package/src/generators/remove/schema.json +11 -7
- package/src/generators/run-commands/schema.json +8 -7
- package/src/generators/workspace/files/__dot__gitignore +1 -1
- package/src/generators/workspace/schema.json +2 -1
- package/src/generators/workspace-generator/files/schema.json__tmpl__ +1 -1
- package/src/generators/workspace-generator/schema.json +3 -2
- package/src/migrations/update-13-9-0/replace-tao-with-nx.js +2 -0
- package/src/migrations/update-13-9-0/replace-tao-with-nx.js.map +1 -1
- package/src/tslint/nxEnforceModuleBoundariesRule.js +1 -1
- package/src/tslint/nxEnforceModuleBoundariesRule.js.map +1 -1
- package/src/utilities/app-root.d.ts +1 -0
- package/src/utilities/app-root.js +5 -0
- package/src/utilities/app-root.js.map +1 -0
- package/src/utilities/buildable-libs-utils.js +10 -1
- package/src/utilities/buildable-libs-utils.js.map +1 -1
- package/src/utilities/default-base.js +0 -1
- package/src/utilities/default-base.js.map +1 -1
- package/src/utilities/generate-globs.js +2 -2
- package/src/utilities/generate-globs.js.map +1 -1
- package/src/utilities/plugins/plugin-capabilities.js +1 -1
- package/src/utilities/plugins/plugin-capabilities.js.map +1 -1
- package/src/utilities/typescript.js +4 -4
- package/src/utilities/typescript.js.map +1 -1
- package/src/utils/app-root.d.ts +1 -1
- package/src/utils/app-root.js +2 -1
- package/src/utils/app-root.js.map +1 -1
- package/src/utils/rules/format-files.js +2 -2
- package/src/utils/rules/format-files.js.map +1 -1
- package/src/utils/runtime-lint-utils.js +2 -2
- package/src/utils/runtime-lint-utils.js.map +1 -1
- package/src/utils/versions.js +1 -1
|
@@ -3,23 +3,23 @@
|
|
|
3
3
|
"$id": "NxWorkspaceMove",
|
|
4
4
|
"cli": "nx",
|
|
5
5
|
"title": "Nx Move",
|
|
6
|
-
"description": "Move a project to another folder in the workspace",
|
|
6
|
+
"description": "Move a project to another folder in the workspace.",
|
|
7
7
|
"type": "object",
|
|
8
8
|
"examples": [
|
|
9
9
|
{
|
|
10
|
-
"command": "g @nrwl/workspace:move --project my-feature-lib shared/my-feature-lib",
|
|
11
|
-
"description": "Move libs/my-feature-lib to libs/shared/my-feature-lib"
|
|
10
|
+
"command": "nx g @nrwl/workspace:move --project my-feature-lib shared/my-feature-lib",
|
|
11
|
+
"description": "Move `libs/my-feature-lib` to `libs/shared/my-feature-lib`"
|
|
12
12
|
}
|
|
13
13
|
],
|
|
14
14
|
"properties": {
|
|
15
15
|
"projectName": {
|
|
16
16
|
"type": "string",
|
|
17
17
|
"alias": "project",
|
|
18
|
-
"description": "The name of the project to move"
|
|
18
|
+
"description": "The name of the project to move."
|
|
19
19
|
},
|
|
20
20
|
"destination": {
|
|
21
21
|
"type": "string",
|
|
22
|
-
"description": "The folder to move the project into",
|
|
22
|
+
"description": "The folder to move the project into.",
|
|
23
23
|
"$default": {
|
|
24
24
|
"$source": "argv",
|
|
25
25
|
"index": 0
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
},
|
|
28
28
|
"importPath": {
|
|
29
29
|
"type": "string",
|
|
30
|
-
"description": "The new import path to use in the tsconfig.base.json"
|
|
30
|
+
"description": "The new import path to use in the `tsconfig.base.json`."
|
|
31
31
|
},
|
|
32
32
|
"updateImportPath": {
|
|
33
33
|
"type": "boolean",
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
"$schema": "http://json-schema.org/schema",
|
|
3
3
|
"$id": "NxWorkspaceNew",
|
|
4
4
|
"title": "Create an empty workspace",
|
|
5
|
+
"description": "Create an empty workspace.",
|
|
5
6
|
"type": "object",
|
|
6
7
|
"cli": "nx",
|
|
7
8
|
"properties": {
|
|
@@ -15,7 +16,7 @@
|
|
|
15
16
|
"x-prompt": "What name would you like to use for the workspace?"
|
|
16
17
|
},
|
|
17
18
|
"cli": {
|
|
18
|
-
"description": "CLI used for generating code and running tasks",
|
|
19
|
+
"description": "CLI used for generating code and running tasks.",
|
|
19
20
|
"type": "string",
|
|
20
21
|
"enum": ["nx", "angular"],
|
|
21
22
|
"default": "nx"
|
|
@@ -70,7 +71,7 @@
|
|
|
70
71
|
"default": true
|
|
71
72
|
},
|
|
72
73
|
"preset": {
|
|
73
|
-
"description": "What to create in the new workspace",
|
|
74
|
+
"description": "What to create in the new workspace.",
|
|
74
75
|
"type": "string"
|
|
75
76
|
},
|
|
76
77
|
"appName": {
|
|
@@ -78,7 +79,7 @@
|
|
|
78
79
|
"description": "Application name."
|
|
79
80
|
},
|
|
80
81
|
"nxCloud": {
|
|
81
|
-
"description": "Connect the workspace to the free tier of the distributed cache provided by Nx Cloud",
|
|
82
|
+
"description": "Connect the workspace to the free tier of the distributed cache provided by Nx Cloud.",
|
|
82
83
|
"type": "boolean",
|
|
83
84
|
"default": false
|
|
84
85
|
},
|
|
@@ -2,12 +2,13 @@
|
|
|
2
2
|
"$schema": "http://json-schema.org/schema",
|
|
3
3
|
"$id": "NxWorkspaceNpmPackage",
|
|
4
4
|
"title": "Add a minimal npm package",
|
|
5
|
+
"description": "Add a minimal npm package.",
|
|
5
6
|
"cli": "nx",
|
|
6
7
|
"type": "object",
|
|
7
8
|
"properties": {
|
|
8
9
|
"name": {
|
|
9
10
|
"type": "string",
|
|
10
|
-
"description": "Package name",
|
|
11
|
+
"description": "Package name.",
|
|
11
12
|
"$default": {
|
|
12
13
|
"$source": "argv",
|
|
13
14
|
"index": 0
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
"$id": "NxWorkspacePreset",
|
|
4
4
|
"cli": "nx",
|
|
5
5
|
"title": "Creates applications in a new workspace",
|
|
6
|
+
"description": "Creates applications in a new workspace.",
|
|
6
7
|
"type": "object",
|
|
7
8
|
"properties": {
|
|
8
9
|
"preset": {
|
|
@@ -52,7 +53,7 @@
|
|
|
52
53
|
}
|
|
53
54
|
},
|
|
54
55
|
"standaloneConfig": {
|
|
55
|
-
"description": "Split the project configurations into
|
|
56
|
+
"description": "Split the project configurations into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
|
|
56
57
|
"type": "boolean"
|
|
57
58
|
},
|
|
58
59
|
"packageManager": {
|
|
@@ -11,11 +11,13 @@ const typescript_1 = require("../../../utilities/typescript");
|
|
|
11
11
|
function updateTsconfig(tree, schema, project) {
|
|
12
12
|
const { appsDir, libsDir, npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
|
|
13
13
|
const tsConfigPath = (0, typescript_1.getRootTsConfigPathInTree)(tree);
|
|
14
|
+
const defaultImportPath = `@${npmScope}/${project.root.substr(project.projectType === 'application'
|
|
15
|
+
? appsDir.length + 1
|
|
16
|
+
: libsDir.length + 1)}`;
|
|
17
|
+
const importPath = schema.importPath || defaultImportPath;
|
|
14
18
|
if (tree.exists(tsConfigPath)) {
|
|
15
19
|
(0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
|
|
16
|
-
delete json.compilerOptions.paths[
|
|
17
|
-
? appsDir.length + 1
|
|
18
|
-
: libsDir.length + 1)}`];
|
|
20
|
+
delete json.compilerOptions.paths[importPath];
|
|
19
21
|
return json;
|
|
20
22
|
});
|
|
21
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,8DAA0E;AAG1E;;;;GAIG;AACH,SAAgB,cAAc,CAC5B,IAAU,EACV,MAAc,EACd,OAA6B;IAE7B,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAEhE,MAAM,YAAY,GAAG,IAAA,sCAAyB,EAAC,IAAI,CAAC,CAAC;IACrD,IAAI,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,8DAA0E;AAG1E;;;;GAIG;AACH,SAAgB,cAAc,CAC5B,IAAU,EACV,MAAc,EACd,OAA6B;IAE7B,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAEhE,MAAM,YAAY,GAAG,IAAA,sCAAyB,EAAC,IAAI,CAAC,CAAC;IACrD,MAAM,iBAAiB,GAAG,IAAI,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CAC3D,OAAO,CAAC,WAAW,KAAK,aAAa;QACnC,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;QACpB,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CACvB,EAAE,CAAC;IACJ,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,iBAAiB,CAAC;IAC1D,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;QAC7B,IAAA,mBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;YACtC,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC9C,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AApBD,wCAoBC"}
|
|
@@ -3,23 +3,23 @@
|
|
|
3
3
|
"$id": "NxWorkspaceRemove",
|
|
4
4
|
"cli": "nx",
|
|
5
5
|
"title": "Nx Remove",
|
|
6
|
-
"description": "Remove a project from the workspace",
|
|
6
|
+
"description": "Remove a project from the workspace.",
|
|
7
7
|
"type": "object",
|
|
8
8
|
"examples": [
|
|
9
9
|
{
|
|
10
|
-
"command": "g @nrwl/workspace:remove my-feature-lib",
|
|
11
|
-
"description": "Remove my-feature-lib from the workspace"
|
|
10
|
+
"command": "nx g @nrwl/workspace:remove my-feature-lib",
|
|
11
|
+
"description": "Remove `my-feature-lib` from the workspace"
|
|
12
12
|
},
|
|
13
13
|
{
|
|
14
|
-
"command": "g @nrwl/workspace:remove my-feature-lib --forceRemove",
|
|
15
|
-
"description": "Force removal of my-feature-lib from the workspace"
|
|
14
|
+
"command": "nx g @nrwl/workspace:remove my-feature-lib --forceRemove",
|
|
15
|
+
"description": "Force removal of `my-feature-lib` from the workspace"
|
|
16
16
|
}
|
|
17
17
|
],
|
|
18
18
|
"properties": {
|
|
19
19
|
"projectName": {
|
|
20
20
|
"type": "string",
|
|
21
21
|
"alias": "project",
|
|
22
|
-
"description": "The name of the project to remove",
|
|
22
|
+
"description": "The name of the project to remove.",
|
|
23
23
|
"$default": {
|
|
24
24
|
"$source": "argv",
|
|
25
25
|
"index": 0
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
"forceRemove": {
|
|
29
29
|
"type": "boolean",
|
|
30
30
|
"aliases": ["force-remove"],
|
|
31
|
-
"description": "When true
|
|
31
|
+
"description": "When `true`, forces removal even if the project is still in use.",
|
|
32
32
|
"default": false
|
|
33
33
|
},
|
|
34
34
|
"skipFormat": {
|
|
@@ -36,6 +36,10 @@
|
|
|
36
36
|
"aliases": ["skip-format"],
|
|
37
37
|
"description": "Skip formatting files.",
|
|
38
38
|
"default": false
|
|
39
|
+
},
|
|
40
|
+
"importPath": {
|
|
41
|
+
"type": "string",
|
|
42
|
+
"description": "The library name used at creation time"
|
|
39
43
|
}
|
|
40
44
|
},
|
|
41
45
|
"required": ["projectName"]
|
|
@@ -2,18 +2,19 @@
|
|
|
2
2
|
"$schema": "http://json-schema.org/schema",
|
|
3
3
|
"$id": "SchematicsRunCommands",
|
|
4
4
|
"title": "Create a custom target to run any command",
|
|
5
|
+
"description": "Create a custom target to run any command.",
|
|
5
6
|
"type": "object",
|
|
6
7
|
"cli": "nx",
|
|
7
8
|
"examples": [
|
|
8
9
|
{
|
|
9
|
-
"command": "g @nrwl/workspace:run-commands printhello --project my-feature-lib --command 'echo hello'",
|
|
10
|
-
"description": "Add the printhello target to my-feature-lib"
|
|
10
|
+
"command": "nx g @nrwl/workspace:run-commands printhello --project my-feature-lib --command 'echo hello'",
|
|
11
|
+
"description": "Add the `printhello` target to `my-feature-lib`"
|
|
11
12
|
}
|
|
12
13
|
],
|
|
13
14
|
"properties": {
|
|
14
15
|
"name": {
|
|
15
16
|
"type": "string",
|
|
16
|
-
"description": "Target name",
|
|
17
|
+
"description": "Target name.",
|
|
17
18
|
"$default": {
|
|
18
19
|
"$source": "argv",
|
|
19
20
|
"index": 0
|
|
@@ -21,17 +22,17 @@
|
|
|
21
22
|
"x-prompt": "What name would you like to use to invoke the command?"
|
|
22
23
|
},
|
|
23
24
|
"project": {
|
|
24
|
-
"description": "Project name",
|
|
25
|
+
"description": "Project name.",
|
|
25
26
|
"type": "string",
|
|
26
27
|
"x-prompt": "What project does the target belong to?"
|
|
27
28
|
},
|
|
28
29
|
"command": {
|
|
29
|
-
"description": "Command to run",
|
|
30
|
+
"description": "Command to run.",
|
|
30
31
|
"type": "string",
|
|
31
32
|
"x-prompt": "What command would you like to run?"
|
|
32
33
|
},
|
|
33
34
|
"cwd": {
|
|
34
|
-
"description": "Current working directory of the command",
|
|
35
|
+
"description": "Current working directory of the command.",
|
|
35
36
|
"type": "string"
|
|
36
37
|
},
|
|
37
38
|
"outputs": {
|
|
@@ -39,7 +40,7 @@
|
|
|
39
40
|
"type": "string"
|
|
40
41
|
},
|
|
41
42
|
"envFile": {
|
|
42
|
-
"description": "Env files to be loaded before executing the commands",
|
|
43
|
+
"description": "Env files to be loaded before executing the commands.",
|
|
43
44
|
"type": "string"
|
|
44
45
|
}
|
|
45
46
|
},
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
"$id": "SchematicsNxNgNew",
|
|
4
4
|
"cli": "nx",
|
|
5
5
|
"title": "Create an empty workspace",
|
|
6
|
+
"description": "Create an empty workspace.",
|
|
6
7
|
"type": "object",
|
|
7
8
|
"properties": {
|
|
8
9
|
"name": {
|
|
@@ -46,7 +47,7 @@
|
|
|
46
47
|
},
|
|
47
48
|
"preset": {
|
|
48
49
|
"type": "string",
|
|
49
|
-
"description": "Preset of the workspace"
|
|
50
|
+
"description": "Preset of the workspace."
|
|
50
51
|
},
|
|
51
52
|
"npmScope": {
|
|
52
53
|
"type": "string",
|
|
@@ -2,11 +2,12 @@
|
|
|
2
2
|
"cli": "nx",
|
|
3
3
|
"$id": "SchematicsNxWorkspaceSchematic",
|
|
4
4
|
"title": "Create a custom generator",
|
|
5
|
+
"description": "Create a custom generator.",
|
|
5
6
|
"type": "object",
|
|
6
7
|
"properties": {
|
|
7
8
|
"name": {
|
|
8
9
|
"type": "string",
|
|
9
|
-
"description": "Generator name",
|
|
10
|
+
"description": "Generator name.",
|
|
10
11
|
"$default": {
|
|
11
12
|
"$source": "argv",
|
|
12
13
|
"index": 0
|
|
@@ -14,7 +15,7 @@
|
|
|
14
15
|
"x-prompt": "What name would you like to use for the workspace generator?"
|
|
15
16
|
},
|
|
16
17
|
"skipFormat": {
|
|
17
|
-
"description": "Skip formatting files",
|
|
18
|
+
"description": "Skip formatting files.",
|
|
18
19
|
"type": "boolean",
|
|
19
20
|
"default": false
|
|
20
21
|
}
|
|
@@ -14,6 +14,8 @@ function replaceTaoWithNx(host) {
|
|
|
14
14
|
removeTao(json.devDependencies);
|
|
15
15
|
return json;
|
|
16
16
|
});
|
|
17
|
+
const pmc = (0, devkit_1.getPackageManagerCommand)();
|
|
18
|
+
devkit_1.logger.info(`Please run ${pmc.install} to ensure the correct version of Nx is installed.`);
|
|
17
19
|
}
|
|
18
20
|
exports.replaceTaoWithNx = replaceTaoWithNx;
|
|
19
21
|
function removeTao(json) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replace-tao-with-nx.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-9-0/replace-tao-with-nx.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"replace-tao-with-nx.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-9-0/replace-tao-with-nx.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAEtB,SAAgB,gBAAgB,CAAC,IAAU;IACzC,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAS,EAAE,EAAE;QAC7C,IAAI,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,EAAE;YACxC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;SAChE;aAAM,IAAI,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,EAAE;YAClD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC;SACtE;QACD,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC7B,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,IAAA,iCAAwB,GAAE,CAAC;IACvC,eAAM,CAAC,IAAI,CACT,cAAc,GAAG,CAAC,OAAO,oDAAoD,CAC9E,CAAC;AACJ,CAAC;AAfD,4CAeC;AAED,SAAS,SAAS,CAAC,IAAS;IAC1B,IAAI,CAAC,IAAI;QAAE,OAAO;IAClB,IAAI,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC;AAChC,CAAC;AAED,kBAAe,gBAAgB,CAAC"}
|
|
@@ -18,7 +18,7 @@ class Rule extends Lint.Rules.AbstractRule {
|
|
|
18
18
|
this.targetProjectLocator = targetProjectLocator;
|
|
19
19
|
this.workspaceLayout = workspaceLayout;
|
|
20
20
|
if (!projectPath) {
|
|
21
|
-
this.projectPath = (0, path_1.normalize)(devkit_1.
|
|
21
|
+
this.projectPath = (0, path_1.normalize)(devkit_1.workspaceRoot);
|
|
22
22
|
if (!global.projectGraph) {
|
|
23
23
|
const nxJson = (0, devkit_2.readNxJson)();
|
|
24
24
|
global.npmScope = nxJson.npmScope;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nxEnforceModuleBoundariesRule.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tslint/nxEnforceModuleBoundariesRule.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAO/B,
|
|
1
|
+
{"version":3,"file":"nxEnforceModuleBoundariesRule.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tslint/nxEnforceModuleBoundariesRule.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from 'nx/src/utils/app-root';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"app-root.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/app-root.ts"],"names":[],"mappings":";;;AAAA,gEAAsC"}
|
|
@@ -128,7 +128,16 @@ function cleanupTmpTsConfigFile(tmpTsConfigPath) {
|
|
|
128
128
|
}
|
|
129
129
|
function checkDependentProjectsHaveBeenBuilt(root, projectName, targetName, projectDependencies) {
|
|
130
130
|
const missing = findMissingBuildDependencies(root, projectName, targetName, projectDependencies);
|
|
131
|
-
if (missing.length > 0) {
|
|
131
|
+
if (missing.length === projectDependencies.length && missing.length > 0) {
|
|
132
|
+
console.error((0, devkit_1.stripIndents) `
|
|
133
|
+
It looks like all of ${projectName}'s dependencies have not been built yet:
|
|
134
|
+
${missing.map((x) => ` - ${x.node.name}`).join('\n')}
|
|
135
|
+
|
|
136
|
+
You might be missing a "targetDependencies" configuration in your root nx.json (https://nx.dev/configuration/packagejson#target-dependencies),
|
|
137
|
+
or "dependsOn" configured in ${projectName}'s angular.json/workspace.json record or project.json (https://nx.dev/configuration/packagejson#dependson)
|
|
138
|
+
`);
|
|
139
|
+
}
|
|
140
|
+
else if (missing.length > 0) {
|
|
132
141
|
console.error((0, devkit_1.stripIndents) `
|
|
133
142
|
Some of the project ${projectName}'s dependencies have not been built yet. Please build these libraries before:
|
|
134
143
|
${missing.map((x) => ` - ${x.node.name}`).join('\n')}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildable-libs-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/buildable-libs-utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"buildable-libs-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/buildable-libs-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.checkGitVersion = exports.deduceDefaultBase = void 0;
|
|
4
4
|
const child_process_1 = require("child_process");
|
|
5
|
-
// TODO (v13): Update to main
|
|
6
5
|
function deduceDefaultBase() {
|
|
7
6
|
const nxDefaultBase = 'main';
|
|
8
7
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-base.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/default-base.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AAEzC,
|
|
1
|
+
{"version":3,"file":"default-base.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/default-base.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AAEzC,SAAgB,iBAAiB;IAC/B,MAAM,aAAa,GAAG,MAAM,CAAC;IAC7B,IAAI;QACF,OAAO,CACL,IAAA,wBAAQ,EAAC,qCAAqC,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE;YACjE,aAAa,CACd,CAAC;KACH;IAAC,WAAM;QACN,OAAO,aAAa,CAAC;KACtB;AACH,CAAC;AAVD,8CAUC;AAED,SAAgB,eAAe;IAC7B,IAAI;QACF,IAAI,gBAAgB,GAAG,IAAA,wBAAQ,EAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QACnE,OAAO,gBAAgB,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAC;KAC7D;IAAC,WAAM;QACN,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAPD,0CAOC"}
|
|
@@ -12,7 +12,7 @@ const project_graph_utils_1 = require("nx/src/utils/project-graph-utils");
|
|
|
12
12
|
* @param fileGlobPattern pass a custom glob pattern to be used
|
|
13
13
|
*/
|
|
14
14
|
function createGlobPatternsForDependencies(dirPath, fileGlobPattern) {
|
|
15
|
-
const filenameRelativeToWorkspaceRoot = (0, path_1.relative)(app_root_1.
|
|
15
|
+
const filenameRelativeToWorkspaceRoot = (0, path_1.relative)(app_root_1.workspaceRoot, dirPath);
|
|
16
16
|
const projectGraph = (0, project_graph_1.readCachedProjectGraph)();
|
|
17
17
|
// find the project
|
|
18
18
|
let projectName;
|
|
@@ -25,7 +25,7 @@ function createGlobPatternsForDependencies(dirPath, fileGlobPattern) {
|
|
|
25
25
|
// generate the glob
|
|
26
26
|
try {
|
|
27
27
|
const projectDirs = (0, project_graph_utils_1.getSourceDirOfDependentProjects)(projectName, projectGraph);
|
|
28
|
-
return projectDirs.map((sourceDir) => (0, path_1.resolve)(app_root_1.
|
|
28
|
+
return projectDirs.map((sourceDir) => (0, path_1.resolve)(app_root_1.workspaceRoot, (0, devkit_1.joinPathFragments)(sourceDir, fileGlobPattern)));
|
|
29
29
|
}
|
|
30
30
|
catch (e) {
|
|
31
31
|
throw new Error(`createGlobPatternsForDependencies: Error when generating globs.\n${e === null || e === void 0 ? void 0 : e.message}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-globs.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/generate-globs.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"generate-globs.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/generate-globs.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AACjD,oDAAsD;AACtD,+BAAyC;AACzC,2EAAiF;AACjF,0EAG0C;AAE1C;;;;GAIG;AACH,SAAgB,iCAAiC,CAC/C,OAAe,EACf,eAAuB;IAEvB,MAAM,+BAA+B,GAAG,IAAA,eAAQ,EAAC,wBAAa,EAAE,OAAO,CAAC,CAAC;IACzE,MAAM,YAAY,GAAG,IAAA,sCAAsB,GAAE,CAAC;IAE9C,mBAAmB;IACnB,IAAI,WAAW,CAAC;IAChB,IAAI;QACF,WAAW,GAAG,IAAA,+CAAyB,EACrC,+BAA+B,EAC/B,YAAY,CACb,CAAC;KACH;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CACb,oFAAoF,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,OAAO,EAAE,CACjG,CAAC;KACH;IAED,oBAAoB;IACpB,IAAI;QACF,MAAM,WAAW,GAAG,IAAA,qDAA+B,EACjD,WAAW,EACX,YAAY,CACb,CAAC;QAEF,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CACnC,IAAA,cAAO,EAAC,wBAAa,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,eAAe,CAAC,CAAC,CACtE,CAAC;KACH;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CACb,oEAAoE,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,OAAO,EAAE,CACjF,CAAC;KACH;AACH,CAAC;AAnCD,8EAmCC"}
|
|
@@ -39,7 +39,7 @@ function getPluginCapabilities(workspaceRoot, pluginName) {
|
|
|
39
39
|
}
|
|
40
40
|
exports.getPluginCapabilities = getPluginCapabilities;
|
|
41
41
|
function listPluginCapabilities(pluginName) {
|
|
42
|
-
const plugin = getPluginCapabilities(devkit_2.
|
|
42
|
+
const plugin = getPluginCapabilities(devkit_2.workspaceRoot, pluginName);
|
|
43
43
|
if (!plugin) {
|
|
44
44
|
const pmc = (0, devkit_1.getPackageManagerCommand)();
|
|
45
45
|
output_1.output.note({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-capabilities.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/plugin-capabilities.ts"],"names":[],"mappings":";;;AAAA,yCAAsE;AACtE,
|
|
1
|
+
{"version":3,"file":"plugin-capabilities.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utilities/plugins/plugin-capabilities.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ var find_nodes_1 = require("./typescript/find-nodes");
|
|
|
11
11
|
Object.defineProperty(exports, "findNodes", { enumerable: true, get: function () { return find_nodes_1.findNodes; } });
|
|
12
12
|
var get_source_nodes_1 = require("./typescript/get-source-nodes");
|
|
13
13
|
Object.defineProperty(exports, "getSourceNodes", { enumerable: true, get: function () { return get_source_nodes_1.getSourceNodes; } });
|
|
14
|
-
const normalizedAppRoot = devkit_2.
|
|
14
|
+
const normalizedAppRoot = devkit_2.workspaceRoot.replace(/\\/g, '/');
|
|
15
15
|
let tsModule;
|
|
16
16
|
function readTsConfig(tsConfigPath) {
|
|
17
17
|
if (!tsModule) {
|
|
@@ -56,7 +56,7 @@ exports.resolveModuleByImport = resolveModuleByImport;
|
|
|
56
56
|
function getCompilerHost(tsConfigPath) {
|
|
57
57
|
const options = readTsConfigOptions(tsConfigPath);
|
|
58
58
|
const host = tsModule.createCompilerHost(options, true);
|
|
59
|
-
const moduleResolutionCache = tsModule.createModuleResolutionCache(devkit_2.
|
|
59
|
+
const moduleResolutionCache = tsModule.createModuleResolutionCache(devkit_2.workspaceRoot, host.getCanonicalFileName);
|
|
60
60
|
return { options, host, moduleResolutionCache };
|
|
61
61
|
}
|
|
62
62
|
function getRootTsConfigPathInTree(tree) {
|
|
@@ -74,7 +74,7 @@ function getRelativePathToRootTsConfig(tree, targetPath) {
|
|
|
74
74
|
exports.getRelativePathToRootTsConfig = getRelativePathToRootTsConfig;
|
|
75
75
|
function getRootTsConfigFileName() {
|
|
76
76
|
for (const tsConfigName of ['tsconfig.base.json', 'tsconfig.json']) {
|
|
77
|
-
const tsConfigPath = (0, path_1.join)(devkit_2.
|
|
77
|
+
const tsConfigPath = (0, path_1.join)(devkit_2.workspaceRoot, tsConfigName);
|
|
78
78
|
if ((0, fs_1.existsSync)(tsConfigPath)) {
|
|
79
79
|
return tsConfigName;
|
|
80
80
|
}
|
|
@@ -84,7 +84,7 @@ function getRootTsConfigFileName() {
|
|
|
84
84
|
exports.getRootTsConfigFileName = getRootTsConfigFileName;
|
|
85
85
|
function getRootTsConfigPath() {
|
|
86
86
|
const tsConfigFileName = getRootTsConfigFileName();
|
|
87
|
-
return tsConfigFileName ? (0, path_1.join)(devkit_2.
|
|
87
|
+
return tsConfigFileName ? (0, path_1.join)(devkit_2.workspaceRoot, tsConfigFileName) : null;
|
|
88
88
|
}
|
|
89
89
|
exports.getRootTsConfigPath = getRootTsConfigPath;
|
|
90
90
|
//# sourceMappingURL=typescript.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/typescript.ts"],"names":[],"mappings":";;;AAAA,yCAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"typescript.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/typescript.ts"],"names":[],"mappings":"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"}
|
package/src/utils/app-root.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export { appRootPath } from 'nx/src/utils/app-root';
|
|
1
|
+
export { appRootPath, workspaceRoot } from 'nx/src/utils/app-root';
|
package/src/utils/app-root.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.appRootPath = void 0;
|
|
3
|
+
exports.workspaceRoot = exports.appRootPath = void 0;
|
|
4
4
|
var app_root_1 = require("nx/src/utils/app-root");
|
|
5
5
|
Object.defineProperty(exports, "appRootPath", { enumerable: true, get: function () { return app_root_1.appRootPath; } });
|
|
6
|
+
Object.defineProperty(exports, "workspaceRoot", { enumerable: true, get: function () { return app_root_1.workspaceRoot; } });
|
|
6
7
|
//# sourceMappingURL=app-root.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-root.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/app-root.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"app-root.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/app-root.ts"],"names":[],"mappings":";;;AAAA,kDAAmE;AAA1D,uGAAA,WAAW,OAAA;AAAE,yGAAA,aAAa,OAAA"}
|
|
@@ -33,7 +33,7 @@ function formatFiles(options = { skipFormat: false }, directory = '') {
|
|
|
33
33
|
return host;
|
|
34
34
|
}
|
|
35
35
|
return (0, rxjs_1.from)(files).pipe((0, operators_1.filter)((file) => host.exists(file.path)), (0, operators_1.mergeMap)((file) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
36
|
-
const systemPath = path.join(devkit_1.
|
|
36
|
+
const systemPath = path.join(devkit_1.workspaceRoot, file.path);
|
|
37
37
|
let options = {
|
|
38
38
|
filepath: systemPath,
|
|
39
39
|
};
|
|
@@ -56,7 +56,7 @@ function formatFiles(options = { skipFormat: false }, directory = '') {
|
|
|
56
56
|
}
|
|
57
57
|
exports.formatFiles = formatFiles;
|
|
58
58
|
function updateWorkspaceJsonToMatchFormatVersion(host) {
|
|
59
|
-
const workspaceConfigPath = (0, workspace_1.workspaceConfigName)(devkit_1.
|
|
59
|
+
const workspaceConfigPath = (0, workspace_1.workspaceConfigName)(devkit_1.workspaceRoot);
|
|
60
60
|
try {
|
|
61
61
|
if (workspaceConfigPath) {
|
|
62
62
|
const workspaceJson = (0, devkit_2.parseJson)(host.read(workspaceConfigPath).toString());
|