@nrwl/workspace 15.3.0 → 15.3.3

package/CHANGELOG.md

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [15.3.0](https://github.com/nrwl/nx/compare/15.2.0...15.3.0) (2022-12-06)
+## [15.3.3](https://github.com/nrwl/nx/compare/15.3.2...15.3.3) (2022-12-12)
 
 **Note:** Version bump only for package @nrwl/workspace

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/workspace",
-  "version": "15.3.0",
+  "version": "15.3.3",
   "private": false,
   "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.",
   "repository": {
@@ -33,31 +33,31 @@
     "requirements": {},
     "migrations": "./migrations.json",
     "packageGroup": {
-      "@nrwl/angular": "15.3.0",
-      "@nrwl/cli": "15.3.0",
-      "@nrwl/cypress": "15.3.0",
-      "@nrwl/detox": "15.3.0",
-      "@nrwl/devkit": "15.3.0",
-      "@nrwl/esbuild": "15.3.0",
-      "@nrwl/eslint-plugin-nx": "15.3.0",
-      "@nrwl/expo": "15.3.0",
-      "@nrwl/express": "15.3.0",
-      "@nrwl/jest": "15.3.0",
-      "@nrwl/js": "15.3.0",
-      "@nrwl/linter": "15.3.0",
-      "@nrwl/nest": "15.3.0",
-      "@nrwl/next": "15.3.0",
-      "@nrwl/node": "15.3.0",
+      "@nrwl/angular": "15.3.3",
+      "@nrwl/cli": "15.3.3",
+      "@nrwl/cypress": "15.3.3",
+      "@nrwl/detox": "15.3.3",
+      "@nrwl/devkit": "15.3.3",
+      "@nrwl/esbuild": "15.3.3",
+      "@nrwl/eslint-plugin-nx": "15.3.3",
+      "@nrwl/expo": "15.3.3",
+      "@nrwl/express": "15.3.3",
+      "@nrwl/jest": "15.3.3",
+      "@nrwl/js": "15.3.3",
+      "@nrwl/linter": "15.3.3",
+      "@nrwl/nest": "15.3.3",
+      "@nrwl/next": "15.3.3",
+      "@nrwl/node": "15.3.3",
       "@nrwl/nx-cloud": "latest",
-      "@nrwl/nx-plugin": "15.3.0",
-      "@nrwl/react": "15.3.0",
-      "@nrwl/react-native": "15.3.0",
-      "@nrwl/rollup": "15.3.0",
-      "@nrwl/storybook": "15.3.0",
-      "@nrwl/tao": "15.3.0",
-      "@nrwl/web": "15.3.0",
-      "@nrwl/webpack": "15.3.0",
-      "nx": "15.3.0"
+      "@nrwl/nx-plugin": "15.3.3",
+      "@nrwl/react": "15.3.3",
+      "@nrwl/react-native": "15.3.3",
+      "@nrwl/rollup": "15.3.3",
+      "@nrwl/storybook": "15.3.3",
+      "@nrwl/tao": "15.3.3",
+      "@nrwl/web": "15.3.3",
+      "@nrwl/webpack": "15.3.3",
+      "nx": "15.3.3"
     }
   },
   "peerDependencies": {
@@ -69,8 +69,8 @@
     }
   },
   "dependencies": {
-    "@nrwl/devkit": "15.3.0",
-    "@nrwl/linter": "15.3.0",
+    "@nrwl/devkit": "15.3.3",
+    "@nrwl/linter": "15.3.3",
     "@parcel/watcher": "2.0.4",
     "chalk": "4.1.0",
     "chokidar": "^3.5.1",
@@ -85,7 +85,7 @@
     "ignore": "^5.0.4",
     "minimatch": "3.0.5",
     "npm-run-path": "^4.0.1",
-    "nx": "15.3.0",
+    "nx": "15.3.3",
     "open": "^8.4.0",
     "rxjs": "^6.5.4",
     "semver": "7.3.4",
@@ -98,5 +98,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "42618c7e1dc6e14dc9f1eabb636de0023bcd8ba2"
+  "gitHead": "486516ea1384d15ea74fe8334687355d1aa98f51"
 }

package/src/executors/run-commands/schema.json

@@ -138,6 +138,13 @@
     }
   },
   "additionalProperties": true,
-  "required": [],
+  "oneOf": [
+    {
+      "required": ["commands"]
+    },
+    {
+      "required": ["command"]
+    }
+  ],
   "examplesFile": "../../../docs/run-commands-examples.md"
 }

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

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

package/src/generators/ci-workflow/files/gitlab/.gitlab-ci.yml__tmpl__

@@ -0,0 +1,48 @@
+image: node:18
+variables:
+  CI: 'true'
+
+# Creating template for DTE agents
+.dte-agent:
+  interruptible: true
+  script:
+    <% if(packageManagerPrefix == 'pnpm exec'){ %>
+    - npm install --prefix=$HOME/.local -g pnpm@6.32.4
+    <% } %>
+    - <%= packageManagerInstall %>
+    - <%= packageManagerPrefix %> nx-cloud start-agent
+
+# Creating template for a job running DTE (orchestrator)
+.base-pipeline:
+  interruptible: true
+  only:
+    - main
+    - merge_requests
+  before_script:
+    <% if(packageManagerPrefix == 'pnpm exec'){ %>
+    - npm install --prefix=$HOME/.local -g pnpm@6.32.4
+    <% } %>
+    - <%= packageManagerInstall %>
+    - NX_HEAD=$CI_COMMIT_SHA
+    - NX_BASE=${CI_MERGE_REQUEST_DIFF_BASE_SHA:-$CI_COMMIT_BEFORE_SHA}
+
+# Main job running DTE
+<%= workflowName %>:
+  stage: affected
+  extends: .base-pipeline
+  script:
+    - <%= packageManagerPrefix %> nx-cloud start-ci-run --stop-agents-after="build"
+    - <%= packageManagerPrefix %> nx-cloud record -- yarn nx workspace-lint --base=$NX_BASE --head=$NX_HEAD
+    - <%= packageManagerPrefix %> nx-cloud record -- yarn nx format:check --base=$NX_BASE --head=$NX_HEAD
+    - <%= packageManagerPrefix %> nx affected --base=$NX_BASE --head=$NX_HEAD --target=lint --parallel=3 & yarn nx affected --base=$NX_BASE --head=$NX_HEAD --target=test --parallel=3 --ci --code-coverage & yarn nx affected --base=$NX_BASE --head=$NX_HEAD --target=e2e --parallel=3 --ci --code-coverage & yarn nx affected --base=$NX_BASE --head=$NX_HEAD --target=build --parallel=3
+
+# Create as many agents as you want
+nx-dte-agent1:
+  extends: .dte-agent
+  stage: affected
+nx-dte-agent2:
+  extends: .dte-agent
+  stage: affected
+nx-dte-agent3:
+  extends: .dte-agent
+  stage: affected

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

@@ -17,7 +17,8 @@
           { "value": "github", "label": "Github Actions" },
           { "value": "circleci", "label": "Circle CI" },
           { "value": "azure", "label": "Azure DevOps" },
-          { "value": "bitbucket-pipelines", "label": "BitBucket Pipelines" }
+          { "value": "bitbucket-pipelines", "label": "BitBucket Pipelines" },
+          { "value": "gitlab", "label": "Gitlab" }
         ]
       }
     },