diff --git a/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/TestModel.kt b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/TestModel.kt index ff518954eb1..7f3e215fc4d 100644 --- a/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/TestModel.kt +++ b/compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/TestModel.kt @@ -153,7 +153,7 @@ class ProjectInfoParser(infoFile: File) : InfoParser(infoFile) { val libraries = mutableListOf() val steps = mutableListOf() var muted = false - var moduleKind = ModuleKind.COMMON_JS + var moduleKind = ModuleKind.ES loop { line -> lineCounter++ diff --git a/js/js.tests/test/org/jetbrains/kotlin/incremental/AbstractInvalidationTest.kt b/js/js.tests/test/org/jetbrains/kotlin/incremental/AbstractInvalidationTest.kt index 302ec6f3c77..234b4386c33 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/incremental/AbstractInvalidationTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/incremental/AbstractInvalidationTest.kt @@ -373,7 +373,7 @@ abstract class AbstractInvalidationTest(private val targetBackend: TargetBackend private fun String.isAllowedKtFile() = endsWith(".kt") && !TEST_FILE_IGNORE_PATTERN.matches(this) - private fun String.isAllowedJsFile() = endsWith(".js") && !TEST_FILE_IGNORE_PATTERN.matches(this) + private fun String.isAllowedJsFile() = (endsWith(".js") || endsWith(".mjs")) && !TEST_FILE_IGNORE_PATTERN.matches(this) protected fun File.filteredKtFiles(): Collection { assert(isDirectory && exists()) diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsFirInvalidationTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsFirInvalidationTestGenerated.java index 3cb027ebe25..cef459dc445 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsFirInvalidationTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsFirInvalidationTestGenerated.java @@ -115,12 +115,6 @@ public class JsFirInvalidationTestGenerated extends AbstractJsFirInvalidationTes runTest("js/js.translator/testData/incremental/invalidation/enumsInInlineFunctions/"); } - @Test - @TestMetadata("esModules") - public void testEsModules() throws Exception { - runTest("js/js.translator/testData/incremental/invalidation/esModules/"); - } - @Test @TestMetadata("exceptionsFromInlineFunction") public void testExceptionsFromInlineFunction() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsIrES6InvalidationTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsIrES6InvalidationTestGenerated.java index 0fda2d83f4b..6d3a00dbf16 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsIrES6InvalidationTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsIrES6InvalidationTestGenerated.java @@ -115,12 +115,6 @@ public class JsIrES6InvalidationTestGenerated extends AbstractJsIrES6Invalidatio runTest("js/js.translator/testData/incremental/invalidation/enumsInInlineFunctions/"); } - @Test - @TestMetadata("esModules") - public void testEsModules() throws Exception { - runTest("js/js.translator/testData/incremental/invalidation/esModules/"); - } - @Test @TestMetadata("exceptionsFromInlineFunction") public void testExceptionsFromInlineFunction() throws Exception { diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsIrInvalidationTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsIrInvalidationTestGenerated.java index efe174b35b0..78ae2ab1d34 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsIrInvalidationTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsIrInvalidationTestGenerated.java @@ -115,12 +115,6 @@ public class JsIrInvalidationTestGenerated extends AbstractJsIrInvalidationTest runTest("js/js.translator/testData/incremental/invalidation/enumsInInlineFunctions/"); } - @Test - @TestMetadata("esModules") - public void testEsModules() throws Exception { - runTest("js/js.translator/testData/incremental/invalidation/esModules/"); - } - @Test @TestMetadata("exceptionsFromInlineFunction") public void testExceptionsFromInlineFunction() throws Exception { diff --git a/js/js.translator/testData/incremental/invalidation/esModules/lib1/l1.0_data_class.kt b/js/js.translator/testData/incremental/invalidation/esModules/lib1/l1.0_data_class.kt deleted file mode 100644 index 9be505b0aec..00000000000 --- a/js/js.translator/testData/incremental/invalidation/esModules/lib1/l1.0_data_class.kt +++ /dev/null @@ -1,2 +0,0 @@ -data class Demo(val x: Int) { -} diff --git a/js/js.translator/testData/incremental/invalidation/esModules/lib1/l1.1_simple_class.kt b/js/js.translator/testData/incremental/invalidation/esModules/lib1/l1.1_simple_class.kt deleted file mode 100644 index 80091b4b4fc..00000000000 --- a/js/js.translator/testData/incremental/invalidation/esModules/lib1/l1.1_simple_class.kt +++ /dev/null @@ -1,2 +0,0 @@ -class Demo(val x: Int) { -} diff --git a/js/js.translator/testData/incremental/invalidation/esModules/lib1/l1.2_inline_class.kt b/js/js.translator/testData/incremental/invalidation/esModules/lib1/l1.2_inline_class.kt deleted file mode 100644 index 50f0b101879..00000000000 --- a/js/js.translator/testData/incremental/invalidation/esModules/lib1/l1.2_inline_class.kt +++ /dev/null @@ -1,2 +0,0 @@ -inline class Demo(val x: Int) { -} diff --git a/js/js.translator/testData/incremental/invalidation/esModules/lib1/module.info b/js/js.translator/testData/incremental/invalidation/esModules/lib1/module.info deleted file mode 100644 index c8ac5b0261c..00000000000 --- a/js/js.translator/testData/incremental/invalidation/esModules/lib1/module.info +++ /dev/null @@ -1,16 +0,0 @@ -STEP 0: - modifications: - U : l1.0_data_class.kt -> l1.kt - added file: l1.kt -STEP 1: - modifications: - U : l1.1_simple_class.kt -> l1.kt - modified ir: l1.kt -STEP 2: - modifications: - U : l1.2_inline_class.kt -> l1.kt - modified ir: l1.kt -STEP 3: - modifications: - U : l1.1_simple_class.kt -> l1.kt - modified ir: l1.kt diff --git a/js/js.translator/testData/incremental/invalidation/esModules/main/m.kt b/js/js.translator/testData/incremental/invalidation/esModules/main/m.kt deleted file mode 100644 index 6604fb36756..00000000000 --- a/js/js.translator/testData/incremental/invalidation/esModules/main/m.kt +++ /dev/null @@ -1,18 +0,0 @@ -fun box(stepId: Int): String { - val d = Demo(15) - when (stepId) { - 0, 2 -> { - if (!testEquals(d, Demo(15))) return "Fail equals" - if (testHashCode(d) != Demo(15).hashCode()) return "Fail hashCode" - if (testToString(d) != "Demo(x=15)") return "Fail toString" - } - 1, 3-> { - if (testEquals(d, Demo(15))) return "Fail equals" - if (testHashCode(d) == Demo(15).hashCode()) return "Fail hashCode" - if (testToString(d) != "[object Object]") return "Fail toString" - } - else -> return "Unknown" - } - - return "OK" -} diff --git a/js/js.translator/testData/incremental/invalidation/esModules/main/module.info b/js/js.translator/testData/incremental/invalidation/esModules/main/module.info deleted file mode 100644 index 9550f5463aa..00000000000 --- a/js/js.translator/testData/incremental/invalidation/esModules/main/module.info +++ /dev/null @@ -1,6 +0,0 @@ -STEP 0: - dependencies: lib1 - added file: m.kt, testEquals.kt, testHashCode.kt, testToString.kt -STEP 1..3: - dependencies: lib1 - updated imports: m.kt, testEquals.kt, testHashCode.kt, testToString.kt diff --git a/js/js.translator/testData/incremental/invalidation/esModules/main/testEquals.kt b/js/js.translator/testData/incremental/invalidation/esModules/main/testEquals.kt deleted file mode 100644 index 3d499bae39c..00000000000 --- a/js/js.translator/testData/incremental/invalidation/esModules/main/testEquals.kt +++ /dev/null @@ -1,3 +0,0 @@ -fun testEquals(lhs: Demo, rhs: Demo): Boolean { - return lhs == rhs -} diff --git a/js/js.translator/testData/incremental/invalidation/esModules/main/testHashCode.kt b/js/js.translator/testData/incremental/invalidation/esModules/main/testHashCode.kt deleted file mode 100644 index d56070a5e1d..00000000000 --- a/js/js.translator/testData/incremental/invalidation/esModules/main/testHashCode.kt +++ /dev/null @@ -1,3 +0,0 @@ -fun testHashCode(d: Demo): Int { - return d.hashCode() -} diff --git a/js/js.translator/testData/incremental/invalidation/esModules/main/testToString.kt b/js/js.translator/testData/incremental/invalidation/esModules/main/testToString.kt deleted file mode 100644 index cbf8eb2058b..00000000000 --- a/js/js.translator/testData/incremental/invalidation/esModules/main/testToString.kt +++ /dev/null @@ -1,3 +0,0 @@ -fun testToString(d: Demo): String { - return d.toString() -} diff --git a/js/js.translator/testData/incremental/invalidation/esModules/project.info b/js/js.translator/testData/incremental/invalidation/esModules/project.info deleted file mode 100644 index 89aaff8e929..00000000000 --- a/js/js.translator/testData/incremental/invalidation/esModules/project.info +++ /dev/null @@ -1,9 +0,0 @@ -MODULES: lib1, main -MODULE_KIND: es - -STEP 0: - libs: lib1, main - dirty js: lib1, main -STEP 1..3: - libs: lib1, main - dirty js: lib1, main diff --git a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-a-new.js b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-a-new.js deleted file mode 100644 index 4c1d7837e93..00000000000 --- a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-a-new.js +++ /dev/null @@ -1,8 +0,0 @@ -(function (_) { - 'use strict'; - function externalDemoFunction() { return 3; } - - _.externalDemoFunction = externalDemoFunction; - - return _ -}(module.exports)); diff --git a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-a-new.mjs b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-a-new.mjs new file mode 100644 index 00000000000..44204df4fe3 --- /dev/null +++ b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-a-new.mjs @@ -0,0 +1 @@ +export function externalDemoFunction() { return 3; } \ No newline at end of file diff --git a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-a.js b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-a.js deleted file mode 100644 index 3b9bc6db208..00000000000 --- a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-a.js +++ /dev/null @@ -1,8 +0,0 @@ -(function (_) { - 'use strict'; - function externalDemoFunction() { return 0; } - - _.externalDemoFunction = externalDemoFunction; - - return _ -}(module.exports)); diff --git a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-a.mjs b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-a.mjs new file mode 100644 index 00000000000..fae8403c223 --- /dev/null +++ b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-a.mjs @@ -0,0 +1 @@ +export function externalDemoFunction() { return 0; } diff --git a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-b-new.js b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-b-new.js deleted file mode 100644 index c7dca748a00..00000000000 --- a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-b-new.js +++ /dev/null @@ -1,8 +0,0 @@ -(function (_) { - 'use strict'; - function externalDemoFunction() { return 2; } - - _.externalDemoFunction = externalDemoFunction; - - return _ -}(module.exports)); diff --git a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-b-new.mjs b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-b-new.mjs new file mode 100644 index 00000000000..85aad16b0f7 --- /dev/null +++ b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-b-new.mjs @@ -0,0 +1 @@ +export function externalDemoFunction() { return 2; } \ No newline at end of file diff --git a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-b.js b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-b.js deleted file mode 100644 index eaeec4f76ad..00000000000 --- a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-b.js +++ /dev/null @@ -1,8 +0,0 @@ -(function (_) { - 'use strict'; - function externalDemoFunction() { return 1; } - - _.externalDemoFunction = externalDemoFunction; - - return _ -}(module.exports)); diff --git a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-b.mjs b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-b.mjs new file mode 100644 index 00000000000..7ad1f9d554e --- /dev/null +++ b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-b.mjs @@ -0,0 +1 @@ +export function externalDemoFunction() { return 1; } \ No newline at end of file diff --git a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-c-new.js b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-c-new.js deleted file mode 100644 index 84145f88d4c..00000000000 --- a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-c-new.js +++ /dev/null @@ -1,8 +0,0 @@ -(function (_) { - 'use strict'; - function externalDemoFunction() { return 5; } - - _.externalDemoFunction = externalDemoFunction; - - return _ -}(module.exports)); diff --git a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-c-new.mjs b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-c-new.mjs new file mode 100644 index 00000000000..418d7d68ad3 --- /dev/null +++ b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-c-new.mjs @@ -0,0 +1 @@ +export function externalDemoFunction() { return 5; } \ No newline at end of file diff --git a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-c.js b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-c.js deleted file mode 100644 index ee3ae4c91fb..00000000000 --- a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-c.js +++ /dev/null @@ -1,8 +0,0 @@ -(function (_) { - 'use strict'; - function externalDemoFunction() { return 4; } - - _.externalDemoFunction = externalDemoFunction; - - return _ -}(module.exports)); diff --git a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-c.mjs b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-c.mjs new file mode 100644 index 00000000000..c7c341c9cac --- /dev/null +++ b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/js-module-c.mjs @@ -0,0 +1 @@ +export function externalDemoFunction() { return 4; } \ No newline at end of file diff --git a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleA.0.kt b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleA.0.kt index 73c94819601..5de645912eb 100644 --- a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleA.0.kt +++ b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleA.0.kt @@ -1,3 +1,3 @@ -@file:JsModule("js-module-a") +@file:JsModule("./js-module-a.mjs") external fun externalDemoFunction(): Int diff --git a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleA.1.kt b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleA.1.kt index e79e03d690e..9fdd00422d9 100644 --- a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleA.1.kt +++ b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleA.1.kt @@ -1 +1 @@ -@file:JsModule("js-module-a") +@file:JsModule("./js-module-a.mjs") diff --git a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleA.4.kt b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleA.4.kt index 3da971f302f..89e53a48cf3 100644 --- a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleA.4.kt +++ b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleA.4.kt @@ -1,3 +1,3 @@ -@file:JsModule("js-module-a-new") +@file:JsModule("./js-module-a-new.mjs") external fun externalDemoFunction(): Int diff --git a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleB.0.kt b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleB.0.kt index 6e079973729..bbd4fa41169 100644 --- a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleB.0.kt +++ b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleB.0.kt @@ -1 +1 @@ -@file:JsModule("js-module-b") +@file:JsModule("./js-module-b.mjs") diff --git a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleB.1.kt b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleB.1.kt index 8296e12bdf2..e71192da44b 100644 --- a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleB.1.kt +++ b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleB.1.kt @@ -1,3 +1,3 @@ -@file:JsModule("js-module-b") +@file:JsModule("./js-module-b.mjs") external fun externalDemoFunction(): Int diff --git a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleB.2.kt b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleB.2.kt index 1dc98a774ed..692406ef8d6 100644 --- a/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleB.2.kt +++ b/js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/lib1/JsModuleB.2.kt @@ -1,3 +1,3 @@ -@file:JsModule("js-module-b-new") +@file:JsModule("./js-module-b-new.mjs") external fun externalDemoFunction(): Int