From b20cb61f87a851003ff759b6923d392fc09fb7e4 Mon Sep 17 00:00:00 2001 From: Ranjan Purbey Date: Tue, 4 Feb 2025 19:20:08 +0530 Subject: [PATCH 1/2] remove comment about adapter-auto ...once a specific sveltekit adapter is chosen Fixes https://github.com/sveltejs/cli/issues/430 --- packages/addons/_tests/sveltekit-adapter/test.ts | 6 ++++-- packages/addons/sveltekit-adapter/index.ts | 8 ++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/addons/_tests/sveltekit-adapter/test.ts b/packages/addons/_tests/sveltekit-adapter/test.ts index ffdf6a4f8..3adc35175 100644 --- a/packages/addons/_tests/sveltekit-adapter/test.ts +++ b/packages/addons/_tests/sveltekit-adapter/test.ts @@ -1,6 +1,8 @@ import { expect } from '@playwright/test'; -import { setupTest } from '../_setup/suite.ts'; +import { readFile } from 'node:fs/promises'; +import { join } from 'node:path'; import sveltekitAdapter from '../../sveltekit-adapter/index.ts'; +import { setupTest } from '../_setup/suite.ts'; const addonId = sveltekitAdapter.id; const { test, variants, prepareServer } = setupTest({ [addonId]: sveltekitAdapter }); @@ -13,5 +15,5 @@ test.concurrent.for(kitOnly)('core - %s', async (variant, { page, ...ctx }) => { // kill server process when we're done ctx.onTestFinished(async () => await close()); - expect(true).toBe(true); + expect(await readFile(join(cwd, 'svelte.config.js'), 'utf8')).not.toMatch('adapter-auto'); }); diff --git a/packages/addons/sveltekit-adapter/index.ts b/packages/addons/sveltekit-adapter/index.ts index af3311e90..f79d9e251 100644 --- a/packages/addons/sveltekit-adapter/index.ts +++ b/packages/addons/sveltekit-adapter/index.ts @@ -82,6 +82,14 @@ export default defineAddon({ ) as AstTypes.ObjectProperty | undefined; if (kitConfig && kitConfig.value.type === 'ObjectExpression') { + const adapterProp = kitConfig.value.properties.find( + (p) => + p.type === 'ObjectProperty' && p.key.type === 'Identifier' && p.key.name === 'adapter' + ); + if (adapterProp) { + adapterProp.comments = []; + } + // only overrides the `adapter` property so we can reset it's args object.overrideProperties(kitConfig.value, { adapter: functions.callByIdentifier(adapterName, []) From 2f33279a57745a9706c710a6345852e15d91b093 Mon Sep 17 00:00:00 2001 From: Ranjan Purbey Date: Tue, 4 Feb 2025 19:30:03 +0530 Subject: [PATCH 2/2] add changeset --- .changeset/happy-news-drive.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/happy-news-drive.md diff --git a/.changeset/happy-news-drive.md b/.changeset/happy-news-drive.md new file mode 100644 index 000000000..cf272c9f2 --- /dev/null +++ b/.changeset/happy-news-drive.md @@ -0,0 +1,5 @@ +--- +'sv': patch +--- + +Remove comment about adapter-auto once a specific sveltekit adapter is chosen