Skip to content

Commit 0074d10

Browse files
Rich-HarrisRich-Harris
authored
[feat] Typechecking variants (#6253)
Create TypeScript/JSDoc/vanilla variants of shared template .ts files
1 parent e24297e commit 0074d10

File tree

24 files changed

+112
-69
lines changed

24 files changed

+112
-69
lines changed

Diff for: ‎.changeset/early-bulldogs-smile.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'create-svelte': patch
3+
---
4+
5+
Create TypeScript/JSDoc/vanilla versions of shared template .ts files

Diff for: ‎.changeset/healthy-penguins-fail.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'create-svelte': patch
3+
---
4+
5+
Create vite.config.ts when creating TypeScript project

Diff for: ‎packages/adapter-static/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
"svelte": "^3.48.0",
3333
"typescript": "^4.7.4",
3434
"uvu": "^0.5.3",
35-
"vite": "^3.0.8"
35+
"vite": "^3.0.9"
3636
}
3737
}

Diff for: ‎packages/adapter-static/test/apps/prerendered/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"devDependencies": {
1111
"@sveltejs/kit": "workspace:*",
1212
"svelte": "^3.48.0",
13-
"vite": "^3.0.8"
13+
"vite": "^3.0.9"
1414
},
1515
"type": "module"
1616
}

Diff for: ‎packages/adapter-static/test/apps/spa/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@sveltejs/kit": "workspace:*",
1313
"sirv-cli": "^2.0.2",
1414
"svelte": "^3.48.0",
15-
"vite": "^3.0.8"
15+
"vite": "^3.0.9"
1616
},
1717
"type": "module"
1818
}

Diff for: ‎packages/create-svelte/scripts/build-templates.js

+28-9
Original file line numberDiff line numberDiff line change
@@ -206,22 +206,41 @@ async function generate_shared() {
206206
}
207207

208208
if (name.endsWith('.ts') && !include.includes('typescript')) {
209+
// file includes types in TypeScript and JSDoc —
210+
// create .js file, with and without JSDoc
211+
const js = convert_typescript(contents);
209212
const js_name = name.replace(/\.ts$/, '.js');
210-
shared.add(js_name);
211213

214+
// typescript
212215
files.push({
213-
name: js_name,
214-
include: [...include],
215-
exclude: [...exclude, 'typescript'],
216-
contents: convert_typescript(contents)
216+
name,
217+
include: [...include, 'typescript'],
218+
exclude,
219+
contents: strip_jsdoc(contents)
217220
});
218221

219-
include.push('typescript');
220-
}
222+
// checkjs
223+
files.push({
224+
name: js_name,
225+
include: [...include, 'checkjs'],
226+
exclude,
227+
contents: js
228+
});
221229

222-
shared.add(name);
230+
// no typechecking
231+
files.push({
232+
name: js_name,
233+
include,
234+
exclude: [...exclude, 'typescript', 'checkjs'],
235+
contents: strip_jsdoc(js)
236+
});
223237

224-
files.push({ name, include, exclude, contents });
238+
shared.add(name);
239+
shared.add(js_name);
240+
} else {
241+
shared.add(name);
242+
files.push({ name, include, exclude, contents });
243+
}
225244
});
226245

227246
files.sort((a, b) => a.include.length + a.exclude.length - (b.include.length + b.exclude.length));

Diff for: ‎packages/create-svelte/shared/vite.config.ts

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { sveltekit } from '@sveltejs/kit/vite';
2+
import type { UserConfig } from 'vite';
3+
4+
/** @type {import('vite').UserConfig} */
5+
const config: UserConfig = {
6+
plugins: [sveltekit()]
7+
};
8+
9+
export default config;

Diff for: ‎packages/create-svelte/templates/default/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"svelte": "^3.48.0",
1414
"svelte-preprocess": "^4.10.6",
1515
"typescript": "^4.7.4",
16-
"vite": "^3.0.4"
16+
"vite": "^3.0.9"
1717
},
1818
"type": "module",
1919
"dependencies": {

Diff for: ‎packages/create-svelte/templates/default/vite.config.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
1+
import path from 'path';
12
import { sveltekit } from '@sveltejs/kit/vite';
23

34
/** @type {import('vite').UserConfig} */
45
const config = {
5-
plugins: [sveltekit()]
6+
plugins: [sveltekit()],
7+
8+
server: {
9+
fs: {
10+
allow: [path.resolve('../../../kit')]
11+
}
12+
}
613
};
714

815
export default config;

Diff for: ‎packages/kit/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"tiny-glob": "^0.2.9",
4040
"typescript": "^4.7.4",
4141
"uvu": "^0.5.3",
42-
"vite": "^3.0.8"
42+
"vite": "^3.0.9"
4343
},
4444
"peerDependencies": {
4545
"svelte": "^3.44.0",

Diff for: ‎packages/kit/src/vite/index.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@ const enforced_config = {
5858
root: true
5959
};
6060

61-
/**
62-
* @return {import('vite').Plugin[]}
63-
*/
61+
/** @return {import('vite').Plugin[]} */
6462
export function sveltekit() {
6563
return [...svelte(), kit()];
6664
}

Diff for: ‎packages/kit/test/apps/amp/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"svelte": "^3.48.0",
2020
"svelte-check": "^2.7.1",
2121
"typescript": "^4.7.4",
22-
"vite": "^3.0.8"
22+
"vite": "^3.0.9"
2323
},
2424
"type": "module"
2525
}

Diff for: ‎packages/kit/test/apps/basics/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"svelte": "^3.48.0",
1919
"svelte-check": "^2.7.1",
2020
"typescript": "^4.7.4",
21-
"vite": "^3.0.8"
21+
"vite": "^3.0.9"
2222
},
2323
"type": "module"
2424
}

Diff for: ‎packages/kit/test/apps/dev-only/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"svelte": "^3.48.0",
1717
"svelte-check": "^2.7.1",
1818
"typescript": "^4.7.4",
19-
"vite": "^3.0.8"
19+
"vite": "^3.0.9"
2020
},
2121
"type": "module"
2222
}

Diff for: ‎packages/kit/test/apps/options-2/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"svelte": "^3.48.0",
1919
"svelte-check": "^2.7.1",
2020
"typescript": "^4.7.4",
21-
"vite": "^3.0.8"
21+
"vite": "^3.0.9"
2222
},
2323
"type": "module"
2424
}

Diff for: ‎packages/kit/test/apps/options/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"svelte": "^3.48.0",
1818
"svelte-check": "^2.7.1",
1919
"typescript": "^4.7.4",
20-
"vite": "^3.0.8"
20+
"vite": "^3.0.9"
2121
},
2222
"type": "module"
2323
}

Diff for: ‎packages/kit/test/apps/writes/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"svelte": "^3.48.0",
1919
"svelte-check": "^2.7.1",
2020
"typescript": "^4.7.4",
21-
"vite": "^3.0.8"
21+
"vite": "^3.0.9"
2222
},
2323
"type": "module"
2424
}

Diff for: ‎packages/kit/test/prerendering/basics/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"svelte-check": "^2.7.1",
1616
"typescript": "^4.7.4",
1717
"uvu": "^0.5.3",
18-
"vite": "^3.0.8"
18+
"vite": "^3.0.9"
1919
},
2020
"type": "module"
2121
}

Diff for: ‎packages/kit/test/prerendering/fallback/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"svelte-check": "^2.7.1",
1616
"typescript": "^4.7.4",
1717
"uvu": "^0.5.3",
18-
"vite": "^3.0.8"
18+
"vite": "^3.0.9"
1919
},
2020
"type": "module"
2121
}

Diff for: ‎packages/kit/test/prerendering/options/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"svelte-check": "^2.7.1",
1616
"typescript": "^4.7.4",
1717
"uvu": "^0.5.3",
18-
"vite": "^3.0.8"
18+
"vite": "^3.0.9"
1919
},
2020
"type": "module"
2121
}

Diff for: ‎packages/kit/test/prerendering/paths-base/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"svelte-check": "^2.7.1",
1616
"typescript": "^4.7.4",
1717
"uvu": "^0.5.3",
18-
"vite": "^3.0.8"
18+
"vite": "^3.0.9"
1919
},
2020
"type": "module"
2121
}

Diff for: ‎packages/kit/test/prerendering/trailing-slash/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"svelte-check": "^2.7.1",
1616
"typescript": "^4.7.4",
1717
"uvu": "^0.5.4",
18-
"vite": "^3.0.8"
18+
"vite": "^3.0.9"
1919
},
2020
"type": "module"
2121
}

0 commit comments

Comments
 (0)