diff --git a/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/amd.js b/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/amd.js index c06a02b86aa..5a820170b51 100644 --- a/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/amd.js +++ b/compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLibModuleKind/amd.js @@ -2,7 +2,18 @@ var modules = {}; modules.kotlin = kotlin; + // Hard-code expected dependency order since we are unable to refer to modules by filename here. + var names = ["jslib-example", "out"]; + function define(name, dependencies, body) { + if (Array.isArray(name)) { + body = dependencies; + dependencies = name; + name = names.shift(); + } + else { + if (name !== names.shift()) throw new Error("Unexpected dependency") + } var resolvedDependencies = []; var currentModule = {}; modules[name] = currentModule; diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsModuleKind/amd.js b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsModuleKind/amd.js index d14207713cd..9d42710abe7 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsModuleKind/amd.js +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsModuleKind/amd.js @@ -1,7 +1,18 @@ (function(global) { var modules = {}; + // Hard-code expected dependency order since we are unable to refer to modules by filename here. + var names = ["kotlin", "app", "check"]; + function define(name, dependencies, body) { + if (Array.isArray(name)) { + body = dependencies; + dependencies = name; + name = names.shift(); + } + else { + if (name !== names.shift()) throw new Error("Unexpected dependency") + } var resolvedDependencies = []; var currentModule = {}; modules[name] = currentModule; diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-moduleKind/amd.js b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-moduleKind/amd.js index f24b9ccc0b6..b611d41b0c6 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-moduleKind/amd.js +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-moduleKind/amd.js @@ -1,5 +1,15 @@ var amdModules = {}; +// Hard-code expected dependency order since we are unable to refer to modules by filename here. +var moduleNames = ["kotlin", "test-js-moduleKind", "check"]; function define(moduleName, dependencies, body) { + if (Array.isArray(moduleName)) { + body = dependencies; + dependencies = moduleName; + moduleName = moduleNames.shift(); + } + else { + if (moduleName !== moduleNames.shift()) throw new Error("Unexpected dependency") + } var resolvedDependencies = []; var currentModule = {}; amdModules[moduleName] = currentModule;