Merge branch '3.x'

Author: deepy

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Version 3.x *(unreleased)*
 
+## Version 3.6.0 *(2023-04-20)*
+* Allow task rules to be disabled [#116](https://github.com/node-gradle/gradle-node-plugin/issues/116)
+* Add `fastNpmInstall` option to only track lock-files #[157](https://github.com/node-gradle/gradle-node-plugin/issues/157)
+
 ## Version 3.5.1 *(2022-12-26)*
 * Fix configuration cache support in pnpm
 

README.md

@@ -4,7 +4,7 @@
 
 ![Build Status](https://github.com/node-gradle/gradle-node-plugin/workflows/Build/badge.svg?branch=master)
 [![License](https://img.shields.io/github/license/node-gradle/gradle-node-plugin.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
-![Version](https://img.shields.io/badge/Version-3.5.1-orange.svg)
+![Version](https://img.shields.io/badge/Version-3.6.0-orange.svg)
 
 This plugin enables you to use a lot of [Node.js](https://nodejs.org)-based technologies as part of your 
 build without having Node.js installed locally on your system. It integrates the following Node.js-based system
@@ -39,7 +39,8 @@ issue to [GitHub Issues](https://github.com/node-gradle/gradle-node-plugin/issue
 
 Here's the documentation for older releases of the plugin:
 
-* [3.5.1](https://github.com/node-gradle/gradle-node-plugin/blob/3.5.1/README.md) (current)
+* [3.6.0](https://github.com/node-gradle/gradle-node-plugin/blob/3.6.0/README.md) (current)
+* [3.5.1](https://github.com/node-gradle/gradle-node-plugin/blob/3.5.1/README.md)
 * [3.5.0](https://github.com/node-gradle/gradle-node-plugin/blob/3.5.0/README.md)
 * [3.4.0](https://github.com/node-gradle/gradle-node-plugin/blob/3.4.0/README.md)
 * [3.3.0](https://github.com/node-gradle/gradle-node-plugin/blob/3.3.0/README.md)

docs/installation.md

@@ -5,7 +5,7 @@ in your `build.gradle` file:
 
 ```gradle
 plugins {
-  id "com.github.node-gradle.node" version "3.5.1"
+  id "com.github.node-gradle.node" version "3.6.0"
 }
 ```
 
@@ -18,7 +18,7 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.github.node-gradle:gradle-node-plugin:3.5.1"
+    classpath "com.github.node-gradle:gradle-node-plugin:3.6.0"
   }
 }
 

docs/usage.md

@@ -18,7 +18,7 @@ file (see [Installing](installation.md) for details):
 
 ```gradle
 plugins {
-  id "com.github.node-gradle.node" version "3.5.1"
+  id "com.github.node-gradle.node" version "3.6.0"
 }
 ```
 

src/main/kotlin/com/github/gradle/node/NodeExtension.kt

@@ -137,6 +137,16 @@ open class NodeExtension(project: Project) {
     @Deprecated("Deprecated in version 3.0, please use nodeProjectDir now")
     val nodeModulesDir = nodeProjectDir
 
+    /**
+     * Create rules for automatic task creation
+     *
+     * Disabling this will prevent the npm_ npx_ yarn_ pnpm_ tasks from being
+     * automatically created.
+     * It's recommended to turn this off after you've gotten comfortable
+     * with the plugin and register your own tasks instead of relying on the rule.
+     */
+    val enableTaskRules = project.objects.property<Boolean>().convention(true)
+
     init {
         distBaseUrl.set("https://nodejs.org/dist")
     }

src/main/kotlin/com/github/gradle/node/NodePlugin.kt

@@ -15,6 +15,7 @@ import com.github.gradle.node.yarn.task.YarnSetupTask
 import com.github.gradle.node.yarn.task.YarnTask
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.provider.Property
 import org.gradle.kotlin.dsl.create
 import org.gradle.kotlin.dsl.named
 import org.gradle.kotlin.dsl.register
@@ -30,9 +31,9 @@ class NodePlugin : Plugin<Project> {
         project.extensions.create<PackageJsonExtension>(PackageJsonExtension.NAME, project)
         addGlobalTypes()
         addTasks()
-        addNpmRule()
-        addPnpmRule()
-        addYarnRule()
+        addNpmRule(nodeExtension.enableTaskRules)
+        addPnpmRule(nodeExtension.enableTaskRules)
+        addYarnRule(nodeExtension.enableTaskRules)
         project.afterEvaluate {
             if (nodeExtension.download.get()) {
                 nodeExtension.distBaseUrl.orNull?.let { addRepository(it, nodeExtension.allowInsecureProtocol.orNull) }
@@ -64,10 +65,10 @@ class NodePlugin : Plugin<Project> {
         project.tasks.register<YarnSetupTask>(YarnSetupTask.NAME)
     }
 
-    private fun addNpmRule() { // note this rule also makes it possible to specify e.g. "dependsOn npm_install"
+    private fun addNpmRule(enableTaskRules: Property<Boolean>) { // note this rule also makes it possible to specify e.g. "dependsOn npm_install"
         project.tasks.addRule("Pattern: \"npm_<command>\": Executes an NPM command.") {
             val taskName = this
-            if (taskName.startsWith("npm_")) {
+            if (taskName.startsWith("npm_") && enableTaskRules.get()) {
                 project.tasks.create<NpmTask>(taskName) {
                     val tokens = taskName.split("_").drop(1) // all except first
                     npmCommand.set(tokens)
@@ -79,10 +80,10 @@ class NodePlugin : Plugin<Project> {
         }
     }
 
-    private fun addPnpmRule() { // note this rule also makes it possible to specify e.g. "dependsOn npm_install"
+    private fun addPnpmRule(enableTaskRules: Property<Boolean>) { // note this rule also makes it possible to specify e.g. "dependsOn npm_install"
         project.tasks.addRule("Pattern: \"pnpm_<command>\": Executes an PNPM command.") {
             val taskName = this
-            if (taskName.startsWith("pnpm_")) {
+            if (taskName.startsWith("pnpm_") && enableTaskRules.get()) {
                 project.tasks.register<PnpmTask>(taskName) {
                     val tokens = taskName.split("_").drop(1) // all except first
                     pnpmCommand.set(tokens)
@@ -94,10 +95,10 @@ class NodePlugin : Plugin<Project> {
         }
     }
 
-    private fun addYarnRule() { // note this rule also makes it possible to specify e.g. "dependsOn yarn_install"
+    private fun addYarnRule(enableTaskRules: Property<Boolean>) { // note this rule also makes it possible to specify e.g. "dependsOn yarn_install"
         project.tasks.addRule("Pattern: \"yarn_<command>\": Executes an Yarn command.") {
             val taskName = this
-            if (taskName.startsWith("yarn_")) {
+            if (taskName.startsWith("yarn_") && enableTaskRules.get()) {
                 project.tasks.create<YarnTask>(taskName) {
                     val tokens = taskName.split("_").drop(1) // all except first
                     yarnCommand.set(tokens)

src/main/kotlin/com/github/gradle/node/npm/task/NpmInstallTask.kt

@@ -29,6 +29,9 @@ abstract class NpmInstallTask : NpmTask() {
         dependsOn(NpmSetupTask.NAME)
         npmCommand.set(nodeExtension.npmInstallCommand.map { listOf(it) })
         fastInstall.set(nodeExtension.fastNpmInstall)
+        outputs.doNotCacheIf("With fastNpmInstall there's no output to cache") {
+            fastInstall.get()
+        }
     }
 
     @PathSensitive(RELATIVE)

src/test/groovy/com/github/gradle/node/Versions.groovy

@@ -0,0 +1,8 @@
+package com.github.gradle.node
+
+class Versions {
+    static TEST_PNPM_DOWNLOAD_VERSION = "8.1.1"
+    static TEST_PNPM_DOWNLOAD_REGEX = /\n8\.1\.1\n/
+    static TEST_PNPM_LOCAL_VERSION = "8.2.0"
+    static TEST_PNPM_LOCAL_REGEX = /\n8\.2\.0\n/
+}

src/test/groovy/com/github/gradle/node/npm/task/NpmRule_integTest.groovy

@@ -27,6 +27,30 @@ class NpmRule_integTest extends AbstractIntegTest {
         gv << GRADLE_VERSIONS_UNDER_TEST
     }
 
+    def 'rules can be disabled (#gv.version)'() {
+        given:
+        gradleVersion = gv
+        writeBuild('''
+            plugins {
+                id 'com.github.node-gradle.node'
+            }
+            
+            node {
+                enableTaskRules = false
+            }
+        ''')
+        writeEmptyPackageJson()
+
+        when:
+        def result = buildAndFail('npm_install')
+
+        then:
+        result.output.contains("Task 'npm_install' not found")
+
+        where:
+        gv << GRADLE_VERSIONS_UNDER_TEST
+    }
+
    def 'can configure npm_ rule task (#gv.version)'() {
        given:
        gradleVersion = gv

src/test/groovy/com/github/gradle/node/pnpm/task/PnpmInstall_integTest.groovy

@@ -22,6 +22,7 @@ class PnpmInstall_integTest
             }
         ''' )
         writeEmptyPackageJson()
+        writeFile("pnpm-lock.yaml", "lockfileVersion: '6.0'")
 
         when:
         def result = build( 'pnpmInstall' )
@@ -65,6 +66,7 @@ class PnpmInstall_integTest
             "postinstall" : "pnpm run versionOutput"
         }
         """)
+        writeFile("pnpm-lock.yaml", "lockfileVersion: '6.0'")
 
         when:
         def result = build( 'pnpmInstall', '--info' )