Minor fixes

Update yarn -> npm

Author: Mr3zee

.idea/kotlinx-rpc.iml

@@ -19,6 +19,9 @@ org.gradle.configuration-cache=true
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
 
+# https://youtrack.jetbrains.com/issue/KT-78504
+kotlin.js.yarn=false
+
 # development mode for kotlinx.rpc gradle plugin. Uses local project paths to apply the compiler plugin
 kotlinx.rpc.plugin.internalDevelopment=true
 

compiler-plugin/gradle.properties

@@ -363,6 +363,27 @@ Here is a 'simple' guide for solving problems:
         - Try different IDE version (last resort)
 - Docker
     - `Cannot connect to the Docker daemon` - open `Docker Desktop`
+- Kotlin/Js or Kotlin/Wasm
+  - `kotlinUpgradePackageLock` or `kotlinWasmUpgradePackageLock` (and also `kotlinNpmInstall` or `kotlinWasmNpmInstall`)
+have a funny tendency to fail sometimes, and you don't know why. 
+I'll tell you! 
+We use proxy repos, and sometimes dependencies get downloaded from the wrong source.
+Make sure ALL urls in `package-lock.json` files start with `https://packages.jetbrains.team/npm/p/krpc/build-deps/`.
+If something doesn't work, your steps are:
+    - Delete `package-lock.json` file
+    - Delete `<REPO_ROOT>/build/js` / `<REPO_ROOT>/build/wasm`
+    - Run `kotlinUpgradePackageLock` / `kotlinWasmUpgradePackageLock`
+  - If the problem persists:
+    - Check that `<REPO_ROOT>/build/<target>/.npmrc` AND `<REPO_ROOT>/build/<target>/.yarnrc` are present
+    - Check that `.yarnrc` contains one line: `registry: "https://packages.jetbrains.team/npm/p/krpc/build-deps/"`
+    - Check that `.npmrc` contains the following lines:
+      - `registry="https://packages.jetbrains.team/npm/p/krpc/build-deps/"`
+      - `always-auth=true`
+      - `save-exact=true`
+      - `//packages.jetbrains.team/npm/p/krpc/build-deps/:_authToken=<your_auth_token>`, 
+where `<your_auth_token>` is from the [proxy-repositories.md](proxy-repositories.md) guide.
+    - Check that `<USER_HOME>/.npmrc` / `<USER_HOME>/.yarnrc` don't interfere
+command to debug. Replace versions of tools if needed.
 
 Something doesn't work, and you are sure it's not your fault? Report it appropriately! Don't be lazy.
 
@@ -377,7 +398,8 @@ all included builds (not subprojects) must reflect the change.
 - `checkLegacyAbi` / `updateLegacyAbi` - ABI checks. 
 See https://kotlinlang.org/docs/whatsnew22.html#binary-compatibility-validation-included-in-kotlin-gradle-plugin.
 Former BCV: https://github.com/Kotlin/binary-compatibility-validator
-- `kotlinUpgradeYarnLock` - update [kotlin-js-store](../kotlin-js-store) contents, usually after Kotlin version update.
+- `kotlinUpgradePackageLock` / `kotlinWasmUpgradePackageLock` - update [kotlin-js-store](../kotlin-js-store) contents, 
+usually after Kotlin version update.
 - `updateDocsChangelog` - put modified [CONTRIBUTING.md](../CONTRIBUTING.md) into [topics](pages/kotlinx-rpc/topics)
 - `detekt` - run detekt checks.
 - `verifyPlatformTable` / `dumpPlatformTable` - Update [platforms.topic](pages/kotlinx-rpc/topics/platforms.topic)

docs/environment.md

@@ -19,6 +19,9 @@ org.gradle.configuration-cache=true
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
 
+# https://youtrack.jetbrains.com/issue/KT-78504
+kotlin.js.yarn=false
+
 # development mode for kotlinx.rpc gradle plugin. Uses local project paths to apply the compiler plugin
 kotlinx.rpc.plugin.internalDevelopment=true
 

dokka-plugin/gradle.properties

@@ -9,27 +9,37 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.*
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsEnvSpec
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
-import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockMismatchReport
-import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin
-import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootEnvSpec
+import org.jetbrains.kotlin.gradle.targets.js.npm.BaseNpmExtension
+import org.jetbrains.kotlin.gradle.targets.js.npm.LockFileMismatchReport
+import org.jetbrains.kotlin.gradle.targets.wasm.nodejs.WasmNodeJsEnvSpec
+import org.jetbrains.kotlin.gradle.targets.wasm.nodejs.WasmNodeJsRootPlugin
+import org.jetbrains.kotlin.gradle.targets.web.nodejs.BaseNodeJsEnvSpec
+import org.jetbrains.kotlin.gradle.targets.web.nodejs.CommonNodeJsRootPlugin
+import org.jetbrains.kotlin.gradle.targets.web.npm.CommonNpmResolverPlugin
 import util.other.optionalProperty
 import util.other.spacePassword
 import util.other.useProxyRepositories
 import java.io.File
 
-fun Project.configureNpm() {
-    val kotlinMasterBuild by optionalProperty()
-
-    val executeNpmLogin by tasks.registering {
+private inline fun <
+    reified Plugin : CommonNodeJsRootPlugin,
+    reified Spec : BaseNodeJsEnvSpec
+> Project.registerExecuteNpmLoginTask(
+    target: String,
+    npmInstallTaskName: String,
+    useProxy: Boolean,
+) {
+    val capitalizedTarget = target.replaceFirstChar { it.titlecase() }
+    val task = tasks.register("execute${capitalizedTarget}NpmLogin") {
         if (!useProxyRepositories) {
-            return@registering
+            return@register
         }
 
         val registryUrl = "https://packages.jetbrains.team/npm/p/krpc/build-deps/"
 
         // To prevent leaking of credentials in VCS on dev machine use the build directory config file
-        val buildYarnConfigFile = File(project.rootDir, "build/js/.yarnrc")
-        val buildNpmConfigFile = File(project.rootDir, "build/js/.npmrc")
+        val buildYarnConfigFile = File(project.rootDir, "build/$target/.yarnrc")
+        val buildNpmConfigFile = File(project.rootDir, "build/$target/.npmrc")
 
         val spacePassword: String? = spacePassword
 
@@ -64,35 +74,46 @@ fun Project.configureNpm() {
         outputs.file(buildNpmConfigFile).withPropertyName("buildOutputNpmFile")
     }
 
-    val useProxy = useProxyRepositories
-
-    plugins.withType(NodeJsRootPlugin::class.java).configureEach {
-        rootProject.extensions.configure<NodeJsEnvSpec> {
+    plugins.withType<Plugin>().configureEach {
+        rootProject.extensions.configure<Spec> {
             download = true
+
             if (useProxy) {
                 downloadBaseUrl = "https://packages.jetbrains.team/files/p/krpc/build-deps/"
             }
         }
 
-        tasks.named("kotlinNpmInstall").configure {
-            dependsOn(executeNpmLogin)
+        tasks.named(npmInstallTaskName).configure {
+            dependsOn(task)
         }
     }
+}
+
+fun Project.configureNpm() {
+    val kotlinMasterBuild by optionalProperty()
+    val useProxy = useProxyRepositories
+
+    registerExecuteNpmLoginTask<NodeJsRootPlugin, NodeJsEnvSpec>(
+        target = "js",
+        npmInstallTaskName = "kotlinNpmInstall",
+        useProxy = useProxy,
+    )
+
+    registerExecuteNpmLoginTask<WasmNodeJsRootPlugin, WasmNodeJsEnvSpec>(
+        target = "wasm",
+        npmInstallTaskName = "kotlinWasmNpmInstall",
+        useProxy = useProxy,
+    )
 
     // necessary for CI js tests
-    rootProject.plugins.withType<YarnPlugin> {
-        rootProject.extensions.configure<YarnRootEnvSpec> {
+    rootProject.plugins.withType<CommonNpmResolverPlugin> {
+        rootProject.extensions.configure<BaseNpmExtension> {
             ignoreScripts = false
-            download = true
 
-            yarnLockMismatchReport = if (useProxy && !kotlinMasterBuild) {
-                YarnLockMismatchReport.FAIL
+            packageLockMismatchReport = if (useProxy && !kotlinMasterBuild) {
+                LockFileMismatchReport.FAIL
             } else {
-                YarnLockMismatchReport.WARNING
-            }
-
-            if (useProxy) {
-                downloadBaseUrl = "https://packages.jetbrains.team/files/p/krpc/build-deps/"
+                LockFileMismatchReport.WARNING
             }
         }
     }

gradle-conventions/src/main/kotlin/util/tasks/npm.kt

@@ -19,6 +19,9 @@ org.gradle.configuration-cache=true
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
 
+# https://youtrack.jetbrains.com/issue/KT-78504
+kotlin.js.yarn=false
+
 # development mode for kotlinx.rpc gradle plugin. Uses local project paths to apply the compiler plugin
 kotlinx.rpc.plugin.internalDevelopment=true
 

gradle-plugin/gradle.properties

@@ -19,6 +19,9 @@ org.gradle.configuration-cache=true
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
 
+# https://youtrack.jetbrains.com/issue/KT-78504
+kotlin.js.yarn=false
+
 # development mode for kotlinx.rpc gradle plugin. Uses local project paths to apply the compiler plugin
 kotlinx.rpc.plugin.internalDevelopment=true