Bump dependencies

trinhlbk1991 · Jun 11, 2024 · 0230a7f · 0230a7f
1 parent 78d6de6
commit 0230a7f
Show file tree

Hide file tree

Showing 10 changed files with 81 additions and 76 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -12,6 +12,6 @@ insert_final_newline = false
 indent_style = space
 indent_size = 2
 
-[*.{js,ts,cjs}]
+[*.{js,ts,cjs,mjs}]
 indent_style = space
 indent_size = 2
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
diff --git a/.github/workflows/quality-control.yml b/.github/workflows/quality-control.yml
@@ -37,7 +37,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [20.x, 22.x]
 
     steps:
       - uses: actions/checkout@v4

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -17,29 +17,25 @@
 		"**/.yarn/**": true,
 		"**/lib/**": true
 	},
+	"editor.formatOnSave": true,
+	"editor.defaultFormatter": "esbenp.prettier-vscode",
+	"editor.codeActionsOnSave": {
+		"source.fixAll": "explicit",
+		"source.organizeImports": "explicit"
+	},
 	"[javascript]": {
 		"editor.defaultFormatter": "esbenp.prettier-vscode"
 	},
 	"[typescript]": {
 		"editor.defaultFormatter": "esbenp.prettier-vscode"
 	},
-	"[scss]": {
-		"editor.defaultFormatter": "esbenp.prettier-vscode"
-	},
-	"[json]": {
-		"editor.defaultFormatter": "esbenp.prettier-vscode"
-	},
-	"editor.codeActionsOnSave": {
-		"source.fixAll": "explicit",
-		"source.organizeImports": "explicit"
-	},
 	"eslint.enable": true,
-	"eslint.format.enable": true,
-	"prettier.configPath": ".prettierrc.js",
-	"prettier.ignorePath": ".prettierignore",
-	"css.validate": false,
-	"less.validate": false,
-	"scss.validate": false,
-	"stylelint.enable": true,
-	"stylelint.validate": ["css", "scss"]
+	"eslint.validate": [
+		"javascript",
+		"javascriptreact",
+		"typescript",
+		"typescriptreact"
+	],
+	"prettier.configPath": "prettier.config.mjs",
+	"prettier.ignorePath": ".prettierignore"
 }
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -0,0 +1,47 @@
+import eslint from "@eslint/js";
+import prettierConfig from "eslint-config-prettier";
+import globals from "globals";
+import tseslint from "typescript-eslint";
+
+export default tseslint.config(
+  eslint.configs.recommended,
+  ...tseslint.configs.recommended,
+  {
+    languageOptions: {
+      parserOptions: {
+        projectService: true,
+        tsconfigRootDir: import.meta.dirname,
+        ecmaVersion: 2022,
+        globals: {
+          ...globals.es2022,
+          ...globals.node,
+        },
+      },
+    },
+  },
+  prettierConfig,
+  {
+    ignores: [
+      "package.json",
+      "node_modules/*",
+      ".yarn/*",
+      "lib/*",
+      "tempDir/*",
+      "tests/*.epub",
+    ],
+  },
+  {
+    files: ["**/*.ts"],
+    rules: {
+      "@typescript-eslint/no-unused-vars": [
+        "error",
+        {
+          args: "all",
+          argsIgnorePattern: "^_",
+          caughtErrors: "all",
+          caughtErrorsIgnorePattern: "^_",
+        },
+      ],
+    },
+  }
+);
diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
 		"access": "public"
 	},
 	"engines": {
-		"node": "18.x || 20.x"
+		"node": "20.x || 22.x"
 	},
 	"keywords": [
 		"epub",
@@ -30,17 +30,17 @@
 	],
 	"scripts": {
 		"freshlock": "rm -rf node_modules/ && rm .yarn/install-state.gz && rm yarn.lock && yarn",
-		"check-lint": "eslint . --ext .js,.jsx,.ts,.tsx",
+		"check-lint": "eslint",
 		"check-format": "prettier --check .",
 		"check-tsc": "tsc --noEmit",
-		"lint": "eslint . --fix --ext .js,.jsx,.ts,.tsx",
+		"lint": "eslint --fix",
 		"format": "prettier --write .",
 		"build": "tsc",
 		"test": "cross-env NODE_OPTIONS='--loader=ts-node/esm' mocha"
 	},
 	"dependencies": {
 		"archiver": "^7.0.1",
-		"axios": "^1.6.8",
+		"axios": "^1.7.2",
 		"diacritics": "^1.3.0",
 		"ejs": "^3.1.10",
 		"entities": "^4.5.0",
@@ -54,31 +54,24 @@
 		"uslug": "^1.0.4"
 	},
 	"devDependencies": {
-		"@tsconfig/node18": "^18.2.4",
+		"@eslint/js": "^9.4.0",
+		"@tsconfig/node20": "^20.1.4",
 		"@types/archiver": "^6.0.2",
 		"@types/diacritics": "^1.3.3",
 		"@types/ejs": "^3.1.5",
 		"@types/fs-extra": "^11.0.4",
 		"@types/mocha": "^10.0.6",
-		"@types/node": "^20.12.12",
+		"@types/node": "^20.14.2",
 		"@types/uslug": "^1.0.4",
-		"@typescript-eslint/eslint-plugin": "^7.9.0",
-		"@typescript-eslint/parser": "^7.9.0",
 		"cross-env": "^7.0.3",
-		"eslint": "^8.57.0",
+		"eslint": "^9.4.0",
 		"eslint-config-prettier": "^9.1.0",
+		"globals": "^15.4.0",
 		"mocha": "^10.4.0",
-		"prettier": "^3.2.5",
+		"prettier": "^3.3.2",
 		"ts-node": "^10.9.2",
-		"typescript": "^5.4.5"
+		"typescript": "^5.4.5",
+		"typescript-eslint": "^8.0.0-alpha.30"
 	},
-	"ava": {
-		"extensions": {
-			"ts": "module"
-		},
-		"nodeArguments": [
-			"--loader=ts-node/esm"
-		]
-	},
-	"packageManager": "[email protected]"
+	"packageManager": "[email protected]"
 }
diff --git a/.prettierrc.cjs → prettier.config.mjs b/.prettierrc.cjs → prettier.config.mjs
@@ -1,9 +1,9 @@
-module.exports = {
+const config = {
   printWidth: 120,
   trailingComma: "es5",
   overrides: [
     {
-      files: [".eslintrc.*", ".prettierrc.*", "*.json", "*.md"],
+      files: ["eslint.config.mjs", "prettier.config.mjs", "*.json", "*.md"],
       options: {
         printWidth: 80,
       },
@@ -16,3 +16,5 @@ module.exports = {
     },
   ],
 };
+
+export default config;
diff --git a/src/index.ts b/src/index.ts
@@ -458,11 +458,9 @@ export class EPub {
         const html = loadHtml(content.data, [
           () => (tree) => {
             const validateElements = (node: Element) => {
-              // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
               const attrs = node.properties!;
               if (["img", "br", "hr"].includes(node.tagName)) {
                 if (node.tagName === "img") {
-                  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                   node.properties!.alt = node.properties?.alt || "image-placeholder";
                 }
               }
@@ -471,12 +469,10 @@ export class EPub {
                 if (allowedAttributes.includes(k)) {
                   if (k === "type") {
                     if (attrs[k] !== "script") {
-                      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                       delete node.properties![k];
                     }
                   }
                 } else {
-                  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                   delete node.properties![k];
                 }
               }
@@ -502,7 +498,6 @@ export class EPub {
               if (!["img", "input"].includes(node.tagName)) {
                 return;
               }
-              // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
               const url = node.properties!.src as string | null | undefined;
               if (url === undefined || url === null) {
                 return;
@@ -531,7 +526,6 @@ export class EPub {
                 }
                 this.images.push({ id, url, dir, mediaType, extension });
               }
-              // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
               node.properties!.src = `images/${id}.${extension}`;
             };
 

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "./node_modules/@tsconfig/node18/tsconfig.json",
+	"extends": "./node_modules/@tsconfig/node20/tsconfig.json",
 	"compilerOptions": {
 		/* Visit https://aka.ms/tsconfig.json to read more about this file */
 		"outDir": "lib",