From 42251e4e36b2381cc6f155dd749727d199b7268f Mon Sep 17 00:00:00 2001 From: liudonghua Date: Fri, 8 Dec 2023 06:16:03 +0000 Subject: [PATCH] update name of app validation --- bin/options/index.ts | 4 ++-- dist/cli.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/options/index.ts b/bin/options/index.ts index 17f41d951..26687bd88 100644 --- a/bin/options/index.ts +++ b/bin/options/index.ts @@ -14,7 +14,7 @@ function resolveAppName(name: string, platform: NodeJS.Platform): string { function isValidName(name: string, platform: NodeJS.Platform): boolean { const platformRegexMapping: PlatformMap = { linux: /^[a-z0-9]+(-[a-z0-9]+)*$/, - default: /^[a-zA-Z0-9]+$/, + default: /^[a-zA-Z0-9]+([-a-zA-Z0-9])*$/, }; const reg = platformRegexMapping[platform] || platformRegexMapping.default; return !!name && reg.test(name); @@ -38,7 +38,7 @@ export default async function handleOptions( if (!isValidName(name, platform)) { const LINUX_NAME_ERROR = `✕ name should only include lowercase letters, numbers, and dashes, and must contain at least one lowercase letter. Examples: com-123-xxx, 123pan, pan123, weread, we-read.`; - const DEFAULT_NAME_ERROR = `✕ Name should only include letters and numbers, and must contain at least one letter. Examples: 123pan, 123Pan, Pan123, weread, WeRead, WERead.`; + const DEFAULT_NAME_ERROR = `✕ Name should only include letters and numbers, and dashes (dashes must not at the begining), and must contain at least one letter. Examples: 123pan, 123Pan, Pan123, weread, WeRead, WERead, we-read.`; const errorMsg = platform === 'linux' ? LINUX_NAME_ERROR : DEFAULT_NAME_ERROR; logger.error(errorMsg); if (isActions) { diff --git a/dist/cli.js b/dist/cli.js index 73b7f6117..3af0e630d 100644 --- a/dist/cli.js +++ b/dist/cli.js @@ -946,7 +946,7 @@ function resolveAppName(name, platform) { function isValidName(name, platform) { const platformRegexMapping = { linux: /^[a-z0-9]+(-[a-z0-9]+)*$/, - default: /^[a-zA-Z0-9]+$/, + default: /^[a-zA-Z0-9]+([-a-zA-Z0-9])*$/, }; const reg = platformRegexMapping[platform] || platformRegexMapping.default; return !!name && reg.test(name); @@ -964,7 +964,7 @@ async function handleOptions(options, url) { } if (!isValidName(name, platform)) { const LINUX_NAME_ERROR = `✕ name should only include lowercase letters, numbers, and dashes, and must contain at least one lowercase letter. Examples: com-123-xxx, 123pan, pan123, weread, we-read.`; - const DEFAULT_NAME_ERROR = `✕ Name should only include letters and numbers, and must contain at least one letter. Examples: 123pan, 123Pan, Pan123, weread, WeRead, WERead.`; + const DEFAULT_NAME_ERROR = `✕ Name should only include letters and numbers, and dashes (dashes must not at the begining), and must contain at least one letter. Examples: 123pan, 123Pan, Pan123, weread, WeRead, WERead, we-read.`; const errorMsg = platform === 'linux' ? LINUX_NAME_ERROR : DEFAULT_NAME_ERROR; logger.error(errorMsg); if (isActions) {