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/goofy-papers-swim.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'sv': patch
---

fix(cloudflare): don't generate types on install, use the dedicated script
37 changes: 23 additions & 14 deletions packages/sv/lib/addons/sveltekit-adapter/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { defineAddon, defineAddonOptions } from '../../core/index.ts';
import { defineAddon, defineAddonOptions, json } from '../../core/index.ts';
import { exports, functions, imports, object, type AstTypes } from '../../core/tooling/js/index.ts';
import { parseJson, parseScript, parseToml } from '../../core/tooling/parsers.ts';
import { fileExists, readFile } from '../../cli/add/utils.ts';
import { fileExists, getHighlighter, readFile } from '../../cli/add/utils.ts';
import { sanitizeName } from '../../core/sanitize.ts';
import { resolveCommand } from 'package-manager-detector';
import * as js from '../../core/tooling/js/index.ts';
Expand Down Expand Up @@ -43,7 +43,7 @@ export default defineAddon({
setup: ({ kit, unsupported }) => {
if (!kit) unsupported('Requires SvelteKit');
},
run: ({ sv, options, files, cwd, packageManager, language }) => {
run: ({ sv, options, files, cwd, language }) => {
const adapter = adapters.find((a) => a.id === options.adapter)!;

// removes previously installed adapters
Expand All @@ -59,11 +59,11 @@ export default defineAddon({

// in sk 3, we will keep "preview": "vite preview" like any other adapter
if (options.adapter === 'cloudflare') {
if (options.cfTarget === 'workers') {
data.scripts.preview = 'wrangler dev .svelte-kit/cloudflare/_worker.js --port 4173';
} else if (options.cfTarget === 'pages') {
data.scripts.preview = 'wrangler pages dev .svelte-kit/cloudflare --port 4173';
}
const preview =
options.cfTarget === 'workers'
? 'wrangler dev .svelte-kit/cloudflare/_worker.js --port 4173'
: 'wrangler pages dev .svelte-kit/cloudflare --port 4173';
data.scripts.preview = preview;
}

return generateCode();
Expand Down Expand Up @@ -186,12 +186,7 @@ export default defineAddon({
sv.file(files.package, (content) => {
const { data, generateCode } = parseJson(content);

data.scripts ??= {};
data.scripts.types = 'wrangler types';
const { command, args } = resolveCommand(packageManager, 'run', ['types'])!;
data.scripts.prepare = data.scripts.prepare
? `${command} ${args.join(' ')} && ${data.scripts.prepare}`
: `${command} ${args.join(' ')}`;
json.packageScriptsUpsert(data, 'gen', 'wrangler types');

return generateCode();
});
Expand Down Expand Up @@ -226,6 +221,20 @@ export default defineAddon({
});
}
}
},
nextSteps({ options, packageManager }) {
const toReturn: string[] = [];
if (options.adapter === 'cloudflare') {
const color = getHighlighter();
const { command, args } = resolveCommand(packageManager, 'run', ['gen'])!;
toReturn.push(
`${color.command(`${command} ${args.join(' ')}`)} ` +
`${color.optional(`# updates `)}` +
`${color.route(`cloudflare`)}` +
`${color.optional(` types`)}`
);
}
return toReturn;
}
});

Expand Down
Loading