@nrwl/workspace 14.0.0-beta.2 → 14.0.0-beta.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/.eslintrc.json +24 -0
  2. package/package.json +24 -24
  3. package/src/generators/ci-workflow/ci-workflow.js +6 -0
  4. package/src/generators/ci-workflow/ci-workflow.js.map +1 -1
  5. package/src/generators/ci-workflow/files/circleci/.circleci/config.yml__tmpl__ +76 -0
  6. package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__ +26 -0
  7. 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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/workspace",
3
- "version": "14.0.0-beta.2",
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.2",
36
- "@nrwl/cypress": "14.0.0-beta.2",
37
- "@nrwl/devkit": "14.0.0-beta.2",
38
- "@nrwl/eslint-plugin-nx": "14.0.0-beta.2",
39
- "@nrwl/express": "14.0.0-beta.2",
40
- "@nrwl/jest": "14.0.0-beta.2",
41
- "@nrwl/linter": "14.0.0-beta.2",
42
- "@nrwl/nest": "14.0.0-beta.2",
43
- "@nrwl/next": "14.0.0-beta.2",
44
- "@nrwl/node": "14.0.0-beta.2",
45
- "@nrwl/nx-plugin": "14.0.0-beta.2",
46
- "@nrwl/react": "14.0.0-beta.2",
47
- "@nrwl/storybook": "14.0.0-beta.2",
48
- "@nrwl/web": "14.0.0-beta.2",
49
- "@nrwl/js": "14.0.0-beta.2",
50
- "@nrwl/cli": "14.0.0-beta.2",
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.2",
53
- "@nrwl/detox": "14.0.0-beta.2",
54
- "nx": "14.0.0-beta.2"
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.2",
88
- "@nrwl/devkit": "14.0.0-beta.2",
89
- "@nrwl/jest": "14.0.0-beta.2",
90
- "@nrwl/linter": "14.0.0-beta.2"
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
  }
package/src/generators/ci-workflow/ci-workflow.js CHANGED
@@ -8,7 +8,13 @@ function ciWorkflowGenerator(host, schema) {
8
8
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
9
9
  const ci = schema.ci;
10
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
+ }
11
16
  (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, 'files', ci), '', options);
17
+ yield (0, devkit_1.formatFiles)(host);
12
18
  });
13
19
  }
14
20
  exports.ciWorkflowGenerator = ciWorkflowGenerator;
package/src/generators/ci-workflow/ci-workflow.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ci-workflow.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/ci-workflow/ci-workflow.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;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,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IAC9E,CAAC;CAAA;AALD,kDAKC;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"}
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"}
package/src/generators/ci-workflow/files/circleci/.circleci/config.yml__tmpl__ ADDED
@@ -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
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.2';
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';