Merge pull request #342 from modelix/build/do-not-update-version-before-publishing

build(ts-model-api): do not change version when running publish task

Author: Oleksandr Dzhychko

.github/workflows/publish.yml

@@ -29,7 +29,16 @@ jobs:
       - name: Use tag as version
         run: echo "${GITHUB_REF#refs/*/}" > version.txt
       - name: Build and Publish Artifacts
-        run: ./gradlew --build-cache build publish -PciBuild=true -Partifacts.itemis.cloud.user=${{secrets.ARTIFACTS_ITEMIS_CLOUD_USER}} -Partifacts.itemis.cloud.pw=${{secrets.ARTIFACTS_ITEMIS_CLOUD_PW}} -Pgpr.user=${{ github.actor }} -Pgpr.key=${{ secrets.GITHUB_TOKEN }} -Pgpr.universalkey=${{ secrets.GHP_UNIVERSAL_PUBLISH_TOKEN }}
+        run: >-
+          ./gradlew --build-cache build publish
+          -PciBuild=true
+          -Partifacts.itemis.cloud.user=${{ secrets.ARTIFACTS_ITEMIS_CLOUD_USER }}
+          -Partifacts.itemis.cloud.pw=${{ secrets.ARTIFACTS_ITEMIS_CLOUD_PW }}
+          -Pgpr.user=${{ github.actor }}
+          -Pgpr.key=${{ secrets.GITHUB_TOKEN }}
+          -Pgpr.universalkey=${{ secrets.GHP_UNIVERSAL_PUBLISH_TOKEN }}
+          -Porg.gradle.internal.http.connectionTimeout=180000
+          -Porg.gradle.internal.http.socketTimeout=180000
         env:
           NODE_AUTH_TOKEN: ${{ secrets.ARTIFACTS_ITEMIS_CLOUD_NPM_TOKEN }}
       - name: Set up QEMU

ts-model-api/build.gradle.kts

@@ -1,12 +1,11 @@
-import com.github.gradle.node.npm.task.NpmTask
-
 plugins {
   base
   alias(libs.plugins.node)
   alias(libs.plugins.ktlint) apply false
+  alias(libs.plugins.npm.publish)
 }
 
-tasks.named("npm_run_build") {
+val npmRunBuild = tasks.named("npm_run_build") {
   inputs.dir("src")
   inputs.file("package.json")
   inputs.file("package-lock.json")
@@ -38,24 +37,49 @@ val patchKotlinExternals = tasks.create("patchKotlinExternals") {
   }
 }
 
-tasks.named("assemble") {
+tasks.assemble {
   dependsOn("npm_run_build")
   dependsOn("npm_run_generateKotlin")
   dependsOn(patchKotlinExternals)
 }
 
-tasks.named("npm_run_generateKotlin") {
-  finalizedBy(patchKotlinExternals)
+tasks.check {
+  dependsOn("npm_run_lint")
 }
 
-val updateVersion = tasks.register<NpmTask>("updateVersion") {
-  args.set(listOf("version", "$version"))
+tasks.named("npm_run_generateKotlin") {
+  finalizedBy(patchKotlinExternals)
 }
 
-tasks.named("npm_publish") {
-  dependsOn(updateVersion)
+// To copy the files is a workaround for https://github.com/mpetuska/npm-publish/issues/87
+// With `NpmPackage.files` we cannot copy the "dist" directory into `destinationDir`.
+// We can only either copy the files from "dist" directly into `destinationDir`
+// or copy all files from `projectDir` into `destinationDir`.
+val copyBuildTypeScriptForPackaging = tasks.create<Copy>("copyBuildTypeScriptForPackaging") {
+  dependsOn(npmRunBuild)
+  from(projectDir)
+  include("dist")
+  into(layout.buildDirectory.dir("typeScriptForPackaging"))
 }
 
-tasks.named("publish") {
-  dependsOn("npm_publish")
+npmPublish {
+  registries {
+    register("itemis-npm-open") {
+      uri.set("https://artifacts.itemis.cloud/repository/npm-open")
+      System.getenv("NODE_AUTH_TOKEN").takeIf { !it.isNullOrBlank() }?.let {
+        authToken.set(it)
+      }
+    }
+  }
+  packages {
+    create("js") {
+      packageJsonTemplateFile.set(projectDir.resolve("package.json"))
+      packageJson {
+        version.set("${project.version}")
+      }
+      files {
+        setFrom(copyBuildTypeScriptForPackaging.outputs)
+      }
+    }
+  }
 }

ts-model-api/package.json

@@ -28,7 +28,6 @@
     "clean": "shx rm -rf dist/ .*cache *.log",
     "lint": "npm run lint:debug -- --config tslint.prod.json",
     "lint:debug": "tslint --project tsconfig.json --format stylish",
-    "prepublishOnly": "npm run lint && npm run build",
     "test": "shx echo 'Write your own tests'",
     "ts": "tsc",
     "watch": "tsc --watch",
@@ -47,9 +46,5 @@
   "engines": {
     "node": ">= 10.18.1",
     "npm": ">= 6.13.4"
-  },
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://artifacts.itemis.cloud/repository/npm-open/"
   }
 }