refactor(browser): move client code into src (#2367)

* fix: refactor browser package * chore:fix CI * chore: move public folder inside src/client * chore: revert lock file * chore: .
vitest-dev · Nov 23, 2022 · aa6ee0f · aa6ee0f
1 parent 4b21c59
commit aa6ee0f
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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 → packages/browser/src/client/index.html b/packages/browser/index.html → packages/browser/src/client/index.html
@@ -24,6 +24,6 @@
  </head>
  <body>
  <iframe id="vitest-ui" src=""></iframe>
- <script type="module" src="./client/main.ts"></script>
+ <script type="module" src="/main.ts"></script>
  </body>
 </html>
diff --git a/packages/browser/client/main.ts → packages/browser/src/client/main.ts b/packages/browser/client/main.ts → packages/browser/src/client/main.ts
diff --git a/packages/browser/public/favicon.svg → ...ges/browser/src/client/public/favicon.svg b/packages/browser/public/favicon.svg → ...ges/browser/src/client/public/favicon.svg
diff --git a/packages/browser/vite.config.ts → packages/browser/src/client/vite.config.ts b/packages/browser/vite.config.ts → 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 → packages/browser/src/node/index.ts b/packages/browser/node/index.ts → packages/browser/src/node/index.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git 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"],