diff --git a/extension/package.json b/extension/package.json index b86be1c..495ef5b 100644 --- a/extension/package.json +++ b/extension/package.json @@ -16,8 +16,8 @@ }, "license": "Apache-2.0", "scripts": { - "build": "tsc --project . && vite build --config vite.sw.config.mts", - "watch": "vite build --watch --config vite.sw.config.mts", + "build": "tsc --project . && vite build --config vite.config.mts", + "watch": "vite build --watch --config vite.config.mts", "test": "playwright test", "clean": "rm -rf dist" }, diff --git a/extension/tsconfig.json b/extension/tsconfig.json index 9c22b0b..621422e 100644 --- a/extension/tsconfig.json +++ b/extension/tsconfig.json @@ -13,10 +13,5 @@ "jsxImportSource": "react", "noEmit": true }, - "include": [ - "src", - ], - "exclude": [ - "src/ui", - ] + "include": ["src"] } diff --git a/extension/tsconfig.ui.json b/extension/tsconfig.ui.json deleted file mode 100644 index f62dd8a..0000000 --- a/extension/tsconfig.ui.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "compilerOptions": { - "target": "ESNext", - "esModuleInterop": true, - "moduleResolution": "node", - "strict": true, - "module": "ESNext", - "rootDir": "src", - "outDir": "./lib", - "resolveJsonModule": true, - "types": ["chrome"], - "jsx": "react-jsx", - "jsxImportSource": "react", - "noEmit": true, - }, - "include": [ - "src/ui", - ], -} diff --git a/extension/vite.config.mts b/extension/vite.config.mts index 399ed52..26b445d 100644 --- a/extension/vite.config.mts +++ b/extension/vite.config.mts @@ -1,43 +1,39 @@ -/** - * Copyright (c) Microsoft Corporation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ import { fileURLToPath } from 'url'; import { dirname, resolve } from 'path'; import { defineConfig } from 'vite'; -import react from '@vitejs/plugin-react'; +import { viteStaticCopy } from 'vite-plugin-static-copy'; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); -// https://vitejs.dev/config/ export default defineConfig({ - plugins: [react()], - root: resolve(__dirname, 'src/ui'), + plugins: [ + viteStaticCopy({ + targets: [ + { + src: resolve(__dirname, 'icons/*'), + dest: 'icons' + }, + { + src: resolve(__dirname, 'manifest.json'), + dest: '.' + }, + { + src: resolve(__dirname, 'welcome.html'), + dest: '.' + } + ] + }) + ], build: { - outDir: resolve(__dirname, 'dist/'), + lib: { + entry: resolve(__dirname, 'src/background.ts'), + fileName: 'lib/background', + formats: ['es'] + }, + outDir: 'dist', emptyOutDir: false, - minify: false, - rollupOptions: { - input: ['src/ui/connect.html', 'src/ui/status.html'], - output: { - manualChunks: undefined, - entryFileNames: 'lib/ui/[name].js', - chunkFileNames: 'lib/ui/[name].js', - assetFileNames: 'lib/ui/[name].[ext]' - } - } + minify: false } }); diff --git a/extension/vite.sw.config.mts b/extension/vite.sw.config.mts deleted file mode 100644 index 3eb2728..0000000 --- a/extension/vite.sw.config.mts +++ /dev/null @@ -1,54 +0,0 @@ -/** - * Copyright (c) Microsoft Corporation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { fileURLToPath } from 'url'; -import { dirname, resolve } from 'path'; -import { defineConfig } from 'vite'; -import { viteStaticCopy } from 'vite-plugin-static-copy'; - -const __filename = fileURLToPath(import.meta.url); -const __dirname = dirname(__filename); - -export default defineConfig({ - plugins: [ - viteStaticCopy({ - targets: [ - { - src: resolve(__dirname, 'icons/*'), - dest: 'icons' - }, - { - src: resolve(__dirname, 'manifest.json'), - dest: '.' - }, - { - src: resolve(__dirname, 'welcome.html'), - dest: '.' - } - ] - }) - ], - build: { - lib: { - entry: resolve(__dirname, 'src/background.ts'), - fileName: 'lib/background', - formats: ['es'] - }, - outDir: 'dist', - emptyOutDir: false, - minify: false - } -});