diff --git a/eslint.config.mjs b/eslint.config.mjs index 97a59e9..a345aef 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -42,7 +42,7 @@ export default [ }, }, { - ignores: ['**/*.js', '**/*.mjs', '**/*.d.ts'], + ignores: ['**/*.js', '**/*.mjs', '**/*.cjs', '**/*.d.ts'], }, { files: ['**/*.test.ts'], diff --git a/vite.config.base.ts b/vite.config.base.ts new file mode 100644 index 0000000..d346db2 --- /dev/null +++ b/vite.config.base.ts @@ -0,0 +1,11 @@ +import { defineConfig } from 'vitest/config'; +import path from 'path'; + +export default defineConfig({ + resolve: { + alias: { + '@src': path.resolve(__dirname, './src'), + '@demo': path.resolve(__dirname, './demo'), + }, + }, +}); diff --git a/vite.config.ghpages.ts b/vite.config.ghpages.ts index 0753853..a68a23f 100644 --- a/vite.config.ghpages.ts +++ b/vite.config.ghpages.ts @@ -1,15 +1,9 @@ -import { defineConfig } from 'vitest/config'; -import path from 'path'; +import { mergeConfig } from 'vitest/config'; +import baseConfig from './vite.config.base'; // https://vitejs.dev/config/ -export default defineConfig({ +export default mergeConfig(baseConfig, { base: './', - resolve: { - alias: { - '@src': path.resolve(__dirname, './src'), - '@demo': path.resolve(__dirname, './demo'), - }, - }, build: { outDir: './ghpages', emptyOutDir: true, diff --git a/vite.config.ts b/vite.config.ts index 4a372d3..01cf638 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,16 +1,10 @@ /// -import { defineConfig } from 'vitest/config'; -import path from 'path'; +import { mergeConfig } from 'vitest/config'; import { playwright } from '@vitest/browser-playwright'; +import baseConfig from './vite.config.base'; // https://vitejs.dev/config/ -export default defineConfig({ - resolve: { - alias: { - '@src': path.resolve(__dirname, './src'), - '@demo': path.resolve(__dirname, './demo'), - }, - }, +export default mergeConfig(baseConfig, { test: { browser: { enabled: true,