Update yarn -> npm

Author: Mr3zee

compiler-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
 

docs/environment.md

@@ -364,26 +364,25 @@ Here is a 'simple' guide for solving problems:
 - Docker
     - `Cannot connect to the Docker daemon` - open `Docker Desktop`
 - Kotlin/Js or Kotlin/Wasm
-  - `kotlinUpgradeYarnLock` or `kotlinUpgradeWasmYarnLock` (and also `kotlinNpmInstall` or `kotlinWasmNpmInstall`)
+  - `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 `.lock` files start with `https://packages.jetbrains.team/npm/p/krpc/build-deps/`.
+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 `.lock` file
+    - Delete `package-lock.json` file
     - Delete `<REPO_ROOT>/build/js` / `<REPO_ROOT>/build/wasm`
-    - Run `kotlinUpgradeYarnLock` / `kotlinUpgradeWasmYarnLock`
+    - 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 following lines:
+    - 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 [proxy-repositories.md](proxy-repositories.md) guide.
-    - Check that `<USER_HOME>/.npmrc` / `<USER_HOME>/.yarnrc` doesn't interfere
-    - Use `/Users/<USER>/.gradle/nodejs/node-v22.0.0-darwin-arm64/bin/node /Users/<USER>/.gradle/yarn/yarn-v1.22.17/bin/yarn.js --ignore-engines --verbose --ignore-scripts`
+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.
@@ -399,7 +398,7 @@ 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` / `kotlinWasmUpgradeYarnLock` - update [kotlin-js-store](../kotlin-js-store) contents, 
+- `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.

dokka-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
 

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

@@ -9,13 +9,13 @@ 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.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.yarn.BaseYarnRootEnvSpec
-import org.jetbrains.kotlin.gradle.targets.web.yarn.CommonYarnPlugin
+import org.jetbrains.kotlin.gradle.targets.web.npm.CommonNpmResolverPlugin
 import util.other.optionalProperty
 import util.other.spacePassword
 import util.other.useProxyRepositories
@@ -106,19 +106,14 @@ fun Project.configureNpm() {
     )
 
     // necessary for CI js tests
-    rootProject.plugins.withType<CommonYarnPlugin> {
-        rootProject.extensions.configure<BaseYarnRootEnvSpec> {
+    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-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
 

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