create-nx-workspace
Advanced tools
Comparing version 0.0.0-pr-29314-e664f92 to 0.0.0-pr-29636-0cd26ed
@@ -6,2 +6,5 @@ import * as yargs from 'yargs'; | ||
preset: Preset; | ||
linter?: 'none' | 'eslint'; | ||
formatter?: 'none' | 'prettier'; | ||
workspaces?: boolean; | ||
} | ||
@@ -13,3 +16,2 @@ interface NoneArguments extends BaseArguments { | ||
appName?: string | undefined; | ||
formatter?: 'none' | 'prettier'; | ||
} | ||
@@ -26,5 +28,2 @@ interface ReactArguments extends BaseArguments { | ||
e2eTestRunner: 'none' | 'cypress' | 'playwright'; | ||
linter?: 'none' | 'eslint'; | ||
formatter?: 'none' | 'prettier'; | ||
workspaces?: boolean; | ||
} | ||
@@ -31,0 +30,0 @@ interface AngularArguments extends BaseArguments { |
@@ -574,2 +574,5 @@ "use strict"; | ||
let e2eTestRunner = undefined; | ||
let linter; | ||
let formatter; | ||
const workspaces = parsedArgs.workspaces ?? false; | ||
if (parsedArgs.preset && parsedArgs.preset !== preset_1.Preset.Vue) { | ||
@@ -586,3 +589,5 @@ preset = parsedArgs.preset; | ||
const framework = await determineVueFramework(parsedArgs); | ||
const workspaceType = await determineStandaloneOrMonorepo(); | ||
const workspaceType = workspaces | ||
? 'monorepo' | ||
: await determineStandaloneOrMonorepo(); | ||
if (workspaceType === 'standalone') { | ||
@@ -645,3 +650,19 @@ appName = parsedArgs.appName ?? parsedArgs.name; | ||
} | ||
return { preset, style, appName, e2eTestRunner }; | ||
if (workspaces) { | ||
linter = await determineLinterOptions(parsedArgs); | ||
formatter = await determineFormatterOptions(parsedArgs); | ||
} | ||
else { | ||
linter = 'eslint'; | ||
formatter = 'prettier'; | ||
} | ||
return { | ||
preset, | ||
style, | ||
appName, | ||
e2eTestRunner, | ||
linter, | ||
formatter, | ||
workspaces, | ||
}; | ||
} | ||
@@ -801,2 +822,5 @@ async function determineAngularOptions(parsedArgs) { | ||
let docker; | ||
let linter; | ||
let formatter; | ||
const workspaces = parsedArgs.workspaces ?? false; | ||
if (parsedArgs.preset) { | ||
@@ -821,3 +845,5 @@ preset = parsedArgs.preset; | ||
framework = await determineNodeFramework(parsedArgs); | ||
const workspaceType = await determineStandaloneOrMonorepo(); | ||
const workspaceType = workspaces | ||
? 'monorepo' | ||
: await determineStandaloneOrMonorepo(); | ||
if (workspaceType === 'standalone') { | ||
@@ -856,2 +882,10 @@ preset = preset_1.Preset.NodeStandalone; | ||
} | ||
if (workspaces) { | ||
linter = await determineLinterOptions(parsedArgs); | ||
formatter = await determineFormatterOptions(parsedArgs); | ||
} | ||
else { | ||
linter = 'eslint'; | ||
formatter = 'prettier'; | ||
} | ||
return { | ||
@@ -862,2 +896,5 @@ preset, | ||
docker, | ||
linter, | ||
formatter, | ||
workspaces, | ||
}; | ||
@@ -864,0 +901,0 @@ } |
{ | ||
"name": "create-nx-workspace", | ||
"version": "0.0.0-pr-29314-e664f92", | ||
"version": "0.0.0-pr-29636-0cd26ed", | ||
"private": false, | ||
@@ -5,0 +5,0 @@ "description": "Smart Monorepos · Fast CI", |
@@ -83,6 +83,6 @@ "use strict"; | ||
case preset_1.Preset.WebComponents: | ||
return ['apps/**', 'packages/**']; | ||
return ['apps/*']; | ||
default: | ||
return ['packages/**']; | ||
return ['packages/*']; | ||
} | ||
} |
Sorry, the diff of this file is not supported yet
111348
3043