diff --git a/implementation-contributed/curation_logs/javascriptcore.json b/implementation-contributed/curation_logs/javascriptcore.json index 1ca4ce25d190501e99b836f0b7676837096eaa2d..bbdf548b280d860f182e5d7be545610d60870a34 100644 --- a/implementation-contributed/curation_logs/javascriptcore.json +++ b/implementation-contributed/curation_logs/javascriptcore.json @@ -1,6 +1,6 @@ { - "sourceRevisionAtLastExport": "8a73712b6a", - "targetRevisionAtLastExport": "8e73aadc2", + "sourceRevisionAtLastExport": "a7577363f7", + "targetRevisionAtLastExport": "1f7948aa7", "curatedFiles": { "/stress/Number-isNaN-basics.js": "DELETED_IN_TARGET", "/stress/Object_static_methods_Object.getOwnPropertyDescriptors-proxy.js": "DELETED_IN_TARGET", @@ -1643,6 +1643,8 @@ "/stress/yield-named-variable.js": "DELETED_IN_TARGET", "/stress/yield-out-of-generator.js": "DELETED_IN_TARGET", "/stress/yield-reserved-word.js": "DELETED_IN_TARGET", - "/stress/yield-star-throw-continue.js": "DELETED_IN_TARGET" + "/stress/yield-star-throw-continue.js": "DELETED_IN_TARGET", + "/stress/regress-189186.js": "DELETED_IN_TARGET", + "/stress/regress-189292.js": "DELETED_IN_TARGET" } } \ No newline at end of file diff --git a/implementation-contributed/javascriptcore/modules/different-view.js b/implementation-contributed/javascriptcore/modules/different-view.js index f81e89c25f9f869d40e654b9c2ff275cfb5d897a..c38b52ba2181ad0ee19764e887a4d96ce1fe93a6 100644 --- a/implementation-contributed/javascriptcore/modules/different-view.js +++ b/implementation-contributed/javascriptcore/modules/different-view.js @@ -1,7 +1,5 @@ -import { shouldBe, shouldThrow } from "./resources/assert.js" - -shouldThrow(() => { - loadModule('./different-view/main.js'); -}, `SyntaxError: Importing binding name 'A' cannot be resolved due to ambiguous multiple bindings.`); - +import { shouldBe } from "./resources/assert.js" +import('./different-view/main.js').then($vm.abort, function (error) { + shouldBe(String(error), `SyntaxError: Importing binding name 'A' cannot be resolved due to ambiguous multiple bindings.`); +}).catch($vm.abort); diff --git a/implementation-contributed/javascriptcore/modules/fallback-ambiguous.js b/implementation-contributed/javascriptcore/modules/fallback-ambiguous.js index 36b60fe4d7d712a7b2ffeaa5fa8be6c5613593b4..210ffcd3e30854774bfe92da6c292d73cf6b534c 100644 --- a/implementation-contributed/javascriptcore/modules/fallback-ambiguous.js +++ b/implementation-contributed/javascriptcore/modules/fallback-ambiguous.js @@ -6,7 +6,8 @@ // | | // v @ // (B) -import { shouldThrow } from "./resources/assert.js" -shouldThrow(() => { - loadModule("./fallback-ambiguous/main.js"); -}, `SyntaxError: Indirectly exported binding name 'A' cannot be resolved due to ambiguous multiple bindings.`); +import { shouldBe } from "./resources/assert.js" + +import('./fallback-ambiguous/main.js').then($vm.abort, function (error) { + shouldBe(String(error), `SyntaxError: Indirectly exported binding name 'A' cannot be resolved due to ambiguous multiple bindings.`); +}).catch($vm.abort); diff --git a/implementation-contributed/javascriptcore/modules/import-error.js b/implementation-contributed/javascriptcore/modules/import-error.js index 0237472ccf9008036c9ec69cefa05253d827f074..3b86812e1c159e0ea31ee3695660f5c362f4f768 100644 --- a/implementation-contributed/javascriptcore/modules/import-error.js +++ b/implementation-contributed/javascriptcore/modules/import-error.js @@ -1,13 +1,16 @@ -import { shouldBe, shouldThrow } from "./resources/assert.js" +import { shouldBe } from "./resources/assert.js" -shouldThrow(() => { - loadModule('./import-error/import-not-found.js'); -}, `SyntaxError: Importing binding name 'B' is not found.`); - -shouldThrow(() => { - loadModule('./import-error/import-ambiguous.js'); -}, `SyntaxError: Importing binding name 'B' cannot be resolved due to ambiguous multiple bindings.`); - -shouldThrow(() => { - loadModule('./import-error/import-default-from-star.js'); -}, `SyntaxError: Importing binding name 'default' cannot be resolved by star export entries.`); +Promise.all([ + import('./import-error/import-not-found.js') + .then($vm.abort, function (error) { + shouldBe(String(error), `SyntaxError: Importing binding name 'B' is not found.`); + }).catch($vm.abort), + import('./import-error/import-ambiguous.js') + .then($vm.abort, function (error) { + shouldBe(String(error), `SyntaxError: Importing binding name 'B' cannot be resolved due to ambiguous multiple bindings.`); + }).catch($vm.abort), + import('./import-error/import-default-from-star.js') + .then($vm.abort, function (error) { + shouldBe(String(error), `SyntaxError: Importing binding name 'default' cannot be resolved by star export entries.`); + }).catch($vm.abort), +]).catch($vm.abort); diff --git a/implementation-contributed/javascriptcore/modules/indirect-export-error.js b/implementation-contributed/javascriptcore/modules/indirect-export-error.js index a3cfc77d4f72ec336183549565909f2aed157887..41dbebd30726648c4fa9c18921d7605f9b106c11 100644 --- a/implementation-contributed/javascriptcore/modules/indirect-export-error.js +++ b/implementation-contributed/javascriptcore/modules/indirect-export-error.js @@ -1,13 +1,17 @@ -import { shouldBe, shouldThrow } from "./resources/assert.js" +import { shouldBe } from "./resources/assert.js" -shouldThrow(() => { - loadModule('./indirect-export-error/indirect-export-not-found.js'); -}, `SyntaxError: Indirectly exported binding name 'B' is not found.`); -shouldThrow(() => { - loadModule('./indirect-export-error/indirect-export-ambiguous.js'); -}, `SyntaxError: Indirectly exported binding name 'B' cannot be resolved due to ambiguous multiple bindings.`); - -shouldThrow(() => { - loadModule('./indirect-export-error/indirect-export-default.js'); -}, `SyntaxError: Indirectly exported binding name 'default' cannot be resolved by star export entries.`); +Promise.all([ + import('./indirect-export-error/indirect-export-not-found.js') + .then($vm.abort, function (error) { + shouldBe(String(error), `SyntaxError: Indirectly exported binding name 'B' is not found.`); + }).catch($vm.abort), + import('./indirect-export-error/indirect-export-ambiguous.js') + .then($vm.abort, function (error) { + shouldBe(String(error), `SyntaxError: Indirectly exported binding name 'B' cannot be resolved due to ambiguous multiple bindings.`); + }).catch($vm.abort), + import('./indirect-export-error/indirect-export-default.js') + .then($vm.abort, function (error) { + shouldBe(String(error), `SyntaxError: Indirectly exported binding name 'default' cannot be resolved by star export entries.`); + }).catch($vm.abort), +]).catch($vm.abort); diff --git a/implementation-contributed/javascriptcore/modules/namespace-error.js b/implementation-contributed/javascriptcore/modules/namespace-error.js index e47817a7b075f96e97b68ec7e4dac8f8ae08de8a..6d6a9eda2676027538969d2e191ad0c3c880cf8a 100644 --- a/implementation-contributed/javascriptcore/modules/namespace-error.js +++ b/implementation-contributed/javascriptcore/modules/namespace-error.js @@ -1,5 +1,5 @@ -import { shouldThrow } from "./resources/assert.js" +import { shouldBe } from "./resources/assert.js" -shouldThrow(() => { - loadModule('./namespace-error/namespace-local-error-should-hide-global-ambiguity.js'); -}, `SyntaxError: Indirectly exported binding name 'default' cannot be resolved by star export entries.`); +import('./namespace-error/namespace-local-error-should-hide-global-ambiguity.js').then($vm.abort, function (error) { + shouldBe(String(error), `SyntaxError: Indirectly exported binding name 'default' cannot be resolved by star export entries.`); +}).catch($vm.abort);