diff --git a/.github/workflows/electron-linux.yml b/.github/workflows/electron-linux.yml index 2116db385..82be00e63 100644 --- a/.github/workflows/electron-linux.yml +++ b/.github/workflows/electron-linux.yml @@ -15,12 +15,12 @@ jobs: steps: - name: Checkout repository 🛎️ - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Node version 🍀 - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '20' - name: Install dependencies ⚙️ run: npm ci @@ -31,7 +31,7 @@ jobs: npm run electron:build - name: Save artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: electron-release-app path: | diff --git a/.github/workflows/electron-mac.yml b/.github/workflows/electron-mac.yml index c4ef46fb1..4ea6647d1 100644 --- a/.github/workflows/electron-mac.yml +++ b/.github/workflows/electron-mac.yml @@ -21,12 +21,12 @@ jobs: steps: - name: Checkout repository 🛎️ - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Node version 🍀 - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '20' - name: Install dependencies ⚙️ run: npm ci @@ -37,7 +37,7 @@ jobs: npm run electron:build - name: Save artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: electron-release-app path: | diff --git a/.github/workflows/electron-windows.yml b/.github/workflows/electron-windows.yml index e422d147e..43eda9c6c 100644 --- a/.github/workflows/electron-windows.yml +++ b/.github/workflows/electron-windows.yml @@ -15,12 +15,12 @@ jobs: steps: - name: Checkout repository 🛎️ - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Node version 🍀 - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '20' - name: Install dependencies ⚙️ run: npm ci @@ -31,7 +31,7 @@ jobs: npm run electron:build - name: Save artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: electron-release-app path: | diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 87c657150..9cb02674c 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -21,12 +21,12 @@ jobs: pull-requests: write steps: - name: Checkout repository 🛎️ - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Node version 🍀 - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '20' - name: Install dependencies ⚙️ run: npm ci @@ -37,7 +37,7 @@ jobs: npm run build - name: Archive artifacts 📁 - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: dist diff --git a/electron-builder.yml b/electron-builder.yml index 36ec28e4d..0ef7ab850 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -35,6 +35,7 @@ mac: entitlementsInherit: './build/osx/entitlements.mac.plist' hardenedRuntime: true gatekeeperAssess: false + notarize: false afterSign: 'scripts/electron/notarize.cjs' diff --git a/package-lock.json b/package-lock.json index 1571d2cb4..7934f61b3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -134,7 +134,7 @@ "uuid": "^9.0.1", "vite": "^5.1.6", "vite-plugin-electron": "^0.28.4", - "vite-plugin-pwa": "^0.19.4", + "vite-plugin-pwa": "^0.19.8", "vite-plugin-top-level-await": "^1.4.1", "vite-plugin-wasm": "^3.3.0", "vitest": "^1.4.0", @@ -7836,12 +7836,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -11066,37 +11066,17 @@ } }, "node_modules/engine.io-client": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.2.tgz", - "integrity": "sha512-CQZqbrpEYnrpGqC07a9dJDz4gePZUgTPMU3NKJPSeQOyw27Tst4Pl3FemKoFGAlHzgZmKjoRmiJvbWfhCXUlIg==", + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.4.tgz", + "integrity": "sha512-GeZeeRjpD2qf49cZQ0Wvh/8NJNfeXkXXcoGh+F77oEAgo9gUHwT1fCRxSNU+YEEaysOJTnsFHmM5oAcPy4ntvQ==", "dependencies": { "@socket.io/component-emitter": "~3.1.0", "debug": "~4.3.1", "engine.io-parser": "~5.2.1", - "ws": "~8.11.0", + "ws": "~8.17.1", "xmlhttprequest-ssl": "~2.0.0" } }, - "node_modules/engine.io-client/node_modules/ws": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz", - "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==", - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, "node_modules/engine.io-parser": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.1.tgz", @@ -12166,9 +12146,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -19348,22 +19328,6 @@ "tar-stream": "^2.1.4" } }, - "node_modules/prebuild-install/node_modules/tar-stream": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", - "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "dev": true, - "dependencies": { - "bl": "^4.0.3", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -22194,7 +22158,6 @@ "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", "dev": true, - "peer": true, "dependencies": { "bl": "^4.0.3", "end-of-stream": "^1.4.1", @@ -23219,9 +23182,9 @@ } }, "node_modules/vite-plugin-pwa": { - "version": "0.19.4", - "resolved": "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.19.4.tgz", - "integrity": "sha512-KiEFXaYEj2Hg1it+yECy75oqNmlXimI7BaLx7Sxl7Qsd9EIVxaf3GX1mZdLpHe83pDgHBNwm9USGQxSCNp5m7A==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.19.8.tgz", + "integrity": "sha512-e1oK0dfhzhDhY3VBuML6c0h8Xfx6EkOVYqolj7g+u8eRfdauZe5RLteCIA/c5gH0CBQ0CNFAuv/AFTx4Z7IXTw==", "dev": true, "dependencies": { "debug": "^4.3.4", @@ -24698,9 +24661,9 @@ "dev": true }, "node_modules/ws": { - "version": "8.16.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", - "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", + "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", "engines": { "node": ">=10.0.0" }, diff --git a/package.json b/package.json index e076f0271..b485e8e8e 100644 --- a/package.json +++ b/package.json @@ -158,7 +158,7 @@ "uuid": "^9.0.1", "vite": "^5.1.6", "vite-plugin-electron": "^0.28.4", - "vite-plugin-pwa": "^0.19.4", + "vite-plugin-pwa": "^0.19.8", "vite-plugin-top-level-await": "^1.4.1", "vite-plugin-wasm": "^3.3.0", "vitest": "^1.4.0", diff --git a/src/components/nodes/components/NodeUrl.vue b/src/components/nodes/components/NodeUrl.vue index c06c4440f..226f29993 100644 --- a/src/components/nodes/components/NodeUrl.vue +++ b/src/components/nodes/components/NodeUrl.vue @@ -5,7 +5,7 @@ :{{ port }} @@ -43,7 +43,7 @@ export default { let domain = null if (!isIP.value) { - const regex = /([^.]*)\.(.*)/ + const regex = /([^.]*)\.?(.*)/ const parts = hostname.value.match(regex) if (parts !== null) { name = parts[1]