Merge branch 'dev-0.8'

Author: ony3000

.eslintignore

@@ -1 +1 @@
-18
+20

.eslintrc.json

@@ -1,6 +1,6 @@
 {
   "recommendations": [
-    "dbaeumer.vscode-eslint",
+    "biomejs.biome",
     "editorconfig.editorconfig",
     "esbenp.prettier-vscode",
     "streetsidesoftware.code-spell-checker"

.nvmrc

@@ -1,5 +1,8 @@
 {
+  "editor.codeActionsOnSave": {
+    "source.fixAll.biome": "explicit"
+  },
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.formatOnSave": true,
-  "eslint.workingDirectories": [{ "mode": "auto" }]
+  "eslint.enable": false
 }

.vscode/extensions.json

@@ -53,14 +53,6 @@ So you can combine as many plugins as you want.
 
 ## Installation
 
-For Prettier v2:
-
-```sh
-npm install -D prettier@^2 prettier-plugin-merge
-```
-
-For Prettier v3:
-
 ```sh
 npm install -D prettier prettier-plugin-merge
 ```
@@ -118,11 +110,3 @@ Starting with `0.6.0`, when there is a minor release on one side, I plan to refl
 ## Compatibility with other Prettier plugins
 
 All other plugins used with this plugin must be compatible with your version of Prettier.
-
-For example, suppose you have three plugins:
-
-- `prettier-plugin-A`: Only compatible with Prettier v2
-- `prettier-plugin-B`: Only compatible with Prettier v3
-- `prettier-plugin-X`: Compatible with both versions
-
-Prettier v2 users can only configure `prettier-plugin-A` and `prettier-plugin-X`, and Prettier v3 users can only configure `prettier-plugin-B` and `prettier-plugin-X`.

.vscode/settings.json

@@ -0,0 +1,34 @@
+{
+  "$schema": "https://biomejs.dev/schemas/2.0.0/schema.json",
+  "vcs": {
+    "enabled": false,
+    "clientKind": "git",
+    "useIgnoreFile": false
+  },
+  "files": {
+    "ignoreUnknown": false
+  },
+  "formatter": {
+    "enabled": false,
+    "indentStyle": "tab"
+  },
+  "linter": {
+    "enabled": true,
+    "rules": {
+      "recommended": true
+    }
+  },
+  "javascript": {
+    "formatter": {
+      "quoteStyle": "double"
+    }
+  },
+  "assist": {
+    "enabled": false,
+    "actions": {
+      "source": {
+        "organizeImports": "on"
+      }
+    }
+  }
+}

README.md

@@ -23,40 +23,40 @@
   "scripts": {
     "build": "pnpm run clean:bundle && esbuild src/index.ts --bundle --outdir=dist --platform=node \"--external:prettier\" --minify",
     "build:plain": "pnpm run clean:bundle && esbuild src/index.ts --bundle --outdir=dist --platform=node \"--external:prettier\"",
-    "clean": "pnpm run clean:bundle && pnpm -r exec rimraf node_modules/ && rimraf package.merged.json",
+    "clean": "pnpm run clean:bundle",
     "clean:bundle": "rimraf dist/",
-    "lint": "eslint src/ tests/",
-    "merge-deps": "rimraf package.merged.json && merge-packages ./ src/packages/core-parts/ src/packages/v2-plugin/ src/packages/v3-plugin/",
-    "prepare-release": "pnpm run build:plain && npm version prerelease --preid=alpha --git-tag-version=false && pnpm run merge-deps && npm pack"
+    "lint": "biome lint --max-diagnostics=none src/ tests/",
+    "preview": "pnpm run build:plain && npm version prerelease --preid=alpha --git-tag-version=false && npm pack",
+    "preview:minor": "pnpm run build:plain && npm version preminor --preid=alpha --git-tag-version=false && npm pack",
+    "test": "vitest run --passWithNoTests"
   },
   "dependencies": {
     "diff": "5.1.0"
   },
   "devDependencies": {
+    "@biomejs/biome": "2.0.0",
     "@trivago/prettier-plugin-sort-imports": "4.2.1",
     "@types/diff": "5.0.3",
-    "@types/node": "20.2.5",
-    "@types/prettier": "2.7.3",
-    "@typescript-eslint/eslint-plugin": "5.54.0",
-    "@typescript-eslint/parser": "5.54.0",
+    "@types/node": "20.17.46",
     "esbuild": "0.19.11",
-    "eslint": "8.35.0",
-    "eslint-config-airbnb-base": "15.0.0",
-    "eslint-config-airbnb-typescript": "17.0.0",
-    "eslint-config-prettier": "8.6.0",
-    "eslint-import-resolver-node": "0.3.7",
-    "eslint-import-resolver-typescript": "3.5.3",
-    "eslint-plugin-import": "2.27.5",
-    "merge-packages": "0.1.6",
-    "prettier": "2.8.4",
+    "prettier": "3.1.0",
+    "prettier-plugin-astro": "0.11.0",
+    "prettier-plugin-brace-style": "0.7.0",
+    "prettier-plugin-classnames": "0.7.5",
+    "prettier-plugin-space-before-function-paren": "0.0.7",
+    "prettier-plugin-svelte": "3.0.0",
+    "prettier-plugin-tailwindcss": "0.5.2",
     "rimraf": "5.0.1",
-    "typescript": "4.9.5"
+    "typescript": "5.8.3",
+    "vite-tsconfig-paths": "4.2.3",
+    "vitest": "1.1.3",
+    "vue": "3.3.9"
   },
   "peerDependencies": {
-    "prettier": "^2 || ^3"
+    "prettier": "^3"
   },
-  "packageManager": "pnpm@8.5.1",
+  "packageManager": "pnpm@10.10.0",
   "engines": {
-    "node": ">=14"
+    "node": ">=18"
   }
 }