8000 chore: move tests out of main entry point · sveltejs/cli@ec3020b · GitHub
[go: up one dir, main page]
Skip to content

Commit ec3020b

Browse files
benmccannbenmccann
committed
chore: move tests out of main entry point
1 parent 59ddada commit ec3020b

File tree

42 files changed

+91
-138
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+91
-138
lines changed

‎community-adder-template/src/config/adder.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { options } from './options.js';
2-
import { defineAdderConfig } from '@svelte-cli/core';
2+
import { defineAdder } from '@svelte-cli/core';
33
import { imports } from '@svelte-cli/core/js';
44

5-
export const adder = defineAdderConfig({
5+
export const adder = defineAdder({
66
metadata: {
77
id: 'community-adder-template',
88
name: 'Community Adder Template',

‎community-adder-template/src/index.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { defineAdder } from '@svelte-cli/core';
21
import { adder } from './config/adder.js';
3-
import { tests } from './config/tests.js';
42

5-
export default defineAdder(adder, tests);
3+
export default adder;

‎community-adder-template/src/config/tests.js renamed to ‎community-adder-template/tests/tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { defineAdderTests } from '@svelte-cli/core';
2-
import { options } from './options.js';
2+
import { options } from '../src/config/options.js';
33

44
export const tests = defineAdderTests({
55
files: [],

‎packages/adders/_config/official.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export const adderCategories: AdderCategories = getCategoriesById();
2727
function getCategoriesById(): AdderCategories {
2828
const adderCategories: any = {};
2929
for (const [key, adders] of Object.entries(categories)) {
30-
adderCategories[key] = adders.map((a) => a.config.metadata.id);
30+
adderCategories[key] = adders.map((a) => a.metadata.id);
3131
}
3232
return adderCategories;
3333
}
@@ -37,7 +37,7 @@ export const adderIds: string[] = Object.values(adderCategories).flatMap((x) =>
3737
const adderDetails = Object.values(categories).flat();
3838

3939
export function getAdderDetails(name: string): AdderWithoutExplicitArgs {
40-
const details = adderDetails.find((a) => a.config.metadata.id === name);
40+
const details = adderDetails.find((a) => a.metadata.id === name);
4141
if (!details) {
4242
throw new Error(`Invalid adder name: ${name}`);
4343
}

‎packages/adders/drizzle/config/adder.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { options as availableOptions } from './options.ts';
22
import { common, exports, functions, imports, object, variables } from '@svelte-cli/core/js';
3-
import { defineAdderConfig, dedent, type TextFileEditor } from '@svelte-cli/core';
3+
import { defineAdder, dedent, type TextFileEditor } from '@svelte-cli/core';
44

55
const PORTS = {
66
mysql: '3306',
77
postgresql: '5432',
88
sqlite: ''
99
} as const;
10< F438 /code>10

11-
export const adder = defineAdderConfig({
11+
export const adder = defineAdder({
1212
metadata: {
1313
id: 'drizzle',
1414
name: 'Drizzle',

‎packages/adders/drizzle/index.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { defineAdder } from '@svelte-cli/core';
21
import { adder } from './config/adder.ts';
3-
import { tests } from './config/tests.ts';
42

5-
export default defineAdder(adder, tests);
3+
export default adder;

‎packages/adders/drizzle/config/tests.ts renamed to ‎packages/adders/drizzle/tests/tests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { options } from './options.ts';
1+
import { options } from '../config/options.ts';
22
import { defineAdderTests } from '@svelte-cli/core';
33
import { common } from '@svelte-cli/core/js';
44
import { addFromRawHtml } from '@svelte-cli/core/html';

‎packages/adders/eslint/config/adder.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import fs from 'node:fs';
22
import path from 'node:path';
33
import { options } from './options.ts';
44
import { addEslintConfigPrettier } from '../../common.ts';
5-
import { defineAdderConfig, log, type AstKinds, type AstTypes } from '@svelte-cli/core';
5+
import { defineAdder, log, type AstKinds, type AstTypes } from '@svelte-cli/core';
66
import { array, common, exports, functions, imports, object } from '@svelte-cli/core/js';
77

8-
export const adder = defineAdderConfig({
8+export const adder = defineAdder({
99
metadata: {
1010
id: 'eslint',
1111
name: 'ESLint',

‎packages/adders/eslint/index.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { defineAdder } from '@svelte-cli/core';
21
import { adder } from './config/adder.ts';
3-
import { tests } from './config/tests.ts';
42

5-
export default defineAdder(adder, tests);
3+
export default adder;

‎packages/adders/playwright/config/tests.ts renamed to ‎packages/adders/eslint/tests/tests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { defineAdderTests } from '@svelte-cli/core';
2-
import { options } from './options.ts';
2+
import { options } from '../config/options.ts';
33

44
export const tests = defineAdderTests({
55
files: [],

‎packages/adders/lucia/config/adder.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { options } from './options.ts';
2-
import { colors, dedent, defineAdderConfig, log, Walker } from '@svelte-cli/core';
2+
import { colors, dedent, defineAdder, log, Walker } from '@svelte-cli/core';
33
import { common, exports, imports, variables, object, functions } from '@svelte-cli/core/js';
44
// eslint-disable-next-line no-duplicate-imports
55
import type { AstTypes } from '@svelte-cli/core/js';
@@ -22,7 +22,7 @@ type Dialect = keyof typeof LUCIA_ADAPTER;
2222
let drizzleDialect: Dialect;
2323
let schemaPath: string;
2424

25-
export const adder = defineAdderConfig({
25+
export const adder = defineAdder({
2626
metadata: {
2727
id: 'lucia',
2828
name: 'Lucia',

‎packages/adders/lucia/index.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { defineAdder } from '@svelte-cli/core';
21
import { adder } from './config/adder.ts';
3-
import { tests } from './config/tests.ts';
42

5-
export default defineAdder(adder, tests);
3+
export default adder;

‎packages/adders/eslint/config/tests.ts renamed to ‎packages/adders/lucia/tests/tests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { defineAdderTests } from '@svelte-cli/core';
2-
import { options } from './options.ts';
2+
import { options } from '../config/options.ts';
33

44
export const tests = defineAdderTests({
55
files: [],

‎packages/adders/mdsvex/config/adder.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { options } from './options.ts';
2-
import { defineAdderConfig } from '@svelte-cli/core';
2+
import { defineAdder } from '@svelte-cli/core';
33
import { array, exports, functions, imports, object } from '@svelte-cli/core/js';
44

5-
export const adder = defineAdderConfig({
5+
export const adder = defineAdder({
66
metadata: {
77
id: 'mdsvex',
88
name: 'mdsvex',

‎packages/adders/mdsvex/index.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { defineAdder } from '@svelte-cli/core';
21
import { adder } from './config/adder.ts';
3-
import { tests } from './config/tests.ts';
42

5-
export default defineAdder(adder, tests);
3+
export default adder;

‎packages/adders/mdsvex/config/tests.ts renamed to ‎packages/adders/mdsvex/tests/tests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
type TextFileEditor,
55
type OptionDefinition
66
} from '@svelte-cli/core';
7-
import { options } from './options.ts';
7+
import { options } from '../config/options.ts';
88
import { imports } from '@svelte-cli/core/js';
99
import * as html from '@svelte-cli/core/html';
1010

‎packages/adders/playwright/config/adder.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import fs from 'node:fs';
22
import { join } from 'node:path';
33
import { options } from './options.ts';
4-
import { dedent, defineAdderConfig, log } from '@svelte-cli/core';
4+
import { dedent, defineAdder, log } from '@svelte-cli/core';
55
import { common, exports, imports, object } from '@svelte-cli/core/js';
66

7-
export const adder = defineAdderConfig({
7+
export const adder = defineAdder({
88
metadata: {
99
id: 'playwright',
1010
name: 'Playwright',

‎packages/adders/playwright/index.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { defineAdder } from '@svelte-cli/core';
21
import { adder } from './config/adder.ts';
3-
import { tests } from './config/tests.ts';
42

5-
export default defineAdder(adder, tests);
3+
export default adder;

‎packages/adders/lucia/config/tests.ts renamed to ‎packages/adders/playwright/tests/tests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { defineAdderTests } from '@svelte-cli/core';
2-
import { options } from './options.ts';
2+
import { options } from '../config/options.ts';
33

44
export const tests = defineAdderTests({
55
files: [],

‎packages/adders/prettier/config/adder.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { dedent, defineAdderConfig, log, colors } from '@svelte-cli/core';
1+
import { dedent, defineAdder, log, colors } from '@svelte-cli/core';
22
import { options } from './options.ts';
33
import { addEslintConfigPrettier } from '../../common.ts';
44

5-
export const adder = defineAdderConfig({
5+
export const adder = defineAdder({
66
metadata: {
77
id: 'prettier',
88
name: 'Prettier',

‎packages/adders/prettier/index.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { defineAdder } from '@svelte-cli/core';
21
import { adder } from './config/adder.ts';
3-
import { tests } from './config/tests.ts';
42

5-
export default defineAdder(adder, tests);
3+
export default adder;

‎packages/adders/prettier/config/tests.ts renamed to ‎packages/adders/prettier/tests/tests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { defineAdderTests } from '@svelte-cli/core';
2-
import { options } from './options.ts';
2+
import { options } from '../config/options.ts';
33

44
export const tests = defineAdderTests({
55
files: [],

‎packages/adders/routify/config/adder.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { defineAdderConfig } from '@svelte-cli/core';
1+
import { defineAdder } from '@svelte-cli/core';
22
import { options } from './options.ts';
33
import { array, exports, functions, imports, object, variables } from '@svelte-cli/core/js';
44
import * as html from '@svelte-cli/core/html';
55

6-
export const adder = defineAdderConfig({
6+
export const adder = defineAdder({
77
metadata: {
88
id: 'routify',
99
name: 'Routify',

‎packages/adders/routify/index.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { defineAdder } from '@svelte-cli/core';
21
import { adder } from './config/adder.ts';
3-
import { tests } from './config/tests.ts';
42

5-
export default defineAdder(adder, tests);
3+
export default adder;

‎packages/adders/routify/config/tests.ts renamed to ‎packages/adders/routify/tests/tests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { defineAdderTests } from '@svelte-cli/core';
2-
import { options } from './options.ts';
2+
import { options } from '../config/options.ts';
33

44
export const tests = defineAdderTests({
55
files: [],

‎packages/adders/storybook/config/adder.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { defineAdderConfig } from '@svelte-cli/core';
1+
import { defineAdder } from '@svelte-cli/core';
22
import { options } from './options.ts';
33

4-
export const adder = defineAdderConfig({
4+
export const adder = defineAdder({
55
metadata: {
66
id: 'storybook',
77
name: 'Storybook',

‎packages/adders/storybook/index.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { defineAdder } from '@svelte-cli/core';
21
import { adder } from './config/adder.ts';
3-
import { tests } from './config/tests.ts';
42

5-
export default defineAdder(adder, tests);
3+
export default adder;

‎packages/adders/storybook/config/tests.ts renamed to ‎packages/adders/storybook/tests/tests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { defineAdderTests } from '@svelte-cli/core';
2-
import { options } from './options.ts';
2+
import { options } from '../config/options.ts';
33

44
let port = 6006;
55

‎packages/adders/tailwindcss/config/adder.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { options } from './options.ts';
2-
import { defineAdderConfig } from '@svelte-cli/core';
2+
import { defineAdder } from '@svelte-cli/core';
33
import { array, common, exports, functions, imports, object } from '@svelte-cli/core/js';
44
import { addImports } from '@svelte-cli/core/css';
55
import { element } from '@svelte-cli/core/html';
66

7-
export const adder = defineAdderConfig({
7+
export const adder = defineAdder({
88
metadata: {
99
id: 'tailwindcss',
1010
alias: 'tailwind',

‎packages/adders/tailwindcss/index.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { defineAdder } from '@svelte-cli/core';
21
import { adder } from './config/adder.ts';
3-
import { tests } from './config/tests.ts';
42

5-
export default defineAdder(adder, tests);
3+
export default adder;

‎packages/adders/tailwindcss/config/tests.ts renamed to ‎packages/adders/tailwindcss/tests/tests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { defineAdderTests, type OptionDefinition, type SvelteFileEditor } from '@svelte-cli/core';
2-
import { options } from './options.ts';
2+
import { options } from '../config/options.ts';
33
import * as html from '@svelte-cli/core/html';
44

55
const divId = 'myDiv';

‎packages/adders/vitest/config/adder.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { options } from './options.ts';
2-
import { dedent, defineAdderConfig, log } from '@svelte-cli/core';
2+
import { dedent, defineAdder, log } from '@svelte-cli/core';
33
import { common, exports, imports, object } from '@svelte-cli/core/js';
44

5-
export const adder = defineAdderConfig({
5+
export const adder = defineAdder({
66
metadata: {
77
id: 'vitest',
88
name: 'Vitest',

‎packages/adders/vitest/config/tests.ts

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎packages/adders/vitest/index.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { defineAdder } from '@svelte-cli/core';
21
import { adder } from './config/adder.ts';
3-
import { tests } from './config/tests.ts';
42

5-
export default defineAdder(adder, tests);
3+
export default adder;

‎packages/adders/vitest/tests/tests.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { defineAdderTests } from '@svelte-cli/core';
2+
import { options } from '../config/options.ts';
3+
4+
export const tests = defineAdderTests({
5+
files: [],
6+
options,
7+
optionValues: [],
8+
tests: []
9+
});

0 commit comments

Comments
 (0)
0