VSinerva/freesewing
1
0
Fork 0
Code Activity

fix(new-design): Remove hyphen as a valid design name character

Browse source
This commit is contained in:
Benjamin Fan 2023-05-27 10:14:30 -07:00
parent 55d659f8ce
commit 9c91cef752
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
packages/new-design/lib/utils.mjs
View file

@ -49,9 +49,9 @@ export const checkNodeVersion = () => {
// Helper method to validate the design name // Helper method to validate the design name
const validateDesignName = (name) => { const validateDesignName = (name) => {
if (/^([a-z][a-z0-9_\-]*)$/.test(name)) return true if (/^([a-z][a-z0-9_]*)$/.test(name)) return true
else else
return ' 🙈 Please use only lowercase letters, digits, underscores, or hyphens. Names must start with a lowercase letter. 🤷' return ' 🙈 Please use only lowercase letters, digits, or underscores. Names must start with a lowercase letter. 🤷'
} }
// Gets user input to figure out what to do // Gets user input to figure out what to do
@ -107,7 +107,7 @@ export const getChoices = async () => {
await prompts({ await prompts({
type: 'text', type: 'text',
name: 'name', name: 'name',
message: 'What name would you like the design to have? 🏷️ ([a-z0-9_\\-] only)', message: 'What name would you like the design to have? 🏷️ ([a-z0-9_] only)',
validate: validateDesignName, validate: validateDesignName,
}) })
).name ).name

6
scripts/add-software.mjs
View file

@ -85,7 +85,7 @@ async function addDesign() {
const { name } = await prompts({ const { name } = await prompts({
type: 'text', type: 'text',
name: 'name', name: 'name',
message: 'What name would you like the design to have? ([a-z0-9_\\-] only)', message: 'What name would you like the design to have? ([a-z0-9_] only)',
validate: validateDesignName, validate: validateDesignName,
}) })
@ -223,9 +223,9 @@ function validateDesignName(name) {
) )
return `Sorry but ${name} is already taken so you'll need to pick something else` return `Sorry but ${name} is already taken so you'll need to pick something else`
if (/^([a-z][a-z0-9_\-]*)$/.test(name)) return true if (/^([a-z][a-z0-9_]*)$/.test(name)) return true
else else
return ' 🙈 Please use only lowercase letters, digits, underscores, or hyphens. Names must start with a lowercase letter. 🤷' return ' 🙈 Please use only lowercase letters, digits, or underscores. Names must start with a lowercase letter. 🤷'
} }
function validatePluginName(name) { function validatePluginName(name) {