0.3.1: openssl 3.1.1

LibreService · Jun 10, 2023 · 2ac8a60 · 2ac8a60
1 parent a13f8bc
commit 2ac8a60
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 38 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -48,6 +48,7 @@ jobs:
       - name: Test
         if: ${{ matrix.os == 'ubuntu-latest' }}
         run: |
+          npx playwright install
           npx playwright install-deps
           pnpm run test
       - name: Release

diff --git a/README.md b/README.md
@@ -5,6 +5,13 @@ Generate CA, server and client configuration for OpenVPN.
 
 https://my-ovpn.vercel.app/
 
+This is a **STATIC** website so you **DON'T** need to own a server to host it.
+
+All computation is performed in browser, thanks to Web Assembly.
+
+It's also a [PWA](https://web.dev/progressive-web-apps/), so you can install it like a native App and use it **OFFLINE**.
+
+
 ## Use case
 ### CA
 * Generate `ca.key` and `ca.crt`.

diff --git a/index.html b/index.html
@@ -2,16 +2,16 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" href="/LibreService.svg" type="image/svg+xml">
-    <link rel="alternate icon" href="/favicon.ico" type="image/png" sizes="16x16">
-    <link rel="apple-touch-icon" href="/apple-touch-icon.png">
-    <link rel="mask-icon" href="/LibreService.svg" color="#FFFFFF">
+    <link rel="icon" href="./LibreService.svg" type="image/svg+xml">
+    <link rel="alternate icon" href="./favicon.ico" type="image/png" sizes="16x16">
+    <link rel="apple-touch-icon" href="./apple-touch-icon.png">
+    <link rel="mask-icon" href="./LibreService.svg" color="#FFFFFF">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1" />
     <title>My OVPN - LibreService</title>
     <meta name="description" content="OpenVPN configuration generator">
   </head>
   <body>
     <div id="app"></div>
-    <script type="module" src="/src/main.ts"></script>
+    <script type="module" src="./src/main.ts"></script>
   </body>
 </html>
diff --git a/openssl b/openssl
diff --git a/package.json b/package.json
@@ -1,9 +1,10 @@
 {
   "name": "@libreservice/my-ovpn",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "files": [
     "dist"
   ],
+  "appName": "My OVPN",
   "homepage": "https://github.com/LibreService/my_ovpn",
   "author": {
     "name": "Qijia Liu",
@@ -26,37 +27,36 @@
   },
   "devDependencies": {
     "@libreservice/my-widget": "^0.1.2",
-    "@libreservice/my-worker": "^0.3.0",
-    "@playwright/test": "^1.31.2",
-    "@rollup/plugin-node-resolve": "^15.0.1",
+    "@libreservice/my-worker": "^0.4.0",
+    "@playwright/test": "^1.35.0",
+    "@rollup/plugin-node-resolve": "^15.1.0",
     "@rollup/plugin-replace": "^5.0.2",
-    "@types/node": "^18.15.5",
-    "@typescript-eslint/eslint-plugin": "^5.56.0",
-    "@typescript-eslint/parser": "^5.56.0",
+    "@types/node": "^20.2.6",
+    "@typescript-eslint/eslint-plugin": "^5.59.9",
+    "@typescript-eslint/parser": "^5.59.9",
     "@vicons/fa": "^0.12.0",
     "@vicons/fluent": "^0.12.0",
     "@vicons/material": "^0.12.0",
     "@vicons/tabler": "^0.12.0",
-    "@vitejs/plugin-vue": "^4.1.0",
-    "client-zip": "^2.3.1",
-    "esbuild": "^0.17.12",
-    "eslint": "^8.36.0",
-    "eslint-config-standard-with-typescript": "^34.0.1",
+    "@vitejs/plugin-vue": "^4.2.3",
+    "client-zip": "^2.4.4",
+    "esbuild": "^0.18.0",
+    "eslint": "^8.42.0",
+    "eslint-config-standard-with-typescript": "^35.0.0",
     "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-n": "^15.6.1",
+    "eslint-plugin-n": "^16.0.0",
     "eslint-plugin-promise": "^6.1.1",
-    "eslint-plugin-vue": "^9.9.0",
-    "naive-ui": "^2.34.3",
-    "playwright": "^1.31.2",
-    "rollup": "^3.20.0",
+    "eslint-plugin-vue": "^9.14.1",
+    "naive-ui": "^2.34.4",
+    "rollup": "^3.24.1",
     "rollup-plugin-esbuild": "^5.0.0",
-    "typescript": "^5.0.2",
-    "vite": "^4.2.1",
-    "vite-plugin-pwa": "^0.14.4",
-    "vite-plugin-run": "^0.4.0",
+    "typescript": "^5.1.3",
+    "vite": "^4.3.9",
+    "vite-plugin-pwa": "^0.16.3",
+    "vite-plugin-run": "^0.4.1",
     "vooks": "^0.2.12",
-    "vue": "^3.2.47",
-    "vue-router": "^4.1.6",
-    "vue-tsc": "^1.2.0"
+    "vue": "^3.3.4",
+    "vue-router": "^4.2.2",
+    "vue-tsc": "^1.6.5"
   }
 }
diff --git a/src/App.vue b/src/App.vue
@@ -5,7 +5,7 @@ import { jump } from './router'
 import MyFileList from './components/MyFileList.vue'
 import MyPwa from './components/MyPwa.vue'
 import { isMobile } from './util'
-import { homepage } from '../package.json'
+import { homepage, appName } from '../package.json'
 import './main.css'
 
 const osThemeRef = useOsTheme()
@@ -21,7 +21,7 @@ const osThemeRef = useOsTheme()
             <my-layout>
               <template #header>
                 <my-header
-                  icon="/LibreService.svg"
+                  icon="./LibreService.svg"
                   :homepage="homepage"
                 />
               </template>
@@ -30,7 +30,7 @@ const osThemeRef = useOsTheme()
                   style="cursor: pointer; text-align: center; margin-top: 16px"
                   @click="jump('Main')"
                 >
-                  <n-h1>My OVPN</n-h1>
+                  <n-h1>{{ appName }}</n-h1>
                 </div>
                 <router-view v-slot="{ Component }">
                   <keep-alive>

diff --git a/src/router.ts b/src/router.ts
@@ -11,8 +11,12 @@ const routes = [
   { path: '/client', name: 'Client', component: ClientView }
 ]
 
+function findBaseURL (entryPath: string) {
+  return entryPath.substring(0, entryPath.lastIndexOf('/'))
+}
+
 const router = createRouter({
-  history: createWebHistory(),
+  history: createWebHistory(findBaseURL(window.location.pathname)),
   routes
 })
 

diff --git a/src/workerAPI.ts b/src/workerAPI.ts
@@ -1,6 +1,6 @@
 import { LambdaWorker } from '@libreservice/my-worker'
 
-const workerURL = '/worker.js'
+const workerURL = './worker.js'
 const worker = new LambdaWorker(workerURL)
 
 const genKey: () => Promise<number> = worker.register('genKey')

diff --git a/tsconfig.node.json b/tsconfig.node.json
@@ -3,7 +3,8 @@
     "composite": true,
     "module": "ESNext",
     "moduleResolution": "Node",
+    "resolveJsonModule": true,
     "allowSyntheticDefaultImports": true
   },
-  "include": ["vite.config.ts"]
+  "include": ["vite.config.ts", "package.json"]
 }
diff --git a/vite.config.ts b/vite.config.ts
@@ -4,6 +4,7 @@ import { run } from 'vite-plugin-run'
 import vue from '@vitejs/plugin-vue'
 import replace from '@rollup/plugin-replace'
 import { VitePWA, VitePWAOptions } from 'vite-plugin-pwa'
+import { appName } from './package.json'
 
 const resources = ['crypto.js', 'crypto.wasm']
 
@@ -37,8 +38,8 @@ const plugins = [
     registerType: 'autoUpdate',
     workbox,
     manifest: {
-      name: 'My OVPN',
-      short_name: 'My OVPN',
+      name: appName,
+      short_name: appName,
       icons: [
         {
           src: 'LibreService.svg',
@@ -63,6 +64,7 @@ if (process.env.NODE_ENV !== 'production') {
 }
 
 export default defineConfig({
+  base: '',
   build: {
     target: 'es2020'
   },