drop yarn, use just npm; don't store package lock

rsocket · May 21, 2024 · 4262613 · 4262613
1 parent 970cd96
commit 4262613
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2,290 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,15 +14,18 @@
  * limitations under the License.
  */
 
-import org.jetbrains.kotlin.gradle.targets.js.yarn.*
+import org.jetbrains.kotlin.gradle.targets.js.nodejs.*
+import org.jetbrains.kotlin.gradle.targets.js.npm.*
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform) apply false
 }
 
-plugins.withType<YarnPlugin> {
-    yarn.apply {
-        lockFileDirectory = file("gradle/js/yarn")
-        yarnLockMismatchReport = YarnLockMismatchReport.WARNING
+plugins.withType<NodeJsRootPlugin> {
+    // ignore package lock
+    extensions.configure<NpmExtension> {
+        lockFileDirectory.set(layout.buildDirectory.dir("kotlin-js-store"))
+        packageLockMismatchReport.set(LockFileMismatchReport.NONE)
+        packageLockAutoReplace.set(true)
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -19,6 +19,7 @@ version=0.16.0-SNAPSHOT
 kotlin.mpp.import.enableKgpDependencyResolution=true
 kotlin.native.ignoreDisabledTargets=true
 kotlin.native.ignoreIncorrectDependencies=true
+kotlin.js.yarn=false
 kotlinx.atomicfu.enableJvmIrTransformation=true
 kotlinx.atomicfu.enableJsIrTransformation=true
 kotlinx.atomicfu.enableNativeIrTransformation=true