diff --git a/easytier-gui/index.html b/easytier-gui/index.html index aa51dde1..78f170b0 100644 --- a/easytier-gui/index.html +++ b/easytier-gui/index.html @@ -2,7 +2,6 @@ - Tauri + Vue + TS diff --git a/easytier-gui/package.json b/easytier-gui/package.json index bf1ff7bc..f4c88be6 100644 --- a/easytier-gui/package.json +++ b/easytier-gui/package.json @@ -5,8 +5,9 @@ "private": true, "packageManager": "pnpm@9.12.1+sha512.e5a7e52a4183a02d5931057f7a0dbff9d5e9ce3161e33fa68ae392125b79282a8a8a470a51dfc8a0ed86221442eb2fb57019b0990ed24fab519bf0e1bc5ccfc4", "scripts": { - "dev": "vite", - "build": "vue-tsc --noEmit && vite build", + "build:deps": "pnpm --filter tauri-plugin-vpnservice-api build && pnpm --filter easytier-frontend-lib build", + "dev": "pnpm run build:deps && vite", + "build": "pnpm run build:deps && vue-tsc --noEmit && vite build", "preview": "vite preview", "tauri": "tauri", "lint": "eslint . --ignore-pattern src-tauri", diff --git a/easytier-gui/vite.config.ts b/easytier-gui/vite.config.ts index 47f1134d..8ff40571 100644 --- a/easytier-gui/vite.config.ts +++ b/easytier-gui/vite.config.ts @@ -33,6 +33,7 @@ const host = process.env.TAURI_DEV_HOST // https://vitejs.dev/config/ export default defineConfig(async () => ({ + base: './', resolve: { alias: { '~/': `${path.resolve(__dirname, 'src')}/`, diff --git a/easytier-web/frontend/package.json b/easytier-web/frontend/package.json index b2711544..473dfbca 100644 --- a/easytier-web/frontend/package.json +++ b/easytier-web/frontend/package.json @@ -4,8 +4,9 @@ "version": "0.0.0", "type": "module", "scripts": { - "dev": "vite", - "build": "vue-tsc -b && vite build", + "build:deps": "pnpm --filter easytier-frontend-lib build", + "dev": "pnpm run build:deps && vite", + "build": "pnpm run build:deps && vue-tsc -b && vite build", "preview": "vite preview" }, "dependencies": { @@ -32,4 +33,4 @@ "vite-plugin-singlefile": "^2.0.3", "vue-tsc": "^2.1.10" } -} \ No newline at end of file +} diff --git a/package.json b/package.json index 2d259706..24635a38 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "private": true, "pnpm": { "overrides": { + "caniuse-lite": "1.0.30001791", "minimatch": "10.2.4" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1418835c..5b88b23b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,6 +5,7 @@ settings: excludeLinksFromLockfile: false overrides: + caniuse-lite: 1.0.30001791 minimatch: 10.2.4 importers: @@ -2146,8 +2147,8 @@ packages: resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==} engines: {node: '>= 6'} - caniuse-lite@1.0.30001741: - resolution: {integrity: sha512-QGUGitqsc8ARjLdgAfxETDhRbJ0REsP6O3I96TAth/mVjh2cYzN2u+3AzPP3aVSm2FehEItaJw1xd+IGBXWeSw==} + caniuse-lite@1.0.30001791: + resolution: {integrity: sha512-yk0l/YSrOnFZk3UROpDLQD9+kC1l4meK/wed583AXrzoarMGJcbRi2Q4RaUYbKxYAsZ8sWmaSa/DsLmdBeI1vQ==} ccount@2.0.1: resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==} @@ -5985,7 +5986,7 @@ snapshots: autoprefixer@10.4.21(postcss@8.5.6): dependencies: browserslist: 4.25.4 - caniuse-lite: 1.0.30001741 + caniuse-lite: 1.0.30001791 fraction.js: 4.3.7 normalize-range: 0.1.2 picocolors: 1.1.1 @@ -6018,7 +6019,7 @@ snapshots: browserslist@4.25.4: dependencies: - caniuse-lite: 1.0.30001741 + caniuse-lite: 1.0.30001791 electron-to-chromium: 1.5.214 node-releases: 2.0.20 update-browserslist-db: 1.1.3(browserslist@4.25.4) @@ -6043,7 +6044,7 @@ snapshots: camelcase-css@2.0.1: {} - caniuse-lite@1.0.30001741: {} + caniuse-lite@1.0.30001791: {} ccount@2.0.1: {}