@nrwl/workspace 14.4.0-beta.5 → 14.4.0-beta.8
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +1 -1
- package/package.json +26 -26
- package/src/generators/move/lib/update-eslintrc-json.js +1 -1
- package/src/generators/move/lib/update-eslintrc-json.js.map +1 -1
- package/src/generators/move/lib/update-imports.js +2 -2
- package/src/generators/move/lib/update-imports.js.map +1 -1
- package/src/generators/move/lib/update-project-root-files.js +1 -1
- package/src/generators/move/lib/update-project-root-files.js.map +1 -1
- package/src/generators/remove/lib/update-tsconfig.js +3 -3
- package/src/generators/remove/lib/update-tsconfig.js.map +1 -1
- package/src/utilities/buildable-libs-utils.js +3 -11
- package/src/utilities/buildable-libs-utils.js.map +1 -1
package/CHANGELOG.md
CHANGED
@@ -3,6 +3,6 @@
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
5
5
|
|
6
|
-
# [14.4.0-beta.
|
6
|
+
# [14.4.0-beta.8](https://github.com/nrwl/nx/compare/14.3.6...14.4.0-beta.8) (2022-07-01)
|
7
7
|
|
8
8
|
**Note:** Version bump only for package @nrwl/workspace
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@nrwl/workspace",
|
3
|
-
"version": "14.4.0-beta.
|
3
|
+
"version": "14.4.0-beta.8",
|
4
4
|
"description": "Smart, Fast and Extensible Build System.",
|
5
5
|
"repository": {
|
6
6
|
"type": "git",
|
@@ -32,27 +32,27 @@
|
|
32
32
|
"requirements": {},
|
33
33
|
"migrations": "./migrations.json",
|
34
34
|
"packageGroup": {
|
35
|
-
"@nrwl/angular": "14.4.0-beta.
|
36
|
-
"@nrwl/cypress": "14.4.0-beta.
|
37
|
-
"@nrwl/devkit": "14.4.0-beta.
|
38
|
-
"@nrwl/eslint-plugin-nx": "14.4.0-beta.
|
39
|
-
"@nrwl/express": "14.4.0-beta.
|
40
|
-
"@nrwl/jest": "14.4.0-beta.
|
41
|
-
"@nrwl/linter": "14.4.0-beta.
|
42
|
-
"@nrwl/nest": "14.4.0-beta.
|
43
|
-
"@nrwl/next": "14.4.0-beta.
|
44
|
-
"@nrwl/node": "14.4.0-beta.
|
45
|
-
"@nrwl/nx-plugin": "14.4.0-beta.
|
46
|
-
"@nrwl/react": "14.4.0-beta.
|
47
|
-
"@nrwl/storybook": "14.4.0-beta.
|
48
|
-
"@nrwl/web": "14.4.0-beta.
|
49
|
-
"@nrwl/js": "14.4.0-beta.
|
50
|
-
"@nrwl/cli": "14.4.0-beta.
|
51
|
-
"@nrwl/tao": "14.4.0-beta.
|
35
|
+
"@nrwl/angular": "14.4.0-beta.8",
|
36
|
+
"@nrwl/cypress": "14.4.0-beta.8",
|
37
|
+
"@nrwl/devkit": "14.4.0-beta.8",
|
38
|
+
"@nrwl/eslint-plugin-nx": "14.4.0-beta.8",
|
39
|
+
"@nrwl/express": "14.4.0-beta.8",
|
40
|
+
"@nrwl/jest": "14.4.0-beta.8",
|
41
|
+
"@nrwl/linter": "14.4.0-beta.8",
|
42
|
+
"@nrwl/nest": "14.4.0-beta.8",
|
43
|
+
"@nrwl/next": "14.4.0-beta.8",
|
44
|
+
"@nrwl/node": "14.4.0-beta.8",
|
45
|
+
"@nrwl/nx-plugin": "14.4.0-beta.8",
|
46
|
+
"@nrwl/react": "14.4.0-beta.8",
|
47
|
+
"@nrwl/storybook": "14.4.0-beta.8",
|
48
|
+
"@nrwl/web": "14.4.0-beta.8",
|
49
|
+
"@nrwl/js": "14.4.0-beta.8",
|
50
|
+
"@nrwl/cli": "14.4.0-beta.8",
|
51
|
+
"@nrwl/tao": "14.4.0-beta.8",
|
52
52
|
"@nrwl/nx-cloud": "latest",
|
53
|
-
"@nrwl/react-native": "14.4.0-beta.
|
54
|
-
"@nrwl/detox": "14.4.0-beta.
|
55
|
-
"nx": "14.4.0-beta.
|
53
|
+
"@nrwl/react-native": "14.4.0-beta.8",
|
54
|
+
"@nrwl/detox": "14.4.0-beta.8",
|
55
|
+
"nx": "14.4.0-beta.8"
|
56
56
|
}
|
57
57
|
},
|
58
58
|
"peerDependencies": {
|
@@ -64,9 +64,9 @@
|
|
64
64
|
}
|
65
65
|
},
|
66
66
|
"dependencies": {
|
67
|
-
"@nrwl/devkit": "14.4.0-beta.
|
68
|
-
"@nrwl/jest": "14.4.0-beta.
|
69
|
-
"@nrwl/linter": "14.4.0-beta.
|
67
|
+
"@nrwl/devkit": "14.4.0-beta.8",
|
68
|
+
"@nrwl/jest": "14.4.0-beta.8",
|
69
|
+
"@nrwl/linter": "14.4.0-beta.8",
|
70
70
|
"@parcel/watcher": "2.0.4",
|
71
71
|
"chalk": "4.1.0",
|
72
72
|
"chokidar": "^3.5.1",
|
@@ -81,7 +81,7 @@
|
|
81
81
|
"ignore": "^5.0.4",
|
82
82
|
"minimatch": "3.0.5",
|
83
83
|
"npm-run-path": "^4.0.1",
|
84
|
-
"nx": "14.4.0-beta.
|
84
|
+
"nx": "14.4.0-beta.8",
|
85
85
|
"open": "^8.4.0",
|
86
86
|
"rxjs": "^6.5.4",
|
87
87
|
"semver": "7.3.4",
|
@@ -90,5 +90,5 @@
|
|
90
90
|
"yargs": "^17.4.0",
|
91
91
|
"yargs-parser": "21.0.1"
|
92
92
|
},
|
93
|
-
"gitHead": "
|
93
|
+
"gitHead": "35bb15908ed7029ce6a33917465114d6513fd999"
|
94
94
|
}
|
@@ -9,7 +9,7 @@ function offsetFilePath(project, pathToFile, offset) {
|
|
9
9
|
return pathToFile;
|
10
10
|
}
|
11
11
|
const pathFromRoot = (0, path_1.join)(project.root, pathToFile);
|
12
|
-
return (0,
|
12
|
+
return (0, devkit_1.joinPathFragments)(offset, pathFromRoot);
|
13
13
|
}
|
14
14
|
/**
|
15
15
|
* Update the .eslintrc file of the project if it exists.
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"update-eslintrc-json.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-eslintrc-json.ts"],"names":[],"mappings":";;;AAAA,
|
1
|
+
{"version":3,"file":"update-eslintrc-json.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-eslintrc-json.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,+BAA4B;AAc5B,SAAS,cAAc,CACrB,OAA6B,EAC7B,UAAkB,EAClB,MAAc;IAEd,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QAChC,sBAAsB;QACtB,OAAO,UAAU,CAAC;KACnB;IACD,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACpD,OAAO,IAAA,0BAAiB,EAAC,MAAM,EAAE,YAAY,CAAC,CAAC;AACjD,CAAC;AAED;;;;GAIG;AACH,SAAgB,kBAAkB,CAChC,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC,MAAM,CAAC,yBAAyB,EAAE,gBAAgB,CAAC,CAAC;IAE9E,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;QAC9B,oCAAoC;QACpC,OAAO;KACR;IAED,MAAM,MAAM,GAAG,IAAA,uBAAc,EAAC,MAAM,CAAC,yBAAyB,CAAC,CAAC;IAEhE,IAAA,mBAAU,EAAsB,IAAI,EAAE,YAAY,EAAE,CAAC,YAAY,EAAE,EAAE;;QACnE,IAAI,OAAO,YAAY,CAAC,OAAO,KAAK,QAAQ,EAAE;YAC5C,YAAY,CAAC,OAAO,GAAG,cAAc,CACnC,OAAO,EACP,YAAY,CAAC,OAAO,EACpB,MAAM,CACP,CAAC;SACH;aAAM;YACL,YAAY,CAAC,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAc,EAAE,EAAE,CACjE,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CACxC,CAAC;SACH;QAED,MAAA,YAAY,CAAC,SAAS,0CAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;;YACpC,IAAI,MAAA,CAAC,CAAC,aAAa,0CAAE,OAAO,EAAE;gBAC5B,CAAC,CAAC,aAAa,CAAC,OAAO,GAAG,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1D,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,yBAAyB,CAAC,CAC1D,CAAC;aACH;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,YAAY,CAAC;IACtB,CAAC,CAAC,CAAC;AACL,CAAC;AArCD,gDAqCC"}
|
@@ -30,7 +30,7 @@ function updateImports(tree, schema, project) {
|
|
30
30
|
}
|
31
31
|
const projectRef = {
|
32
32
|
from: fromPath ||
|
33
|
-
(0, utils_1.normalizeSlashes)((0, path_1.getImportPath)(npmScope, project.root.slice(libsDir.length
|
33
|
+
(0, utils_1.normalizeSlashes)((0, path_1.getImportPath)(npmScope, project.root.slice(libsDir.length).replace(/^\/|\\/, ''))),
|
34
34
|
to: schema.importPath,
|
35
35
|
};
|
36
36
|
if (schema.updateImportPath) {
|
@@ -50,7 +50,7 @@ function updateImports(tree, schema, project) {
|
|
50
50
|
}
|
51
51
|
}
|
52
52
|
const projectRoot = {
|
53
|
-
from: project.root.slice(libsDir.length
|
53
|
+
from: project.root.slice(libsDir.length).replace(/^\/|\\/, ''),
|
54
54
|
to: schema.destination,
|
55
55
|
};
|
56
56
|
if (tsConfig) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"update-imports.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-imports.ts"],"names":[],"mappings":";;;AAAA,yCAUsB;AACtB,4CAAkD;AAClD,iCAAiC;AACjC,8DAA0E;AAC1E,yEAAqE;AAErE,mCAA2C;AAE3C;;;;GAIG;AACH,SAAgB,aAAa,CAC3B,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,IAAI,OAAO,CAAC,WAAW,KAAK,aAAa,EAAE;QACzC,wCAAwC;QACxC,OAAO;KACR;IAED,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IACvD,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAEnC,gDAAgD;IAChD,6EAA6E;IAC7E,MAAM,YAAY,GAAG,IAAA,sCAAyB,EAAC,IAAI,CAAC,CAAC;IACrD,IAAI,QAAa,CAAC;IAClB,IAAI,QAAgB,CAAC;IACrB,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;QAC7B,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;QACjE,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CACnE,QAAQ,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC9C,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CACjC,CACF,CAAC;KACH;IAED,MAAM,UAAU,GAAG;QACjB,IAAI,EACF,QAAQ;YACR,IAAA,wBAAgB,EACd,IAAA,oBAAa,
|
1
|
+
{"version":3,"file":"update-imports.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-imports.ts"],"names":[],"mappings":"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"}
|
@@ -26,7 +26,7 @@ function updateProjectRootFiles(tree, schema, project) {
|
|
26
26
|
return;
|
27
27
|
}
|
28
28
|
const dots = /\./g;
|
29
|
-
const regex = new RegExp(oldRelativeRoot.replace(dots, '\\.')
|
29
|
+
const regex = new RegExp(`(?<!\\.\\.\\/)${oldRelativeRoot.replace(dots, '\\.')}(?!\\/\\.\\.)`, 'g');
|
30
30
|
for (const file of tree.children(schema.relativeToRootDestination)) {
|
31
31
|
const ext = (0, path_1.extname)(file);
|
32
32
|
if (!allowedExt.includes(ext)) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"update-project-root-files.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-project-root-files.ts"],"names":[],"mappings":";;;AACA,yCAA6C;AAC7C,6BAA6B;AAC7B,+BAAqC;AAErC,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AAC3C;;;;;;GAMG;AACH,SAAgB,sBAAsB,CACpC,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,MAAM,eAAe,GAAG,IAAI;SACzB,QAAQ,CACP,IAAI,CAAC,IAAI,CAAC,sBAAa,EAAE,MAAM,CAAC,yBAAyB,CAAC,EAC1D,sBAAa,CACd;SACA,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,MAAM,eAAe,GAAG,IAAI;SACzB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAa,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,sBAAa,CAAC;SAC/D,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IAEb,IAAI,eAAe,KAAK,eAAe,EAAE;QACvC,gBAAgB;QAChB,OAAO;KACR;IAED,MAAM,IAAI,GAAG,KAAK,CAAC;IACnB,MAAM,KAAK,GAAG,IAAI,MAAM,
|
1
|
+
{"version":3,"file":"update-project-root-files.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-project-root-files.ts"],"names":[],"mappings":";;;AACA,yCAA6C;AAC7C,6BAA6B;AAC7B,+BAAqC;AAErC,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AAC3C;;;;;;GAMG;AACH,SAAgB,sBAAsB,CACpC,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,MAAM,eAAe,GAAG,IAAI;SACzB,QAAQ,CACP,IAAI,CAAC,IAAI,CAAC,sBAAa,EAAE,MAAM,CAAC,yBAAyB,CAAC,EAC1D,sBAAa,CACd;SACA,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,MAAM,eAAe,GAAG,IAAI;SACzB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAa,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,sBAAa,CAAC;SAC/D,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IAEb,IAAI,eAAe,KAAK,eAAe,EAAE;QACvC,gBAAgB;QAChB,OAAO;KACR;IAED,MAAM,IAAI,GAAG,KAAK,CAAC;IACnB,MAAM,KAAK,GAAG,IAAI,MAAM,CACtB,iBAAiB,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,eAAe,EACpE,GAAG,CACJ,CAAC;IACF,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,yBAAyB,CAAC,EAAE;QAClE,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;QAC1B,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC7B,SAAS;SACV;QACD,IAAI,IAAI,KAAK,gBAAgB,EAAE;YAC7B,SAAS;SACV;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAC1B,IAAA,WAAI,EAAC,MAAM,CAAC,yBAAyB,EAAE,IAAI,CAAC,EAC5C,OAAO,CACR,CAAC;QACF,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;QAC9D,IAAI,CAAC,KAAK,CAAC,IAAA,WAAI,EAAC,MAAM,CAAC,yBAAyB,EAAE,IAAI,CAAC,EAAE,UAAU,CAAC,CAAC;KACtE;AACH,CAAC;AA3CD,wDA2CC"}
|
@@ -12,9 +12,9 @@ const typescript_1 = require("../../../utilities/typescript");
|
|
12
12
|
function updateTsconfig(tree, schema, project) {
|
13
13
|
const { appsDir, libsDir, npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
|
14
14
|
const tsConfigPath = (0, typescript_1.getRootTsConfigPathInTree)(tree);
|
15
|
-
const defaultImportPath = (0, path_1.getImportPath)(npmScope, project.root
|
16
|
-
? appsDir.length
|
17
|
-
|
15
|
+
const defaultImportPath = (0, path_1.getImportPath)(npmScope, project.root
|
16
|
+
.slice(project.projectType === 'application' ? appsDir.length : libsDir.length)
|
17
|
+
.replace(/^\/|\\/, ''));
|
18
18
|
const importPath = schema.importPath || defaultImportPath;
|
19
19
|
if (tree.exists(tsConfigPath)) {
|
20
20
|
(0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
|
@@ -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,4CAAkD;AAClD,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,IAAA,oBAAa,EACrC,QAAQ,EACR,OAAO,CAAC,IAAI,
|
1
|
+
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,4CAAkD;AAClD,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,IAAA,oBAAa,EACrC,QAAQ,EACR,OAAO,CAAC,IAAI;SACT,KAAK,CACJ,OAAO,CAAC,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CACxE;SACA,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CACzB,CAAC;IACF,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;AAvBD,wCAuBC"}
|
@@ -130,21 +130,13 @@ function cleanupTmpTsConfigFile(tmpTsConfigPath) {
|
|
130
130
|
}
|
131
131
|
function checkDependentProjectsHaveBeenBuilt(root, projectName, targetName, projectDependencies) {
|
132
132
|
const missing = findMissingBuildDependencies(root, projectName, targetName, projectDependencies);
|
133
|
-
if (missing.length
|
133
|
+
if (missing.length > 0) {
|
134
134
|
console.error((0, devkit_1.stripIndents) `
|
135
135
|
It looks like all of ${projectName}'s dependencies have not been built yet:
|
136
136
|
${missing.map((x) => ` - ${x.node.name}`).join('\n')}
|
137
137
|
|
138
|
-
You might be missing a "targetDefaults" configuration in your root nx.json (https://nx.dev/configuration/
|
139
|
-
or "dependsOn" configured in ${projectName}'s
|
140
|
-
`);
|
141
|
-
}
|
142
|
-
else if (missing.length > 0) {
|
143
|
-
console.error((0, devkit_1.stripIndents) `
|
144
|
-
Some of the project ${projectName}'s dependencies have not been built yet. Please build these libraries before:
|
145
|
-
${missing.map((x) => ` - ${x.node.name}`).join('\n')}
|
146
|
-
|
147
|
-
Try: nx run ${projectName}:${targetName} --with-deps
|
138
|
+
You might be missing a "targetDefaults" configuration in your root nx.json (https://nx.dev/configuration/projectjson#target-defaults),
|
139
|
+
or "dependsOn" configured in ${projectName}'s project.json (https://nx.dev/configuration/projectjson#dependson)
|
148
140
|
`);
|
149
141
|
return false;
|
150
142
|
}
|
@@ -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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"}
|