From 04e7867413a5998424befb01a24ab27c180fab5e Mon Sep 17 00:00:00 2001 From: Bruno Bernardino Date: Mon, 16 May 2022 16:25:46 +0100 Subject: [PATCH] Fix macos build, tweak variable names, remove unnecessary variable. --- .github/workflows/build-tauri.yml | 2 -- packages/tauri/src-tauri/src/menu.rs | 2 +- packages/tauri/webpack.config.js | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-tauri.yml b/.github/workflows/build-tauri.yml index d4c0db46..5e9d6f05 100644 --- a/.github/workflows/build-tauri.yml +++ b/.github/workflows/build-tauri.yml @@ -55,7 +55,6 @@ jobs: run: npm run tauri:build:debug env: PL_SERVER_URL: ${{ secrets.PL_SERVER_URL }} - PL_PWA_URL: ${{ secrets.PL_PWA_URL }} TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} - name: Build (production) @@ -63,7 +62,6 @@ jobs: run: npm run tauri:build env: PL_SERVER_URL: ${{ secrets.PL_SERVER_URL }} - PL_PWA_URL: ${{ secrets.PL_PWA_URL }} TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} - name: Archive AppImage diff --git a/packages/tauri/src-tauri/src/menu.rs b/packages/tauri/src-tauri/src/menu.rs index 2db83647..3d41ce6f 100644 --- a/packages/tauri/src-tauri/src/menu.rs +++ b/packages/tauri/src-tauri/src/menu.rs @@ -15,7 +15,7 @@ impl AddDefaultSubmenus for Menu { return self.add_submenu(Submenu::new( app_name.to_string(), Menu::new() - .add_native_item(MenuItem::About(app_name.to_string())) + .add_native_item(MenuItem::About(app_name.to_string()), {}) .add_native_item(MenuItem::Separator) .add_native_item(MenuItem::Services) .add_native_item(MenuItem::Separator) diff --git a/packages/tauri/webpack.config.js b/packages/tauri/webpack.config.js index 3819e052..327980e1 100644 --- a/packages/tauri/webpack.config.js +++ b/packages/tauri/webpack.config.js @@ -7,7 +7,7 @@ const { version } = require("./package.json"); const out = process.env.PL_PWA_DIR || resolve(__dirname, "dist"); const serverUrl = process.env.PL_SERVER_URL || `http://0.0.0.0:${process.env.PL_SERVER_PORT || 3000}`; const pwaUrl = process.env.PL_PWA_URL || `http://localhost:${process.env.PL_PWA_PORT || 8080}`; -const websocketServerUrl = pwaUrl.replace("http://", "ws://").replace("https://", "wss://"); +const websocketPwaUrl = pwaUrl.replace("http://", "ws://").replace("https://", "wss://"); const rootDir = resolve(__dirname, "../.."); const assetsDir = resolve(rootDir, process.env.PL_ASSETS_DIR || "assets"); const { name, terms_of_service } = require(join(assetsDir, "manifest.json")); @@ -67,7 +67,7 @@ module.exports = { meta: { "Content-Security-Policy": { "http-equiv": "Content-Security-Policy", - content: `default-src 'self' ${serverUrl} ${websocketServerUrl} https://api.pwnedpasswords.com blob:; style-src 'self' 'unsafe-inline'; object-src 'self' blob:; frame-src 'self'; img-src 'self' blob: data: https:;`, + content: `default-src 'self' ${serverUrl} ${websocketPwaUrl} https://api.pwnedpasswords.com blob:; style-src 'self' 'unsafe-inline'; object-src 'self' blob:; frame-src 'self'; img-src 'self' blob: data: https:;`, }, }, }),