From cfc29ef8216beb2da74ef2d19faecbf7936face2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= Date: Fri, 17 Sep 2021 08:46:43 +0200 Subject: [PATCH] Always use mjs imports This is needed for Node/NPM 16 compat --- src/core/errors/index.mjs | 2 +- src/node/config/scripts/generateNodeIndex.mjs | 4 ++-- tests/node/tests/operations.mjs | 2 +- tests/operations/tests/AvroToJSON.mjs | 2 +- tests/operations/tests/BaconCipher.mjs | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/core/errors/index.mjs b/src/core/errors/index.mjs index b27affc2..6d96acb0 100644 --- a/src/core/errors/index.mjs +++ b/src/core/errors/index.mjs @@ -1,6 +1,6 @@ import OperationError from "./OperationError.mjs"; import DishError from "./DishError.mjs"; -import ExcludedOperationError from "./ExcludedOperationError"; +import ExcludedOperationError from "./ExcludedOperationError.mjs"; export { OperationError, diff --git a/src/node/config/scripts/generateNodeIndex.mjs b/src/node/config/scripts/generateNodeIndex.mjs index 13c9a842..4e16fbeb 100644 --- a/src/node/config/scripts/generateNodeIndex.mjs +++ b/src/node/config/scripts/generateNodeIndex.mjs @@ -41,7 +41,7 @@ let code = `/** import NodeDish from "./NodeDish.mjs"; import { _wrap, help, bake, _explainExcludedFunction } from "./api.mjs"; import File from "./File.mjs"; -import { OperationError, DishError, ExcludedOperationError } from "../core/errors/index"; +import { OperationError, DishError, ExcludedOperationError } from "../core/errors/index.mjs"; import { // import as core_ to avoid name clashes after wrap. `; @@ -52,7 +52,7 @@ includedOperations.forEach((op) => { }); code +=` -} from "../core/operations/index"; +} from "../core/operations/index.mjs"; global.File = File; diff --git a/tests/node/tests/operations.mjs b/tests/node/tests/operations.mjs index 52748167..d02de6e7 100644 --- a/tests/node/tests/operations.mjs +++ b/tests/node/tests/operations.mjs @@ -32,7 +32,7 @@ import { CSSMinify, toBase64, toHex -} from "../../../src/node/index"; +} from "../../../src/node/index.mjs"; import chef from "../../../src/node/index.mjs"; import TestRegister from "../../lib/TestRegister.mjs"; import File from "../../../src/node/File.mjs"; diff --git a/tests/operations/tests/AvroToJSON.mjs b/tests/operations/tests/AvroToJSON.mjs index 045abddb..b823cbfc 100644 --- a/tests/operations/tests/AvroToJSON.mjs +++ b/tests/operations/tests/AvroToJSON.mjs @@ -6,7 +6,7 @@ * @license Apache-2.0 */ -import TestRegister from "../../lib/TestRegister"; +import TestRegister from "../../lib/TestRegister.mjs"; TestRegister.addTests([ { diff --git a/tests/operations/tests/BaconCipher.mjs b/tests/operations/tests/BaconCipher.mjs index 8833b584..90e5ee64 100644 --- a/tests/operations/tests/BaconCipher.mjs +++ b/tests/operations/tests/BaconCipher.mjs @@ -5,8 +5,8 @@ * @copyright Karsten Silkenbäumer 2019 * @license Apache-2.0 */ -import TestRegister from "../../lib/TestRegister"; -import { BACON_ALPHABETS, BACON_TRANSLATIONS } from "../../../src/core/lib/Bacon"; +import TestRegister from "../../lib/TestRegister.mjs"; +import { BACON_ALPHABETS, BACON_TRANSLATIONS } from "../../../src/core/lib/Bacon.mjs"; const alphabets = Object.keys(BACON_ALPHABETS); const translations = BACON_TRANSLATIONS;