From 9d1ab2d1471e5b7f8ce9225632c9c01f028572e5 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Tue, 8 Oct 2024 18:35:23 -0700 Subject: [PATCH 1/5] chore: make text the default contentType --- packages/adders/drizzle/config/adder.ts | 4 ---- packages/adders/drizzle/config/tests.ts | 1 - packages/adders/lucia/config/adder.ts | 4 ---- packages/adders/mdsvex/config/tests.ts | 2 -- packages/adders/playwright/config/adder.ts | 2 -- packages/adders/prettier/config/adder.ts | 1 - packages/adders/vitest/config/adder.ts | 1 - packages/core/files/processors.ts | 4 ++-- 8 files changed, 2 insertions(+), 17 deletions(-) diff --git a/packages/adders/drizzle/config/adder.ts b/packages/adders/drizzle/config/adder.ts index fcc46c28..45c7d7f0 100644 --- a/packages/adders/drizzle/config/adder.ts +++ b/packages/adders/drizzle/config/adder.ts @@ -74,17 +74,14 @@ export const adder = defineAdderConfig({ files: [ { name: () => '.env', - contentType: 'text', content: generateEnvFileContent }, { name: () => '.env.example', - contentType: 'text', content: generateEnvFileContent }, { name: () => 'docker-compose.yml', - contentType: 'text', condition: ({ options }) => options.docker && (options.mysql === 'mysql2' || options.postgresql === 'postgres.js'), content: ({ content, options }) => { @@ -142,7 +139,6 @@ export const adder = defineAdderConfig({ { // Adds the db file to the gitignore if an ignore is present name: () => '.gitignore', - contentType: 'text', condition: ({ options }) => options.database === 'sqlite', content: ({ content }) => { if (content.length === 0) return content; diff --git a/packages/adders/drizzle/config/tests.ts b/packages/adders/drizzle/config/tests.ts index 2165521a..e4f49b58 100644 --- a/packages/adders/drizzle/config/tests.ts +++ b/packages/adders/drizzle/config/tests.ts @@ -65,7 +65,6 @@ export const tests = defineAdderTests({ { // override the config so we can remove strict mode name: ({ typescript }) => `drizzle.config.${typescript ? 'ts' : 'js'}`, - contentType: 'text', condition: ({ kit }) => Boolean(kit), content: ({ content }) => { return content.replace('strict: true,', ''); diff --git a/packages/adders/lucia/config/adder.ts b/packages/adders/lucia/config/adder.ts index eac7b959..b875467b 100644 --- a/packages/adders/lucia/config/adder.ts +++ b/packages/adders/lucia/config/adder.ts @@ -476,7 +476,6 @@ export const adder = defineAdderConfig({ name: ({ kit, typescript }) => `${kit!.routesDirectory}/demo/login/+page.server.${typescript ? 'ts' : 'js'}`, condition: ({ options }) => options.demo, - contentType: 'text', content({ content, typescript }) { if (content) { log.warn( @@ -622,7 +621,6 @@ export const adder = defineAdderConfig({ { name: ({ kit }) => `${kit!.routesDirectory}/demo/login/+page.svelte`, condition: ({ options }) => options.demo, - contentType: 'text', content({ content, typescript }) { if (content) { log.warn(`Existing ${colors.yellow('/demo/login/+page.svelte')} file. Could not update.`); @@ -660,7 +658,6 @@ export const adder = defineAdderConfig({ name: ({ kit, typescript }) => `${kit!.routesDirectory}/demo/+page.server.${typescript ? 'ts' : 'js'}`, condition: ({ options }) => options.demo, - contentType: 'text', content({ content, typescript }) { if (content) { log.warn( @@ -704,7 +701,6 @@ export const adder = defineAdderConfig({ { name: ({ kit }) => `${kit!.routesDirectory}/demo/+page.svelte`, condition: ({ options }) => options.demo, - contentType: 'text', content({ content, typescript }) { if (content) { log.warn(`Existing ${colors.yellow('/demo/+page.svelte')} file. Could not update.`); diff --git a/packages/adders/mdsvex/config/tests.ts b/packages/adders/mdsvex/config/tests.ts index abc00c0f..385a7da2 100644 --- a/packages/adders/mdsvex/config/tests.ts +++ b/packages/adders/mdsvex/config/tests.ts @@ -24,13 +24,11 @@ export const tests = defineAdderTests({ }, { name: ({ kit }) => `${kit?.routesDirectory}/Demo.svx`, - contentType: 'text', content: addMarkdownFile, condition: ({ kit }) => Boolean(kit) }, { name: () => 'src/Demo.svx', - contentType: 'text', content: addMarkdownFile, condition: ({ kit }) => !kit } diff --git a/packages/adders/playwright/config/adder.ts b/packages/adders/playwright/config/adder.ts index 488ac7c4..9c098204 100644 --- a/packages/adders/playwright/config/adder.ts +++ b/packages/adders/playwright/config/adder.ts @@ -35,7 +35,6 @@ export const adder = defineAdderConfig({ }, { name: () => '.gitignore', - contentType: 'text', condition: ({ cwd }) => fs.existsSync(join(cwd, '.gitignore')), content: ({ content }) => { if (content.includes('test-results')) return content; @@ -44,7 +43,6 @@ export const adder = defineAdderConfig({ }, { name: ({ typescript }) => `e2e/demo.test.${typescript ? 'ts' : 'js'}`, - contentType: 'text', content: ({ content }) => { if (content) return content; diff --git a/packages/adders/prettier/config/adder.ts b/packages/adders/prettier/config/adder.ts index 355ea888..a21b1da5 100644 --- a/packages/adders/prettier/config/adder.ts +++ b/packages/adders/prettier/config/adder.ts @@ -29,7 +29,6 @@ export const adder = defineAdderConfig({ files: [ { name: () => '.prettierignore', - contentType: 'text', content: ({ content }) => { if (content) return content; return dedent` diff --git a/packages/adders/vitest/config/adder.ts b/packages/adders/vitest/config/adder.ts index fd0378ba..2679fde6 100644 --- a/packages/adders/vitest/config/adder.ts +++ b/packages/adders/vitest/config/adder.ts @@ -34,7 +34,6 @@ export const adder = defineAdderConfig({ }, { name: ({ typescript }) => `src/demo.spec.${typescript ? 'ts' : 'js'}`, - contentType: 'text', content: ({ content }) => { if (content) return content; diff --git a/packages/core/files/processors.ts b/packages/core/files/processors.ts index c0b29302..07f6efc9 100644 --- a/packages/core/files/processors.ts +++ b/packages/core/files/processors.ts @@ -54,7 +54,7 @@ type SvelteFile = { content: (editor: SvelteFileEditor) => void; }; type TextFile = { - contentType: 'text'; + contentType?: 'text'; content: (editor: TextFileEditor) => string; }; @@ -107,7 +107,7 @@ export function createOrUpdateFiles( if (fileDetails.contentType === 'svelte') { content = handleSvelteFile(content, fileDetails, workspace); } - if (fileDetails.contentType === 'text') { + if (!fileDetails.contentType || fileDetails.contentType === 'text') { content = handleTextFile(content, fileDetails, workspace); } From 4501af8ae49f4a12fa906b3b98ea6f406a847645 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Tue, 8 Oct 2024 20:24:55 -0700 Subject: [PATCH 2/5] Update packages/core/files/processors.ts Co-authored-by: CokaKoala <31664583+AdrianGonz97@users.noreply.github.com> --- packages/core/files/processors.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/files/processors.ts b/packages/core/files/processors.ts index 07f6efc9..40cc3d8f 100644 --- a/packages/core/files/processors.ts +++ b/packages/core/files/processors.ts @@ -54,7 +54,7 @@ type SvelteFile = { content: (editor: SvelteFileEditor) => void; }; type TextFile = { - contentType?: 'text'; + contentType: undefined; content: (editor: TextFileEditor) => string; }; From 621b587e733132a54f2c4e02a94f7eca463db5d2 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Tue, 8 Oct 2024 20:25:05 -0700 Subject: [PATCH 3/5] Update packages/core/files/processors.ts Co-authored-by: CokaKoala <31664583+AdrianGonz97@users.noreply.github.com> --- packages/core/files/processors.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/files/processors.ts b/packages/core/files/processors.ts index 40cc3d8f..a3011295 100644 --- a/packages/core/files/processors.ts +++ b/packages/core/files/processors.ts @@ -107,7 +107,7 @@ export function createOrUpdateFiles( if (fileDetails.contentType === 'svelte') { content = handleSvelteFile(content, fileDetails, workspace); } - if (!fileDetails.contentType || fileDetails.contentType === 'text') { + if (!fileDetails.contentType) { content = handleTextFile(content, fileDetails, workspace); } From 502b90e72bb0980706908d2d5049231dbc8523b5 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Tue, 8 Oct 2024 20:32:48 -0700 Subject: [PATCH 4/5] try again --- packages/core/files/processors.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/files/processors.ts b/packages/core/files/processors.ts index a3011295..76da488d 100644 --- a/packages/core/files/processors.ts +++ b/packages/core/files/processors.ts @@ -54,7 +54,7 @@ type SvelteFile = { content: (editor: SvelteFileEditor) => void; }; type TextFile = { - contentType: undefined; + contentType?: undefined; content: (editor: TextFileEditor) => string; }; From acffcd7c096fcd5e4a1a48a3e75754ba165cde5b Mon Sep 17 00:00:00 2001 From: AdrianGonz97 <31664583+AdrianGonz97@users.noreply.github.com> Date: Tue, 8 Oct 2024 23:39:10 -0400 Subject: [PATCH 5/5] update community template --- community-adder-template/src/config/adder.js | 1 - 1 file changed, 1 deletion(-) diff --git a/community-adder-template/src/config/adder.js b/community-adder-template/src/config/adder.js index 0836054c..9120dbfe 100644 --- a/community-adder-template/src/config/adder.js +++ b/community-adder-template/src/config/adder.js @@ -15,7 +15,6 @@ export const adder = defineAdderConfig({ files: [ { name: () => 'adder-template-demo.txt', - contentType: 'text', content: ({ content, options }) => { if (options.demo) { return 'This is a text file made by the Community Adder Template demo!';