Rename kotlin-test-nodejs-runner to kotlin-test-js-runner

.gitignore

@@ -51,5 +51,5 @@ build/
 kotlin-ultimate/
 node_modules/
 .rpt2_cache/
-libraries/tools/kotlin-test-nodejs-runner/lib/
+libraries/tools/kotlin-test-js-runner/lib/
 local.properties

compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt

@@ -51,8 +51,8 @@ class CodeConformanceTest : TestCase() {
             "libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/build/tmp",
             "libraries/tools/kotlin-maven-plugin/target",
             "libraries/tools/kotlinp/src",
-            "libraries/tools/kotlin-test-nodejs-runner/node_modules",
-            "libraries/tools/kotlin-test-nodejs-runner/.gradle",
+            "libraries/tools/kotlin-test-js-runner/node_modules",
+            "libraries/tools/kotlin-test-js-runner/.gradle",
             "compiler/testData/psi/kdoc",
             "compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt",
             "compiler/util/src/org/jetbrains/kotlin/config/MavenComparableVersion.java",
@@ -81,8 +81,8 @@ class CodeConformanceTest : TestCase() {
             "libraries/stdlib/js-v1/node_modules",
             "libraries/tools/kotlin-maven-plugin-test/target",
             "libraries/tools/kotlin-gradle-plugin-integration-tests/build",
-            "libraries/tools/kotlin-test-nodejs-runner/node_modules",
-            "libraries/tools/kotlin-test-nodejs-runner/.gradle",
+            "libraries/tools/kotlin-test-js-runner/node_modules",
+            "libraries/tools/kotlin-test-js-runner/.gradle",
             "buildSrc/prepare-deps/build",
             "compiler/ir/serialization.js/build"
         )

libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts

@@ -111,7 +111,7 @@ tasks.withType<Test> {
         ":kotlin-scripting-common:install",
         ":kotlin-scripting-jvm:install",
         ":kotlin-scripting-compiler-embeddable:install",
-        ":kotlin-test-nodejs-runner:install"
+        ":kotlin-test-js-runner:install"
     )
 
     executable = "${rootProject.extra["JDK_18"]!!}/bin/java"

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt

@@ -384,10 +384,10 @@ class Kotlin2JsGradlePluginIT : BaseGradleIT() {
             assertFileExists("build/js/node_modules/kotlin/kotlin.js.map")
             assertFileExists("build/js/node_modules/kotlin-test/kotlin-test.js")
             assertFileExists("build/js/node_modules/kotlin-test/kotlin-test.js.map")
-            assertFileExists("build/js/node_modules/kotlin-test-nodejs-runner/kotlin-test-nodejs-runner.js")
-            assertFileExists("build/js/node_modules/kotlin-test-nodejs-runner/kotlin-test-nodejs-runner.js.map")
-            assertFileExists("build/js/node_modules/kotlin-test-nodejs-runner/kotlin-nodejs-source-map-support.js")
-            assertFileExists("build/js/node_modules/kotlin-test-nodejs-runner/kotlin-nodejs-source-map-support.js.map")
+            assertFileExists("build/js/node_modules/kotlin-test-js-runner/kotlin-test-nodejs-runner.js")
+            assertFileExists("build/js/node_modules/kotlin-test-js-runner/kotlin-test-nodejs-runner.js.map")
+            assertFileExists("build/js/node_modules/kotlin-test-js-runner/kotlin-nodejs-source-map-support.js")
+            assertFileExists("build/js/node_modules/kotlin-test-js-runner/kotlin-nodejs-source-map-support.js.map")
             assertFileExists("build/js/node_modules/kotlin-js-plugin/kotlin/kotlin-js-plugin.js")
             assertFileExists("build/js/node_modules/kotlin-js-plugin/kotlin/kotlin-js-plugin.js.map")
             assertFileExists("build/js/node_modules/kotlin-js-plugin-test/kotlin/kotlin-js-plugin-test.js")

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/NpmVersions.kt

@@ -47,7 +47,7 @@ class NpmVersions {
 
     val puppeteer = NpmPackageVersion("puppeteer", "1.19.0")
 
-    val kotlinNodeJsTestRunner = KotlinGradleNpmPackage("test-nodejs-runner")
+    val kotlinNodeJsTestRunner = KotlinGradleNpmPackage("test-js-runner")
 
     val istanbulInstrumenterLoader = NpmPackageVersion("istanbul-instrumenter-loader", "3.0.1")
 }

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsExec.kt

@@ -41,7 +41,7 @@ open class NodeJsExec : AbstractExecTask<NodeJsExec>(NodeJsExec::class.java), Re
         if (sourceMapStackTraces) {
             args(
                 "--require",
-                compilation.npmProject.require("kotlin-test-nodejs-runner/kotlin-nodejs-source-map-support")
+                compilation.npmProject.require("kotlin-test-js-runner/kotlin-nodejs-source-map-support")
             )
         }
 

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt

@@ -335,7 +335,7 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : KotlinJsTestF
 
             val adapterJs = npmProject.dir.resolve("adapter.js")
             adapterJs.printWriter().use { writer ->
-                val karmaRunner = npmProject.require("kotlin-test-nodejs-runner/kotlin-test-karma-runner.js")
+                val karmaRunner = npmProject.require("kotlin-test-js-runner/kotlin-test-karma-runner.js")
                 writer.println("require('$karmaRunner')")
 
                 files.forEach { file ->

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/mocha/KotlinMocha.kt

@@ -28,7 +28,7 @@ class KotlinMocha(override val compilation: KotlinJsCompilation) : KotlinJsTestF
 
     override val requiredNpmDependencies: Collection<RequiredKotlinJsDependency>
         get() = listOf(
-            KotlinGradleNpmPackage("test-nodejs-runner"),
+            KotlinGradleNpmPackage("test-js-runner"),
             versions.mocha,
             versions.mochaTeamCityReporter
         )
@@ -58,7 +58,7 @@ class KotlinMocha(override val compilation: KotlinJsCompilation) : KotlinJsTestF
                     npmProject.require(it)
                 } +
                 listOf(
-                    "-r", "kotlin-test-nodejs-runner/kotlin-nodejs-source-map-support.js",
+                    "-r", "kotlin-test-js-runner/kotlin-nodejs-source-map-support.js",
                     "--reporter", "mocha-teamcity-reporter"
                 )
 

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/nodejs/KotlinNodeJsTestRunner.kt

@@ -29,7 +29,7 @@ class KotlinNodeJsTestRunner(override val compilation: KotlinJsCompilation) : Ko
         get() = "KotlinNodeJsTestRunner(ignoredTestSuites=$ignoredTestSuites)"
 
     override val requiredNpmDependencies: Collection<RequiredKotlinJsDependency>
-        get() = listOf(KotlinGradleNpmPackage("test-nodejs-runner"))
+        get() = listOf(KotlinGradleNpmPackage("test-js-runner"))
 
     override fun createTestExecutionSpec(
         task: KotlinJsTest,
@@ -53,8 +53,8 @@ class KotlinNodeJsTestRunner(override val compilation: KotlinJsCompilation) : Ko
         )
 
         val testRuntimeNodeModules = listOf(
-            "kotlin-test-nodejs-runner/kotlin-test-nodejs-runner.js",
-            "kotlin-test-nodejs-runner/kotlin-nodejs-source-map-support.js"
+            "kotlin-test-js-runner/kotlin-test-nodejs-runner.js",
+            "kotlin-test-js-runner/kotlin-nodejs-source-map-support.js"
         )
 
         val args = nodeJsArgs +

settings.gradle

@@ -147,7 +147,7 @@ include ":kotlin-build-common",
         ":kotlin-test:kotlin-test-testng",
         ":kotlin-test:kotlin-test-js",
         ":kotlin-test:kotlin-test-js:kotlin-test-js-it",
-        ":kotlin-test-nodejs-runner",
+        ":kotlin-test-js-runner",
         ":kotlinx-metadata",
         ":kotlinx-metadata-jvm",
         ":prepare:build.version",
@@ -304,7 +304,7 @@ project(':kotlin-test:kotlin-test-junit5').projectDir = "$rootDir/libraries/kotl
 project(':kotlin-test:kotlin-test-testng').projectDir = "$rootDir/libraries/kotlin.test/testng" as File
 project(':kotlin-test:kotlin-test-js').projectDir = "$rootDir/libraries/kotlin.test/js" as File
 project(':kotlin-test:kotlin-test-js:kotlin-test-js-it').projectDir = "$rootDir/libraries/kotlin.test/js/it" as File
-project(':kotlin-test-nodejs-runner').projectDir = "$rootDir/libraries/tools/kotlin-test-nodejs-runner" as File
+project(':kotlin-test-js-runner').projectDir = "$rootDir/libraries/tools/kotlin-test-js-runner" as File
 project(':kotlin-reflect').projectDir = "$rootDir/libraries/reflect" as File
 project(':kotlin-reflect-api').projectDir = "$rootDir/libraries/reflect/api" as File
 project(':kotlinx-metadata').projectDir = "$rootDir/libraries/kotlinx-metadata" as File