Skip to content

Commit 220abfb

Browse files
dummdidummdummdidumm
authored
(chore) bump a lot of stuff (#1793)
Most notably: - bump Svelte and svelte-preprocess to latest - bump Rollup - remove eslint - bump svelte2tsx version to 0.6.0 in preparation of next major release
1 parent cdefe00 commit 220abfb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+580
-1764
lines changed

Diff for: ‎.eslintignore

-7
This file was deleted.

Diff for: ‎.eslintrc.js

-31
This file was deleted.

Diff for: ‎.prettierignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
packages/svelte2tsx/*.d.ts
22
packages/svelte2tsx/repl/*
3+
packages/svelte2tsx/*.js
4+
packages/svelte2tsx/*.mjs
35
packages/svelte2tsx/test/*/samples/**/*
46
packages/svelte2tsx/test/sourcemaps/samples/*
57
packages/svelte2tsx/test/emitDts/samples/*/expected/**

Diff for: ‎package.json

+2-8
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,13 @@
1313
"test": "cross-env CI=true yarn workspaces run test",
1414
"watch": "tsc -b -watch",
1515
"format": "prettier --write .",
16-
"lint": "prettier --check . && eslint \"packages/**/*.{ts,js}\""
16+
"lint": "prettier --check ."
1717
},
1818
"dependencies": {
1919
"typescript": "^4.9.3"
2020
},
2121
"devDependencies": {
22-
"@sveltejs/eslint-config": "github:sveltejs/eslint-config#v5.2.0",
23-
"@typescript-eslint/eslint-plugin": "^4.3.0",
24-
"@typescript-eslint/parser": "^4.3.0",
25-
"eslint": "^7.7.0",
26-
"eslint-plugin-import": "^2.22.1",
27-
"eslint-plugin-svelte3": "^2.7.3",
28-
"prettier": "2.3.2",
22+
"prettier": "2.8.1",
2923
"cross-env": "^7.0.2",
3024
"ts-node": "^10.0.0"
3125
}

Diff for: ‎packages/language-server/bin/server.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#! /usr/bin/env node
22

3-
// eslint-disable-next-line @typescript-eslint/no-var-requires
43
const { startServer } = require('../dist/src/server');
54

65
startServer();

Diff for: ‎packages/language-server/package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
"node": ">= 12.0.0"
3535
},
3636
"devDependencies": {
37-
"@tsconfig/node12": "^1.0.0",
37+
"@tsconfig/node16": "^1.0.0",
3838
"@types/estree": "^0.0.42",
3939
"@types/lodash": "^4.14.116",
4040
"@types/mocha": "^9.1.0",
41-
"@types/node": "^13.9.0",
41+
"@types/node": "^16.0.0",
4242
"@types/prettier": "^2.2.3",
4343
"@types/sinon": "^7.5.2",
4444
"cross-env": "^7.0.2",
@@ -47,17 +47,17 @@
4747
"ts-node": "^10.0.0"
4848
},
4949
"dependencies": {
50-
"@jridgewell/trace-mapping": "^0.3.9",
50+
"@jridgewell/trace-mapping": "^0.3.17",
5151
"@vscode/emmet-helper": "^2.8.4",
5252
"chokidar": "^3.4.1",
5353
"estree-walker": "^2.0.1",
5454
"fast-glob": "^3.2.7",
5555
"lodash": "^4.17.21",
56-
"prettier": "2.8.0",
57-
"prettier-plugin-svelte": "~2.8.0",
58-
"svelte": "^3.49.0",
59-
"svelte-preprocess": "~4.10.1",
60-
"svelte2tsx": "~0.5.0",
56+
"prettier": "2.8.1",
57+
"prettier-plugin-svelte": "~2.9.0",
58+
"svelte": "^3.55.0",
59+
"svelte-preprocess": "~5.0.0",
60+
"svelte2tsx": "~0.6.0",
6161
"typescript": "*",
6262
"vscode-css-languageservice": "~6.2.0",
6363
"vscode-html-languageservice": "~5.0.0",

Diff for: ‎packages/language-server/scripts/.eslintrc.js

-6
This file was deleted.

Diff for: ‎packages/language-server/src/importPackage.ts

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ export function getPackageInfo(packageName: string, fromPath: string) {
3333
const packageJSONPath = require.resolve(`${packageName}/package.json`, {
3434
paths
3535
});
36-
// eslint-disable-next-line @typescript-eslint/no-var-requires
3736
const { version } = dynamicRequire(packageJSONPath);
3837
const [major, minor, patch] = version.split('.');
3938

Diff for: ‎packages/language-server/src/lib/documents/Document.ts

+3
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@ export class Document extends WritableDocument {
124124
);
125125
}
126126

127+
/**
128+
* @deprecated This no longer exists in svelte-preprocess v5, we leave it in in case someone is using this with v4
129+
*/
127130
private addDefaultLanguage(
128131
config: SvelteConfig | undefined,
129132
tagInfo: TagInformation | null,

Diff for: ‎packages/language-server/src/plugins/svelte/features/getCodeActions/getQuickfixes.ts

-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ function createSvelteAnchorMissingAttributeQuickfixAction(
117117
node: Node
118118
): CodeAction {
119119
// Assert non-null because the node target attribute is required for 'security-anchor-rel-noreferrer'
120-
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
121120
const targetAttribute = node.attributes.find((i: any) => i.name == 'target')!;
122121
const targetAttributePosition = positionAt(targetAttribute.end, content, lineOffsets);
123122

Diff for: ‎packages/language-server/src/plugins/svelte/features/getCodeActions/getRefactorings.ts

-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ async function executeExtractComponentCommand(
137137

138138
// `import {...} from '..'` or `import ... from '..'`
139139
const scriptRelativeImportRegex =
140-
// eslint-disable-next-line max-len
141140
/import\s+{[^}]*}.*['"`](((\.\/)|(\.\.\/)).*?)['"`]|import\s+\w+\s+from\s+['"`](((\.\/)|(\.\.\/)).*?)['"`]/g;
142141
// `@import '..'`
143142
const styleRelativeImportRege = /@import\s+['"`](((\.\/)|(\.\.\/)).*?)['"`]/g;

Diff for: ‎packages/language-server/src/plugins/typescript/features/CompletionProvider.ts

-1
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,6 @@ const beginOfDocumentRange = Range.create(Position.create(0, 0), Position.create
863863

864864
// `import {...} from '..'` or `import ... from '..'`
865865
// Note: Does not take into account if import is within a comment.
866-
// eslint-disable-next-line max-len
867866
const scriptImportRegex =
868867
/\bimport\s+{([^}]*?)}\s+?from\s+['"`].+?['"`]|\bimport\s+(\w+?)\s+from\s+['"`].+?['"`]/g;
869868

Diff for: ‎packages/language-server/src/plugins/typescript/utils.ts

-1
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@ const commentsRegex = /^(\s*\/\/.*\s*)*/;
270270
// - what's coming after @ts-(no)check is irrelevant as long there is any kind of whitespace or line break, so this would be picked up, too: // @ts-check asdasd
271271
// [ \t\u00a0\u1680\u2000-\u200a\u2028\u2029\u202f\u205f\u3000\ufeff]
272272
// is just \s (a.k.a any whitespace character) without linebreak and vertical tab
273-
// eslint-disable-next-line max-len
274273
const tsCheckRegex =
275274
/\/\/[ \t\u00a0\u1680\u2000-\u200a\u2028\u2029\u202f\u205f\u3000\ufeff]*(@ts-(no)?check)($|\s)/;
276275

Diff for: ‎packages/language-server/src/utils.ts

-1
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,6 @@ export function returnObjectIfHasKeys<T>(obj: T | undefined): T | undefined {
294294
}
295295
}
296296

297-
// eslint-disable-next-line no-useless-escape
298297
const fileNameLowerCaseRegExp = /[^\u0130\u0131\u00DFa-z0-9\\/:\-_\. ]+/g;
299298

300299
/**

Diff for: ‎packages/language-server/test/.eslintrc.js

-6
This file was deleted.

Diff for: ‎packages/language-server/test/lib/documents/Document.test.ts

+3-9
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ describe('Document', () => {
2828
const document = new Document('file:///hello.svelte', '<script>a</script><style>b</style>');
2929
assert.deepEqual(document.scriptInfo, {
3030
content: 'a',
31-
attributes: {
32-
lang: 'javascript'
33-
},
31+
attributes: {},
3432
start: 8,
3533
end: 9,
3634
startPos: Position.create(0, 8),
@@ -39,9 +37,7 @@ describe('Document', () => {
3937
});
4038
assert.deepEqual(document.styleInfo, {
4139
content: 'b',
42-
attributes: {
43-
lang: 'css'
44-
},
40+
attributes: {},
4541
start: 25,
4642
end: 26,
4743
startPos: Position.create(0, 25),
@@ -52,9 +48,7 @@ describe('Document', () => {
5248
document.setText('<script>b</script>');
5349
assert.deepEqual(document.scriptInfo, {
5450
content: 'b',
55-
attributes: {
56-
lang: 'javascript'
57-
},
51+
attributes: {},
5852
start: 8,
5953
end: 9,
6054
startPos: Position.create(0, 8),

Diff for: ‎packages/language-server/test/lib/documents/configLoader.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ describe('ConfigLoader', () => {
9191
Object.keys(
9292
configLoader.getConfig(normalizePath('/some/path/comp.svelte'))?.preprocess || {}
9393
).sort(),
94-
['defaultLanguages', 'markup', 'script', 'style'].sort()
94+
['markup', 'script', 'style'].sort()
9595
);
9696
});
9797

Diff for: ‎packages/language-server/test/plugins/svelte/features/getCodeAction.test.ts

-3
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ describe('SveltePlugin#getCodeAction', () => {
159159
{
160160
edits: [
161161
{
162-
// eslint-disable-next-line max-len
163162
newText: `<!-- svelte-ignore security-anchor-rel-noreferrer -->${EOL}`,
164163
range: {
165164
end: {
@@ -213,7 +212,6 @@ describe('SveltePlugin#getCodeAction', () => {
213212
{
214213
edits: [
215214
{
216-
// eslint-disable-next-line max-len
217215
newText: `<!-- svelte-ignore a11y-missing-attribute -->${EOL}`,
218216
range: {
219217
end: {
@@ -369,7 +367,6 @@ describe('SveltePlugin#getCodeAction', () => {
369367
{
370368
edits: [
371369
{
372-
// eslint-disable-next-line max-len
373370
newText: `<!-- svelte-ignore a11y-missing-attribute -->${EOL}`,
374371
range: {
375372
end: {

Diff for: ‎packages/language-server/test/plugins/typescript/features/CodeActionsProvider.test.ts

-2
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,6 @@ function test(useNewTransformation: boolean) {
686686
{
687687
edits: [
688688
{
689-
// eslint-disable-next-line max-len
690689
newText:
691690
"import { A } from 'bla';\nimport { C } from 'blubb';\n",
692691
range: {
@@ -775,7 +774,6 @@ function test(useNewTransformation: boolean) {
775774
{
776775
edits: [
777776
{
778-
// eslint-disable-next-line max-len
779777
newText:
780778
"import { A, B } from 'bla';\n" +
781779
"import { C } from 'blubb';\n" +

Diff for: ‎packages/language-server/test/plugins/typescript/features/CompletionProvider.test.ts

-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,6 @@ function test(useNewTransformation: boolean) {
245245
);
246246
assert.ok(completions!.items.length > 0, 'Expected completions to have length');
247247

248-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
249248
const eventCompletions = completions!.items.filter((item) =>
250249
item.label.startsWith('on:')
251250
);

Diff for: ‎packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/custom-types/svelte-ambient-typings.d.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable */
21
declare namespace svelte.JSX {
32
interface HTMLAttributes {
43
owntypefromold?: string;

Diff for: ‎packages/language-server/test/plugins/typescript/features/diagnostics/index.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ function executeTests(dir: string, workspaceDir: string, useNewTransformation: b
5757
try {
5858
assert.deepStrictEqual(
5959
diagnostics,
60-
JSON.parse(readFileSync(expectedFile, 'UTF-8'))
60+
JSON.parse(readFileSync(expectedFile, 'utf-8'))
6161
);
6262
} catch (e) {
6363
if (process.argv.includes('--auto')) {
@@ -72,7 +72,7 @@ function executeTests(dir: string, workspaceDir: string, useNewTransformation: b
7272

7373
function writeFile(msg: string) {
7474
console.info(msg, dir.substring(__dirname.length));
75-
writeFileSync(expectedFile, JSON.stringify(diagnostics), 'UTF-8');
75+
writeFileSync(expectedFile, JSON.stringify(diagnostics), 'utf-8');
7676
}
7777
};
7878
}

Diff for: ‎packages/svelte-check/package.json

+16-16
Original file line numberDiff line numberDiff line change
@@ -19,38 +19,38 @@
1919
},
2020
"homepage": "https://github.com/sveltejs/language-tools#readme",
2121
"dependencies": {
22-
"@jridgewell/trace-mapping": "^0.3.9",
22+
"@jridgewell/trace-mapping": "^0.3.17",
2323
"picocolors": "^1.0.0",
2424
"chokidar": "^3.4.1",
2525
"fast-glob": "^3.2.7",
2626
"import-fresh": "^3.2.1",
2727
"sade": "^1.7.4",
28-
"svelte-preprocess": "^4.0.0",
29-
"typescript": "*"
28+
"svelte-preprocess": "^5.0.0",
29+
"typescript": "^4.9.4"
3030
},
3131
"peerDependencies": {
32-
"svelte": "^3.24.0"
32+
"svelte": "^3.55.0"
3333
},
3434
"scripts": {
3535
"build": "rollup -c && node ./dist/src/index.js --workspace ./test --tsconfig ./tsconfig.json",
3636
"prepublishOnly": "npm run build",
3737
"test": "echo 'NOOP'"
3838
},
3939
"devDependencies": {
40-
"@rollup/plugin-typescript": "^6.0.0",
41-
"@rollup/plugin-commonjs": "^15.0.0",
42-
"@rollup/plugin-json": "^4.0.0",
43-
"@rollup/plugin-node-resolve": "^9.0.0",
44-
"@rollup/plugin-replace": "2.3.3",
45-
"@tsconfig/node12": "^1.0.0",
40+
"@rollup/plugin-typescript": "^10.0.0",
41+
"@rollup/plugin-commonjs": "^24.0.0",
42+
"@rollup/plugin-json": "^6.0.0",
43+
"@rollup/plugin-node-resolve": "^15.0.0",
44+
"@rollup/plugin-replace": "5.0.2",
45+
"@tsconfig/node16": "^1.0.0",
4646
"@types/sade": "^1.7.2",
47-
"rollup": "2.52.7",
48-
"rollup-plugin-cleanup": "^3.0.0",
49-
"rollup-plugin-copy": "^3.0.0",
47+
"rollup": "3.7.5",
48+
"rollup-plugin-cleanup": "^3.2.0",
49+
"rollup-plugin-copy": "^3.4.0",
5050
"svelte-language-server": "*",
51-
"vscode-languageserver": "8.0.1",
52-
"vscode-languageserver-protocol": "3.17.1",
53-
"vscode-languageserver-types": "3.17.1",
51+
"vscode-languageserver": "8.0.2",
52+
"vscode-languageserver-protocol": "3.17.2",
53+
"vscode-languageserver-types": "3.17.2",
5454
"vscode-uri": "~3.0.0"
5555
}
5656
}

Diff for: ‎packages/svelte-check/rollup.config.js renamed to ‎packages/svelte-check/rollup.config.mjs

File renamed without changes.

Diff for: ‎packages/svelte-check/src/options.ts

-3
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@ export interface SvelteCheckCliOptions {
1717
useNewTransformation: boolean;
1818
}
1919

20-
// eslint-disable max-len
2120
export function parseOptions(cb: (opts: SvelteCheckCliOptions) => any) {
2221
const prog = sade('svelte-check', true)
23-
// eslint-disable-next-line @typescript-eslint/no-var-requires
2422
.version(require('../../package.json').version) // ends up in dist/src, that's why we go two levels up
2523
.option(
2624
'--workspace',
@@ -90,7 +88,6 @@ export function parseOptions(cb: (opts: SvelteCheckCliOptions) => any) {
9088

9189
prog.parse(process.argv);
9290
}
93-
// eslint-enable max-len
9491

9592
const outputFormats = ['human', 'human-verbose', 'machine'] as const;
9693
type OutputFormat = typeof outputFormats[number];

Diff for: ‎packages/svelte-check/src/writers.ts

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ export class HumanFriendlyWriter implements Writer {
5353

5454
// Display location in a format that IDEs will turn into file links
5555
const { line, character } = diagnostic.range.start;
56-
// eslint-disable-next-line max-len
5756
this.stream.write(
5857
`${workspaceDir}${sep}${pc.green(filename)}:${line + 1}:${character + 1}\n`
5958
);

Diff for: ‎packages/svelte-vscode/.eslintrc.js

-5
This file was deleted.

Diff for: ‎packages/svelte-vscode/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -718,9 +718,9 @@
718718
]
719719
},
720720
"devDependencies": {
721-
"@tsconfig/node12": "^1.0.0",
721+
"@tsconfig/node16": "^1.0.0",
722722
"@types/lodash": "^4.14.116",
723-
"@types/node": "^13.9.0",
723+
"@types/node": "^16.0.0",
724724
"@types/vscode": "^1.67",
725725
"js-yaml": "^3.14.0",
726726
"typescript": "*",

0 commit comments

Comments
 (0)