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

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. package/package.json +24 -24
  2. package/src/generators/ci-workflow/ci-workflow.js +1 -1
  3. package/src/generators/ci-workflow/ci-workflow.js.map +1 -1
  4. package/src/generators/ci-workflow/files/azure/azure-pipelines.yml__tmpl__ +15 -22
  5. package/src/generators/ci-workflow/files/circleci/.circleci/config.yml__tmpl__ +3 -3
  6. package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__ +2 -2
  7. package/src/generators/ci-workflow/schema.json +1 -0
  8. package/src/utils/versions.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/workspace",
3
- "version": "14.0.0-beta.3",
3
+ "version": "14.0.0-beta.4",
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.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",
35
+ "@nrwl/angular": "14.0.0-beta.4",
36
+ "@nrwl/cypress": "14.0.0-beta.4",
37
+ "@nrwl/devkit": "14.0.0-beta.4",
38
+ "@nrwl/eslint-plugin-nx": "14.0.0-beta.4",
39
+ "@nrwl/express": "14.0.0-beta.4",
40
+ "@nrwl/jest": "14.0.0-beta.4",
41
+ "@nrwl/linter": "14.0.0-beta.4",
42
+ "@nrwl/nest": "14.0.0-beta.4",
43
+ "@nrwl/next": "14.0.0-beta.4",
44
+ "@nrwl/node": "14.0.0-beta.4",
45
+ "@nrwl/nx-plugin": "14.0.0-beta.4",
46
+ "@nrwl/react": "14.0.0-beta.4",
47
+ "@nrwl/storybook": "14.0.0-beta.4",
48
+ "@nrwl/web": "14.0.0-beta.4",
49
+ "@nrwl/js": "14.0.0-beta.4",
50
+ "@nrwl/cli": "14.0.0-beta.4",
51
51
  "@nrwl/nx-cloud": "latest",
52
- "@nrwl/react-native": "14.0.0-beta.3",
53
- "@nrwl/detox": "14.0.0-beta.3",
54
- "nx": "14.0.0-beta.3"
52
+ "@nrwl/react-native": "14.0.0-beta.4",
53
+ "@nrwl/detox": "14.0.0-beta.4",
54
+ "nx": "14.0.0-beta.4"
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.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"
87
+ "nx": "14.0.0-beta.4",
88
+ "@nrwl/devkit": "14.0.0-beta.4",
89
+ "@nrwl/jest": "14.0.0-beta.4",
90
+ "@nrwl/linter": "14.0.0-beta.4"
91
91
  }
92
92
  }
package/src/generators/ci-workflow/ci-workflow.js CHANGED
@@ -19,7 +19,7 @@ function ciWorkflowGenerator(host, schema) {
19
19
  }
20
20
  exports.ciWorkflowGenerator = ciWorkflowGenerator;
21
21
  function normalizeOptions(options) {
22
- const { name: workflowName, fileName: workflowFileName } = (0, devkit_1.names)(options.name || 'build');
22
+ const { name: workflowName, fileName: workflowFileName } = (0, devkit_1.names)(options.name || 'CI');
23
23
  const { exec: packageManagerPrefix, ciInstall: packageManagerInstall } = (0, devkit_1.getPackageManagerCommand)();
24
24
  return {
25
25
  workflowName,
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,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"}
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,IAAI,CACrB,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/azure/azure-pipelines.yml__tmpl__ CHANGED
@@ -6,29 +6,22 @@ pr:
6
6
  - <%= mainBranch %>
7
7
 
8
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)
9
+ CI: 'true'
10
+ NX_CLOUD_DISTRIBUTED_EXECUTION: 'true'
11
+ ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
12
+ NX_BRANCH: $(System.PullRequest.PullRequestNumber)
13
+ TARGET_BRANCH: $[replace(variables['System.PullRequest.TargetBranch'],'refs/heads/','origin/')]
14
+ BASE_SHA: $(git merge-base $(TARGET_BRANCH) HEAD)
15
+ ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
16
+ NX_BRANCH: $(Build.SourceBranchName)
17
+ BASE_SHA: $(git rev-parse HEAD~1)
18
+ HEAD_SHA: $(git rev-parse HEAD)
26
19
 
27
20
  jobs:
28
21
  - job: agents
29
22
  strategy:
30
23
  parallel: 3
31
- displayName: 'Nx Cloud Agent'
24
+ displayName: Nx Cloud Agent
32
25
  pool:
33
26
  vmImage: 'ubuntu-latest'
34
27
  steps:
@@ -38,10 +31,10 @@ jobs:
38
31
  <% } %>- script: <%= packageManagerInstall %>
39
32
  displayName: NPM Install Dependencies
40
33
  - script: npx nx-cloud start-agent
41
- displayName: 'Start Nx-Cloud agent
34
+ displayName: Start Nx-Cloud agent
42
35
 
43
36
  - job: main
44
- displayName: 'Nx Cloud Main'
37
+ displayName: Nx Cloud Main
45
38
  pool:
46
39
  vmImage: 'ubuntu-latest'
47
40
  steps:
@@ -52,9 +45,9 @@ jobs:
52
45
  displayName: NPM Install Dependencies
53
46
  - script: <%= packageManagerPrefix %> nx-cloud start-ci-run
54
47
  displayName: Start CI run
55
- - script: <%= packageManagerPrefix %> nx workspace-lint
48
+ - script: <%= packageManagerPrefix %> nx-cloud record -- <%= packageManagerPrefix %> nx workspace-lint
56
49
  displayName: Run workspace lint
57
- - script: <%= packageManagerPrefix %> nx format:check --base=$(BASE_SHA) --head=$(HEAD_SHA)
50
+ - script: <%= packageManagerPrefix %> nx-cloud record -- <%= packageManagerPrefix %> nx format:check --base=$(BASE_SHA) --head=$(HEAD_SHA)
58
51
  displayName: Check format
59
52
  - script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) --target=lint --parallel=3
60
53
  displayName: Run lint
package/src/generators/ci-workflow/files/circleci/.circleci/config.yml__tmpl__ CHANGED
@@ -44,10 +44,10 @@ jobs:
44
44
  command: <%= packageManagerPrefix %> nx-cloud start-ci-run
45
45
  - run:
46
46
  name: Run workspace lint
47
- command: <%= packageManagerPrefix %> nx workspace-lint
47
+ command: <%= packageManagerPrefix %> nx-cloud record -- <%= packageManagerPrefix %> nx workspace-lint
48
48
  - run:
49
49
  name: Check format
50
- command: <%= packageManagerPrefix %> nx format:check --base=$NX_BASE --head=$NX_HEAD
50
+ command: <%= packageManagerPrefix %> nx-cloud record -- <%= packageManagerPrefix %> nx format:check --base=$NX_BASE --head=$NX_HEAD
51
51
  - run:
52
52
  name: Run lint
53
53
  command: <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD --target=lint --parallel=3
@@ -72,5 +72,5 @@ workflows:
72
72
  matrix:
73
73
  parameters:
74
74
  ordinal: [1, 2, 3]
75
- - main
75
+ - main:
76
76
  name: Nx Cloud Main
package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__ CHANGED
@@ -12,8 +12,8 @@ jobs:
12
12
  uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.2
13
13
  with:
14
14
  parallel-commands: |
15
- <%= packageManagerPrefix %> nx workspace-lint
16
- <%= packageManagerPrefix %> nx format:check
15
+ <%= packageManagerPrefix %> nx-cloud record -- <%= packageManagerPrefix %> nx workspace-lint
16
+ <%= packageManagerPrefix %> nx-cloud record -- <%= packageManagerPrefix %> nx format:check
17
17
  parallel-commands-on-agents: |
18
18
  <%= packageManagerPrefix %> nx affected --target=lint --parallel=3
19
19
  <%= packageManagerPrefix %> nx affected --target=test --parallel=3 --ci --code-coverage
package/src/generators/ci-workflow/schema.json CHANGED
@@ -27,6 +27,7 @@
27
27
  "$source": "argv",
28
28
  "index": 0
29
29
  },
30
+ "default": "CI",
30
31
  "x-prompt": "How should we name your workflow?",
31
32
  "pattern": "^[a-zA-Z].*$"
32
33
  }
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.3';
4
+ exports.nxVersion = '14.0.0-beta.4';
5
5
  exports.angularCliVersion = '~13.3.0';
6
6
  exports.typescriptVersion = '~4.6.2';
7
7
  exports.prettierVersion = '^2.5.1';