Skip to content

Commit 6c6c712

Browse files
renovate[bot]renovate-botota-meshi
authored
Update dependency eslint-scope to v6 (#76)
* Update dependency eslint-scope to v6 * update * update * Support svelte 3.41.0 Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: yosuke ota <[email protected]>
1 parent df55fdc commit 6c6c712

File tree

7 files changed

+13
-20
lines changed

7 files changed

+13
-20
lines changed

explorer-v2/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"@lukeed/uuid": "^2.0.0",
2828
"cookie": "^0.4.1",
2929
"eslint-plugin-svelte3": "^3.2.0",
30-
"eslint-scope": "^5.1.1",
30+
"eslint-scope": "^6.0.0",
3131
"eslint4b": "^7.26.0",
3232
"pako": "^2.0.3",
3333
"svelte": "^3.34.0",

explorer-v2/src/lib/ESLintPlayground.svelte

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,12 @@
4747
4848
// eslint-disable-next-line no-use-before-define -- false positive
4949
$: serializedString = (() => {
50-
const defaultCode = DEFAULT_CODE;
51-
const defaultRules = DEFAULT_RULES_CONFIG;
52-
const serializeCode = defaultCode === code ? undefined : code;
53-
const serializeRules = equalsRules(defaultRules, rules) ? undefined : rules;
50+
const serializeCode = DEFAULT_CODE === code ? undefined : code;
51+
const serializeRules = equalsRules(DEFAULT_RULES_CONFIG, rules) ? undefined : rules;
5452
return serializeState({
5553
code: serializeCode,
5654
rules: serializeRules,
57-
useEslintPluginSvelte3
55+
useEslintPluginSvelte3: useEslintPluginSvelte3 ? true : undefined
5856
});
5957
})();
6058
$: {

explorer-v2/src/lib/scripts/monaco-loader.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,12 @@ export async function loadMonacoEditor() {
4646
return (
4747
editorLoaded ||
4848
(editorLoaded = new Promise((resolve) => {
49-
// eslint-disable-next-line node/no-missing-require -- ignore
50-
window.require(['vs/editor/editor.main'], (r) => {
51-
resolve(r);
52-
});
49+
if (typeof window !== 'undefined') {
50+
// eslint-disable-next-line node/no-missing-require -- ignore
51+
window.require(['vs/editor/editor.main'], (r) => {
52+
resolve(r);
53+
});
54+
}
5355
}))
5456
);
5557
}

explorer-v2/src/routes/playground.svelte

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,3 @@
1111
</svelte:head>
1212

1313
<ESLintPlayground />
14-
15-
<style>
16-
</style>

explorer-v2/src/routes/scope.svelte

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,3 @@
1111
</svelte:head>
1212

1313
<ScopeExplorer />
14-
15-
<style>
16-
</style>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
},
3737
"homepage": "https://github.com/ota-meshi/svelte-eslint-parser#readme",
3838
"dependencies": {
39-
"eslint-scope": "^5.1.1",
39+
"eslint-scope": "^6.0.0",
4040
"eslint-visitor-keys": "^3.0.0",
4141
"espree": "^8.0.0"
4242
},

src/parser/analyze-scope.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import type ESTree from "estree"
22
import type { Scope, ScopeManager } from "eslint-scope"
3-
import { Variable, Reference } from "eslint-scope"
4-
import eslintScope from "eslint-scope"
3+
import { Variable, Reference, analyze } from "eslint-scope"
54
import { getFallbackKeys } from "../traverse"
65
import type { SvelteReactiveStatement, SvelteScriptElement } from "../ast"
76
/**
@@ -24,7 +23,7 @@ export function analyzeScope(
2423
sourceType,
2524
}
2625

27-
return eslintScope.analyze(root, {
26+
return analyze(root, {
2827
ignoreEval: true,
2928
nodejsScope: false,
3029
impliedStrict: ecmaFeatures.impliedStrict,

0 commit comments

Comments
 (0)