diff --git a/community-adder-template/src/config/checks.js b/community-adder-template/src/config/checks.js deleted file mode 100644 index 958dbb4e2..000000000 --- a/community-adder-template/src/config/checks.js +++ /dev/null @@ -1,6 +0,0 @@ -import { defineAdderChecks } from '@svelte-cli/core'; -import { options } from './options.js'; - -export const checks = defineAdderChecks({ - options -}); diff --git a/community-adder-template/src/index.js b/community-adder-template/src/index.js index 68a875ddd..c84db806b 100644 --- a/community-adder-template/src/index.js +++ b/community-adder-template/src/index.js @@ -1,6 +1,5 @@ import { defineAdder } from '@svelte-cli/core'; import { adder } from './config/adder.js'; -import { checks } from './config/checks.js'; import { tests } from './config/tests.js'; -export default defineAdder(adder, checks, tests); +export default defineAdder(adder, tests); diff --git a/packages/adders/drizzle/config/checks.ts b/packages/adders/drizzle/config/checks.ts deleted file mode 100644 index 923c1632a..000000000 --- a/packages/adders/drizzle/config/checks.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { defineAdderChecks } from '@svelte-cli/core'; -import { options } from './options.ts'; - -export const checks = defineAdderChecks({ - options -}); diff --git a/packages/adders/drizzle/index.ts b/packages/adders/drizzle/index.ts index 2ac6e417d..812455e9c 100644 --- a/packages/adders/drizzle/index.ts +++ b/packages/adders/drizzle/index.ts @@ -1,6 +1,5 @@ import { defineAdder } from '@svelte-cli/core'; import { adder } from './config/adder.ts'; -import { checks } from './config/checks.ts'; import { tests } from './config/tests.ts'; -export default defineAdder(adder, checks, tests); +export default defineAdder(adder, tests); diff --git a/packages/adders/eslint/config/checks.ts b/packages/adders/eslint/config/checks.ts deleted file mode 100644 index 923c1632a..000000000 --- a/packages/adders/eslint/config/checks.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { defineAdderChecks } from '@svelte-cli/core'; -import { options } from './options.ts'; - -export const checks = defineAdderChecks({ - options -}); diff --git a/packages/adders/eslint/index.ts b/packages/adders/eslint/index.ts index 2ac6e417d..812455e9c 100644 --- a/packages/adders/eslint/index.ts +++ b/packages/adders/eslint/index.ts @@ -1,6 +1,5 @@ import { defineAdder } from '@svelte-cli/core'; import { adder } from './config/adder.ts'; -import { checks } from './config/checks.ts'; import { tests } from './config/tests.ts'; -export default defineAdder(adder, checks, tests); +export default defineAdder(adder, tests); diff --git a/packages/adders/lucia/config/checks.ts b/packages/adders/lucia/config/checks.ts deleted file mode 100644 index 588efc83a..000000000 --- a/packages/adders/lucia/config/checks.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { defineAdderChecks } from '@svelte-cli/core'; -import { options } from './options.ts'; - -export const checks = defineAdderChecks({ options }); diff --git a/packages/adders/lucia/index.ts b/packages/adders/lucia/index.ts index 2ac6e417d..812455e9c 100644 --- a/packages/adders/lucia/index.ts +++ b/packages/adders/lucia/index.ts @@ -1,6 +1,5 @@ import { defineAdder } from '@svelte-cli/core'; import { adder } from './config/adder.ts'; -import { checks } from './config/checks.ts'; import { tests } from './config/tests.ts'; -export default defineAdder(adder, checks, tests); +export default defineAdder(adder, tests); diff --git a/packages/adders/mdsvex/config/checks.ts b/packages/adders/mdsvex/config/checks.ts deleted file mode 100644 index 923c1632a..000000000 --- a/packages/adders/mdsvex/config/checks.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { defineAdderChecks } from '@svelte-cli/core'; -import { options } from './options.ts'; - -export const checks = defineAdderChecks({ - options -}); diff --git a/packages/adders/mdsvex/index.ts b/packages/adders/mdsvex/index.ts index 2d66e9fe7..812455e9c 100644 --- a/packages/adders/mdsvex/index.ts +++ b/packages/adders/mdsvex/index.ts @@ -1,6 +1,5 @@ import { defineAdder } from '@svelte-cli/core'; import { adder } from './config/adder.ts'; import { tests } from './config/tests.ts'; -import { checks } from './config/checks.ts'; -export default defineAdder(adder, checks, tests); +export default defineAdder(adder, tests); diff --git a/packages/adders/playwright/config/checks.ts b/packages/adders/playwright/config/checks.ts deleted file mode 100644 index 923c1632a..000000000 --- a/packages/adders/playwright/config/checks.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { defineAdderChecks } from '@svelte-cli/core'; -import { options } from './options.ts'; - -export const checks = defineAdderChecks({ - options -}); diff --git a/packages/adders/playwright/index.ts b/packages/adders/playwright/index.ts index 2ac6e417d..812455e9c 100644 --- a/packages/adders/playwright/index.ts +++ b/packages/adders/playwright/index.ts @@ -1,6 +1,5 @@ import { defineAdder } from '@svelte-cli/core'; import { adder } from './config/adder.ts'; -import { checks } from './config/checks.ts'; import { tests } from './config/tests.ts'; -export default defineAdder(adder, checks, tests); +export default defineAdder(adder, tests); diff --git a/packages/adders/prettier/config/checks.ts b/packages/adders/prettier/config/checks.ts deleted file mode 100644 index 923c1632a..000000000 --- a/packages/adders/prettier/config/checks.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { defineAdderChecks } from '@svelte-cli/core'; -import { options } from './options.ts'; - -export const checks = defineAdderChecks({ - options -}); diff --git a/packages/adders/prettier/index.ts b/packages/adders/prettier/index.ts index 2ac6e417d..812455e9c 100644 --- a/packages/adders/prettier/index.ts +++ b/packages/adders/prettier/index.ts @@ -1,6 +1,5 @@ import { defineAdder } from '@svelte-cli/core'; import { adder } from './config/adder.ts'; -import { checks } from './config/checks.ts'; import { tests } from './config/tests.ts'; -export default defineAdder(adder, checks, tests); +export default defineAdder(adder, tests); diff --git a/packages/adders/routify/config/checks.ts b/packages/adders/routify/config/checks.ts deleted file mode 100644 index 923c1632a..000000000 --- a/packages/adders/routify/config/checks.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { defineAdderChecks } from '@svelte-cli/core'; -import { options } from './options.ts'; - -export const checks = defineAdderChecks({ - options -}); diff --git a/packages/adders/routify/index.ts b/packages/adders/routify/index.ts index 2d66e9fe7..812455e9c 100644 --- a/packages/adders/routify/index.ts +++ b/packages/adders/routify/index.ts @@ -1,6 +1,5 @@ import { defineAdder } from '@svelte-cli/core'; import { adder } from './config/adder.ts'; import { tests } from './config/tests.ts'; -import { checks } from './config/checks.ts'; -export default defineAdder(adder, checks, tests); +export default defineAdder(adder, tests); diff --git a/packages/adders/storybook/config/checks.ts b/packages/adders/storybook/config/checks.ts deleted file mode 100644 index 923c1632a..000000000 --- a/packages/adders/storybook/config/checks.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { defineAdderChecks } from '@svelte-cli/core'; -import { options } from './options.ts'; - -export const checks = defineAdderChecks({ - options -}); diff --git a/packages/adders/storybook/index.ts b/packages/adders/storybook/index.ts index 2d66e9fe7..812455e9c 100644 --- a/packages/adders/storybook/index.ts +++ b/packages/adders/storybook/index.ts @@ -1,6 +1,5 @@ import { defineAdder } from '@svelte-cli/core'; import { adder } from './config/adder.ts'; import { tests } from './config/tests.ts'; -import { checks } from './config/checks.ts'; -export default defineAdder(adder, checks, tests); +export default defineAdder(adder, tests); diff --git a/packages/adders/tailwindcss/config/checks.ts b/packages/adders/tailwindcss/config/checks.ts deleted file mode 100644 index 923c1632a..000000000 --- a/packages/adders/tailwindcss/config/checks.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { defineAdderChecks } from '@svelte-cli/core'; -import { options } from './options.ts'; - -export const checks = defineAdderChecks({ - options -}); diff --git a/packages/adders/tailwindcss/index.ts b/packages/adders/tailwindcss/index.ts index 2ac6e417d..812455e9c 100644 --- a/packages/adders/tailwindcss/index.ts +++ b/packages/adders/tailwindcss/index.ts @@ -1,6 +1,5 @@ import { defineAdder } from '@svelte-cli/core'; import { adder } from './config/adder.ts'; -import { checks } from './config/checks.ts'; import { tests } from './config/tests.ts'; -export default defineAdder(adder, checks, tests); +export default defineAdder(adder, tests); diff --git a/packages/adders/vitest/config/checks.ts b/packages/adders/vitest/config/checks.ts deleted file mode 100644 index 923c1632a..000000000 --- a/packages/adders/vitest/config/checks.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { defineAdderChecks } from '@svelte-cli/core'; -import { options } from './options.ts'; - -export const checks = defineAdderChecks({ - options -}); diff --git a/packages/adders/vitest/index.ts b/packages/adders/vitest/index.ts index 2ac6e417d..812455e9c 100644 --- a/packages/adders/vitest/index.ts +++ b/packages/adders/vitest/index.ts @@ -1,6 +1,5 @@ import { defineAdder } from '@svelte-cli/core'; import { adder } from './config/adder.ts'; -import { checks } from './config/checks.ts'; import { tests } from './config/tests.ts'; -export default defineAdder(adder, checks, tests); +export default defineAdder(adder, tests); diff --git a/packages/cli/commands/add.ts b/packages/cli/commands/add.ts index a56e4a810..87022d2ac 100644 --- a/packages/cli/commands/add.ts +++ b/packages/cli/commands/add.ts @@ -360,7 +360,7 @@ export async function runAddCommand(options: Options, adders: string[]): Promise // run precondition checks if (options.preconditions) { const preconditions = selectedAdders - .flatMap(({ adder }) => adder.checks.preconditions) + .flatMap(({ adder }) => adder.config.preconditions) .filter((p) => p !== undefined); // add global checks diff --git a/packages/core/adder/config.ts b/packages/core/adder/config.ts index 9c5d3eaa7..fec5a2741 100644 --- a/packages/core/adder/config.ts +++ b/packages/core/adder/config.ts @@ -48,6 +48,7 @@ export type AdderConfig = { packages: Array>; scripts?: Array>; files: Array>; + preconditions?: Precondition[]; nextSteps?: ( data: { highlighter: Highlighter; @@ -71,7 +72,6 @@ export function defineAdderConfig( export type Adder = { config: AdderConfig; - checks: AdderCheckConfig; tests?: AdderTestConfig; }; @@ -80,10 +80,9 @@ export type AdderConfigWithoutExplicitArgs = AdderConfig( config: AdderConfig, - checks: AdderCheckConfig, tests?: AdderTestConfig ): Adder { - const adder: Adder = { config, checks, tests }; + const adder: Adder = { config, tests }; return adder; } @@ -125,14 +124,3 @@ export type Precondition = { name: string; run: () => MaybePromise<{ success: boolean; message: string | undefined }>; }; - -export type AdderCheckConfig = { - options: Args; - preconditions?: Precondition[]; -}; - -export function defineAdderChecks( - checks: AdderCheckConfig -): AdderCheckConfig { - return checks; -} diff --git a/packages/core/index.ts b/packages/core/index.ts index c6640775b..d3d1abe4a 100644 --- a/packages/core/index.ts +++ b/packages/core/index.ts @@ -2,8 +2,7 @@ export { defineAdderConfig, defineAdderTests, defineAdder, - defineAdderOptions, - defineAdderChecks + defineAdderOptions } from './adder/config.ts'; export { log } from '@svelte-cli/clack-prompts'; export { default as colors } from 'picocolors';