Linting updates, satisfy ESLint

CCDirectLink · Jan 30, 2024 · 8748631 · 8748631
1 parent 0e5b343
commit 8748631
Show file tree

Hide file tree

Showing 13 changed files with 109 additions and 121 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1,5 +1,4 @@
 .pnpm-store/
 dist/
-src/node-module-imports/
-common/vendor-libs/**/*.js*
+packages/common/src/vendor-libs
 ultimate-crosscode-typedefs/
diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -31,6 +31,10 @@ overrides:
     rules:
       node/no-missing-import: off
 
+  - files: '**/*.d.ts'
+    rules:
+      no-var: off
+
   - files: '**/src/**/*.ts'
     extends: eslint-config-dmitmel/rules/typescript/with-type-checking
     parserOptions:

diff --git a/main.html b/main.html
@@ -1,16 +1,16 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
-<head>
+  <head>
     <style>
-        body {
-            background-color: #000;
-            color: #fff;
-        }
+      body {
+        background-color: #000;
+        color: #fff;
+      }
     </style>
-    <meta charset="utf-8"/>
+    <meta charset="utf-8" />
     <title>CrossCode (CCLoader3)</title>
-    <link href="main.css" rel="stylesheet"/>
+    <link href="main.css" rel="stylesheet" />
     <script src="dist/core.js" type="module"></script>
-</head>
-<body></body>
+  </head>
+  <body></body>
 </html>
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "engines": {
-    "node": ">=11.0.0"
+    "node": ">=18.0.0"
   },
   "dependencies": {
     "jszip": "=3.10.1",
@@ -13,12 +13,12 @@
     "@types/jquery": "^1.10.31",
     "@types/node": ">=11.9",
     "@types/semver": "6.2.x || 6.3.x",
-    "@typescript-eslint/eslint-plugin": "^5.2.0",
-    "@typescript-eslint/parser": "^5.2.0",
+    "@typescript-eslint/eslint-plugin": "^6.20.0",
+    "@typescript-eslint/parser": "^6.20.0",
     "archiver": "^5.3.1",
     "esbuild": "^0.20.0",
     "esbuild-copy-static-files": "^0.1.0",
-    "eslint": "^8.1.0",
+    "eslint": "^8.56.0",
     "eslint-config-dmitmel": "dmitmel/eslint-config-dmitmel",
     "eslint-plugin-node": "^11.1.0",
     "prettier": "^2.8.8",
@@ -29,6 +29,7 @@
   "scripts": {
     "build": "node build.mjs",
     "lint": "eslint . --ext .js,.ts --ignore-path .eslintignore",
-    "check-fmt": "prettier --check '**/*.{js,ts,json,css,scss,html}'"
+    "check-fmt": "prettier --check '**/*.{js,ts,json,css,html}'",
+    "format": "prettier --write **/*.{js,ts,json,css,scss,html}"
   }
-}
+}
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,9 @@
 {
   "name": "@ccloader3/common",
   "private": true,
+  "engines": {
+    "node": ">=18.0.0"
+  },
   "exports": {
     "./*": "./src/*.ts"
   }

diff --git a/packages/common/tsconfig.json b/packages/common/tsconfig.json
@@ -1,3 +1,3 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.json"
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,9 @@
 {
   "name": "@ccloader3/core",
   "private": true,
+  "engines": {
+    "node": ">=18.0.0"
+  },
   "exports": {
     "./*": "./src/*.ts"
   },

diff --git a/packages/core/src/mod.ts b/packages/core/src/mod.ts
@@ -7,8 +7,8 @@ import {
   Dependency,
   LegacyPluginClass,
   LoadingStage,
-  Mod as ModPublic,
   ModID,
+  Mod as ModPublic,
   PluginClass,
 } from 'ultimate-crosscode-typedefs/modloader/mod';
 
@@ -17,7 +17,7 @@ export class Mod implements ModPublic {
   public readonly version: semver.SemVer | null = null;
   public readonly dependencies: ReadonlyMap<ModID, Dependency>;
   public readonly assetsDirectory: string;
-  public assets: Set<string> = new Set();
+  public assets = new Set<string>();
   public pluginClassInstance: PluginClass | null = null;
 
   public constructor(

diff --git a/packages/runtime/ccmod.json b/packages/runtime/ccmod.json
@@ -4,11 +4,9 @@
   "version": "3.3.0-alpha",
   "description": "CCLoader's graphical user interface and standard library implementation",
   "plugin": "main.js",
-  "assets": [
-    "data/lang/sc/gui.en_US.json.patch"
-  ],
+  "assets": ["data/lang/sc/gui.en_US.json.patch"],
   "dependencies": {
     "crosscode": "^1.1.0 || 1.0.2",
     "ccloader": "^3.3.1-alpha"
   }
-}
+}
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -1,6 +1,9 @@
 {
   "name": "@ccloader3/runtime",
   "private": true,
+  "engines": {
+    "node": ">=18.0.0"
+  },
   "exports": {
     "./*": "./src/*.ts"
   },

diff --git a/packages/runtime/tsconfig.json b/packages/runtime/tsconfig.json
@@ -1,10 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": [
-    "src",
-    "node_modules/ultimate-crosscode-typedefs/crosscode-ccloader-all.d.ts"
-  ],
-  "compilerOptions": {
-    "moduleResolution": "node"
-  }
+  "include": ["src", "node_modules/ultimate-crosscode-typedefs/crosscode-ccloader-all.d.ts"]
 }