From 6132ad747248eb6c456ac9f5bcd08fba6fc877c9 Mon Sep 17 00:00:00 2001 From: Craigory Coppola Date: Fri, 10 Jun 2022 13:25:16 -0400 Subject: [PATCH] fix(js): preset should use packages folder (#10691) --- packages/workspace/src/generators/preset/preset.ts | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/workspace/src/generators/preset/preset.ts b/packages/workspace/src/generators/preset/preset.ts index 87ff837159030..2dfbb024e7d9a 100644 --- a/packages/workspace/src/generators/preset/preset.ts +++ b/packages/workspace/src/generators/preset/preset.ts @@ -33,11 +33,7 @@ export const presetSchematic = convertNxGenerator(presetGenerator); export default presetGenerator; async function createPreset(tree: Tree, options: Schema) { - if ( - options.preset === Preset.Empty || - options.preset === Preset.Apps || - options.preset === Preset.TS - ) { + if (options.preset === Preset.Empty || options.preset === Preset.Apps) { return; } else if (options.preset === Preset.Angular) { const { @@ -178,6 +174,13 @@ async function createPreset(tree: Tree, options: Schema) { if (options.preset === Preset.Core) { tree.delete('workspace.json'); } + } else if (options.preset === Preset.TS) { + const c = readWorkspaceConfiguration(tree); + c.workspaceLayout = { + appsDir: 'packages', + libsDir: 'packages', + }; + updateWorkspaceConfiguration(tree, c); } else { throw new Error(`Invalid preset ${options.preset}`); }