From 8a74c5c9892e9d161a647f4e29416f7de39594df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A1=BE=E4=B8=80=E5=B3=B0?= Date: Wed, 7 Jun 2023 11:30:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=85=20tauriConfig=20?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/builders/common.ts | 21 ++++++++++++++++++++- package.json | 1 + 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/bin/builders/common.ts b/bin/builders/common.ts index f9a4338..08d5428 100644 --- a/bin/builders/common.ts +++ b/bin/builders/common.ts @@ -3,10 +3,29 @@ import prompts, { override } from 'prompts'; import path from 'path'; import fs from 'fs/promises'; import fs2 from 'fs-extra'; +import {TauriConfig} from 'tauri/src/types'; + import { npmDirectory } from '@/utils/dir.js'; import logger from '@/options/logger.js'; import URL from 'node:url'; +type DangerousRemoteDomainIpAccess = { + domain: string; + windows: string[]; + enableTauriAPI: boolean; + schema?: string; + plugins?: string[]; +} + +// https://tauri.app/v1/api/config/#remotedomainaccessscope +type NextTauriConfig = TauriConfig & { + tauri: { + security: { + dangerousRemoteDomainIpcAccess?: DangerousRemoteDomainIpAccess[] + } + } +} + export async function promptText(message: string, initial?: string) { const response = await prompts({ @@ -18,7 +37,7 @@ export async function promptText(message: string, initial?: string) { return response.content; } -function setSecurityConfigWithUrl(tauriConfig: any, url: string) { +function setSecurityConfigWithUrl(tauriConfig: NextTauriConfig, url: string) { const {hostname} = URL.parse(url); tauriConfig.tauri.security.dangerousRemoteDomainIpcAccess[0].domain = hostname; } diff --git a/package.json b/package.json index 9675b17..e6298ff 100644 --- a/package.json +++ b/package.json @@ -78,6 +78,7 @@ "concurrently": "^7.5.0", "cross-env": "^7.0.3", "rollup": "^3.3.0", + "tauri": "^0.15.0", "tslib": "^2.4.1", "typescript": "^4.9.3" }