Merge branch 'master' of https://github.com/nestjs/nest-cli

nestjs · Jul 7, 2021 · 8968374 · 8968374
2 parents 683df15 + c59c827
commit 8968374
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/actions/generate.action.ts b/actions/generate.action.ts
@@ -4,6 +4,7 @@ import { Input } from '../commands';
 import { getValueOrDefault } from '../lib/compiler/helpers/get-value-or-default';
 import {
   AbstractCollection,
+  Collection,
   CollectionFactory,
   SchematicOption,
 } from '../lib/schematics';
@@ -35,7 +36,7 @@ const generateFiles = async (inputs: Input[]) => {
   const spec = inputs.find((option) => option.name === 'spec');
 
   const collection: AbstractCollection = CollectionFactory.create(
-    collectionOption || configuration.collection,
+    collectionOption || configuration.collection || Collection.NESTJS,
   );
   const schematicOptions: SchematicOption[] = mapSchematicOptions(inputs);
   schematicOptions.push(

diff --git a/commands/generate.command.ts b/commands/generate.command.ts
@@ -1,7 +1,6 @@
 import * as chalk from 'chalk';
 import * as Table from 'cli-table3';
 import { Command, CommanderStatic } from 'commander';
-import { Collection } from '../lib/schematics';
 import { NestCollection } from '../lib/schematics/nest.collection';
 import { AbstractCommand } from './abstract.command';
 import { Input } from './command.input';
@@ -58,7 +57,7 @@ export class GenerateCommand extends AbstractCommand {
           });
           options.push({
             name: 'collection',
-            value: command.collection || Collection.NESTJS,
+            value: command.collection,
           });
           options.push({
             name: 'project',