From 32f968b992867824e916a3428daa5d782ba1676e Mon Sep 17 00:00:00 2001 From: Tlntin Date: Sat, 24 Dec 2022 12:49:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Windows,Mac=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=8C=85=E5=90=8D=E6=AD=A3=E5=88=99=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/builders/common.ts | 10 +++++++++- dist/cli.js | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/bin/builders/common.ts b/bin/builders/common.ts index 1ce9cfc..06b2d19 100644 --- a/bin/builders/common.ts +++ b/bin/builders/common.ts @@ -42,11 +42,19 @@ export async function mergeTauriConfig( if (process.platform === "linux") { const reg = new RegExp(/[0-9]*[a-z]+[0-9]*\-?[0-9]*[a-z]*[0-9]*\-?[0-9]*[a-z]*[0-9]*/); if (!reg.test(name) || reg.exec(name)[0].length != name.length) { - logger.error("package name is illegal， it must be lowercase, numbers, dashes.") + logger.error("package name is illegal， it must be lowercase letters, numbers, dashes, and it must contain the lowercase letters.") logger.error("E.g com-123-xxx, 123pan, pan123,weread, we-read"); process.exit(); } } + if (process.platform === "win32" || process.platform === "darwin" ) { + const reg = new RegExp(/([0-9]*[a-zA-Z]+[0-9]*)+/); + if (!reg.test(name) || reg.exec(name)[0].length != name.length) { + logger.error("package name is illegal， it must be letters, numbers, and it must contain the letters") + logger.error("E.g 123pan,123Pan Pan123,weread, WeRead, WERead"); + process.exit(); + } + } Object.assign(tauriConf.tauri.windows[0], { url, ...tauriConfWindowOptions }); diff --git a/dist/cli.js b/dist/cli.js index a0676a6..468a13b 100644 --- a/dist/cli.js +++ b/dist/cli.js @@ -1637,11 +1637,19 @@ function mergeTauriConfig(url, options, tauriConf) { if (process.platform === "linux") { const reg = new RegExp(/[0-9]*[a-z]+[0-9]*\-?[0-9]*[a-z]*[0-9]*\-?[0-9]*[a-z]*[0-9]*/); if (!reg.test(name) || reg.exec(name)[0].length != name.length) { - logger.error("package name is illegal， it must be lowercase, numbers, dashes."); + logger.error("package name is illegal， it must be lowercase letters, numbers, dashes, and it must contain the lowercase letters."); logger.error("E.g com-123-xxx, 123pan, pan123,weread, we-read"); process.exit(); } } + if (process.platform === "win32" || process.platform === "darwin") { + const reg = new RegExp(/([0-9]*[a-zA-Z]+[0-9]*)+/); + if (!reg.test(name) || reg.exec(name)[0].length != name.length) { + logger.error("package name is illegal， it must be letters, numbers, and it must contain the letters"); + logger.error("E.g 123pan,123Pan Pan123,weread, WeRead, WERead"); + process.exit(); + } + } Object.assign(tauriConf.tauri.windows[0], Object.assign({ url }, tauriConfWindowOptions)); tauriConf.package.productName = name; tauriConf.tauri.bundle.identifier = identifier;