Skip to content

Commit 00d988f

Browse files
ota-meshiota-meshi
authored
chore: fix web site (#606)
1 parent 92f52d0 commit 00d988f

File tree

9 files changed

+42
-62
lines changed

9 files changed

+42
-62
lines changed

Diff for: ‎explorer-v2/build-system/pre-build/eslint.js

-1
This file was deleted.

Diff for: ‎explorer-v2/build-system/pre-build/webpack.config.js

-30
Original file line numberDiff line numberDiff line change
@@ -36,36 +36,6 @@ const base = {
3636
};
3737
/** @type {import('webpack').Configuration[]} */
3838
export default [
39-
{
40-
...base,
41-
entry: {
42-
eslint: resolve('./eslint.js')
43-
},
44-
externals: {
45-
espree: '$$inject_espree$$',
46-
esquery: '$$inject_esquery$$'
47-
},
48-
plugins: [
49-
new WrapperPlugin({
50-
test: /eslint\.js/,
51-
header: `
52-
if (typeof window !== "undefined") {
53-
if (typeof window.global === "undefined") {
54-
window.global = {}
55-
}
56-
if (typeof window.process === "undefined") {
57-
window.process = {
58-
env: {},
59-
cwd: () => undefined,
60-
}
61-
}
62-
}
63-
import * as $$inject_espree$$ from 'espree';
64-
import $$inject_esquery$$ from 'esquery';
65-
`
66-
})
67-
]
68-
},
6939
{
7040
...base,
7141
entry: {

Diff for: ‎explorer-v2/build-system/shim/fast-glob.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export default {};

Diff for: ‎explorer-v2/package.json

+13-12
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,27 @@
1313
},
1414
"dependencies": {
1515
"@fontsource/fira-mono": "^5.1.0",
16-
"@typescript-eslint/parser": "^8.0.0",
17-
"eslint": "^9.0.0",
16+
"@typescript-eslint/parser": "^8.16.0",
17+
"eslint": "^9.16.0",
1818
"eslint-scope": "^7.2.2",
1919
"esquery": "^1.6.0",
2020
"pako": "^2.1.0",
21-
"svelte": "^5.0.0",
21+
"svelte": "^5.2.12",
2222
"svelte-eslint-parser": "link:..",
23-
"tslib": "^2.7.0"
23+
"tslib": "^2.8.1",
24+
"vite-plugin-eslint4b": "^0.5.0"
2425
},
2526
"devDependencies": {
26-
"@sveltejs/adapter-static": "^3.0.5",
27-
"@sveltejs/kit": "^2.7.0",
28-
"@sveltejs/vite-plugin-svelte": "^5.0.0",
27+
"@sveltejs/adapter-static": "^3.0.6",
28+
"@sveltejs/kit": "^2.9.0",
29+
"@sveltejs/vite-plugin-svelte": "^5.0.1",
2930
"monaco-editor": "^0.52.0",
30-
"prettier": "^3.3.3",
31-
"prettier-plugin-svelte": "^3.2.7",
31+
"prettier": "^3.4.1",
32+
"prettier-plugin-svelte": "^3.3.2",
3233
"string-replace-loader": "^3.1.0",
33-
"typescript": "^5.6.3",
34-
"vite": "^6.0.0",
35-
"webpack": "^5.95.0",
34+
"typescript": "^5.7.2",
35+
"vite": "^6.0.1",
36+
"webpack": "^5.96.1",
3637
"webpack-cli": "^5.1.4",
3738
"wrapper-webpack-plugin": "^2.2.2"
3839
}

Diff for: ‎explorer-v2/src/lib/ESLintEditor.svelte

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<script>
2+
import { builtinRules } from 'eslint/use-at-your-own-risk';
23
import MonacoEditor from './MonacoEditor.svelte';
34
import { loadMonacoEditor } from './scripts/monaco-loader';
45
import { createEventDispatcher, onMount } from 'svelte';
@@ -64,7 +65,7 @@
6465
/** message to marker */
6566
async function messageToMarker(message, messageMap) {
6667
const monaco = await loadMonacoEditor();
67-
const rule = message.ruleId && linter.getRules().get(message.ruleId);
68+
const rule = message.ruleId && builtinRules.get(message.ruleId);
6869
const docUrl = rule && rule.meta && rule.meta.docs && rule.meta.docs.url;
6970
const startLineNumber = ensurePositiveInt(message.line, 1);
7071
const startColumn = ensurePositiveInt(message.column, 1);

Diff for: ‎explorer-v2/src/lib/ESLintPlayground.svelte

+13-11
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
import { onDestroy, onMount } from 'svelte';
33
import { Linter } from 'eslint';
44
import * as svelteEslintParser from 'svelte-eslint-parser';
5+
import globals from 'globals';
56
import ESLintEditor from './ESLintEditor.svelte';
67
import RulesSettings from './RulesSettings.svelte';
78
import { deserializeState, serializeState } from './scripts/state';
89
import { DEFAULT_RULES_CONFIG, getURL } from './scripts/rules.js';
910
1011
const linter = new Linter();
11-
linter.defineParser('svelte-eslint-parser', svelteEslintParser);
1212
1313
const DEFAULT_CODE =
1414
`<script>
@@ -115,17 +115,19 @@
115115
{linter}
116116
bind:code
117117
config={{
118-
parser: 'svelte-eslint-parser',
119-
parserOptions: {
120-
ecmaVersion: 2020,
121-
sourceType: 'module',
122-
parser: { ts: tsParser, typescript: tsParser }
118+
languageOptions: {
119+
parser: svelteEslintParser,
120+
parserOptions: {
121+
ecmaVersion: 2020,
122+
sourceType: 'module',
123+
parser: { ts: tsParser, typescript: tsParser }
124+
},
125+
globals: {
126+
...globals.browser,
127+
...globals.es2021
128+
}
123129
},
124-
rules,
125-
env: {
126-
browser: true,
127-
es2021: true
128-
}
130+
rules
129131
}}
130132
class="eslint-playground"
131133
on:result={onLintedResult}

Diff for: ‎explorer-v2/src/lib/scripts/rules.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import { Linter } from 'eslint';
2-
3-
const linter = new Linter();
1+
import { builtinRules } from 'eslint/use-at-your-own-risk';
42

53
export const categories = [
64
{
@@ -22,7 +20,7 @@ export const categories = [
2220
export const DEFAULT_RULES_CONFIG = {};
2321

2422
const rules = [];
25-
for (const [ruleId, rule] of linter.getRules()) {
23+
for (const [ruleId, rule] of builtinRules) {
2624
if (rule.meta.deprecated) {
2725
continue;
2826
}
@@ -41,5 +39,5 @@ for (const [ruleId, rule] of linter.getRules()) {
4139
}
4240
/** get url */
4341
export function getURL(ruleId) {
44-
return linter.getRules().get(ruleId)?.meta.docs.url ?? '';
42+
return builtinRules.get(ruleId)?.meta.docs.url ?? '';
4543
}

Diff for: ‎explorer-v2/src/routes/+layout.svelte

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<script>
22
import Header from '$lib/Header.svelte';
33
import '../app.css';
4+
if (typeof window !== 'undefined') {
5+
window.process = {
6+
cwd: () => '/'
7+
};
8+
}
49
</script>
510

611
<Header />

Diff for: ‎explorer-v2/vite.config.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
11
import { sveltekit } from '@sveltejs/kit/vite';
22
import { resolve } from 'path';
33
import { createRequire } from 'module';
4+
import eslint4b, { requireESLintUseAtYourOwnRisk4b } from 'vite-plugin-eslint4b';
45

56
const { version: MONACO_EDITOR_VERSION } = createRequire(import.meta.url)(
67
'monaco-editor/package.json'
78
);
89

910
/** @type {import('vite').UserConfig} */
1011
const config = {
11-
plugins: [sveltekit()],
12+
plugins: [sveltekit(), eslint4b(), requireESLintUseAtYourOwnRisk4b()],
1213
server: {
1314
fs: { strict: false }
1415
},
1516
resolve: {
1617
alias: {
1718
assert: resolve('./build-system/shim/assert.js'),
1819
path: resolve('./build-system/shim/path.js'),
20+
'node:path': resolve('./build-system/shim/path.js'),
21+
util: resolve('./build-system/shim/util.js'),
1922
fs: resolve('./build-system/shim/fs.js'),
2023
module: resolve('./build-system/shim/module.js'),
2124

2225
globby: resolve('./build-system/shim/globby.js'),
26+
'fast-glob': resolve('./build-system/shim/fast-glob.js'),
2327
tslib: resolve('./node_modules/tslib/tslib.es6.js'),
24-
eslint: resolve('./build-system/shim/eslint.js'),
2528
'svelte-eslint-parser': resolve('./build-system/shim/svelte-eslint-parser.js'),
2629
'svelte/compiler': resolve('./build-system/shim/svelte/compiler.js')
2730
}

0 commit comments

Comments
 (0)