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

package/generators.json

@@ -141,6 +141,12 @@
       "schema": "./src/generators/npm-package/schema.json",
       "description": "Create a minimal NPM package.",
       "x-type": "library"
+    },
+
+    "ci-workflow": {
+      "factory": "./src/generators/ci-workflow/ci-workflow#ciWorkflowGenerator",
+      "schema": "./src/generators/ci-workflow/schema.json",
+      "description": "Generete a CI workflow."
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/workspace",
-  "version": "14.0.0-beta.1",
+  "version": "14.0.0-beta.2",
   "description": "Smart, Fast and Extensible Build System.",
   "repository": {
     "type": "git",
@@ -32,26 +32,26 @@
     "requirements": {},
     "migrations": "./migrations.json",
     "packageGroup": {
-      "@nrwl/angular": "14.0.0-beta.1",
-      "@nrwl/cypress": "14.0.0-beta.1",
-      "@nrwl/devkit": "14.0.0-beta.1",
-      "@nrwl/eslint-plugin-nx": "14.0.0-beta.1",
-      "@nrwl/express": "14.0.0-beta.1",
-      "@nrwl/jest": "14.0.0-beta.1",
-      "@nrwl/linter": "14.0.0-beta.1",
-      "@nrwl/nest": "14.0.0-beta.1",
-      "@nrwl/next": "14.0.0-beta.1",
-      "@nrwl/node": "14.0.0-beta.1",
-      "@nrwl/nx-plugin": "14.0.0-beta.1",
-      "@nrwl/react": "14.0.0-beta.1",
-      "@nrwl/storybook": "14.0.0-beta.1",
-      "@nrwl/web": "14.0.0-beta.1",
-      "@nrwl/js": "14.0.0-beta.1",
-      "@nrwl/cli": "14.0.0-beta.1",
+      "@nrwl/angular": "14.0.0-beta.2",
+      "@nrwl/cypress": "14.0.0-beta.2",
+      "@nrwl/devkit": "14.0.0-beta.2",
+      "@nrwl/eslint-plugin-nx": "14.0.0-beta.2",
+      "@nrwl/express": "14.0.0-beta.2",
+      "@nrwl/jest": "14.0.0-beta.2",
+      "@nrwl/linter": "14.0.0-beta.2",
+      "@nrwl/nest": "14.0.0-beta.2",
+      "@nrwl/next": "14.0.0-beta.2",
+      "@nrwl/node": "14.0.0-beta.2",
+      "@nrwl/nx-plugin": "14.0.0-beta.2",
+      "@nrwl/react": "14.0.0-beta.2",
+      "@nrwl/storybook": "14.0.0-beta.2",
+      "@nrwl/web": "14.0.0-beta.2",
+      "@nrwl/js": "14.0.0-beta.2",
+      "@nrwl/cli": "14.0.0-beta.2",
       "@nrwl/nx-cloud": "latest",
-      "@nrwl/react-native": "14.0.0-beta.1",
-      "@nrwl/detox": "14.0.0-beta.1",
-      "nx": "14.0.0-beta.1"
+      "@nrwl/react-native": "14.0.0-beta.2",
+      "@nrwl/detox": "14.0.0-beta.2",
+      "nx": "14.0.0-beta.2"
     }
   },
   "peerDependencies": {
@@ -84,9 +84,9 @@
     "minimatch": "3.0.4",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
-    "nx": "14.0.0-beta.1",
-    "@nrwl/devkit": "14.0.0-beta.1",
-    "@nrwl/jest": "14.0.0-beta.1",
-    "@nrwl/linter": "14.0.0-beta.1"
+    "nx": "14.0.0-beta.2",
+    "@nrwl/devkit": "14.0.0-beta.2",
+    "@nrwl/jest": "14.0.0-beta.2",
+    "@nrwl/linter": "14.0.0-beta.2"
   }
 }

package/src/generators/ci-workflow/ci-workflow.d.ts

@@ -0,0 +1,6 @@
+import { Tree } from '@nrwl/devkit';
+export interface Schema {
+    name?: string;
+    ci: 'github' | 'azure' | 'circleci';
+}
+export declare function ciWorkflowGenerator(host: Tree, schema: Schema): Promise<void>;

package/src/generators/ci-workflow/ci-workflow.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ciWorkflowGenerator = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const default_base_1 = require("../../utilities/default-base");
+function ciWorkflowGenerator(host, schema) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const ci = schema.ci;
+        const options = normalizeOptions(schema);
+        (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, 'files', ci), '', options);
+    });
+}
+exports.ciWorkflowGenerator = ciWorkflowGenerator;
+function normalizeOptions(options) {
+    const { name: workflowName, fileName: workflowFileName } = (0, devkit_1.names)(options.name || 'build');
+    const { exec: packageManagerPrefix, ciInstall: packageManagerInstall } = (0, devkit_1.getPackageManagerCommand)();
+    return {
+        workflowName,
+        workflowFileName,
+        packageManagerInstall,
+        packageManagerPrefix,
+        mainBranch: (0, default_base_1.deduceDefaultBase)(),
+        tmpl: '',
+    };
+}
+//# sourceMappingURL=ci-workflow.js.map

package/src/generators/ci-workflow/ci-workflow.js.map

@@ -0,0 +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"}

package/src/generators/ci-workflow/files/azure/azure-pipelines.yml__tmpl__

@@ -0,0 +1,67 @@
+name: <%= workflowName %>
+
+trigger:
+  - <%= mainBranch %>
+pr:
+  - <%= mainBranch %>
+
+variables:
+  - name: NX_CLOUD_DISTRIBUTED_EXECUTION
+    value: 'true'
+  - name: NX_BRANCH
+    ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+      value: $(System.PullRequest.PullRequestNumber)
+    ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
+      value: $(Build.SourceBranchName)
+  - name: TARGET_BRANCH
+    ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+      value: $[replace(variables['System.PullRequest.TargetBranch'],'refs/heads/','origin/')]
+  - name: BASE_SHA
+    ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+      value: $(git merge-base $(TARGET_BRANCH) HEAD)
+    ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
+      value: $(git rev-parse HEAD~1)
+  - name: HEAD_SHA
+    value: $(git rev-parse HEAD)
+
+jobs:
+  - job: agents
+    strategy:
+      parallel: 3
+    displayName: 'Nx Cloud Agent'
+    pool:
+      vmImage: 'ubuntu-latest'
+    steps:
+      <% if(packageManagerPrefix == 'pnpm exec'){ %>
+      - script: npm install --prefix=$HOME/.local -g pnpm@6.32.4
+        displayName: Install PNPM
+      <% } %>- script: <%= packageManagerInstall %>
+        displayName: NPM Install Dependencies
+      - script: npx nx-cloud start-agent
+        displayName: 'Start Nx-Cloud agent
+
+  - job: main
+    displayName: 'Nx Cloud Main'
+    pool:
+      vmImage: 'ubuntu-latest'
+    steps:
+      <% if(packageManagerPrefix == 'pnpm exec'){ %>
+      - script: npm install --prefix=$HOME/.local -g pnpm@6.32.4
+        displayName: Install PNPM
+      <% } %>- script: <%= packageManagerInstall %>
+        displayName: NPM Install Dependencies
+      - script: <%= packageManagerPrefix %> nx-cloud start-ci-run
+        displayName: Start CI run
+      - script: <%= packageManagerPrefix %> nx workspace-lint
+        displayName: Run workspace lint
+      - script: <%= packageManagerPrefix %> nx format:check --base=$(BASE_SHA) --head=$(HEAD_SHA)
+        displayName: Check format
+      - script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) --target=lint --parallel=3
+        displayName: Run lint
+      - script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) --target=test --parallel=3 --ci --code-coverage
+        displayName: Run test
+      - script: <%= packageManagerPrefix %> nx affected --base=$(BASE_SHA) --head=$(HEAD_SHA) --target=build --parallel=3
+        displayName: Run build
+      - script: <%= packageManagerPrefix %> nx-cloud stop-all-agents
+        condition: always()
+        displayName: Stop all Nx-Cloud agents

package/src/generators/ci-workflow/schema.json

@@ -0,0 +1,35 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "NxWorkspaceCIWorkflow",
+  "title": "Generate a CI workflow.",
+  "description": "Generate a CI workflow.",
+  "cli": "nx",
+  "type": "object",
+  "properties": {
+    "ci": {
+      "type": "string",
+      "description": "CI provider.",
+      "enum": ["github", "circleci", "azure"],
+      "x-prompt": {
+        "message": "What is your target CI provider?",
+        "type": "list",
+        "items": [
+          { "value": "github", "label": "Github Actions" },
+          { "value": "circleci", "label": "Circle CI" },
+          { "value": "azure", "label": "Azure DevOps" }
+        ]
+      }
+    },
+    "name": {
+      "type": "string",
+      "description": "Workflow name.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "How should we name your workflow?",
+      "pattern": "^[a-zA-Z].*$"
+    }
+  },
+  "required": ["ci"]
+}

package/src/utils/versions.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.typescriptESLintVersion = exports.tslintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
-exports.nxVersion = '14.0.0-beta.1';
+exports.nxVersion = '14.0.0-beta.2';
 exports.angularCliVersion = '~13.3.0';
 exports.typescriptVersion = '~4.6.2';
 exports.prettierVersion = '^2.5.1';