[Wasm] Upgrade Node.js onto 22 version

ilgonmic · Space Team · commit 92a9f55e5c97 · 2024-04-30T08:12:59.000Z
^KT-65864 fixed
^KT-67785 fixed
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-test/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-test/build.gradle.kts
@@ -7,12 +7,6 @@ repositories {
     mavenCentral()
 }
 
-with(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.apply(rootProject)) {
-    // canary nodejs that supports recent Wasm GC changes
-    nodeVersion = "21.0.0-v8-canary202309167e82ab1fa2"
-    nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
-}
-
 with(org.jetbrains.kotlin.gradle.targets.js.d8.D8RootPlugin.apply(rootProject)) {
     // Test that we can set the version and it is a String.
     // But use the default version since update this place every time anyway.
@@ -25,11 +19,6 @@ allprojects.forEach {
     }
 }
 
-tasks.named<org.jetbrains.kotlin.gradle.targets.js.npm.LockCopyTask>("kotlinStorePackageLock") {
-    //A little hacky way to make yarn results
-    inputFile.fileValue(projectDir.resolve("packageLockStub"))
-}
-
 kotlin {
     wasmJs {
         <JsEngine> {
@@ -50,3 +39,8 @@ kotlin {
         }
     }
 }
+
+tasks.named<org.jetbrains.kotlin.gradle.targets.js.npm.LockCopyTask>("kotlinStorePackageLock") {
+    //A little hacky way to make yarn results
+    inputFile.fileValue(projectDir.resolve("packageLockStub"))
+}
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-wasi-test/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-wasm-wasi-test/build.gradle.kts
@@ -2,12 +2,6 @@ plugins {
     kotlin("multiplatform").version("<pluginMarkerVersion>")
 }
 
-with(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.apply(rootProject)) {
-    // canary nodejs that supports recent Wasm GC changes
-    nodeVersion = "21.0.0-v8-canary202309167e82ab1fa2"
-    nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
-}
-
 with(org.jetbrains.kotlin.gradle.targets.js.d8.D8RootPlugin.apply(rootProject)) {
     // Test that we can set the version and it is a String.
     // But use the default version since update this place every time anyway.
@@ -20,11 +14,6 @@ allprojects.forEach {
     }
 }
 
-tasks.named<org.jetbrains.kotlin.gradle.targets.js.npm.LockCopyTask>("kotlinStorePackageLock") {
-    //A little hacky way to make yarn results
-    inputFile.fileValue(projectDir.resolve("packageLockStub"))
-}
-
 repositories {
     mavenLocal()
     mavenCentral()
@@ -45,3 +34,8 @@ kotlin {
         }
     }
 }
+
+tasks.named<org.jetbrains.kotlin.gradle.targets.js.npm.LockCopyTask>("kotlinStorePackageLock") {
+    //A little hacky way to make yarn results
+    inputFile.fileValue(projectDir.resolve("packageLockStub"))
+}
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/d8/D8Exec.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/d8/D8Exec.kt
@@ -9,9 +9,7 @@ import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.tasks.*
 import org.gradle.work.DisableCachingByDefault
 import org.gradle.work.NormalizeLineEndings
-import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
-import org.jetbrains.kotlin.gradle.targets.js.addWasmExperimentalArguments
 import org.jetbrains.kotlin.gradle.tasks.registerTask
 import org.jetbrains.kotlin.gradle.utils.newFileProperty
 
@@ -66,9 +64,6 @@ open class D8Exec : AbstractExecTask<D8Exec>(D8Exec::class.java) {
                 it.executable = d8.requireConfigured().executablePath.absolutePath
                 it.dependsOn(d8.setupTaskProvider)
                 it.dependsOn(compilation.compileKotlinTaskProvider)
-                if (compilation.platformType == KotlinPlatformType.wasm) {
-                    it.d8Args.addWasmExperimentalArguments()
-                }
                 it.configuration()
             }
         }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt
@@ -9,11 +9,9 @@ import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.tasks.*
 import org.gradle.work.DisableCachingByDefault
 import org.gradle.work.NormalizeLineEndings
-import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
 import org.jetbrains.kotlin.gradle.targets.js.KotlinWasmTargetType
 import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency
-import org.jetbrains.kotlin.gradle.targets.js.addWasmExperimentalArguments
 import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.Companion.kotlinNodeJsExtension
 import org.jetbrains.kotlin.gradle.targets.js.npm.RequiresNpmDependencies
@@ -117,9 +115,6 @@ constructor(
                 }
                 it.dependsOn(nodeJsTaskProviders.nodeJsSetupTaskProvider)
                 it.dependsOn(compilation.compileKotlinTaskProvider)
-                if (compilation.platformType == KotlinPlatformType.wasm) {
-                    it.nodeArgs.addWasmExperimentalArguments()
-                }
                 it.configuration()
             }
         }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt
@@ -63,7 +63,7 @@ open class NodeJsRootExtension(
     // Release schedule: https://github.com/nodejs/Release
     // Actual LTS and Current versions: https://nodejs.org/en/download/
     // Older versions and more information, e.g. V8 version inside: https://nodejs.org/en/download/releases/
-    var nodeVersion by Property("18.12.1")
+    var nodeVersion by Property("22.0.0")
 
     var nodeCommand by Property("node")
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinWasmD8.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinWasmD8.kt
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecuti
 import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecutor
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
 import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency
-import org.jetbrains.kotlin.gradle.targets.js.addWasmExperimentalArguments
 import org.jetbrains.kotlin.gradle.targets.js.d8.D8RootPlugin
 import org.jetbrains.kotlin.gradle.targets.js.internal.parseNodeJsStackTraceAsJvm
 import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject
@@ -67,7 +66,6 @@ internal class KotlinWasmD8(private val kotlinJsTest: KotlinJsTest) : KotlinJsTe
 
         val args = mutableListOf<String>()
         with(args) {
-            addWasmExperimentalArguments()
             add(testRunnerFile.absolutePath)
             add("--")
             addAll(cliArgs.toList())
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinWasmNode.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/KotlinWasmNode.kt
@@ -13,7 +13,6 @@ import org.jetbrains.kotlin.gradle.internal.testing.TCServiceMessagesTestExecuto
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
 import org.jetbrains.kotlin.gradle.targets.js.KotlinWasmTargetType
 import org.jetbrains.kotlin.gradle.targets.js.RequiredKotlinJsDependency
-import org.jetbrains.kotlin.gradle.targets.js.addWasmExperimentalArguments
 import org.jetbrains.kotlin.gradle.targets.js.internal.parseNodeJsStackTraceAsJvm
 import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget
 import org.jetbrains.kotlin.gradle.targets.js.npm.npmProject
@@ -74,7 +73,6 @@ internal class KotlinWasmNode(private val kotlinJsTest: KotlinJsTest) : KotlinJs
         val args = mutableListOf<String>()
         with(args) {
             addAll(nodeJsArgs)
-            addWasmExperimentalArguments()
             add(testRunnerFile.absolutePath)
             addAll(cliArgs.toList())
         }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt
@@ -92,9 +92,6 @@ class KotlinMocha(@Transient override val compilation: KotlinJsCompilation, priv
             } else {
                 addAll(cliArg(TIMEOUT_ARG, timeout))
             }
-            if (platformType == KotlinPlatformType.wasm) {
-                addAll(cliArg("-n", "experimental-wasm-typed-funcref,experimental-wasm-gc,experimental-wasm-eh"))
-            }
         }
 
         val dryRunArgs = if (platformType == KotlinPlatformType.wasm)
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/utils.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/utils.kt
@@ -115,7 +115,3 @@ internal fun writeWasmUnitTestRunner(compiledFile: File): File {
     )
     return testRunnerFile
 }
-
-internal fun MutableList<String>.addWasmExperimentalArguments() {
-    add("--experimental-wasm-gc")
-}

Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,6 @@ repositories {`
`7`	`7`	`mavenCentral()`
`8`	`8`	`}`
`9`	`9`
`10`		`-with(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.apply(rootProject)) {`
`11`		`- // canary nodejs that supports recent Wasm GC changes`
`12`		`- nodeVersion = "21.0.0-v8-canary202309167e82ab1fa2"`
`13`		`- nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"`
`14`		`-}`
`15`		`-`
`16`	`10`	`with(org.jetbrains.kotlin.gradle.targets.js.d8.D8RootPlugin.apply(rootProject)) {`
`17`	`11`	`// Test that we can set the version and it is a String.`
`18`	`12`	`// But use the default version since update this place every time anyway.`
`@@ -25,11 +19,6 @@ allprojects.forEach {`
`25`	`19`	`}`
`26`	`20`	`}`
`27`	`21`
`28`		`-tasks.named<org.jetbrains.kotlin.gradle.targets.js.npm.LockCopyTask>("kotlinStorePackageLock") {`
`29`		`- //A little hacky way to make yarn results`
`30`		`- inputFile.fileValue(projectDir.resolve("packageLockStub"))`
`31`		`-}`
`32`		`-`
`33`	`22`	`kotlin {`
`34`	`23`	`wasmJs {`
`35`	`24`	`<JsEngine> {`
`@@ -50,3 +39,8 @@ kotlin {`
`50`	`39`	`}`
`51`	`40`	`}`
`52`	`41`	`}`
	`42`	`+`
	`43`	`+tasks.named<org.jetbrains.kotlin.gradle.targets.js.npm.LockCopyTask>("kotlinStorePackageLock") {`
	`44`	`+ //A little hacky way to make yarn results`
	`45`	`+ inputFile.fileValue(projectDir.resolve("packageLockStub"))`
	`46`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,6 @@ plugins {`
`2`	`2`	`kotlin("multiplatform").version("<pluginMarkerVersion>")`
`3`	`3`	`}`
`4`	`4`
`5`		`-with(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.apply(rootProject)) {`
`6`		`- // canary nodejs that supports recent Wasm GC changes`
`7`		`- nodeVersion = "21.0.0-v8-canary202309167e82ab1fa2"`
`8`		`- nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"`
`9`		`-}`
`10`		`-`
`11`	`5`	`with(org.jetbrains.kotlin.gradle.targets.js.d8.D8RootPlugin.apply(rootProject)) {`
`12`	`6`	`// Test that we can set the version and it is a String.`
`13`	`7`	`// But use the default version since update this place every time anyway.`
`@@ -20,11 +14,6 @@ allprojects.forEach {`
`20`	`14`	`}`
`21`	`15`	`}`
`22`	`16`
`23`		`-tasks.named<org.jetbrains.kotlin.gradle.targets.js.npm.LockCopyTask>("kotlinStorePackageLock") {`
`24`		`- //A little hacky way to make yarn results`
`25`		`- inputFile.fileValue(projectDir.resolve("packageLockStub"))`
`26`		`-}`
`27`		`-`
`28`	`17`	`repositories {`
`29`	`18`	`mavenLocal()`
`30`	`19`	`mavenCentral()`
`@@ -45,3 +34,8 @@ kotlin {`
`45`	`34`	`}`
`46`	`35`	`}`
`47`	`36`	`}`
	`37`	`+`
	`38`	`+tasks.named<org.jetbrains.kotlin.gradle.targets.js.npm.LockCopyTask>("kotlinStorePackageLock") {`
	`39`	`+ //A little hacky way to make yarn results`
	`40`	`+ inputFile.fileValue(projectDir.resolve("packageLockStub"))`
	`41`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,6 @@ class KotlinMocha(@Transient override val compilation: KotlinJsCompilation, priv`
`92`	`92`	`} else {`
`93`	`93`	`addAll(cliArg(TIMEOUT_ARG, timeout))`
`94`	`94`	`}`
`95`		`- if (platformType == KotlinPlatformType.wasm) {`
`96`		`- addAll(cliArg("-n", "experimental-wasm-typed-funcref,experimental-wasm-gc,experimental-wasm-eh"))`
`97`		`- }`
`98`	`95`	`}`
`99`	`96`
`100`	`97`	`val dryRunArgs = if (platformType == KotlinPlatformType.wasm)`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,3 @@ internal fun writeWasmUnitTestRunner(compiledFile: File): File {`
`115`	`115`	`)`
`116`	`116`	`return testRunnerFile`
`117`	`117`	`}`
`118`		`-`
`119`		`-internal fun MutableList<String>.addWasmExperimentalArguments() {`
`120`		`- add("--experimental-wasm-gc")`
`121`		`-}`