Implement hack for KGP ESM main file name bug

Closes #152

.github/workflows/check.yml

@@ -1,30 +1,30 @@
 name: Check
-defaults:
-  run:
+defaults: 
+  run: 
     shell: bash
 
-on:
+on: 
   workflow_dispatch:
   workflow_call:
 
-jobs:
-  check:
+jobs: 
+  check: 
     name: Check on ubuntu-latest
     runs-on: ubuntu-latest
-    env:
+    env: 
       GRADLE_OPTS: "-Dorg.gradle.daemon=true"
-    steps:
+    steps: 
       - uses: actions/checkout@v3
 
       - uses: actions/setup-java@v3
-        with:
+        with: 
           distribution: 'adopt'
           java-version: 11
 
       - name: Restore Gradle cache
         id: cache
         uses: actions/cache@v3
-        with:
+        with: 
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
@@ -51,7 +51,7 @@ jobs:
 
       - uses: github/codeql-action/upload-sarif@v2
         if: ${{ always() }}
-        with:
+        with: 
           sarif_file: ${{ github.workspace }}/detekt.sarif.json
           checkout_path: ${{ github.workspace }}
 
@@ -60,30 +60,30 @@ jobs:
 
       - uses: actions/upload-artifact@v3
         if: ${{ always() }}
-        with:
+        with: 
           name: reports-${{ runner.os }}
           path: |
             **/build/reports
 
       - name: Gradle Check Sandbox
         working-directory: sandbox
-        run: ./gradlew check assemble pack publish --scan
+        run: ../gradlew check assemble pack publish --scan
 
       - uses: actions/upload-artifact@v3
         if: ${{ always() }}
-        with:
+        with: 
           name: sandbox-${{ runner.os }}
           path: |
             sandbox/**/build/reports
             sandbox/**/build/publications
 
       - name: Gradle Check Samples
         working-directory: samples
-        run: ./gradlew check assemble pack publish --scan
+        run: ../gradlew check assemble pack publish --scan
 
       - uses: actions/upload-artifact@v3
         if: ${{ always() }}
-        with:
+        with: 
           name: samples-${{ runner.os }}
           path: |
             samples/**/build/reports
@@ -103,7 +103,7 @@ jobs:
 
       - uses: actions/upload-artifact@v3
         if: ${{ always() }}
-        with:
+        with: 
           name: ts-consumer-${{ runner.os }}
           path: |
             sandbox/ts-consumer/build

.github/workflows/sandbox-publish.yml

@@ -1,27 +1,27 @@
 name: Publish Sandbox to GitHub Packages
-on:
-  workflow_dispatch:
-    inputs:
-      version:
+on: 
+  workflow_dispatch: 
+    inputs: 
+      version: 
         required: true
         description: Package version to publish under
-      sandbox-module:
+      sandbox-module: 
         required: false
         default: both
         description: Sandbox module to publish
-jobs:
-  publish:
+jobs: 
+  publish: 
     runs-on: ubuntu-latest
-    permissions:
+    permissions: 
       contents: read
       packages: write
-    steps:
+    steps: 
       - uses: actions/checkout@v3
 
       - name: Restore Gradle cache
         id: cache
         uses: actions/cache@v3
-        with:
+        with: 
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
@@ -33,15 +33,15 @@ jobs:
 
       - name: Set up JDK
         uses: actions/setup-java@v3
-        with:
+        with: 
           java-version: 11
           distribution: 'adopt'
 
       - name: Publish
         working-directory: sandbox
         run: |
           VERSION=${VERSION:=${{ github.event.inputs.version }}}
-          ./gradlew :${{ github.event.inputs.sandbox-module }}:publishJsNpmPublicationToGitHub \
-              -Pnpm.publish.repository.GitHub.authToken="${{ github.token }}" \
-              -Pnpm.publish.version=${VERSION/v} \
-              -Pnpm.publish.organization=${{ github.repository_owner }}
+          ../gradlew :${{ github.event.inputs.sandbox-module }}:publishJsNpmPublicationToGitHub \
+          -Pnpm.publish.repository.GitHub.authToken="${{ github.token }}" \
+          -Pnpm.publish.version=${VERSION/v} \
+          -Pnpm.publish.organization=${{ github.repository_owner }}

CHANGELOG.md

@@ -9,18 +9,60 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Verified Versions
+
+- Kotlin: 1.9.22
+- Gradle: 8.5
+- JDK: 11
+
+### Added
+
+### Changed
+
+### Removed
+
+---
+
+## [3.4.2]
+
 This is a maintenance release with a few minor bugfixes.
 
 ### Verified Versions
 
+- Kotlin: 1.9.22
+- Gradle: 8.5
+- JDK: 11
+
+### Added
+
+### Changed
+
+- Upgraded dependencies
+- Switched out `com.netflix.nebula.node` plugin hook for node autoconfig to `com.github.node-gradle.node` plugin which
+  it depends on
+- Implemented a patch for older KGP users to remedy https://youtrack.jetbrains.com/issue/KT-59523 when using ESM
+
+### Removed
+
+---
+
+## [3.4.1]
+
+### Verified Versions
+
 - Kotlin: 1.9.0
 - Gradle: 8.2.1
 - JDK: 11
 
 ### Added
 
+- Utility DSL to set NpmRegistry::uri via Provider<String>
+
 ### Changed
 
+- Added trailing slashes to npmjs and github registry convenience DSL URIs
+- Fixed configuration cache issues with Boolean property chains
+
 ### Removed
 
 ---
@@ -406,7 +448,9 @@ This is a maintenance release with a few minor bugfixes.
 
 ---
 
-[Unreleased]: https://github.com/mpetuska/npm-publish/compare/3.4.1...HEAD
+[Unreleased]: https://github.com/mpetuska/npm-publish/compare/3.4.2...HEAD
+
+[3.4.2]: https://github.com/mpetuska/npm-publish/compare/3.4.1...3.4.2
 
 [3.4.1]: https://github.com/mpetuska/npm-publish/compare/3.4.0...3.4.1
 

README.md

@@ -26,24 +26,24 @@ tasks:
 
 ```kotlin title="build.gradle.kts"
 plugins {
-  id("dev.petuska.npm.publish") version "<VERSION>"
-  kotlin("multiplatform") version "<VERSION>>" // Optional, also supports "js"
+    id("dev.petuska.npm.publish") version "<VERSION>"
+    kotlin("multiplatform") version "<VERSION>>" // Optional, also supports "js"
 }
 
 kotlin {
-  js(IR) {
-    binaries.library()
-    browser() // or nodejs()
-  }
+    js(IR) {
+        binaries.library()
+        browser() // or nodejs()
+    }
 }
 
 npmPublish {
-  registries {
-    register("npmjs") {
-      uri.set("https://registry.npmjs.org")
-      authToken.set("obfuscated")
+    registries {
+        register("npmjs") {
+            uri.set("https://registry.npmjs.org")
+            authToken.set("obfuscated")
+        }
     }
-  }
 }
 ```
 

build-conventions/settings.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-  id("com.gradle.enterprise") version "3.14"
+  id("com.gradle.enterprise") version "+"
 }
 
 @Suppress("UnstableApiUsage")

build.gradle.kts

@@ -5,10 +5,12 @@ plugins {
   id("convention.git-hooks")
 }
 
-nexusPublishing.repositories {
-  sonatype {
-    nexusUrl by uri("https://s01.oss.sonatype.org/service/local/")
-    snapshotRepositoryUrl by uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+nexusPublishing {
+  repositories {
+    sonatype {
+      nexusUrl by uri("https://s01.oss.sonatype.org/service/local/")
+      snapshotRepositoryUrl by uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+    }
   }
 }
 

gradle/libs.versions.toml

@@ -1,10 +1,10 @@
 [versions]
-detekt = "1.23.0"
-dokka = "1.8.20"
+detekt = "1.23.4"
+dokka = "1.9.10"
 java = "11"
-junit-jupiter = "5.10.0"
-kotest = "5.6.2"
-kotlin = "1.9.0"
+junit-jupiter = "5.10.1"
+kotest = "5.8.0"
+kotlin = "1.9.22"
 
 [libraries]
 detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
@@ -16,7 +16,7 @@ plugin-container-tasks = "dev.petuska:container-tasks-gradle-plugin:0.0.4"
 plugin-detekt = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
 plugin-git-hooks = "com.github.jakemarsden:git-hooks-gradle-plugin:0.0.2"
 plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
-plugin-nebula-node = "com.netflix.nebula:nebula-node-plugin:3.0.0"
+plugin-node-gradle = "com.github.node-gradle:gradle-node-plugin:7.0.1"
 plugin-versions = "com.github.ben-manes:gradle-versions-plugin:0.47.0"
 plugin-versions-update = "nl.littlerobots.vcu:plugin:0.8.1"
 
@@ -29,4 +29,4 @@ kotest-assertions = [
 [plugins]
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 nexus-publish = "io.github.gradle-nexus.publish-plugin:1.3.0"
-plugin-publish = "com.gradle.plugin-publish:1.2.0"
+plugin-publish = "com.gradle.plugin-publish:1.2.1"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

npm-publish-gradle-plugin/build.gradle.kts

@@ -17,7 +17,7 @@ kotlin {
   explicitApi()
   dependencies {
     compileOnly(libs.plugin.kotlin)
-    compileOnly(libs.plugin.nebula.node)
+    compileOnly(libs.plugin.node.gradle)
 
     testImplementation(libs.plugin.kotlin)
   }

npm-publish-gradle-plugin/src/main/kotlin/NpmPublishPlugin.kt

@@ -1,6 +1,6 @@
 package dev.petuska.npm.publish
 
-import com.moowork.gradle.node.task.SetupTask
+import com.github.gradle.node.task.NodeSetupTask
 import dev.petuska.npm.publish.config.configure
 import dev.petuska.npm.publish.extension.NpmPublishExtension
 import dev.petuska.npm.publish.task.NodeExecTask
@@ -28,11 +28,10 @@ public class NpmPublishPlugin : Plugin<Project> {
   override fun apply(project: Project): Unit = with(project) {
     val extension = extensions.create(NpmPublishExtension.NAME, NpmPublishExtension::class.java)
     configure(extension)
-    pluginManager.withPlugin(NEBULA_NODE_PLUGIN) {
-      val nebulaNodeHome = project.tasks.named<SetupTask>(SetupTask.NAME)
-        .map { it.takeIf { it.enabled }.unsafeCast<SetupTask>() }
-        .map(SetupTask::getNodeDir)
-        .let(layout::dir)
+    pluginManager.withPlugin(NODE_GRADLE_PLUGIN) {
+      val nebulaNodeHome = project.tasks.named<NodeSetupTask>(NodeSetupTask.NAME)
+        .map { it.takeIf { it.enabled }.unsafeCast<NodeSetupTask>() }
+        .flatMap(NodeSetupTask::nodeDir)
       extension.nodeHome.convention(
         sysProjectEnvPropertyConvention(
           name = "nodeHome",
@@ -87,6 +86,6 @@ public class NpmPublishPlugin : Plugin<Project> {
   private companion object {
     private const val KOTLIN_JS_PLUGIN = "org.jetbrains.kotlin.js"
     private const val KOTLIN_MPP_PLUGIN = "org.jetbrains.kotlin.multiplatform"
-    private const val NEBULA_NODE_PLUGIN = "com.netflix.nebula.node"
+    private const val NODE_GRADLE_PLUGIN = "com.github.node-gradle.node"
   }
 }

npm-publish-gradle-plugin/src/main/kotlin/config/kotlinJsTarget.kt

@@ -98,7 +98,7 @@ internal fun Project.configure(target: KotlinJsTargetDsl): Unit = with(PluginLog
       )
       pkg.dependencies.addAllLater(resolveDependencies(target.name, binary))
       pkg.files { files ->
-        files.from(outputFile.map { it.parentFile })
+        files.from(outputFile.map(File::getParentFile))
         files.from(processResourcesTask.map(Copy::getDestinationDir))
       }
     }