@nrwl/workspace 14.4.1 → 14.5.0-beta.1
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/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__ +2 -2
- package/src/generators/move/lib/{update-cypress-json.d.ts → update-cypress-config.d.ts} +2 -2
- package/src/generators/move/lib/update-cypress-config.js +33 -0
- package/src/generators/move/lib/update-cypress-config.js.map +1 -0
- package/src/generators/move/move.js +10 -10
- package/src/generators/move/move.js.map +1 -1
- package/src/tslint/nxEnforceModuleBoundariesRule.js.map +1 -1
- package/src/utils/runtime-lint-utils.d.ts +25 -15
- package/src/utils/runtime-lint-utils.js +71 -13
- package/src/utils/runtime-lint-utils.js.map +1 -1
- package/.eslintrc.json +0 -41
- package/src/generators/move/lib/update-cypress-json.js +0 -24
- package/src/generators/move/lib/update-cypress-json.js.map +0 -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
|
-
|
|
6
|
+
# [14.5.0-beta.1](https://github.com/nrwl/nx/compare/14.4.2...14.5.0-beta.1) (2022-07-14)
|
|
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.
|
|
3
|
+
"version": "14.5.0-beta.1",
|
|
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.
|
|
36
|
-
"@nrwl/cypress": "14.
|
|
37
|
-
"@nrwl/devkit": "14.
|
|
38
|
-
"@nrwl/eslint-plugin-nx": "14.
|
|
39
|
-
"@nrwl/express": "14.
|
|
40
|
-
"@nrwl/jest": "14.
|
|
41
|
-
"@nrwl/linter": "14.
|
|
42
|
-
"@nrwl/nest": "14.
|
|
43
|
-
"@nrwl/next": "14.
|
|
44
|
-
"@nrwl/node": "14.
|
|
45
|
-
"@nrwl/nx-plugin": "14.
|
|
46
|
-
"@nrwl/react": "14.
|
|
47
|
-
"@nrwl/storybook": "14.
|
|
48
|
-
"@nrwl/web": "14.
|
|
49
|
-
"@nrwl/js": "14.
|
|
50
|
-
"@nrwl/cli": "14.
|
|
51
|
-
"@nrwl/tao": "14.
|
|
35
|
+
"@nrwl/angular": "14.5.0-beta.1",
|
|
36
|
+
"@nrwl/cypress": "14.5.0-beta.1",
|
|
37
|
+
"@nrwl/devkit": "14.5.0-beta.1",
|
|
38
|
+
"@nrwl/eslint-plugin-nx": "14.5.0-beta.1",
|
|
39
|
+
"@nrwl/express": "14.5.0-beta.1",
|
|
40
|
+
"@nrwl/jest": "14.5.0-beta.1",
|
|
41
|
+
"@nrwl/linter": "14.5.0-beta.1",
|
|
42
|
+
"@nrwl/nest": "14.5.0-beta.1",
|
|
43
|
+
"@nrwl/next": "14.5.0-beta.1",
|
|
44
|
+
"@nrwl/node": "14.5.0-beta.1",
|
|
45
|
+
"@nrwl/nx-plugin": "14.5.0-beta.1",
|
|
46
|
+
"@nrwl/react": "14.5.0-beta.1",
|
|
47
|
+
"@nrwl/storybook": "14.5.0-beta.1",
|
|
48
|
+
"@nrwl/web": "14.5.0-beta.1",
|
|
49
|
+
"@nrwl/js": "14.5.0-beta.1",
|
|
50
|
+
"@nrwl/cli": "14.5.0-beta.1",
|
|
51
|
+
"@nrwl/tao": "14.5.0-beta.1",
|
|
52
52
|
"@nrwl/nx-cloud": "latest",
|
|
53
|
-
"@nrwl/react-native": "14.
|
|
54
|
-
"@nrwl/detox": "14.
|
|
55
|
-
"nx": "14.
|
|
53
|
+
"@nrwl/react-native": "14.5.0-beta.1",
|
|
54
|
+
"@nrwl/detox": "14.5.0-beta.1",
|
|
55
|
+
"nx": "14.5.0-beta.1"
|
|
56
56
|
}
|
|
57
57
|
},
|
|
58
58
|
"peerDependencies": {
|
|
@@ -64,9 +64,9 @@
|
|
|
64
64
|
}
|
|
65
65
|
},
|
|
66
66
|
"dependencies": {
|
|
67
|
-
"@nrwl/devkit": "14.
|
|
68
|
-
"@nrwl/jest": "14.
|
|
69
|
-
"@nrwl/linter": "14.
|
|
67
|
+
"@nrwl/devkit": "14.5.0-beta.1",
|
|
68
|
+
"@nrwl/jest": "14.5.0-beta.1",
|
|
69
|
+
"@nrwl/linter": "14.5.0-beta.1",
|
|
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.
|
|
84
|
+
"nx": "14.5.0-beta.1",
|
|
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": "63b74d2a5655c0c09131dfa24a0a024ca7360fca"
|
|
94
94
|
}
|
package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__
CHANGED
|
@@ -9,7 +9,7 @@ on:
|
|
|
9
9
|
jobs:
|
|
10
10
|
main:
|
|
11
11
|
name: Nx Cloud - Main Job
|
|
12
|
-
uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.
|
|
12
|
+
uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.6
|
|
13
13
|
with:
|
|
14
14
|
number-of-agents: 3
|
|
15
15
|
parallel-commands: |
|
|
@@ -22,6 +22,6 @@ jobs:
|
|
|
22
22
|
|
|
23
23
|
agents:
|
|
24
24
|
name: Nx Cloud - Agents
|
|
25
|
-
uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.
|
|
25
|
+
uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.6
|
|
26
26
|
with:
|
|
27
27
|
number-of-agents: 3
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { ProjectConfiguration, Tree } from '@nrwl/devkit';
|
|
2
2
|
import { NormalizedSchema } from '../schema';
|
|
3
3
|
/**
|
|
4
|
-
* Updates the videos and screenshots folders in the cypress.json if it exists (i.e. we're moving an e2e project)
|
|
4
|
+
* Updates the videos and screenshots folders in the cypress.json/cypress.config.ts if it exists (i.e. we're moving an e2e project)
|
|
5
5
|
*
|
|
6
6
|
* (assume relative paths have been updated previously)
|
|
7
7
|
*
|
|
8
8
|
* @param schema The options provided to the schematic
|
|
9
9
|
*/
|
|
10
|
-
export declare function
|
|
10
|
+
export declare function updateCypressConfig(tree: Tree, schema: NormalizedSchema, project: ProjectConfiguration): Tree;
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.updateCypressConfig = void 0;
|
|
4
|
+
const path = require("path");
|
|
5
|
+
/**
|
|
6
|
+
* Updates the videos and screenshots folders in the cypress.json/cypress.config.ts if it exists (i.e. we're moving an e2e project)
|
|
7
|
+
*
|
|
8
|
+
* (assume relative paths have been updated previously)
|
|
9
|
+
*
|
|
10
|
+
* @param schema The options provided to the schematic
|
|
11
|
+
*/
|
|
12
|
+
function updateCypressConfig(tree, schema, project) {
|
|
13
|
+
const cypressJsonPath = path.join(schema.relativeToRootDestination, 'cypress.json');
|
|
14
|
+
if (tree.exists(cypressJsonPath)) {
|
|
15
|
+
const cypressJson = JSON.parse(tree.read(cypressJsonPath).toString('utf-8'));
|
|
16
|
+
cypressJson.videosFolder = cypressJson.videosFolder.replace(project.root, schema.relativeToRootDestination);
|
|
17
|
+
cypressJson.screenshotsFolder = cypressJson.screenshotsFolder.replace(project.root, schema.relativeToRootDestination);
|
|
18
|
+
tree.write(cypressJsonPath, JSON.stringify(cypressJson));
|
|
19
|
+
return tree;
|
|
20
|
+
}
|
|
21
|
+
const cypressConfigPath = path.join(schema.relativeToRootDestination, 'cypress.config.ts');
|
|
22
|
+
if (tree.exists(cypressConfigPath)) {
|
|
23
|
+
const oldContent = tree.read(cypressConfigPath, 'utf-8');
|
|
24
|
+
const findName = new RegExp(`'${schema.projectName}'`, 'g');
|
|
25
|
+
const findDir = new RegExp(project.root, 'g');
|
|
26
|
+
const newContent = oldContent
|
|
27
|
+
.replace(findName, `'${schema.newProjectName}'`)
|
|
28
|
+
.replace(findDir, schema.relativeToRootDestination);
|
|
29
|
+
tree.write(cypressConfigPath, newContent);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
exports.updateCypressConfig = updateCypressConfig;
|
|
33
|
+
//# sourceMappingURL=update-cypress-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-cypress-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-cypress-config.ts"],"names":[],"mappings":";;;AACA,6BAA6B;AAQ7B;;;;;;GAMG;AACH,SAAgB,mBAAmB,CACjC,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAC/B,MAAM,CAAC,yBAAyB,EAChC,cAAc,CACf,CAAC;IAEF,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QAChC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CACvB,CAAC;QACxB,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC,OAAO,CACzD,OAAO,CAAC,IAAI,EACZ,MAAM,CAAC,yBAAyB,CACjC,CAAC;QACF,WAAW,CAAC,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC,OAAO,CACnE,OAAO,CAAC,IAAI,EACZ,MAAM,CAAC,yBAAyB,CACjC,CAAC;QAEF,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;KACb;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CACjC,MAAM,CAAC,yBAAyB,EAChC,mBAAmB,CACpB,CAAC;IACF,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;QAClC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,IAAI,MAAM,CAAC,IAAI,MAAM,CAAC,WAAW,GAAG,EAAE,GAAG,CAAC,CAAC;QAC5D,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC9C,MAAM,UAAU,GAAG,UAAU;aAC1B,OAAO,CAAC,QAAQ,EAAE,IAAI,MAAM,CAAC,cAAc,GAAG,CAAC;aAC/C,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,yBAAyB,CAAC,CAAC;QAEtD,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;KAC3C;AACH,CAAC;AAzCD,kDAyCC"}
|
|
@@ -5,19 +5,19 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const check_destination_1 = require("./lib/check-destination");
|
|
7
7
|
const move_project_1 = require("./lib/move-project");
|
|
8
|
-
const
|
|
8
|
+
const move_project_configuration_1 = require("./lib/move-project-configuration");
|
|
9
|
+
const normalize_schema_1 = require("./lib/normalize-schema");
|
|
10
|
+
const update_build_targets_1 = require("./lib/update-build-targets");
|
|
11
|
+
const update_cypress_config_1 = require("./lib/update-cypress-config");
|
|
12
|
+
const update_default_project_1 = require("./lib/update-default-project");
|
|
13
|
+
const update_eslintrc_json_1 = require("./lib/update-eslintrc-json");
|
|
14
|
+
const update_implicit_dependencies_1 = require("./lib/update-implicit-dependencies");
|
|
9
15
|
const update_imports_1 = require("./lib/update-imports");
|
|
10
16
|
const update_jest_config_1 = require("./lib/update-jest-config");
|
|
11
|
-
const
|
|
12
|
-
const update_implicit_dependencies_1 = require("./lib/update-implicit-dependencies");
|
|
17
|
+
const update_package_json_1 = require("./lib/update-package-json");
|
|
13
18
|
const update_project_root_files_1 = require("./lib/update-project-root-files");
|
|
14
|
-
const update_default_project_1 = require("./lib/update-default-project");
|
|
15
|
-
const update_eslintrc_json_1 = require("./lib/update-eslintrc-json");
|
|
16
|
-
const move_project_configuration_1 = require("./lib/move-project-configuration");
|
|
17
|
-
const update_build_targets_1 = require("./lib/update-build-targets");
|
|
18
19
|
const update_readme_1 = require("./lib/update-readme");
|
|
19
|
-
const
|
|
20
|
-
const normalize_schema_1 = require("./lib/normalize-schema");
|
|
20
|
+
const update_storybook_config_1 = require("./lib/update-storybook-config");
|
|
21
21
|
function moveGenerator(tree, rawSchema) {
|
|
22
22
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
23
23
|
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, rawSchema.projectName);
|
|
@@ -27,7 +27,7 @@ function moveGenerator(tree, rawSchema) {
|
|
|
27
27
|
(0, move_project_1.moveProject)(tree, schema, projectConfig); // we MUST move the project first, if we don't we get a "This should never happen" error 🤦♀️
|
|
28
28
|
(0, update_imports_1.updateImports)(tree, schema, projectConfig);
|
|
29
29
|
(0, update_project_root_files_1.updateProjectRootFiles)(tree, schema, projectConfig);
|
|
30
|
-
(0,
|
|
30
|
+
(0, update_cypress_config_1.updateCypressConfig)(tree, schema, projectConfig);
|
|
31
31
|
(0, update_jest_config_1.updateJestConfig)(tree, schema, projectConfig);
|
|
32
32
|
(0, update_storybook_config_1.updateStorybookConfig)(tree, schema, projectConfig);
|
|
33
33
|
(0, update_eslintrc_json_1.updateEslintrcJson)(tree, schema, projectConfig);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"move.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/move/move.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AAEtB,+DAA2D;AAC3D,qDAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"move.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/move/move.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AAEtB,+DAA2D;AAC3D,qDAAiD;AACjD,iFAA4E;AAC5E,6DAAyD;AACzD,qEAAgE;AAChE,uEAAkE;AAClE,yEAAoE;AACpE,qEAAgE;AAChE,qFAAgF;AAChF,yDAAqD;AACrD,iEAA4D;AAC5D,mEAA8D;AAC9D,+EAAyE;AACzE,uDAAmD;AACnD,2EAAsE;AAGtE,SAAsB,aAAa,CAAC,IAAU,EAAE,SAAiB;;QAC/D,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;QAC5E,IAAA,oCAAgB,EAAC,IAAI,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG,IAAA,kCAAe,EAAC,IAAI,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;QAE/D,IAAA,qDAAwB,EAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QACtD,IAAA,0BAAW,EAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,8FAA8F;QACxI,IAAA,8BAAa,EAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAC3C,IAAA,kDAAsB,EAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QACpD,IAAA,2CAAmB,EAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QACjD,IAAA,qCAAgB,EAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAC9C,IAAA,+CAAqB,EAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QACnD,IAAA,yCAAkB,EAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAChD,IAAA,4BAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC3B,IAAA,uCAAiB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAChC,IAAA,yCAAkB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACjC,IAAA,6CAAoB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACnC,IAAA,yDAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAEzC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAtBD,sCAsBC;AAED,kBAAe,aAAa,CAAC;AAEhB,QAAA,aAAa,GAAG,IAAA,2BAAkB,EAAC,aAAa,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nxEnforceModuleBoundariesRule.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tslint/nxEnforceModuleBoundariesRule.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;
|
|
1
|
+
{"version":3,"file":"nxEnforceModuleBoundariesRule.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tslint/nxEnforceModuleBoundariesRule.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,15 @@
|
|
|
1
|
-
import { ProjectGraph, ProjectGraphDependency, ProjectGraphProjectNode, ProjectGraphExternalNode
|
|
1
|
+
import { ProjectGraph, ProjectGraphDependency, ProjectGraphProjectNode, ProjectGraphExternalNode } from '@nrwl/devkit';
|
|
2
2
|
import { TargetProjectLocator } from 'nx/src/utils/target-project-locator';
|
|
3
|
-
export declare type MappedProjectGraphNode<T = any> = ProjectGraphProjectNode<T> & {
|
|
4
|
-
data: {
|
|
5
|
-
files: Record<string, FileData>;
|
|
6
|
-
};
|
|
7
|
-
};
|
|
8
3
|
export declare type MappedProjectGraph<T = any> = ProjectGraph<T> & {
|
|
9
|
-
|
|
4
|
+
allFiles: Record<string, string>;
|
|
10
5
|
};
|
|
11
6
|
export declare type Deps = {
|
|
12
7
|
[projectName: string]: ProjectGraphDependency[];
|
|
13
8
|
};
|
|
14
9
|
export declare type DepConstraint = {
|
|
15
10
|
sourceTag: string;
|
|
16
|
-
onlyDependOnLibsWithTags
|
|
17
|
-
notDependOnLibsWithTags
|
|
11
|
+
onlyDependOnLibsWithTags?: string[];
|
|
12
|
+
notDependOnLibsWithTags?: string[];
|
|
18
13
|
bannedExternalImports?: string[];
|
|
19
14
|
};
|
|
20
15
|
export declare function stringifyTags(tags: string[]): string;
|
|
@@ -29,19 +24,34 @@ export declare function findDependenciesWithTags(targetProject: ProjectGraphProj
|
|
|
29
24
|
export declare function removeExt(file: string): string;
|
|
30
25
|
export declare function matchImportWithWildcard(allowableImport: string, extractedImport: string): boolean;
|
|
31
26
|
export declare function isRelative(s: string): boolean;
|
|
32
|
-
export declare function getTargetProjectBasedOnRelativeImport(imp: string, projectPath: string, projectGraph: MappedProjectGraph, sourceFilePath: string):
|
|
33
|
-
export declare function findProjectUsingFile<T>(projectGraph: MappedProjectGraph<T>, file: string):
|
|
34
|
-
export declare function findSourceProject(projectGraph: MappedProjectGraph, sourceFilePath: string):
|
|
35
|
-
export declare function findTargetProject(projectGraph: MappedProjectGraph, targetFile: string):
|
|
27
|
+
export declare function getTargetProjectBasedOnRelativeImport(imp: string, projectPath: string, projectGraph: MappedProjectGraph, sourceFilePath: string): ProjectGraphProjectNode<any> | undefined;
|
|
28
|
+
export declare function findProjectUsingFile<T>(projectGraph: MappedProjectGraph<T>, file: string): ProjectGraphProjectNode;
|
|
29
|
+
export declare function findSourceProject(projectGraph: MappedProjectGraph, sourceFilePath: string): ProjectGraphProjectNode<any>;
|
|
30
|
+
export declare function findTargetProject(projectGraph: MappedProjectGraph, targetFile: string): ProjectGraphProjectNode<any>;
|
|
36
31
|
export declare function isAbsoluteImportIntoAnotherProject(imp: string, workspaceLayout?: {
|
|
37
32
|
libsDir: string;
|
|
38
33
|
appsDir: string;
|
|
39
34
|
}): boolean;
|
|
40
|
-
export declare function findProjectUsingImport(projectGraph: MappedProjectGraph, targetProjectLocator: TargetProjectLocator, filePath: string, imp: string):
|
|
35
|
+
export declare function findProjectUsingImport(projectGraph: MappedProjectGraph, targetProjectLocator: TargetProjectLocator, filePath: string, imp: string): ProjectGraphProjectNode | ProjectGraphExternalNode;
|
|
41
36
|
export declare function findConstraintsFor(depConstraints: DepConstraint[], sourceProject: ProjectGraphProjectNode): DepConstraint[];
|
|
42
37
|
export declare function onlyLoadChildren(graph: ProjectGraph, sourceProjectName: string, targetProjectName: string, visited: string[]): any;
|
|
43
38
|
export declare function getSourceFilePath(sourceFileName: string, projectPath: string): string;
|
|
44
|
-
export declare function hasBannedImport(source: ProjectGraphProjectNode, target:
|
|
39
|
+
export declare function hasBannedImport(source: ProjectGraphProjectNode, target: ProjectGraphExternalNode, depConstraints: DepConstraint[]): DepConstraint | undefined;
|
|
40
|
+
/**
|
|
41
|
+
* Find all unique (transitive) external dependencies of given project
|
|
42
|
+
* @param graph
|
|
43
|
+
* @param source
|
|
44
|
+
* @returns
|
|
45
|
+
*/
|
|
46
|
+
export declare function findTransitiveExternalDependencies(graph: ProjectGraph, source: ProjectGraphProjectNode): ProjectGraphDependency[];
|
|
47
|
+
/**
|
|
48
|
+
* Check if
|
|
49
|
+
* @param externalDependencies
|
|
50
|
+
* @param graph
|
|
51
|
+
* @param depConstraint
|
|
52
|
+
* @returns
|
|
53
|
+
*/
|
|
54
|
+
export declare function hasBannedDependencies(externalDependencies: ProjectGraphDependency[], graph: ProjectGraph, depConstraint: DepConstraint): Array<[ProjectGraphExternalNode, ProjectGraphProjectNode, DepConstraint]> | undefined;
|
|
45
55
|
export declare function isDirectDependency(target: ProjectGraphExternalNode): boolean;
|
|
46
56
|
/**
|
|
47
57
|
* Verifies whether the given node has an architect builder attached
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isAngularSecondaryEntrypoint = exports.groupImports = exports.isTerminalRun = exports.mapProjectGraphFiles = exports.hasBuildExecutor = exports.isDirectDependency = exports.hasBannedImport = exports.getSourceFilePath = exports.onlyLoadChildren = exports.findConstraintsFor = exports.findProjectUsingImport = exports.isAbsoluteImportIntoAnotherProject = exports.findTargetProject = exports.findSourceProject = exports.findProjectUsingFile = exports.getTargetProjectBasedOnRelativeImport = exports.isRelative = exports.matchImportWithWildcard = exports.removeExt = exports.findDependenciesWithTags = exports.hasNoneOfTheseTags = exports.stringifyTags = void 0;
|
|
3
|
+
exports.isAngularSecondaryEntrypoint = exports.groupImports = exports.isTerminalRun = exports.mapProjectGraphFiles = exports.hasBuildExecutor = exports.isDirectDependency = exports.hasBannedDependencies = exports.findTransitiveExternalDependencies = exports.hasBannedImport = exports.getSourceFilePath = exports.onlyLoadChildren = exports.findConstraintsFor = exports.findProjectUsingImport = exports.isAbsoluteImportIntoAnotherProject = exports.findTargetProject = exports.findSourceProject = exports.findProjectUsingFile = exports.getTargetProjectBasedOnRelativeImport = exports.isRelative = exports.matchImportWithWildcard = exports.removeExt = exports.findDependenciesWithTags = exports.hasNoneOfTheseTags = exports.stringifyTags = void 0;
|
|
4
4
|
const path = require("path");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const path_1 = require("path");
|
|
@@ -70,12 +70,13 @@ function getTargetProjectBasedOnRelativeImport(imp, projectPath, projectGraph, s
|
|
|
70
70
|
if (!isRelative(imp)) {
|
|
71
71
|
return undefined;
|
|
72
72
|
}
|
|
73
|
-
const
|
|
73
|
+
const sourceDir = path.join(projectPath, path.dirname(sourceFilePath));
|
|
74
|
+
const targetFile = (0, devkit_1.normalizePath)(path.resolve(sourceDir, imp)).substring(projectPath.length + 1);
|
|
74
75
|
return findTargetProject(projectGraph, targetFile);
|
|
75
76
|
}
|
|
76
77
|
exports.getTargetProjectBasedOnRelativeImport = getTargetProjectBasedOnRelativeImport;
|
|
77
78
|
function findProjectUsingFile(projectGraph, file) {
|
|
78
|
-
return
|
|
79
|
+
return projectGraph.nodes[projectGraph.allFiles[file]];
|
|
79
80
|
}
|
|
80
81
|
exports.findProjectUsingFile = findProjectUsingFile;
|
|
81
82
|
function findSourceProject(projectGraph, sourceFilePath) {
|
|
@@ -127,17 +128,76 @@ function onlyLoadChildren(graph, sourceProjectName, targetProjectName, visited)
|
|
|
127
128
|
}
|
|
128
129
|
exports.onlyLoadChildren = onlyLoadChildren;
|
|
129
130
|
function getSourceFilePath(sourceFileName, projectPath) {
|
|
130
|
-
|
|
131
|
+
const relativePath = sourceFileName.slice(projectPath.length + 1);
|
|
132
|
+
return (0, devkit_1.normalizePath)(relativePath);
|
|
131
133
|
}
|
|
132
134
|
exports.getSourceFilePath = getSourceFilePath;
|
|
135
|
+
/**
|
|
136
|
+
* Find constraint (if any) that explicitly banns the given target npm project
|
|
137
|
+
* @param externalProject
|
|
138
|
+
* @param depConstraints
|
|
139
|
+
* @returns
|
|
140
|
+
*/
|
|
141
|
+
function isConstraintBanningProject(externalProject, constraint) {
|
|
142
|
+
return constraint.bannedExternalImports.some((importDefinition) => parseImportWildcards(importDefinition).test(externalProject.data.packageName));
|
|
143
|
+
}
|
|
133
144
|
function hasBannedImport(source, target, depConstraints) {
|
|
134
|
-
// return those constraints that match source
|
|
145
|
+
// return those constraints that match source project and have `bannedExternalImports` defined
|
|
135
146
|
depConstraints = depConstraints.filter((c) => (source.data.tags || []).includes(c.sourceTag) &&
|
|
136
147
|
c.bannedExternalImports &&
|
|
137
148
|
c.bannedExternalImports.length);
|
|
138
|
-
return depConstraints.find((constraint) =>
|
|
149
|
+
return depConstraints.find((constraint) => isConstraintBanningProject(target, constraint));
|
|
139
150
|
}
|
|
140
151
|
exports.hasBannedImport = hasBannedImport;
|
|
152
|
+
/**
|
|
153
|
+
* Find all unique (transitive) external dependencies of given project
|
|
154
|
+
* @param graph
|
|
155
|
+
* @param source
|
|
156
|
+
* @returns
|
|
157
|
+
*/
|
|
158
|
+
function findTransitiveExternalDependencies(graph, source) {
|
|
159
|
+
if (!graph.externalNodes) {
|
|
160
|
+
return [];
|
|
161
|
+
}
|
|
162
|
+
const allReachableProjects = [];
|
|
163
|
+
const allProjects = Object.keys(graph.nodes);
|
|
164
|
+
for (let i = 0; i < allProjects.length; i++) {
|
|
165
|
+
if ((0, graph_utils_1.pathExists)(graph, source.name, allProjects[i])) {
|
|
166
|
+
allReachableProjects.push(allProjects[i]);
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
const externalDependencies = [];
|
|
170
|
+
for (let i = 0; i < allReachableProjects.length; i++) {
|
|
171
|
+
const dependencies = graph.dependencies[allReachableProjects[i]];
|
|
172
|
+
if (dependencies) {
|
|
173
|
+
for (let d = 0; d < dependencies.length; d++) {
|
|
174
|
+
const dependency = dependencies[d];
|
|
175
|
+
if (graph.externalNodes[dependency.target]) {
|
|
176
|
+
externalDependencies.push(dependency);
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
return externalDependencies;
|
|
182
|
+
}
|
|
183
|
+
exports.findTransitiveExternalDependencies = findTransitiveExternalDependencies;
|
|
184
|
+
/**
|
|
185
|
+
* Check if
|
|
186
|
+
* @param externalDependencies
|
|
187
|
+
* @param graph
|
|
188
|
+
* @param depConstraint
|
|
189
|
+
* @returns
|
|
190
|
+
*/
|
|
191
|
+
function hasBannedDependencies(externalDependencies, graph, depConstraint) {
|
|
192
|
+
return externalDependencies
|
|
193
|
+
.filter((dependency) => isConstraintBanningProject(graph.externalNodes[dependency.target], depConstraint))
|
|
194
|
+
.map((dep) => [
|
|
195
|
+
graph.externalNodes[dep.target],
|
|
196
|
+
graph.nodes[dep.source],
|
|
197
|
+
depConstraint,
|
|
198
|
+
]);
|
|
199
|
+
}
|
|
200
|
+
exports.hasBannedDependencies = hasBannedDependencies;
|
|
141
201
|
function isDirectDependency(target) {
|
|
142
202
|
const fileName = 'package.json';
|
|
143
203
|
const content = (0, file_utils_1.readFileIfExisting)((0, path_1.join)(app_root_1.workspaceRoot, fileName));
|
|
@@ -182,16 +242,14 @@ function mapProjectGraphFiles(projectGraph) {
|
|
|
182
242
|
if (!projectGraph) {
|
|
183
243
|
return null;
|
|
184
244
|
}
|
|
185
|
-
const
|
|
245
|
+
const allFiles = {};
|
|
186
246
|
Object.entries(projectGraph.nodes).forEach(([name, node]) => {
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
247
|
+
node.data.files.forEach(({ file }) => {
|
|
248
|
+
const fileName = removeExt(file);
|
|
249
|
+
allFiles[fileName] = name;
|
|
190
250
|
});
|
|
191
|
-
const data = Object.assign(Object.assign({}, node.data), { files });
|
|
192
|
-
nodes[name] = Object.assign(Object.assign({}, node), { data });
|
|
193
251
|
});
|
|
194
|
-
return Object.assign(Object.assign({}, projectGraph), {
|
|
252
|
+
return Object.assign(Object.assign({}, projectGraph), { allFiles });
|
|
195
253
|
}
|
|
196
254
|
exports.mapProjectGraphFiles = mapProjectGraphFiles;
|
|
197
255
|
const ESLINT_REGEX = /node_modules.*\/eslint$/;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-lint-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/runtime-lint-utils.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,yCAUsB;AACtB,+
|
|
1
|
+
{"version":3,"file":"runtime-lint-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utils/runtime-lint-utils.ts"],"names":[],"mappings":"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"}
|
package/.eslintrc.json
DELETED
|
@@ -1,41 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"extends": "../../.eslintrc",
|
|
3
|
-
"rules": {},
|
|
4
|
-
"overrides": [
|
|
5
|
-
{
|
|
6
|
-
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
|
|
7
|
-
"rules": {}
|
|
8
|
-
},
|
|
9
|
-
{
|
|
10
|
-
"files": ["**/*.ts"],
|
|
11
|
-
"excludedFiles": ["./src/migrations/**", "./src/utils/**"],
|
|
12
|
-
"rules": {
|
|
13
|
-
"no-restricted-imports": [
|
|
14
|
-
"error",
|
|
15
|
-
"@nrwl/workspace",
|
|
16
|
-
"@angular-devkit/core",
|
|
17
|
-
"@angular-devkit/architect",
|
|
18
|
-
"@angular-devkit/schematics"
|
|
19
|
-
]
|
|
20
|
-
}
|
|
21
|
-
},
|
|
22
|
-
{
|
|
23
|
-
"files": [
|
|
24
|
-
"./package.json",
|
|
25
|
-
"./generators.json",
|
|
26
|
-
"./executors.json",
|
|
27
|
-
"./migrations.json"
|
|
28
|
-
],
|
|
29
|
-
"parser": "jsonc-eslint-parser",
|
|
30
|
-
"rules": {
|
|
31
|
-
"@nrwl/nx/nx-plugin-checks": [
|
|
32
|
-
"error",
|
|
33
|
-
{
|
|
34
|
-
"allowedVersionStrings": ["latest", "*"]
|
|
35
|
-
}
|
|
36
|
-
]
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
],
|
|
40
|
-
"ignorePatterns": ["!**/*"]
|
|
41
|
-
}
|
|
@@ -1,24 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.updateCypressJson = void 0;
|
|
4
|
-
const path = require("path");
|
|
5
|
-
/**
|
|
6
|
-
* Updates the videos and screenshots folders in the cypress.json if it exists (i.e. we're moving an e2e project)
|
|
7
|
-
*
|
|
8
|
-
* (assume relative paths have been updated previously)
|
|
9
|
-
*
|
|
10
|
-
* @param schema The options provided to the schematic
|
|
11
|
-
*/
|
|
12
|
-
function updateCypressJson(tree, schema, project) {
|
|
13
|
-
const cypressJsonPath = path.join(schema.relativeToRootDestination, 'cypress.json');
|
|
14
|
-
if (!tree.exists(cypressJsonPath)) {
|
|
15
|
-
// nothing to do
|
|
16
|
-
return tree;
|
|
17
|
-
}
|
|
18
|
-
const cypressJson = JSON.parse(tree.read(cypressJsonPath).toString('utf-8'));
|
|
19
|
-
cypressJson.videosFolder = cypressJson.videosFolder.replace(project.root, schema.relativeToRootDestination);
|
|
20
|
-
cypressJson.screenshotsFolder = cypressJson.screenshotsFolder.replace(project.root, schema.relativeToRootDestination);
|
|
21
|
-
tree.write(cypressJsonPath, JSON.stringify(cypressJson));
|
|
22
|
-
}
|
|
23
|
-
exports.updateCypressJson = updateCypressJson;
|
|
24
|
-
//# sourceMappingURL=update-cypress-json.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"update-cypress-json.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-cypress-json.ts"],"names":[],"mappings":";;;AACA,6BAA6B;AAQ7B;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAC/B,IAAU,EACV,MAAwB,EACxB,OAA6B;IAE7B,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAC/B,MAAM,CAAC,yBAAyB,EAChC,cAAc,CACf,CAAC;IAEF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QACjC,gBAAgB;QAChB,OAAO,IAAI,CAAC;KACb;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CACvB,CAAC;IACxB,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,CAAC,OAAO,CACzD,OAAO,CAAC,IAAI,EACZ,MAAM,CAAC,yBAAyB,CACjC,CAAC;IACF,WAAW,CAAC,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC,OAAO,CACnE,OAAO,CAAC,IAAI,EACZ,MAAM,CAAC,yBAAyB,CACjC,CAAC;IAEF,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;AAC3D,CAAC;AA5BD,8CA4BC"}
|