Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

crypto: make imports esm compatible

Abdullah Atta2f2653d22328
diff --git a/packages/crypto/src/decryption.ts b/packages/crypto/src/decryption.ts
index b5198c874..da1246405 100644
--- a/packages/crypto/src/decryption.ts
+++ b/packages/crypto/src/decryption.ts
@@ -28,8 +28,8 @@ import {
crypto_secretstream_xchacha20poly1305_TAG_FINAL,
from_hex
} from "@notesnook/sodium";
-import KeyUtils from "./keyutils";
-import { Cipher, Output, DataFormat, SerializedKey } from "./types";
+import KeyUtils from "./keyutils.js";
+import { Cipher, Output, DataFormat, SerializedKey } from "./types.js";
export default class Decryption {
private static transformInput(cipherData: Cipher<DataFormat>): Uint8Array {
diff --git a/packages/crypto/src/encryption.ts b/packages/crypto/src/encryption.ts
index ad4b15d50..d93c294f7 100644
--- a/packages/crypto/src/encryption.ts
+++ b/packages/crypto/src/encryption.ts
@@ -29,8 +29,8 @@ import {
from_base64,
base64_variants
} from "@notesnook/sodium";
-import KeyUtils from "./keyutils";
-import { Chunk, Cipher, Input, DataFormat, SerializedKey } from "./types";
+import KeyUtils from "./keyutils.js";
+import { Chunk, Cipher, Input, DataFormat, SerializedKey } from "./types.js";
const encoder = new TextEncoder();
export default class Encryption {
diff --git a/packages/crypto/index.ts b/packages/crypto/src/index.ts
similarity index 93%
rename from packages/crypto/index.ts
rename to packages/crypto/src/index.ts
index 3c05087d5..22eeedbed 100644
--- a/packages/crypto/index.ts
+++ b/packages/crypto/src/index.ts
@@ -18,11 +18,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import { initialize } from "@notesnook/sodium";
-import Decryption from "./src/decryption";
-import Encryption from "./src/encryption";
-import { INNCrypto } from "./src/interfaces";
-import KeyUtils from "./src/keyutils";
-import Password from "./src/password";
+import Decryption from "./decryption.js";
+import Encryption from "./encryption.js";
+import { INNCrypto } from "./interfaces.js";
+import KeyUtils from "./keyutils.js";
+import Password from "./password.js";
import {
Cipher,
EncryptionKey,
@@ -30,7 +30,7 @@ import {
Output,
DataFormat,
SerializedKey
-} from "./src/types";
+} from "./types.js";
export class NNCrypto implements INNCrypto {
private isReady = false;
@@ -169,6 +169,6 @@ export class NNCrypto implements INNCrypto {
// }
}
-export * from "./src/types";
-export * from "./src/interfaces";
+export * from "./types.js";
+export * from "./interfaces.js";
export { Decryption };
diff --git a/packages/crypto/src/interfaces.ts b/packages/crypto/src/interfaces.ts
index 3921ea2af..9bcd9640a 100644
--- a/packages/crypto/src/interfaces.ts
+++ b/packages/crypto/src/interfaces.ts
@@ -25,7 +25,7 @@ import {
Chunk,
Output,
Input
-} from "./types";
+} from "./types.js";
export interface IStreamable {
read(): Promise<Chunk | undefined>;
diff --git a/packages/crypto/src/keyutils.ts b/packages/crypto/src/keyutils.ts
index f606c1d26..6c72032b9 100644
--- a/packages/crypto/src/keyutils.ts
+++ b/packages/crypto/src/keyutils.ts
@@ -26,7 +26,7 @@ import {
crypto_pwhash_ALG_ARGON2I13,
crypto_aead_xchacha20poly1305_ietf_KEYBYTES
} from "@notesnook/sodium";
-import { EncryptionKey, SerializedKey } from "./types";
+import { EncryptionKey, SerializedKey } from "./types.js";
export default class KeyUtils {
static deriveKey(password: string, salt?: string): EncryptionKey {
diff --git a/packages/crypto/tsconfig.json b/packages/crypto/tsconfig.json
index b8ae4147c..5274060a7 100644
--- a/packages/crypto/tsconfig.json
+++ b/packages/crypto/tsconfig.json
@@ -3,5 +3,5 @@
"compilerOptions": {
"outDir": "./dist"
},
- "include": ["src/", "index.ts"]
+ "include": ["src/"]
}