@nrwl/workspace 14.0.0-beta.0 → 14.0.0-beta.3
Sign up to get free protection for your applications and to get access to all the features.
- package/.eslintrc.json +24 -0
- package/generators.json +6 -0
- package/package.json +24 -24
- package/src/generators/ci-workflow/ci-workflow.d.ts +6 -0
- package/src/generators/ci-workflow/ci-workflow.js +33 -0
- package/src/generators/ci-workflow/ci-workflow.js.map +1 -0
- package/src/generators/ci-workflow/files/azure/azure-pipelines.yml__tmpl__ +67 -0
- package/src/generators/ci-workflow/files/circleci/.circleci/config.yml__tmpl__ +76 -0
- package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__ +26 -0
- package/src/generators/ci-workflow/schema.json +35 -0
- package/src/generators/workspace/files/package.json__tmpl__ +0 -1
- package/src/generators/workspace/workspace.js +1 -1
- package/src/generators/workspace/workspace.js.map +1 -1
- package/src/utils/versions.js +1 -1
package/.eslintrc.json
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
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
|
+
"ignorePatterns": ["!**/*"]
|
|
24
|
+
}
|
package/generators.json
CHANGED
|
@@ -141,6 +141,12 @@
|
|
|
141
141
|
"schema": "./src/generators/npm-package/schema.json",
|
|
142
142
|
"description": "Create a minimal NPM package.",
|
|
143
143
|
"x-type": "library"
|
|
144
|
+
},
|
|
145
|
+
|
|
146
|
+
"ci-workflow": {
|
|
147
|
+
"factory": "./src/generators/ci-workflow/ci-workflow#ciWorkflowGenerator",
|
|
148
|
+
"schema": "./src/generators/ci-workflow/schema.json",
|
|
149
|
+
"description": "Generete a CI workflow."
|
|
144
150
|
}
|
|
145
151
|
}
|
|
146
152
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/workspace",
|
|
3
|
-
"version": "14.0.0-beta.
|
|
3
|
+
"version": "14.0.0-beta.3",
|
|
4
4
|
"description": "Smart, Fast and Extensible Build System.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -32,26 +32,26 @@
|
|
|
32
32
|
"requirements": {},
|
|
33
33
|
"migrations": "./migrations.json",
|
|
34
34
|
"packageGroup": {
|
|
35
|
-
"@nrwl/angular": "14.0.0-beta.
|
|
36
|
-
"@nrwl/cypress": "14.0.0-beta.
|
|
37
|
-
"@nrwl/devkit": "14.0.0-beta.
|
|
38
|
-
"@nrwl/eslint-plugin-nx": "14.0.0-beta.
|
|
39
|
-
"@nrwl/express": "14.0.0-beta.
|
|
40
|
-
"@nrwl/jest": "14.0.0-beta.
|
|
41
|
-
"@nrwl/linter": "14.0.0-beta.
|
|
42
|
-
"@nrwl/nest": "14.0.0-beta.
|
|
43
|
-
"@nrwl/next": "14.0.0-beta.
|
|
44
|
-
"@nrwl/node": "14.0.0-beta.
|
|
45
|
-
"@nrwl/nx-plugin": "14.0.0-beta.
|
|
46
|
-
"@nrwl/react": "14.0.0-beta.
|
|
47
|
-
"@nrwl/storybook": "14.0.0-beta.
|
|
48
|
-
"@nrwl/web": "14.0.0-beta.
|
|
49
|
-
"@nrwl/js": "14.0.0-beta.
|
|
50
|
-
"@nrwl/cli": "14.0.0-beta.
|
|
35
|
+
"@nrwl/angular": "14.0.0-beta.3",
|
|
36
|
+
"@nrwl/cypress": "14.0.0-beta.3",
|
|
37
|
+
"@nrwl/devkit": "14.0.0-beta.3",
|
|
38
|
+
"@nrwl/eslint-plugin-nx": "14.0.0-beta.3",
|
|
39
|
+
"@nrwl/express": "14.0.0-beta.3",
|
|
40
|
+
"@nrwl/jest": "14.0.0-beta.3",
|
|
41
|
+
"@nrwl/linter": "14.0.0-beta.3",
|
|
42
|
+
"@nrwl/nest": "14.0.0-beta.3",
|
|
43
|
+
"@nrwl/next": "14.0.0-beta.3",
|
|
44
|
+
"@nrwl/node": "14.0.0-beta.3",
|
|
45
|
+
"@nrwl/nx-plugin": "14.0.0-beta.3",
|
|
46
|
+
"@nrwl/react": "14.0.0-beta.3",
|
|
47
|
+
"@nrwl/storybook": "14.0.0-beta.3",
|
|
48
|
+
"@nrwl/web": "14.0.0-beta.3",
|
|
49
|
+
"@nrwl/js": "14.0.0-beta.3",
|
|
50
|
+
"@nrwl/cli": "14.0.0-beta.3",
|
|
51
51
|
"@nrwl/nx-cloud": "latest",
|
|
52
|
-
"@nrwl/react-native": "14.0.0-beta.
|
|
53
|
-
"@nrwl/detox": "14.0.0-beta.
|
|
54
|
-
"nx": "14.0.0-beta.
|
|
52
|
+
"@nrwl/react-native": "14.0.0-beta.3",
|
|
53
|
+
"@nrwl/detox": "14.0.0-beta.3",
|
|
54
|
+
"nx": "14.0.0-beta.3"
|
|
55
55
|
}
|
|
56
56
|
},
|
|
57
57
|
"peerDependencies": {
|
|
@@ -84,9 +84,9 @@
|
|
|
84
84
|
"minimatch": "3.0.4",
|
|
85
85
|
"enquirer": "~2.3.6",
|
|
86
86
|
"tslib": "^2.3.0",
|
|
87
|
-
"nx": "14.0.0-beta.
|
|
88
|
-
"@nrwl/devkit": "14.0.0-beta.
|
|
89
|
-
"@nrwl/jest": "14.0.0-beta.
|
|
90
|
-
"@nrwl/linter": "14.0.0-beta.
|
|
87
|
+
"nx": "14.0.0-beta.3",
|
|
88
|
+
"@nrwl/devkit": "14.0.0-beta.3",
|
|
89
|
+
"@nrwl/jest": "14.0.0-beta.3",
|
|
90
|
+
"@nrwl/linter": "14.0.0-beta.3"
|
|
91
91
|
}
|
|
92
92
|
}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ciWorkflowGenerator = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const default_base_1 = require("../../utilities/default-base");
|
|
7
|
+
function ciWorkflowGenerator(host, schema) {
|
|
8
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
+
const ci = schema.ci;
|
|
10
|
+
const options = normalizeOptions(schema);
|
|
11
|
+
const nxJson = (0, devkit_1.readJson)(host, 'nx.json');
|
|
12
|
+
const nxCloudUsed = Object.values(nxJson.tasksRunnerOptions).find((r) => r.runner == '@nrwl/nx-cloud');
|
|
13
|
+
if (!nxCloudUsed) {
|
|
14
|
+
throw new Error('This workspace is not connected to Nx Cloud.');
|
|
15
|
+
}
|
|
16
|
+
(0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, 'files', ci), '', options);
|
|
17
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
18
|
+
});
|
|
19
|
+
}
|
|
20
|
+
exports.ciWorkflowGenerator = ciWorkflowGenerator;
|
|
21
|
+
function normalizeOptions(options) {
|
|
22
|
+
const { name: workflowName, fileName: workflowFileName } = (0, devkit_1.names)(options.name || 'build');
|
|
23
|
+
const { exec: packageManagerPrefix, ciInstall: packageManagerInstall } = (0, devkit_1.getPackageManagerCommand)();
|
|
24
|
+
return {
|
|
25
|
+
workflowName,
|
|
26
|
+
workflowFileName,
|
|
27
|
+
packageManagerInstall,
|
|
28
|
+
packageManagerPrefix,
|
|
29
|
+
mainBranch: (0, default_base_1.deduceDefaultBase)(),
|
|
30
|
+
tmpl: '',
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
//# sourceMappingURL=ci-workflow.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ci-workflow.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/ci-workflow/ci-workflow.ts"],"names":[],"mappings":";;;;AAAA,yCASsB;AACtB,+DAAiE;AAOjE,SAAsB,mBAAmB,CAAC,IAAU,EAAE,MAAc;;QAClE,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;QACrB,MAAM,OAAO,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAEzC,MAAM,MAAM,GAAwB,IAAA,iBAAQ,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC9D,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAC/D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,gBAAgB,CACpC,CAAC;QACF,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;SACjE;QAED,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;QAC5E,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAdD,kDAcC;AAWD,SAAS,gBAAgB,CAAC,OAAe;IACvC,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,IAAA,cAAK,EAC9D,OAAO,CAAC,IAAI,IAAI,OAAO,CACxB,CAAC;IACF,MAAM,EAAE,IAAI,EAAE,oBAAoB,EAAE,SAAS,EAAE,qBAAqB,EAAE,GACpE,IAAA,iCAAwB,GAAE,CAAC;IAC7B,OAAO;QACL,YAAY;QACZ,gBAAgB;QAChB,qBAAqB;QACrB,oBAAoB;QACpB,UAAU,EAAE,IAAA,gCAAiB,GAAE;QAC/B,IAAI,EAAE,EAAE;KACT,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
name: <%= workflowName %>
|
|
2
|
+
|
|
3
|
+
trigger:
|
|
4
|
+
- <%= mainBranch %>
|
|
5
|
+
pr:
|
|
6
|
+
- <%= mainBranch %>
|
|
7
|
+
|
|
8
|
+
variables:
|
|
9
|
+
- name: NX_CLOUD_DISTRIBUTED_EXECUTION
|
|
10
|
+
value: 'true'
|
|
11
|
+
- name: NX_BRANCH
|
|
12
|
+
${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
|
|
13
|
+
value: $(System.PullRequest.PullRequestNumber)
|
|
14
|
+
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
|
|
15
|
+
value: $(Build.SourceBranchName)
|
|
16
|
+
- name: TARGET_BRANCH
|
|
17
|
+
${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
|
|
18
|
+
value: $[replace(variables['System.PullRequest.TargetBranch'],'refs/heads/','origin/')]
|
|
19
|
+
- name: BASE_SHA
|
|
20
|
+
${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
|
|
21
|
+
value: $(git merge-base $(TARGET_BRANCH) HEAD)
|
|
22
|
+
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
|
|
23
|
+
value: $(git rev-parse HEAD~1)
|
|
24
|
+
- name: HEAD_SHA
|
|
25
|
+
value: $(git rev-parse HEAD)
|
|
26
|
+
|
|
27
|
+
jobs:
|
|
28
|
+
- job: agents
|
|
29
|
+
strategy:
|
|
30
|
+
parallel: 3
|
|
31
|
+
displayName: 'Nx Cloud Agent'
|
|
32
|
+
pool:
|
|
33
|
+
vmImage: 'ubuntu-latest'
|
|
34
|
+
steps:
|
|
35
|
+
<% if(packageManagerPrefix == 'pnpm exec'){ %>
|
|
36
|
+
- script: npm install --prefix=$HOME/.local -g pnpm@6.32.4
|
|
37
|
+
displayName: Install PNPM
|
|
38
|
+
<% } %>- script: <%= packageManagerInstall %>
|
|
39
|
+
displayName: NPM Install Dependencies
|
|
40
|
+
- script: npx nx-cloud start-agent
|
|
41
|
+
displayName: 'Start Nx-Cloud agent
|
|
42
|
+
|
|
43
|
+
- job: main
|
|
44
|
+
displayName: 'Nx Cloud Main'
|
|
45
|
+
pool:
|
|
46
|
+
vmImage: 'ubuntu-latest'
|
|
47
|
+
steps:
|
|
48
|
+
<% if(packageManagerPrefix == 'pnpm exec'){ %>
|
|
49
|
+
- script: npm install --prefix=$HOME/.local -g pnpm@6.32.4
|
|
50
|
+
displayName: Install PNPM
|
|
51
|
+
<% } %>- script: <%= packageManagerInstall %>
|
|
52
|
+
displayName: NPM Install Dependencies
|
|
53
|
+
- script: <%= packageManagerPrefix %> nx-cloud start-ci-run
|
|
54
|
+
displayName: Start CI run
|
|
55
|
+
- script: <%= packageManagerPrefix %> nx workspace-lint
|
|
56
|
+
displayName: Run workspace lint
|
|
57
|
+
- script: <%= packageManagerPrefix %> nx format:check --base=$(BASE_SHA) --head=$(HEAD_SHA)
|
|
58
|
+
displayName: Check format
|
|
59
|
+
- script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) --target=lint --parallel=3
|
|
60
|
+
displayName: Run lint
|
|
61
|
+
- script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) --target=test --parallel=3 --ci --code-coverage
|
|
62
|
+
displayName: Run test
|
|
63
|
+
- script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) --target=build --parallel=3
|
|
64
|
+
displayName: Run build
|
|
65
|
+
- script: <%= packageManagerPrefix %> nx-cloud stop-all-agents
|
|
66
|
+
condition: always()
|
|
67
|
+
displayName: Stop all Nx-Cloud agents
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
version: 2.1
|
|
2
|
+
|
|
3
|
+
orbs:
|
|
4
|
+
nx: nrwl/nx@1.4.0
|
|
5
|
+
|
|
6
|
+
jobs:
|
|
7
|
+
agent:
|
|
8
|
+
docker:
|
|
9
|
+
- image: cimg/node:lts-browsers
|
|
10
|
+
parameters:
|
|
11
|
+
ordinal:
|
|
12
|
+
type: integer
|
|
13
|
+
steps:
|
|
14
|
+
- checkout
|
|
15
|
+
<% if(packageManagerPrefix == 'pnpm exec'){ %>
|
|
16
|
+
- run:
|
|
17
|
+
name: Install PNPM
|
|
18
|
+
command: npm install --prefix=$HOME/.local -g pnpm@6.32.4
|
|
19
|
+
<% } %>- run:
|
|
20
|
+
name: Install dependencies
|
|
21
|
+
command: <%= packageManagerInstall %>
|
|
22
|
+
- run:
|
|
23
|
+
name: Start the agent << parameters.ordinal >>
|
|
24
|
+
command: <%= packageManagerPrefix %> nx-cloud start-agent
|
|
25
|
+
no_output_timeout: 60m
|
|
26
|
+
main:
|
|
27
|
+
docker:
|
|
28
|
+
- image: cimg/node:lts-browsers
|
|
29
|
+
environment:
|
|
30
|
+
NX_CLOUD_DISTRIBUTED_EXECUTION: 'true'
|
|
31
|
+
steps:
|
|
32
|
+
- checkout
|
|
33
|
+
<% if(packageManagerPrefix == 'pnpm exec'){ %>
|
|
34
|
+
- run:
|
|
35
|
+
name: Install PNPM
|
|
36
|
+
command: npm install --prefix=$HOME/.local -g pnpm@6.32.4
|
|
37
|
+
<% } %>- run:
|
|
38
|
+
name: Install dependencies
|
|
39
|
+
command: <%= packageManagerInstall %>
|
|
40
|
+
- nx/set-shas:
|
|
41
|
+
main-branch-name: '<%= mainBranch %>'
|
|
42
|
+
- run:
|
|
43
|
+
name: Initialize the Nx Cloud distributed CI run
|
|
44
|
+
command: <%= packageManagerPrefix %> nx-cloud start-ci-run
|
|
45
|
+
- run:
|
|
46
|
+
name: Run workspace lint
|
|
47
|
+
command: <%= packageManagerPrefix %> nx workspace-lint
|
|
48
|
+
- run:
|
|
49
|
+
name: Check format
|
|
50
|
+
command: <%= packageManagerPrefix %> nx format:check --base=$NX_BASE --head=$NX_HEAD
|
|
51
|
+
- run:
|
|
52
|
+
name: Run lint
|
|
53
|
+
command: <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD --target=lint --parallel=3
|
|
54
|
+
- run:
|
|
55
|
+
name: Run test
|
|
56
|
+
command: <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD --target=test --parallel=3 --ci --code-coverage
|
|
57
|
+
- run:
|
|
58
|
+
name: Run build
|
|
59
|
+
command: <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD --target=build --parallel=3
|
|
60
|
+
- run:
|
|
61
|
+
name: Stop all agents
|
|
62
|
+
command: <%= packageManagerPrefix %> nx-cloud stop-all-agents
|
|
63
|
+
when: always
|
|
64
|
+
|
|
65
|
+
workflows:
|
|
66
|
+
version: 2
|
|
67
|
+
|
|
68
|
+
<%= workflowFileName %>:
|
|
69
|
+
jobs:
|
|
70
|
+
- agent:
|
|
71
|
+
name: Nx Cloud Agent << matrix.ordinal >>
|
|
72
|
+
matrix:
|
|
73
|
+
parameters:
|
|
74
|
+
ordinal: [1, 2, 3]
|
|
75
|
+
- main
|
|
76
|
+
name: Nx Cloud Main
|
package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__
ADDED
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
name: <%= workflowName %>
|
|
2
|
+
|
|
3
|
+
on:
|
|
4
|
+
push:
|
|
5
|
+
branches:
|
|
6
|
+
- <%= mainBranch %>
|
|
7
|
+
pull_request:
|
|
8
|
+
|
|
9
|
+
jobs:
|
|
10
|
+
main:
|
|
11
|
+
name: Nx Cloud - Main Job
|
|
12
|
+
uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.2
|
|
13
|
+
with:
|
|
14
|
+
parallel-commands: |
|
|
15
|
+
<%= packageManagerPrefix %> nx workspace-lint
|
|
16
|
+
<%= packageManagerPrefix %> nx format:check
|
|
17
|
+
parallel-commands-on-agents: |
|
|
18
|
+
<%= packageManagerPrefix %> nx affected --target=lint --parallel=3
|
|
19
|
+
<%= packageManagerPrefix %> nx affected --target=test --parallel=3 --ci --code-coverage
|
|
20
|
+
<%= packageManagerPrefix %> nx affected --target=build --parallel=3
|
|
21
|
+
|
|
22
|
+
agents:
|
|
23
|
+
name: Nx Cloud - Agents
|
|
24
|
+
uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.2
|
|
25
|
+
with:
|
|
26
|
+
number-of-agents: 3
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
{
|
|
2
|
+
"$schema": "http://json-schema.org/schema",
|
|
3
|
+
"$id": "NxWorkspaceCIWorkflow",
|
|
4
|
+
"title": "Generate a CI workflow.",
|
|
5
|
+
"description": "Generate a CI workflow.",
|
|
6
|
+
"cli": "nx",
|
|
7
|
+
"type": "object",
|
|
8
|
+
"properties": {
|
|
9
|
+
"ci": {
|
|
10
|
+
"type": "string",
|
|
11
|
+
"description": "CI provider.",
|
|
12
|
+
"enum": ["github", "circleci", "azure"],
|
|
13
|
+
"x-prompt": {
|
|
14
|
+
"message": "What is your target CI provider?",
|
|
15
|
+
"type": "list",
|
|
16
|
+
"items": [
|
|
17
|
+
{ "value": "github", "label": "Github Actions" },
|
|
18
|
+
{ "value": "circleci", "label": "Circle CI" },
|
|
19
|
+
{ "value": "azure", "label": "Azure DevOps" }
|
|
20
|
+
]
|
|
21
|
+
}
|
|
22
|
+
},
|
|
23
|
+
"name": {
|
|
24
|
+
"type": "string",
|
|
25
|
+
"description": "Workflow name.",
|
|
26
|
+
"$default": {
|
|
27
|
+
"$source": "argv",
|
|
28
|
+
"index": 0
|
|
29
|
+
},
|
|
30
|
+
"x-prompt": "How should we name your workflow?",
|
|
31
|
+
"pattern": "^[a-zA-Z].*$"
|
|
32
|
+
}
|
|
33
|
+
},
|
|
34
|
+
"required": ["ci"]
|
|
35
|
+
}
|
|
@@ -21,7 +21,7 @@ function setPresetProperty(tree, options) {
|
|
|
21
21
|
if (options.preset === presets_1.Preset.Core ||
|
|
22
22
|
options.preset === presets_1.Preset.TS ||
|
|
23
23
|
options.preset === presets_1.Preset.NPM) {
|
|
24
|
-
addPropertyWithStableKeys(json, 'extends', '
|
|
24
|
+
addPropertyWithStableKeys(json, 'extends', 'nx/presets/core.json');
|
|
25
25
|
delete json.implicitDependencies;
|
|
26
26
|
delete json.targetDependencies;
|
|
27
27
|
delete json.workspaceLayout;
|
|
@@ -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,yDAA0E;AAC1E,8CAA0C;AAC1C,+DAAiE;AAEpD,QAAA,4BAA4B,GAAG;IAC1C,WAAW,EAAE,IAAI;CAClB,CAAC;AAEF,SAAS,kBAAkB,CAAC,IAAU,EAAE,OAAe;IACrD,MAAM,WAAW,GAAG,IAAA,iBAAY,EAC9B,IAAA,WAAQ,EAAC,SAAgB,EAAE,IAAI,EAAE,OAAO,EAAE,iCAAiC,CAAC,CAC7E,CAAC,QAAQ,EAAE,CAAC;IACb,IAAI,CAAC,KAAK,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,SAAS,EAAE,yBAAyB,CAAC,EAAE,WAAW,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAU,EAAE,OAAe;IACpD,IAAA,mBAAU,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE;QAC5D,IACE,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI;YAC9B,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,EAAE;YAC5B,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,GAAG,EAC7B;YACA,yBAAyB,
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/workspace/workspace.ts"],"names":[],"mappings":"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"}
|
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.typescriptESLintVersion = exports.tslintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
|
|
4
|
-
exports.nxVersion = '14.0.0-beta.
|
|
4
|
+
exports.nxVersion = '14.0.0-beta.3';
|
|
5
5
|
exports.angularCliVersion = '~13.3.0';
|
|
6
6
|
exports.typescriptVersion = '~4.6.2';
|
|
7
7
|
exports.prettierVersion = '^2.5.1';
|