@nx/gradle 19.0.0-canary.20240430-458f2cc → 19.0.0-canary.20240503-dbad02a

package/generators.json

@@ -6,6 +6,11 @@
       "factory": "./src/generators/init/init#initGenerator",
       "schema": "./src/generators/init/schema.json",
       "description": "Initializes a Gradle project in the current workspace"
+    },
+    "ci-workflow": {
+      "factory": "./src/generators/ci-workflow/generator",
+      "schema": "./src/generators/ci-workflow/schema.json",
+      "description": "Setup a CI Workflow to run Nx in CI"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "19.0.0-canary.20240430-458f2cc",
+  "version": "19.0.0-canary.20240503-dbad02a",
   "private": false,
   "description": "The Nx Plugin for Gradle allows Gradle tasks to be run through Nx",
   "repository": {
@@ -33,7 +33,7 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "19.0.0-canary.20240430-458f2cc"
+    "@nx/devkit": "19.0.0-canary.20240503-dbad02a"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/ci-workflow/files/circleci/.circleci/config.yml.template

@@ -0,0 +1,32 @@
+version: 2.1
+
+orbs:
+  nx: nrwl/nx@1.6.2
+
+jobs:
+  main:
+    environment:
+      # Configure the JVM and Gradle to avoid OOM errors
+      _JAVA_OPTIONS: "-Xmx3g"
+      GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2"
+    docker:
+      - image: cimg/openjdk:17.0-node
+    steps:
+      - checkout
+
+      # Connect your workspace on <%= nxCloudHost %> and uncomment this to enable task distribution.
+      # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
+      # - run: <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-jvm" --stop-agents-after="build"
+
+      - nx/set-shas:
+          main-branch-name: '<%= mainBranch %>'
+
+<% for (const command of commands) { %>
+      - run: <%= command %><% } %>
+
+workflows:
+  version: 2
+
+  <%= workflowFileName %>:
+    jobs:
+      - main

package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml.template

@@ -0,0 +1,38 @@
+name: <%= workflowName %>
+
+on:
+  push:
+    branches:
+      - <%= mainBranch %>
+  pull_request:
+
+permissions:
+  actions: read
+  contents: read
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      # Connect your workspace on <%= nxCloudHost %> and uncomment this to enable task distribution.
+      # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "build" targets have been requested
+      # - run: <%= packageManagerPrefix %> nx-cloud start-ci-run --distribute-on="5 linux-medium-jvm" --stop-agents-after="build"
+
+      - name: Set up JDK 17 for x64
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          architecture: x64
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
+      - uses: nrwl/nx-set-shas@v4
+
+<% for (const command of commands) { %>
+      - run: <%= command %><% } %>

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

@@ -0,0 +1,9 @@
+import { Tree } from '@nx/devkit';
+export interface Schema {
+    name: string;
+    ci: 'github' | 'circleci';
+    packageManager?: null;
+    commands?: string[];
+}
+export declare function ciWorkflowGenerator(tree: Tree, schema: Schema): Promise<void>;
+export default ciWorkflowGenerator;

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

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ciWorkflowGenerator = void 0;
+const devkit_1 = require("@nx/devkit");
+const path_1 = require("path");
+const nx_cloud_utils_1 = require("nx/src/utils/nx-cloud-utils");
+const default_base_1 = require("nx/src/utils/default-base");
+function getCiCommands(ci, mainBranch) {
+    switch (ci) {
+        case 'circleci': {
+            return [`./nx affected --base=$NX_BASE --head=$NX_HEAD -t test build`];
+        }
+        default: {
+            return [`./nx affected -t test build`];
+        }
+    }
+}
+async function ciWorkflowGenerator(tree, schema) {
+    const ci = schema.ci;
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const nxCloudUsed = (0, nx_cloud_utils_1.isNxCloudUsed)(nxJson);
+    if (!nxCloudUsed) {
+        throw new Error('This workspace is not connected to Nx Cloud.');
+    }
+    const options = getTemplateData(schema, nxJson);
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files', ci), '', options);
+    await (0, devkit_1.formatFiles)(tree);
+}
+exports.ciWorkflowGenerator = ciWorkflowGenerator;
+function getTemplateData(options, nxJson) {
+    const { name: workflowName, fileName: workflowFileName } = (0, devkit_1.names)(options.name);
+    const packageManager = (0, devkit_1.detectPackageManager)();
+    const { exec: packageManagerPrefix } = (0, devkit_1.getPackageManagerCommand)(packageManager);
+    const nxCloudUrl = (0, nx_cloud_utils_1.getNxCloudUrl)(nxJson);
+    const nxCloudHost = new URL(nxCloudUrl).host;
+    const mainBranch = (0, default_base_1.deduceDefaultBase)();
+    const commands = options.commands ?? getCiCommands(options.ci, mainBranch);
+    return {
+        workflowName,
+        workflowFileName,
+        packageManager,
+        packageManagerPrefix,
+        commands,
+        mainBranch,
+        nxCloudHost,
+    };
+}
+exports.default = ciWorkflowGenerator;

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

@@ -0,0 +1,40 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "$id": "NxGradleCiWorkflowSchema",
+  "title": "Gradle CI Workflow Generator",
+  "description": "Setup a CI Workflow to run Nx in CI.",
+  "type": "object",
+  "properties": {
+    "ci": {
+      "type": "string",
+      "description": "CI provider.",
+      "enum": ["github", "circleci"],
+      "x-prompt": {
+        "message": "What is your target CI provider?",
+        "type": "list",
+        "items": [
+          {
+            "value": "github",
+            "label": "GitHub Actions"
+          },
+          {
+            "value": "circleci",
+            "label": "Circle CI"
+          }
+        ]
+      }
+    },
+    "name": {
+      "type": "string",
+      "description": "Workflow name.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "default": "CI",
+      "x-prompt": "How should we name your workflow?",
+      "pattern": "^[a-zA-Z].*$"
+    }
+  },
+  "required": ["ci", "name"]
+}

package/src/generators/init/init.js

@@ -12,6 +12,7 @@ async function initGenerator(tree, options) {
         }, undefined, options.keepExistingVersions));
     }
     addPlugin(tree);
+    updateNxJsonConfiguration(tree);
     addProjectReportToBuildGradle(tree);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
@@ -71,4 +72,15 @@ allprojects {
         tree.write(buildGradleFile, buildGradleContent);
     }
 }
+function updateNxJsonConfiguration(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (!nxJson.namedInputs) {
+        nxJson.namedInputs = {};
+    }
+    const defaultFilesSet = nxJson.namedInputs.default ?? [];
+    nxJson.namedInputs.default = Array.from(new Set([...defaultFilesSet, '{projectRoot}/**/*']));
+    const productionFileSet = nxJson.namedInputs.production ?? [];
+    nxJson.namedInputs.production = Array.from(new Set([...productionFileSet, 'default', '!{projectRoot}/test/**/*']));
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+}
 exports.default = initGenerator;

package/src/plugin/nodes.js

@@ -53,7 +53,7 @@ exports.createNodes = [
                 });
             }
             const outputDirs = gradleFileToOutputDirsMap.get(gradleFilePath);
-            const { targets, targetGroups } = createGradleTargets(tasks, projectRoot, options, context, outputDirs);
+            const { targets, targetGroups } = createGradleTargets(tasks, options, context, outputDirs, gradleProject);
             const project = {
                 name: projectName,
                 targets,
@@ -75,19 +75,15 @@ exports.createNodes = [
         }
     },
 ];
-function createGradleTargets(tasks, projectRoot, options, context, outputDirs) {
+function createGradleTargets(tasks, options, context, outputDirs, gradleProject) {
     const inputsMap = createInputsMap(context);
     const targets = {};
     const targetGroups = {};
     for (const task of tasks) {
         const targetName = options?.[`${task.name}TargetName`] ?? task.name;
         const outputs = outputDirs.get(task.name);
-        const path = (0, node_path_1.relative)((0, node_path_1.join)(context.workspaceRoot, projectRoot), (0, exec_gradle_1.getGradleBinaryPath)());
         targets[targetName] = {
-            command: `${path} ${task.name}`,
-            options: {
-                cwd: projectRoot,
-            },
+            command: `${(0, exec_gradle_1.getGradleExecFile)()} ${gradleProject ? gradleProject + ':' : ''}${task.name}`,
             cache: cacheableTaskType.has(task.type),
             inputs: inputsMap[task.name],
             outputs: outputs ? [outputs] : undefined,
@@ -110,6 +106,8 @@ function createInputsMap(context) {
             ? ['production', '^production']
             : ['default', '^default'],
         test: ['default', namedInputs?.production ? '^production' : '^default'],
-        classes: ['default', '^default'],
+        classes: namedInputs?.production
+            ? ['production', '^production']
+            : ['default', '^default'],
     };
 }

package/src/utils/exec-gradle.d.ts

@@ -4,4 +4,5 @@ import { ExecFileOptions } from 'child_process';
 import { ExecFileSyncOptionsWithBufferEncoding } from 'node:child_process';
 export declare function execGradle(args: string[], execOptions?: ExecFileSyncOptionsWithBufferEncoding): Buffer;
 export declare function getGradleBinaryPath(): string;
+export declare function getGradleExecFile(): string;
 export declare function execGradleAsync(args: ReadonlyArray<string>, execOptions?: ExecFileOptions): Promise<Buffer>;

package/src/utils/exec-gradle.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.execGradleAsync = exports.getGradleBinaryPath = exports.execGradle = void 0;
+exports.execGradleAsync = exports.getGradleExecFile = exports.getGradleBinaryPath = exports.execGradle = void 0;
 const devkit_1 = require("@nx/devkit");
 const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
@@ -21,6 +21,10 @@ function getGradleBinaryPath() {
     return gradleBinaryPath;
 }
 exports.getGradleBinaryPath = getGradleBinaryPath;
+function getGradleExecFile() {
+    return process.platform.startsWith('win') ? '.\\gradlew.bat' : './gradlew';
+}
+exports.getGradleExecFile = getGradleExecFile;
 function execGradleAsync(args, execOptions) {
     const gradleBinaryPath = getGradleBinaryPath();
     return new Promise((res, rej) => {