@nrwl/workspace 15.7.0-beta.2 → 15.7.0-beta.4
Sign up to get free protection for your applications and to get access to all the features.
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@nrwl/workspace",
|
3
|
-
"version": "15.7.0-beta.
|
3
|
+
"version": "15.7.0-beta.4",
|
4
4
|
"private": false,
|
5
5
|
"description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
|
6
6
|
"repository": {
|
@@ -33,32 +33,32 @@
|
|
33
33
|
"requirements": {},
|
34
34
|
"migrations": "./migrations.json",
|
35
35
|
"packageGroup": {
|
36
|
-
"@nrwl/
|
37
|
-
"@nrwl/
|
38
|
-
"@nrwl/
|
39
|
-
"@nrwl/
|
40
|
-
"@nrwl/
|
41
|
-
"@nrwl/
|
42
|
-
"@nrwl/
|
43
|
-
"@nrwl/
|
44
|
-
"@nrwl/
|
45
|
-
"@nrwl/
|
46
|
-
"@nrwl/
|
47
|
-
"@nrwl/
|
48
|
-
"@nrwl/nest": "15.7.0-beta.
|
49
|
-
"@nrwl/next": "15.7.0-beta.
|
50
|
-
"@nrwl/node": "15.7.0-beta.
|
36
|
+
"@nrwl/jest": "15.7.0-beta.4",
|
37
|
+
"@nrwl/linter": "15.7.0-beta.4",
|
38
|
+
"@nrwl/angular": "15.7.0-beta.4",
|
39
|
+
"@nrwl/cli": "15.7.0-beta.4",
|
40
|
+
"@nrwl/cypress": "15.7.0-beta.4",
|
41
|
+
"@nrwl/detox": "15.7.0-beta.4",
|
42
|
+
"@nrwl/devkit": "15.7.0-beta.4",
|
43
|
+
"@nrwl/esbuild": "15.7.0-beta.4",
|
44
|
+
"@nrwl/eslint-plugin-nx": "15.7.0-beta.4",
|
45
|
+
"@nrwl/expo": "15.7.0-beta.4",
|
46
|
+
"@nrwl/express": "15.7.0-beta.4",
|
47
|
+
"@nrwl/js": "15.7.0-beta.4",
|
48
|
+
"@nrwl/nest": "15.7.0-beta.4",
|
49
|
+
"@nrwl/next": "15.7.0-beta.4",
|
50
|
+
"@nrwl/node": "15.7.0-beta.4",
|
51
51
|
"@nrwl/nx-cloud": "latest",
|
52
|
-
"@nrwl/nx-plugin": "15.7.0-beta.
|
53
|
-
"@nrwl/react-native": "15.7.0-beta.
|
54
|
-
"@nrwl/react": "15.7.0-beta.
|
55
|
-
"@nrwl/rollup": "15.7.0-beta.
|
56
|
-
"@nrwl/storybook": "15.7.0-beta.
|
57
|
-
"@nrwl/tao": "15.7.0-beta.
|
58
|
-
"@nrwl/vite": "15.7.0-beta.
|
59
|
-
"@nrwl/web": "15.7.0-beta.
|
60
|
-
"@nrwl/webpack": "15.7.0-beta.
|
61
|
-
"nx": "15.7.0-beta.
|
52
|
+
"@nrwl/nx-plugin": "15.7.0-beta.4",
|
53
|
+
"@nrwl/react-native": "15.7.0-beta.4",
|
54
|
+
"@nrwl/react": "15.7.0-beta.4",
|
55
|
+
"@nrwl/rollup": "15.7.0-beta.4",
|
56
|
+
"@nrwl/storybook": "15.7.0-beta.4",
|
57
|
+
"@nrwl/tao": "15.7.0-beta.4",
|
58
|
+
"@nrwl/vite": "15.7.0-beta.4",
|
59
|
+
"@nrwl/web": "15.7.0-beta.4",
|
60
|
+
"@nrwl/webpack": "15.7.0-beta.4",
|
61
|
+
"nx": "15.7.0-beta.4"
|
62
62
|
}
|
63
63
|
},
|
64
64
|
"peerDependencies": {
|
@@ -70,8 +70,8 @@
|
|
70
70
|
}
|
71
71
|
},
|
72
72
|
"dependencies": {
|
73
|
-
"@nrwl/devkit": "15.7.0-beta.
|
74
|
-
"@nrwl/linter": "15.7.0-beta.
|
73
|
+
"@nrwl/devkit": "15.7.0-beta.4",
|
74
|
+
"@nrwl/linter": "15.7.0-beta.4",
|
75
75
|
"@parcel/watcher": "2.0.4",
|
76
76
|
"chalk": "^4.1.0",
|
77
77
|
"chokidar": "^3.5.1",
|
@@ -86,7 +86,7 @@
|
|
86
86
|
"jsonc-parser": "3.2.0",
|
87
87
|
"minimatch": "3.0.5",
|
88
88
|
"npm-run-path": "^4.0.1",
|
89
|
-
"nx": "15.7.0-beta.
|
89
|
+
"nx": "15.7.0-beta.4",
|
90
90
|
"open": "^8.4.0",
|
91
91
|
"rxjs": "^6.5.4",
|
92
92
|
"semver": "7.3.4",
|
@@ -99,5 +99,5 @@
|
|
99
99
|
"access": "public"
|
100
100
|
},
|
101
101
|
"types": "./index.d.ts",
|
102
|
-
"gitHead": "
|
102
|
+
"gitHead": "6520e603c4a4f528f445c9d2ba53035a7280a110"
|
103
103
|
}
|
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.11.
|
12
|
+
uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.11.3
|
13
13
|
with:
|
14
14
|
number-of-agents: 3
|
15
15
|
init-commands: |
|
@@ -24,6 +24,6 @@ jobs:
|
|
24
24
|
|
25
25
|
agents:
|
26
26
|
name: Nx Cloud - Agents
|
27
|
-
uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.11.
|
27
|
+
uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.11.3
|
28
28
|
with:
|
29
29
|
number-of-agents: 3
|
@@ -39,13 +39,23 @@ function convertToNxProjectGenerator(host, schema) {
|
|
39
39
|
const leftOverProjects = {};
|
40
40
|
for (const projectName of Object.keys(projects)) {
|
41
41
|
const config = projects[projectName];
|
42
|
-
if (typeof config === 'string')
|
43
|
-
continue;
|
44
42
|
if ((!schema.project || schema.project === projectName) &&
|
45
43
|
!schema.reformat) {
|
46
|
-
|
47
|
-
|
48
|
-
(0, devkit_1.
|
44
|
+
if (typeof config === 'string') {
|
45
|
+
// configuration is in project.json
|
46
|
+
const projectConfig = (0, devkit_1.readJson)(host, (0, path_1.join)(config, 'project.json'));
|
47
|
+
if (projectConfig.name !== projectName) {
|
48
|
+
projectConfig.name = projectName;
|
49
|
+
(0, devkit_1.updateProjectConfiguration)(host, projectName, projectConfig);
|
50
|
+
}
|
51
|
+
}
|
52
|
+
else {
|
53
|
+
// configuration is an object in workspace.json
|
54
|
+
const path = (0, path_1.join)(config.root, 'project.json');
|
55
|
+
if (!host.exists(path)) {
|
56
|
+
projects[projectName].name = projectName;
|
57
|
+
(0, devkit_1.addProjectConfiguration)(host, path, projects[projectName]);
|
58
|
+
}
|
49
59
|
}
|
50
60
|
}
|
51
61
|
else {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"convert-to-nx-project.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/convert-to-nx-project/convert-to-nx-project.ts"],"names":[],"mappings":";;;;AAAA,
|
1
|
+
{"version":3,"file":"convert-to-nx-project.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/convert-to-nx-project/convert-to-nx-project.ts"],"names":[],"mappings":"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"}
|