增加Windows,Mac平台包名正则验证
This commit is contained in:
10
bin/builders/common.ts
vendored
10
bin/builders/common.ts
vendored
@@ -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 });
|
||||
|
||||
10
dist/cli.js
vendored
10
dist/cli.js
vendored
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user