mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2026-10-12 02:01:26 +00:00
Added comments highlight for all upstream fields and custom rules Squashed commit of the following: commit 2feb4d4dc199474199a234e39157b85c37fa6fd6 Merge:b5bfdc81c7729d8c57Author: Ildar Kamalov <[email protected]> Date: Thu Jul 16 15:27:54 2026 +0300 Merge branch 'master' into AGDNS-4229 commitb5bfdc81c4Author: Ildar Kamalov <[email protected]> Date: Thu Jul 16 11:33:09 2026 +0300 support all comments for ignored domains commitdecb5b6587Author: Ildar Kamalov <[email protected]> Date: Wed Jul 15 17:58:39 2026 +0300 fix bootstrap and ignored domains commitbd7d342b2fAuthor: Ildar Kamalov <[email protected]> Date: Wed Jul 15 14:40:53 2026 +0300 remove output from test frontend commit5c9de23626Author: Ildar Kamalov <[email protected]> Date: Wed Jul 15 14:18:50 2026 +0300 fix upstream comments commite103540657Author: Ildar Kamalov <[email protected]> Date: Wed Jul 15 13:32:34 2026 +0300 add comments for clients upstreams commita65ee2cf2aAuthor: Ildar Kamalov <[email protected]> Date: Wed Jul 15 12:30:04 2026 +0300 config commit67207b0464Author: Ildar Kamalov <[email protected]> Date: Wed Jul 15 12:06:04 2026 +0300 fix protection menu commit380ac0797eMerge:10945e24dc1f208ef6Author: Ildar Kamalov <[email protected]> Date: Wed Jul 15 11:55:28 2026 +0300 Merge branch 'master' into AGDNS-4229 commit10945e24dfAuthor: Ildar Kamalov <[email protected]> Date: Tue Jul 14 17:54:41 2026 +0300 fix dockerfile commitfaedfede45Author: Ildar Kamalov <[email protected]> Date: Tue Jul 14 17:27:53 2026 +0300 makefile commitb4723ebceaAuthor: Ildar Kamalov <[email protected]> Date: Tue Jul 14 17:27:38 2026 +0300 AGDNS-4229 add textarea comments highlight commit4923b3645bAuthor: Ildar Kamalov <[email protected]> Date: Tue Jul 14 17:13:31 2026 +0300 AGDNS-4229 add textarea comments highlight
40 lines
1.4 KiB
TypeScript
40 lines
1.4 KiB
TypeScript
import path from 'node:path';
|
|
import { fileURLToPath } from 'node:url';
|
|
import solid from 'vite-plugin-solid';
|
|
import { defineConfig } from 'vitest/config';
|
|
|
|
const rootDir = path.dirname(fileURLToPath(import.meta.url));
|
|
|
|
export default defineConfig({
|
|
plugins: [solid()],
|
|
resolve: {
|
|
conditions: ['development', 'browser'],
|
|
// Force Vite to use a single solid-js instance across all deps,
|
|
// preventing "multiple instances of Solid" from @zag-js/solid, etc.
|
|
dedupe: ['solid-js', 'solid-js/web', 'solid-js/store'],
|
|
alias: {
|
|
panel: path.resolve(rootDir, 'src'),
|
|
Twosky: path.resolve(rootDir, '../.twosky.json'),
|
|
'solid-js': path.resolve(rootDir, 'node_modules/solid-js'),
|
|
'solid-js/web': path.resolve(rootDir, 'node_modules/solid-js/web'),
|
|
'solid-js/store': path.resolve(rootDir, 'node_modules/solid-js/store'),
|
|
},
|
|
},
|
|
ssr: {
|
|
noExternal: [
|
|
'@solidjs/testing-library',
|
|
'@solidjs/router',
|
|
// Force @zag-js/* into the same module graph so they share
|
|
// a single solid-js instance, preventing "multiple instances
|
|
// of Solid" errors in CI.
|
|
'@zag-js/solid',
|
|
],
|
|
},
|
|
test: {
|
|
environment: 'jsdom',
|
|
include: ['src/__tests__/**/*.{test,spec}.{ts,tsx}'],
|
|
setupFiles: ['src/__tests__/setup.ts'],
|
|
css: false,
|
|
},
|
|
});
|