From 4f42c1cff7d81a4a2895e92dd4e5279927c50bf2 Mon Sep 17 00:00:00 2001 From: larabr <7375870+larabr@users.noreply.github.com> Date: Mon, 14 Mar 2022 19:14:28 +0100 Subject: [PATCH] Fix linter import plugin --- .eslintrc.js | 6 +++-- src/crypto/cipher/index.js | 2 +- src/crypto/public_key/elliptic/curves.js | 2 +- src/crypto/public_key/elliptic/ecdh.js | 2 +- src/crypto/public_key/elliptic/eddsa.js | 2 +- src/crypto/public_key/index.js | 2 +- src/encoding/armor.js | 4 +-- src/key/index.js | 6 ++--- src/packet/all_packets.js | 34 ++++++++++++------------ src/packet/signature.js | 2 +- src/type/keyid.js | 2 +- src/type/s2k.js | 4 +-- 12 files changed, 35 insertions(+), 33 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 7227d416a..b85d66c20 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -10,7 +10,8 @@ module.exports = { }, "plugins": [ - "chai-friendly" + "chai-friendly", + "import" ], "globals": { // TODO are all these necessary? @@ -326,7 +327,8 @@ module.exports = { "no-unused-vars": "error", // eslint-plugin-import rules: - "import/extensions": "never", + "import/named": "error", + "import/extensions": "error", "import/no-extraneous-dependencies": ["error", {"devDependencies": true, "optionalDependencies": false, "peerDependencies": false}], "import/no-unassigned-import": "error", diff --git a/src/crypto/cipher/index.js b/src/crypto/cipher/index.js index ef8dd7e51..4f96ef38b 100644 --- a/src/crypto/cipher/index.js +++ b/src/crypto/cipher/index.js @@ -5,7 +5,7 @@ */ import aes from './aes'; -import { DES, TripleDES } from './des.js'; +import { DES, TripleDES } from './des'; import CAST5 from './cast5'; import TF from './twofish'; import BF from './blowfish'; diff --git a/src/crypto/public_key/elliptic/curves.js b/src/crypto/public_key/elliptic/curves.js index e3a0f686e..4403fbadb 100644 --- a/src/crypto/public_key/elliptic/curves.js +++ b/src/crypto/public_key/elliptic/curves.js @@ -21,7 +21,7 @@ * @private */ -import nacl from '@openpgp/tweetnacl/nacl-fast-light.js'; +import nacl from '@openpgp/tweetnacl/nacl-fast-light'; import { getRandomBytes } from '../../random'; import enums from '../../../enums'; import util from '../../../util'; diff --git a/src/crypto/public_key/elliptic/ecdh.js b/src/crypto/public_key/elliptic/ecdh.js index a5de71871..6a56f1e25 100644 --- a/src/crypto/public_key/elliptic/ecdh.js +++ b/src/crypto/public_key/elliptic/ecdh.js @@ -21,7 +21,7 @@ * @private */ -import nacl from '@openpgp/tweetnacl/nacl-fast-light.js'; +import nacl from '@openpgp/tweetnacl/nacl-fast-light'; import { Curve, jwkToRawPublic, rawPublicToJWK, privateToJWK, validateStandardParams } from './curves'; import * as aesKW from '../../aes_kw'; import { getRandomBytes } from '../../random'; diff --git a/src/crypto/public_key/elliptic/eddsa.js b/src/crypto/public_key/elliptic/eddsa.js index 45183c3d5..a3277ff6d 100644 --- a/src/crypto/public_key/elliptic/eddsa.js +++ b/src/crypto/public_key/elliptic/eddsa.js @@ -22,7 +22,7 @@ */ import sha512 from 'hash.js/lib/hash/sha/512'; -import nacl from '@openpgp/tweetnacl/nacl-fast-light.js'; +import nacl from '@openpgp/tweetnacl/nacl-fast-light'; import util from '../../../util'; import enums from '../../../enums'; import hash from '../../hash'; diff --git a/src/crypto/public_key/index.js b/src/crypto/public_key/index.js index 6f386c753..94714eb46 100644 --- a/src/crypto/public_key/index.js +++ b/src/crypto/public_key/index.js @@ -4,7 +4,7 @@ * @private */ -import nacl from '@openpgp/tweetnacl/nacl-fast-light.js'; +import nacl from '@openpgp/tweetnacl/nacl-fast-light'; import * as rsa from './rsa'; import * as elgamal from './elgamal'; import * as elliptic from './elliptic'; diff --git a/src/encoding/armor.js b/src/encoding/armor.js index f68d3e462..99c0d282a 100644 --- a/src/encoding/armor.js +++ b/src/encoding/armor.js @@ -16,8 +16,8 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import * as stream from '@openpgp/web-stream-tools'; -import * as base64 from './base64.js'; -import enums from '../enums.js'; +import * as base64 from './base64'; +import enums from '../enums'; import util from '../util'; import defaultConfig from '../config'; diff --git a/src/key/index.js b/src/key/index.js index a77582947..47c430196 100644 --- a/src/key/index.js +++ b/src/key/index.js @@ -14,9 +14,9 @@ import { createSignaturePacket } from './helper'; -import PrivateKey from './private_key.js'; -import PublicKey from './public_key.js'; -import Subkey from './subkey.js'; +import PrivateKey from './private_key'; +import PublicKey from './public_key'; +import Subkey from './subkey'; export { readKey, diff --git a/src/packet/all_packets.js b/src/packet/all_packets.js index 5a9420abd..6362c3af3 100644 --- a/src/packet/all_packets.js +++ b/src/packet/all_packets.js @@ -4,20 +4,20 @@ * @private */ -export { default as CompressedDataPacket } from './compressed_data.js'; -export { default as SymEncryptedIntegrityProtectedDataPacket } from './sym_encrypted_integrity_protected_data.js'; -export { default as AEADEncryptedDataPacket } from './aead_encrypted_data.js'; -export { default as PublicKeyEncryptedSessionKeyPacket } from './public_key_encrypted_session_key.js'; -export { default as SymEncryptedSessionKeyPacket } from './sym_encrypted_session_key.js'; -export { default as LiteralDataPacket } from './literal_data.js'; -export { default as PublicKeyPacket } from './public_key.js'; -export { default as SymmetricallyEncryptedDataPacket } from './symmetrically_encrypted_data.js'; -export { default as MarkerPacket } from './marker.js'; -export { default as PublicSubkeyPacket } from './public_subkey.js'; -export { default as UserAttributePacket } from './user_attribute.js'; -export { default as OnePassSignaturePacket } from './one_pass_signature.js'; -export { default as SecretKeyPacket } from './secret_key.js'; -export { default as UserIDPacket } from './userid.js'; -export { default as SecretSubkeyPacket } from './secret_subkey.js'; -export { default as SignaturePacket } from './signature.js'; -export { default as TrustPacket } from './trust.js'; +export { default as CompressedDataPacket } from './compressed_data'; +export { default as SymEncryptedIntegrityProtectedDataPacket } from './sym_encrypted_integrity_protected_data'; +export { default as AEADEncryptedDataPacket } from './aead_encrypted_data'; +export { default as PublicKeyEncryptedSessionKeyPacket } from './public_key_encrypted_session_key'; +export { default as SymEncryptedSessionKeyPacket } from './sym_encrypted_session_key'; +export { default as LiteralDataPacket } from './literal_data'; +export { default as PublicKeyPacket } from './public_key'; +export { default as SymmetricallyEncryptedDataPacket } from './symmetrically_encrypted_data'; +export { default as MarkerPacket } from './marker'; +export { default as PublicSubkeyPacket } from './public_subkey'; +export { default as UserAttributePacket } from './user_attribute'; +export { default as OnePassSignaturePacket } from './one_pass_signature'; +export { default as SecretKeyPacket } from './secret_key'; +export { default as UserIDPacket } from './userid'; +export { default as SecretSubkeyPacket } from './secret_subkey'; +export { default as SignaturePacket } from './signature'; +export { default as TrustPacket } from './trust'; diff --git a/src/packet/signature.js b/src/packet/signature.js index 4d56d6e9e..ea2d656e1 100644 --- a/src/packet/signature.js +++ b/src/packet/signature.js @@ -17,7 +17,7 @@ import * as stream from '@openpgp/web-stream-tools'; import { readSimpleLength, UnsupportedError, writeSimpleLength } from './packet'; -import KeyID from '../type/keyid.js'; +import KeyID from '../type/keyid'; import crypto from '../crypto'; import enums from '../enums'; import util from '../util'; diff --git a/src/type/keyid.js b/src/type/keyid.js index 1470bd1f1..b9c88ac60 100644 --- a/src/type/keyid.js +++ b/src/type/keyid.js @@ -20,7 +20,7 @@ * @private */ -import util from '../util.js'; +import util from '../util'; /** * Implementation of type key id diff --git a/src/type/s2k.js b/src/type/s2k.js index abd33e9d8..611740791 100644 --- a/src/type/s2k.js +++ b/src/type/s2k.js @@ -30,8 +30,8 @@ import defaultConfig from '../config'; import crypto from '../crypto'; -import enums from '../enums.js'; -import util from '../util.js'; +import enums from '../enums'; +import util from '../util'; class S2K { /**