From a6860389660ea1c9fcdde38be4834522173df63c Mon Sep 17 00:00:00 2001 From: yosuke ota Date: Sun, 1 Dec 2024 17:38:24 +0900 Subject: [PATCH] chore: fix web site --- explorer-v2/build-system/pre-build/eslint.js | 1 - .../build-system/pre-build/webpack.config.js | 30 ------------------- explorer-v2/build-system/shim/fast-glob.js | 1 + explorer-v2/package.json | 25 ++++++++-------- explorer-v2/src/lib/ESLintEditor.svelte | 3 +- explorer-v2/src/lib/ESLintPlayground.svelte | 24 ++++++++------- explorer-v2/src/lib/scripts/rules.js | 8 ++--- explorer-v2/src/routes/+layout.svelte | 5 ++++ explorer-v2/vite.config.js | 7 +++-- 9 files changed, 42 insertions(+), 62 deletions(-) delete mode 100644 explorer-v2/build-system/pre-build/eslint.js create mode 100644 explorer-v2/build-system/shim/fast-glob.js diff --git a/explorer-v2/build-system/pre-build/eslint.js b/explorer-v2/build-system/pre-build/eslint.js deleted file mode 100644 index aabed74f..00000000 --- a/explorer-v2/build-system/pre-build/eslint.js +++ /dev/null @@ -1 +0,0 @@ -export { Linter } from '../../node_modules/eslint/lib/linter/linter.js'; diff --git a/explorer-v2/build-system/pre-build/webpack.config.js b/explorer-v2/build-system/pre-build/webpack.config.js index 1c2d5bb4..decdc2c4 100644 --- a/explorer-v2/build-system/pre-build/webpack.config.js +++ b/explorer-v2/build-system/pre-build/webpack.config.js @@ -36,36 +36,6 @@ const base = { }; /** @type {import('webpack').Configuration[]} */ export default [ - { - ...base, - entry: { - eslint: resolve('./eslint.js') - }, - externals: { - espree: '$$inject_espree$$', - esquery: '$$inject_esquery$$' - }, - plugins: [ - new WrapperPlugin({ - test: /eslint\.js/, - header: ` - if (typeof window !== "undefined") { - if (typeof window.global === "undefined") { - window.global = {} - } - if (typeof window.process === "undefined") { - window.process = { - env: {}, - cwd: () => undefined, - } - } - } - import * as $$inject_espree$$ from 'espree'; - import $$inject_esquery$$ from 'esquery'; - ` - }) - ] - }, { ...base, entry: { diff --git a/explorer-v2/build-system/shim/fast-glob.js b/explorer-v2/build-system/shim/fast-glob.js new file mode 100644 index 00000000..ff8b4c56 --- /dev/null +++ b/explorer-v2/build-system/shim/fast-glob.js @@ -0,0 +1 @@ +export default {}; diff --git a/explorer-v2/package.json b/explorer-v2/package.json index db3b2381..c8e3f568 100644 --- a/explorer-v2/package.json +++ b/explorer-v2/package.json @@ -13,26 +13,27 @@ }, "dependencies": { "@fontsource/fira-mono": "^5.1.0", - "@typescript-eslint/parser": "^8.0.0", - "eslint": "^9.0.0", + "@typescript-eslint/parser": "^8.16.0", + "eslint": "^9.16.0", "eslint-scope": "^7.2.2", "esquery": "^1.6.0", "pako": "^2.1.0", - "svelte": "^5.0.0", + "svelte": "^5.2.12", "svelte-eslint-parser": "link:..", - "tslib": "^2.7.0" + "tslib": "^2.8.1", + "vite-plugin-eslint4b": "^0.5.0" }, "devDependencies": { - "@sveltejs/adapter-static": "^3.0.5", - "@sveltejs/kit": "^2.7.0", - "@sveltejs/vite-plugin-svelte": "^5.0.0", + "@sveltejs/adapter-static": "^3.0.6", + "@sveltejs/kit": "^2.9.0", + "@sveltejs/vite-plugin-svelte": "^5.0.1", "monaco-editor": "^0.52.0", - "prettier": "^3.3.3", - "prettier-plugin-svelte": "^3.2.7", + "prettier": "^3.4.1", + "prettier-plugin-svelte": "^3.3.2", "string-replace-loader": "^3.1.0", - "typescript": "^5.6.3", - "vite": "^6.0.0", - "webpack": "^5.95.0", + "typescript": "^5.7.2", + "vite": "^6.0.1", + "webpack": "^5.96.1", "webpack-cli": "^5.1.4", "wrapper-webpack-plugin": "^2.2.2" } diff --git a/explorer-v2/src/lib/ESLintEditor.svelte b/explorer-v2/src/lib/ESLintEditor.svelte index 9864ca12..cc440f2c 100644 --- a/explorer-v2/src/lib/ESLintEditor.svelte +++ b/explorer-v2/src/lib/ESLintEditor.svelte @@ -1,4 +1,5 @@
diff --git a/explorer-v2/vite.config.js b/explorer-v2/vite.config.js index bd61e831..aeb9364f 100644 --- a/explorer-v2/vite.config.js +++ b/explorer-v2/vite.config.js @@ -1,6 +1,7 @@ import { sveltekit } from '@sveltejs/kit/vite'; import { resolve } from 'path'; import { createRequire } from 'module'; +import eslint4b, { requireESLintUseAtYourOwnRisk4b } from 'vite-plugin-eslint4b'; const { version: MONACO_EDITOR_VERSION } = createRequire(import.meta.url)( 'monaco-editor/package.json' @@ -8,7 +9,7 @@ const { version: MONACO_EDITOR_VERSION } = createRequire(import.meta.url)( /** @type {import('vite').UserConfig} */ const config = { - plugins: [sveltekit()], + plugins: [sveltekit(), eslint4b(), requireESLintUseAtYourOwnRisk4b()], server: { fs: { strict: false } }, @@ -16,12 +17,14 @@ const config = { alias: { assert: resolve('./build-system/shim/assert.js'), path: resolve('./build-system/shim/path.js'), + 'node:path': resolve('./build-system/shim/path.js'), + util: resolve('./build-system/shim/util.js'), fs: resolve('./build-system/shim/fs.js'), module: resolve('./build-system/shim/module.js'), globby: resolve('./build-system/shim/globby.js'), + 'fast-glob': resolve('./build-system/shim/fast-glob.js'), tslib: resolve('./node_modules/tslib/tslib.es6.js'), - eslint: resolve('./build-system/shim/eslint.js'), 'svelte-eslint-parser': resolve('./build-system/shim/svelte-eslint-parser.js'), 'svelte/compiler': resolve('./build-system/shim/svelte/compiler.js') }