diff --git a/packages/browser/package.json b/packages/browser/package.json index 1c5217d80..2ff12de5b 100644 --- a/packages/browser/package.json +++ b/packages/browser/package.json @@ -25,9 +25,9 @@ ], "scripts": { "build": "rimraf dist && pnpm build:node && pnpm build:client && pnpm copy", - "build:client": "vite build", + "build:client": "vite build src/client", "build:node": "rollup -c", - "dev:client": "vite build --watch", + "dev:client": "vite build src/client --watch", "dev:node": "rollup -c --watch --watch.include=node", "dev": "rimraf dist && run-p dev:node dev:client", "copy": "esno scripts/copy-ui-to-browser.ts", diff --git a/packages/browser/rollup.config.js b/packages/browser/rollup.config.js index dc2e0b3c8..6431ca670 100644 --- a/packages/browser/rollup.config.js +++ b/packages/browser/rollup.config.js @@ -29,7 +29,7 @@ const plugins = [ export default () => [ { input: [ - './node/index.ts', + './src/node/index.ts', ], output: { dir: 'dist', @@ -39,7 +39,7 @@ export default () => [ plugins, }, { - input: './node/index.ts', + input: './src/node/index.ts', output: { file: 'dist/index.d.ts', format: 'esm', diff --git a/packages/browser/index.html b/packages/browser/src/client/index.html similarity index 91% rename from packages/browser/index.html rename to packages/browser/src/client/index.html index 21fa8ac4d..284367484 100644 --- a/packages/browser/index.html +++ b/packages/browser/src/client/index.html @@ -24,6 +24,6 @@ - + diff --git a/packages/browser/client/main.ts b/packages/browser/src/client/main.ts similarity index 100% rename from packages/browser/client/main.ts rename to packages/browser/src/client/main.ts diff --git a/packages/browser/public/favicon.svg b/packages/browser/src/client/public/favicon.svg similarity index 100% rename from packages/browser/public/favicon.svg rename to packages/browser/src/client/public/favicon.svg diff --git a/packages/browser/vite.config.ts b/packages/browser/src/client/vite.config.ts similarity index 84% rename from packages/browser/vite.config.ts rename to packages/browser/src/client/vite.config.ts index 01bd2d6cb..4c60bfe5a 100644 --- a/packages/browser/vite.config.ts +++ b/packages/browser/src/client/vite.config.ts @@ -6,7 +6,7 @@ export default defineConfig({ }, build: { minify: false, - outDir: './dist/client', + outDir: '../../dist/client', emptyOutDir: false, }, }) diff --git a/packages/browser/node/index.ts b/packages/browser/src/node/index.ts similarity index 100% rename from packages/browser/node/index.ts rename to packages/browser/src/node/index.ts diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bf3c68ee6..275fbe101 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6935,7 +6935,7 @@ packages: dev: true /@types/form-data/0.0.33: - resolution: {integrity: sha1-yayFsqX9GENbjIXZ7LUObWyJP/g=} + resolution: {integrity: sha512-8BSvG1kGm83cyJITQMZSulnl6QV8jqAGreJsc5tPu1Jq0vTSOiY/k24Wx82JRpWwZSqrala6sd5rWi6aNXvqcw==} dependencies: '@types/node': 18.11.9 dev: true @@ -7925,10 +7925,10 @@ packages: dependencies: '@volar/code-gen': 0.40.13 '@volar/source-map': 0.40.13 - '@vue/compiler-core': 3.2.41 + '@vue/compiler-core': 3.2.45 '@vue/compiler-dom': 3.2.45 '@vue/compiler-sfc': 3.2.45 - '@vue/reactivity': 3.2.41 + '@vue/reactivity': 3.2.45 '@vue/shared': 3.2.45 dev: true diff --git a/tsconfig.json b/tsconfig.json index 22d442ff7..03bec70b5 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,7 +16,7 @@ "paths": { "@vitest/ws-client": ["./packages/ws-client/src/index.ts"], "@vitest/ui": ["./packages/ui/node/index.ts"], - "@vitest/browser": ["./packages/browser/node/index.ts"], + "@vitest/browser": ["./packages/browser/src/node/index.ts"], "#types": ["./packages/vitest/src/index.ts"], "~/*": ["./packages/ui/client/*"], "vitest": ["./packages/vitest/src/index.ts"],