Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/petite-areas-yell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'sv': patch
---

feat(sv): bump all templates to use typescript 6
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"sv": "workspace:*",
"svelte": "^5.53.0",
"tsdown": "^0.21.4",
"typescript": "^5.9.3",
"typescript": "^6.0.0",
"typescript-eslint": "^8.57.0",
"vitest": "4.1.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/migrate/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"semver": "^7.7.3",
"tiny-glob": "^0.2.9",
"ts-morph": "^24.0.0",
"typescript": "^5.9.3",
"typescript": "^6.0.0",
"zimmerframe": "^1.1.4"
},
"devDependencies": {
Expand Down
18 changes: 18 additions & 0 deletions packages/sv/src/addons/drizzle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,24 @@ export default defineAddon({
})
);

sv.file(
file.svelteConfig,
transforms.script(({ ast, js }) => {
const { value: config } = js.exports.createDefault(ast, {
fallback: js.object.create({})
});
js.object.overrideProperties(config, {
kit: {
typescript: {
config: js.common.parseExpression(
`(config) => ({ ...config, include: [...config.include, '../drizzle.config.${language}'] })`
)
}
}
});
})
);

sv.file(
paths['database schema'],
transforms.script(({ ast, js }) => {
Expand Down
20 changes: 20 additions & 0 deletions packages/sv/src/cli/tests/cli.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { parse } from '@sveltejs/sv-utils';
import fs from 'node:fs';
import path from 'node:path';
import process from 'node:process';
import { exec } from 'tinyexec';
import { beforeAll, describe, expect, it } from 'vitest';

Expand Down Expand Up @@ -118,6 +119,25 @@ describe('cli', () => {
);
}

if (projectName === 'create-with-all-addons' && process.platform !== 'win32') {
await exec('pnpm', ['install', '--no-frozen-lockfile'], {
nodeOptions: { stdio: 'pipe', cwd: testOutputPath }
});
await exec('pnpm', ['build'], {
nodeOptions: { stdio: 'pipe', cwd: testOutputPath }
});
await exec('pnpm', ['auth:schema'], {
nodeOptions: { stdio: 'pipe', cwd: testOutputPath }
});
const check = await exec('pnpm', ['check'], {
nodeOptions: { stdio: 'pipe', cwd: testOutputPath }
});
expect(
check.exitCode,
`svelte-check failed:\n stdout: ${check.stdout}\n stderr: ${check.stderr}`
).toBe(0);
}

if (template === 'addon') {
// replace sv and sv-utils versions in package.json for tests
const packageJsonPath = path.resolve(testOutputPath, 'package.json');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@sveltejs/vite-plugin-svelte": "^7.0.0",
"svelte": "^5.55.1",
"svelte-check": "^4.4.2",
"typescript": "^5.9.3",
"typescript": "^6.0.0",
"vite": "^8.0.2"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"svelte": "^5.55.1",
"svelte-check": "^4.4.2",
"tailwindcss": "^4.2.2",
"typescript": "^5.9.3",
"typescript": "^6.0.0",
"typescript-eslint": "^8.57.0",
"vite": "^8.0.2",
"vitest": "^4.1.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,15 @@ const config = {
// Force runes mode for the project, except for libraries. Can be removed in svelte 6.
runes: ({ filename }) => filename.split(/[/\\]/).includes('node_modules') ? undefined : true
},
kit: { adapter: adapter() },
kit: {
adapter: adapter(),
typescript: {
config: (config) => ({
...config,
include: [...config.include, '../drizzle.config.ts']
})
}
},
preprocess: [mdsvex({ extensions: ['.svx', '.md'] })],
extensions: ['.svelte', '.svx', '.md']
};
Expand Down
2 changes: 1 addition & 1 deletion packages/sv/src/create/shared/+checkjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
},
"devDependencies": {
"svelte-check": "^4.4.2",
"typescript": "^5.9.3"
"typescript": "^6.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/sv/src/create/shared/+typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
},
"devDependencies": {
"svelte-check": "^4.4.2",
"typescript": "^5.9.3"
"typescript": "^6.0.0"
}
}
Loading
Loading