@feathersjs/cli 5.0.0-pre.34 → 5.0.0-pre.35

package/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.0.0-pre.35](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.34...v5.0.0-pre.35) (2023-01-12)
+
+### Bug Fixes
+
+- **cli:** Add unhandledRejection handler to generated index file ([#2932](https://github.com/feathersjs/feathers/issues/2932)) ([e3cedc8](https://github.com/feathersjs/feathers/commit/e3cedc8e00f52d892f21fd6a3eb4ca4fe40a903c))
+- **cli:** Minor generated app improvements ([#2936](https://github.com/feathersjs/feathers/issues/2936)) ([ba1a550](https://github.com/feathersjs/feathers/commit/ba1a5500a8a5ea4ab44da44ac509e48c723d7efd))
+- **cli:** Properly log validation errors in log-error hook ([54c883c](https://github.com/feathersjs/feathers/commit/54c883c2bb5c35c02b1a2081b2f17554550aa1d4))
+- **cli:** Use correct package manager when installing an app ([#2973](https://github.com/feathersjs/feathers/issues/2973)) ([99c2a70](https://github.com/feathersjs/feathers/commit/99c2a70b77f0b68698a66180b69a56cb20c2ca0d))
+
+### Features
+
+- **generators:** Move core code generators to shared generators package ([#2982](https://github.com/feathersjs/feathers/issues/2982)) ([0328d22](https://github.com/feathersjs/feathers/commit/0328d2292153870bc43958f73d2c6f288a8cec17))
+
 # [5.0.0-pre.34](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.33...v5.0.0-pre.34) (2022-12-14)
 
 ### Bug Fixes

package/lib/index.d.ts

@@ -1,2 +1,6 @@
-export * from './cli';
-export * from './commons';
+import chalk from 'chalk';
+import { Command } from 'commander';
+export * from 'commander';
+export { chalk };
+export declare const commandRunner: (name: string) => (options: any) => Promise<void>;
+export declare const program: Command;

package/lib/index.js

@@ -13,7 +13,64 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./cli"), exports);
-__exportStar(require("./commons"), exports);
+exports.program = exports.commandRunner = exports.chalk = void 0;
+const chalk_1 = __importDefault(require("chalk"));
+exports.chalk = chalk_1.default;
+const commander_1 = require("commander");
+const path_1 = require("path");
+const generators_1 = require("@feathersjs/generators");
+__exportStar(require("commander"), exports);
+const commandRunner = (name) => async (options) => {
+    const folder = (0, path_1.dirname)(require.resolve('@feathersjs/generators'));
+    const ctx = (0, generators_1.getContext)({
+        ...options
+    });
+    await (0, generators_1.generator)(ctx)
+        .then((0, generators_1.runGenerator)(folder, name, 'index'))
+        .catch((error) => {
+        const { logger } = ctx.pinion;
+        logger.error(`Error: ${chalk_1.default.white(error.message)}`);
+    });
+};
+exports.commandRunner = commandRunner;
+exports.program = new commander_1.Command();
+exports.program
+    .name('feathers')
+    .description('The Feathers command line interface 🕊️')
+    .version(generators_1.version)
+    .showHelpAfterError();
+const generate = exports.program.command('generate').alias('g');
+generate
+    .command('app')
+    .description('Generate a new application')
+    .option('--name <name>', 'The name of the application')
+    .action((0, exports.commandRunner)('app'));
+generate
+    .command('service')
+    .description('Generate a new service')
+    .option('--name <name>', 'The service name')
+    .option('--path <path>', 'The path to register the service on')
+    .option('--type <type>', 'The service type (knex, mongodb, custom)')
+    .action((0, exports.commandRunner)('service'));
+generate
+    .command('hook')
+    .description('Generate a hook')
+    .option('--name <name>', 'The name of the hook')
+    .option('--type <type>', 'The hook type (around or regular)')
+    .action((0, exports.commandRunner)('hook'));
+generate
+    .command('connection')
+    .description('Add a new database connection')
+    .action((0, exports.commandRunner)('connection'));
+generate
+    .command('authentication')
+    .description('Add authentication to the application')
+    .action((0, exports.commandRunner)('authentication'));
+generate.description(`Run a generator. Currently available: \n  ${generate.commands
+    .map((cmd) => `${chalk_1.default.blue(cmd.name())}: ${cmd.description()} `)
+    .join('\n  ')}`);
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAqB;AACrB,4CAAyB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,kDAAyB;AAMhB,gBANF,eAAK,CAME;AALd,yCAAmC;AACnC,+BAA8B;AAC9B,uDAA0G;AAE1G,4CAAyB;AAGlB,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,KAAK,EAAE,OAAY,EAAE,EAAE;IACpE,MAAM,MAAM,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC,CAAA;IACjE,MAAM,GAAG,GAAG,IAAA,uBAAU,EAAsB;QAC1C,GAAG,OAAO;KACX,CAAC,CAAA;IAEF,MAAM,IAAA,sBAAS,EAAC,GAAG,CAAC;SACjB,IAAI,CAAC,IAAA,yBAAY,EAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;SACzC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;QACf,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAA;QAE7B,MAAM,CAAC,KAAK,CAAC,UAAU,eAAK,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IACtD,CAAC,CAAC,CAAA;AACN,CAAC,CAAA;AAbY,QAAA,aAAa,iBAazB;AAEY,QAAA,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAA;AAEpC,eAAO;KACJ,IAAI,CAAC,UAAU,CAAC;KAChB,WAAW,CAAC,yCAAyC,CAAC;KACtD,OAAO,CAAC,oBAAO,CAAC;KAChB,kBAAkB,EAAE,CAAA;AAEvB,MAAM,QAAQ,GAAG,eAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;AAEvD,QAAQ;KACL,OAAO,CAAC,KAAK,CAAC;KACd,WAAW,CAAC,4BAA4B,CAAC;KACzC,MAAM,CAAC,eAAe,EAAE,6BAA6B,CAAC;KACtD,MAAM,CAAC,IAAA,qBAAa,EAAC,KAAK,CAAC,CAAC,CAAA;AAE/B,QAAQ;KACL,OAAO,CAAC,SAAS,CAAC;KAClB,WAAW,CAAC,wBAAwB,CAAC;KACrC,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC;KAC3C,MAAM,CAAC,eAAe,EAAE,qCAAqC,CAAC;KAC9D,MAAM,CAAC,eAAe,EAAE,0CAA0C,CAAC;KACnE,MAAM,CAAC,IAAA,qBAAa,EAAC,SAAS,CAAC,CAAC,CAAA;AAEnC,QAAQ;KACL,OAAO,CAAC,MAAM,CAAC;KACf,WAAW,CAAC,iBAAiB,CAAC;KAC9B,MAAM,CAAC,eAAe,EAAE,sBAAsB,CAAC;KAC/C,MAAM,CAAC,eAAe,EAAE,mCAAmC,CAAC;KAC5D,MAAM,CAAC,IAAA,qBAAa,EAAC,MAAM,CAAC,CAAC,CAAA;AAEhC,QAAQ;KACL,OAAO,CAAC,YAAY,CAAC;KACrB,WAAW,CAAC,+BAA+B,CAAC;KAC5C,MAAM,CAAC,IAAA,qBAAa,EAAC,YAAY,CAAC,CAAC,CAAA;AAEtC,QAAQ;KACL,OAAO,CAAC,gBAAgB,CAAC;KACzB,WAAW,CAAC,uCAAuC,CAAC;KACpD,MAAM,CAAC,IAAA,qBAAa,EAAC,gBAAgB,CAAC,CAAC,CAAA;AAE1C,QAAQ,CAAC,WAAW,CAClB,6CAA6C,QAAQ,CAAC,QAAQ;KAC3D,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,GAAG,CAAC,WAAW,EAAE,GAAG,CAAC;KAChE,IAAI,CAAC,MAAM,CAAC,EAAE,CAClB,CAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/cli",
   "description": "The command line interface for creating Feathers applications",
-  "version": "5.0.0-pre.34",
+  "version": "5.0.0-pre.35",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "bin": {
@@ -44,7 +44,7 @@
   ],
   "scripts": {
     "prepublish": "npm run compile",
-    "compile": "shx rm -rf lib/ && tsc && shx cp -r src/. lib/",
+    "compile": "shx rm -rf lib/ && tsc",
     "mocha": "mocha --timeout 60000 --config ../../.mocharc.json --recursive test/**.test.ts test/**/*.test.ts",
     "test": "npm run compile && npm run mocha"
   },
@@ -52,39 +52,37 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathershq/pinion": "^0.3.5",
+    "@feathersjs/generators": "^5.0.0-pre.35",
     "chalk": "^4.0.1",
-    "commander": "^9.4.1",
-    "lodash": "^4.17.21",
-    "prettier": "^2.8.0"
+    "commander": "^9.4.1"
   },
   "devDependencies": {
-    "@feathersjs/adapter-commons": "^5.0.0-pre.34",
-    "@feathersjs/authentication": "^5.0.0-pre.34",
-    "@feathersjs/authentication-client": "^5.0.0-pre.34",
-    "@feathersjs/authentication-local": "^5.0.0-pre.34",
-    "@feathersjs/authentication-oauth": "^5.0.0-pre.34",
-    "@feathersjs/configuration": "^5.0.0-pre.34",
-    "@feathersjs/errors": "^5.0.0-pre.34",
-    "@feathersjs/express": "^5.0.0-pre.34",
-    "@feathersjs/feathers": "^5.0.0-pre.34",
-    "@feathersjs/knex": "^5.0.0-pre.34",
-    "@feathersjs/koa": "^5.0.0-pre.34",
-    "@feathersjs/mongodb": "^5.0.0-pre.34",
-    "@feathersjs/rest-client": "^5.0.0-pre.34",
-    "@feathersjs/schema": "^5.0.0-pre.34",
-    "@feathersjs/socketio": "^5.0.0-pre.34",
-    "@feathersjs/transport-commons": "^5.0.0-pre.34",
-    "@feathersjs/typebox": "^5.0.0-pre.34",
+    "@feathersjs/adapter-commons": "^5.0.0-pre.35",
+    "@feathersjs/authentication": "^5.0.0-pre.35",
+    "@feathersjs/authentication-client": "^5.0.0-pre.35",
+    "@feathersjs/authentication-local": "^5.0.0-pre.35",
+    "@feathersjs/authentication-oauth": "^5.0.0-pre.35",
+    "@feathersjs/configuration": "^5.0.0-pre.35",
+    "@feathersjs/errors": "^5.0.0-pre.35",
+    "@feathersjs/express": "^5.0.0-pre.35",
+    "@feathersjs/feathers": "^5.0.0-pre.35",
+    "@feathersjs/knex": "^5.0.0-pre.35",
+    "@feathersjs/koa": "^5.0.0-pre.35",
+    "@feathersjs/mongodb": "^5.0.0-pre.35",
+    "@feathersjs/rest-client": "^5.0.0-pre.35",
+    "@feathersjs/schema": "^5.0.0-pre.35",
+    "@feathersjs/socketio": "^5.0.0-pre.35",
+    "@feathersjs/transport-commons": "^5.0.0-pre.35",
+    "@feathersjs/typebox": "^5.0.0-pre.35",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.11.10",
-    "@types/prettier": "^2.7.1",
-    "axios": "^1.2.0",
-    "mocha": "^10.1.0",
+    "@types/node": "^18.11.18",
+    "@types/prettier": "^2.7.2",
+    "axios": "^1.2.2",
+    "mocha": "^10.2.0",
     "shx": "^0.3.4",
     "ts-node": "^10.9.1",
-    "type-fest": "^3.3.0",
-    "typescript": "^4.9.3"
+    "type-fest": "^3.5.0",
+    "typescript": "^4.9.4"
   },
-  "gitHead": "42cca600d00f0b3b9d89fa79be30fcd46bc50132"
+  "gitHead": "c641598d9a4de3ceda10f56cf2af288a4236b15e"
 }

package/lib/app/index.d.ts

@@ -1,29 +0,0 @@
-import { FeathersBaseContext, FeathersAppInfo } from '../commons';
-export interface AppGeneratorData extends FeathersAppInfo {
-    /**
-     * The application name
-     */
-    name: string;
-    /**
-     * A short description of the app
-     */
-    description: string;
-    /**
-     * The selected user authentication strategies
-     */
-    authStrategies: string[];
-    /**
-     * The database connection string
-     */
-    connectionString: string;
-    /**
-     * The source folder where files are put
-     */
-    lib: string;
-}
-export type AppGeneratorContext = FeathersBaseContext & AppGeneratorData & {
-    dependencies: string[];
-    devDependencies: string[];
-};
-export type AppGeneratorArguments = FeathersBaseContext & Partial<AppGeneratorData>;
-export declare const generate: (ctx: AppGeneratorArguments) => Promise<AppGeneratorContext>;

package/lib/app/index.js

@@ -1,146 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generate = void 0;
-const path_1 = require("path");
-const chalk_1 = __importDefault(require("chalk"));
-const pinion_1 = require("@feathershq/pinion");
-const commons_1 = require("../commons");
-const authentication_1 = require("../authentication");
-const connection_1 = require("../connection");
-const generate = (ctx) => (0, pinion_1.generator)(ctx)
-    .then((0, commons_1.initializeBaseContext)())
-    .then((ctx) => ({
-    ...ctx,
-    dependencies: [],
-    devDependencies: []
-}))
-    .then((0, pinion_1.prompt)((ctx) => [
-    {
-        name: 'language',
-        type: 'list',
-        message: 'Do you want to use JavaScript or TypeScript?',
-        when: !ctx.language,
-        choices: [
-            { name: 'TypeScript', value: 'ts' },
-            { name: 'JavaScript', value: 'js' }
-        ]
-    },
-    {
-        name: 'name',
-        type: 'input',
-        when: !ctx.name,
-        message: 'What is the name of your application?',
-        default: ctx.cwd.split(path_1.sep).pop(),
-        validate: (input) => {
-            if (ctx.dependencyVersions[input]) {
-                return `Application can not have the same name as a dependency`;
-            }
-            return true;
-        }
-    },
-    {
-        name: 'description',
-        type: 'input',
-        when: !ctx.description,
-        message: 'Write a short description'
-    },
-    {
-        type: 'list',
-        name: 'framework',
-        when: !ctx.framework,
-        message: 'Which HTTP framework do you want to use?',
-        choices: [
-            { value: 'koa', name: `KoaJS ${chalk_1.default.grey('(recommended)')}` },
-            { value: 'express', name: 'Express' }
-        ]
-    },
-    {
-        type: 'checkbox',
-        name: 'transports',
-        when: !ctx.transports,
-        message: 'What APIs do you want to offer?',
-        choices: [
-            { value: 'rest', name: 'HTTP (REST)', checked: true },
-            { value: 'websockets', name: 'Real-time', checked: true }
-        ]
-    },
-    {
-        name: 'packager',
-        type: 'list',
-        when: !ctx.packager,
-        message: 'Which package manager are you using?',
-        choices: [
-            { value: 'npm', name: 'npm' },
-            { value: 'yarn', name: 'Yarn' },
-            { value: 'pnpm', name: 'pnpm' }
-        ]
-    },
-    {
-        type: 'list',
-        name: 'schema',
-        when: !ctx.schema,
-        message: 'What is your preferred schema (model) definition format?',
-        choices: [
-            { value: 'typebox', name: `TypeBox ${chalk_1.default.grey('(recommended)')}` },
-            { value: 'json', name: 'JSON schema' }
-        ]
-    },
-    ...(0, connection_1.prompts)(ctx),
-    ...(0, authentication_1.prompts)({
-        ...ctx,
-        service: 'user',
-        path: 'users',
-        entity: 'user'
-    })
-]))
-    .then((0, pinion_1.runGenerators)(__dirname, 'templates'))
-    .then((0, pinion_1.copyFiles)((0, pinion_1.fromFile)(__dirname, 'static'), (0, pinion_1.toFile)('.')))
-    .then((0, commons_1.initializeBaseContext)())
-    .then(async (ctx) => {
-    const { dependencies } = await (0, connection_1.generate)(ctx);
-    return {
-        ...ctx,
-        dependencies
-    };
-})
-    .then((0, pinion_1.when)(({ authStrategies }) => authStrategies.length > 0, async (ctx) => {
-    const { dependencies } = await (0, authentication_1.generate)({
-        ...ctx,
-        service: 'user',
-        path: 'users',
-        entity: 'user'
-    });
-    return {
-        ...ctx,
-        dependencies
-    };
-}))
-    .then((0, pinion_1.install)(({ transports, framework, dependencyVersions, dependencies, schema }) => {
-    const hasSocketio = transports.includes('websockets');
-    dependencies.push('@feathersjs/feathers', '@feathersjs/errors', '@feathersjs/schema', '@feathersjs/configuration', '@feathersjs/transport-commons', '@feathersjs/adapter-commons', '@feathersjs/authentication', '@feathersjs/authentication-client', 'winston');
-    if (hasSocketio) {
-        dependencies.push('@feathersjs/socketio');
-    }
-    if (framework === 'koa') {
-        dependencies.push('@feathersjs/koa');
-    }
-    if (framework === 'express') {
-        dependencies.push('@feathersjs/express', 'compression');
-    }
-    if (schema === 'typebox') {
-        dependencies.push('@feathersjs/typebox');
-    }
-    return (0, commons_1.addVersions)(dependencies, dependencyVersions);
-}, false, ctx.packager))
-    .then((0, pinion_1.install)(({ language, devDependencies, dependencyVersions }) => {
-    devDependencies.push('nodemon', 'axios', 'mocha', 'cross-env', 'prettier', '@feathersjs/cli', '@feathersjs/rest-client');
-    if (language === 'ts') {
-        devDependencies.push('@types/mocha', '@types/node', 'nodemon', 'ts-node', 'typescript', 'shx');
-    }
-    return (0, commons_1.addVersions)(devDependencies, dependencyVersions);
-}, true, ctx.packager));
-exports.generate = generate;
-//# sourceMappingURL=index.js.map

package/lib/app/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/app/index.ts"],"names":[],"mappings":"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"}

package/lib/app/index.ts

@@ -1,228 +0,0 @@
-import { sep } from 'path'
-import chalk from 'chalk'
-import {
-  generator,
-  prompt,
-  runGenerators,
-  fromFile,
-  install,
-  copyFiles,
-  toFile,
-  when
-} from '@feathershq/pinion'
-import { FeathersBaseContext, FeathersAppInfo, initializeBaseContext, addVersions } from '../commons'
-import { generate as authenticationGenerator, prompts as authenticationPrompts } from '../authentication'
-import { generate as connectionGenerator, prompts as connectionPrompts } from '../connection'
-
-export interface AppGeneratorData extends FeathersAppInfo {
-  /**
-   * The application name
-   */
-  name: string
-  /**
-   * A short description of the app
-   */
-  description: string
-  /**
-   * The selected user authentication strategies
-   */
-  authStrategies: string[]
-  /**
-   * The database connection string
-   */
-  connectionString: string
-  /**
-   * The source folder where files are put
-   */
-  lib: string
-}
-
-export type AppGeneratorContext = FeathersBaseContext &
-  AppGeneratorData & {
-    dependencies: string[]
-    devDependencies: string[]
-  }
-
-export type AppGeneratorArguments = FeathersBaseContext & Partial<AppGeneratorData>
-
-export const generate = (ctx: AppGeneratorArguments) =>
-  generator(ctx)
-    .then(initializeBaseContext())
-    .then((ctx) => ({
-      ...ctx,
-      dependencies: [],
-      devDependencies: []
-    }))
-    .then(
-      prompt<AppGeneratorArguments, AppGeneratorContext>((ctx) => [
-        {
-          name: 'language',
-          type: 'list',
-          message: 'Do you want to use JavaScript or TypeScript?',
-          when: !ctx.language,
-          choices: [
-            { name: 'TypeScript', value: 'ts' },
-            { name: 'JavaScript', value: 'js' }
-          ]
-        },
-        {
-          name: 'name',
-          type: 'input',
-          when: !ctx.name,
-          message: 'What is the name of your application?',
-          default: ctx.cwd.split(sep).pop(),
-          validate: (input) => {
-            if (ctx.dependencyVersions[input]) {
-              return `Application can not have the same name as a dependency`
-            }
-
-            return true
-          }
-        },
-        {
-          name: 'description',
-          type: 'input',
-          when: !ctx.description,
-          message: 'Write a short description'
-        },
-        {
-          type: 'list',
-          name: 'framework',
-          when: !ctx.framework,
-          message: 'Which HTTP framework do you want to use?',
-          choices: [
-            { value: 'koa', name: `KoaJS ${chalk.grey('(recommended)')}` },
-            { value: 'express', name: 'Express' }
-          ]
-        },
-        {
-          type: 'checkbox',
-          name: 'transports',
-          when: !ctx.transports,
-          message: 'What APIs do you want to offer?',
-          choices: [
-            { value: 'rest', name: 'HTTP (REST)', checked: true },
-            { value: 'websockets', name: 'Real-time', checked: true }
-          ]
-        },
-        {
-          name: 'packager',
-          type: 'list',
-          when: !ctx.packager,
-          message: 'Which package manager are you using?',
-          choices: [
-            { value: 'npm', name: 'npm' },
-            { value: 'yarn', name: 'Yarn' },
-            { value: 'pnpm', name: 'pnpm' }
-          ]
-        },
-        {
-          type: 'list',
-          name: 'schema',
-          when: !ctx.schema,
-          message: 'What is your preferred schema (model) definition format?',
-          choices: [
-            { value: 'typebox', name: `TypeBox ${chalk.grey('(recommended)')}` },
-            { value: 'json', name: 'JSON schema' }
-          ]
-        },
-        ...connectionPrompts(ctx),
-        ...authenticationPrompts({
-          ...ctx,
-          service: 'user',
-          path: 'users',
-          entity: 'user'
-        })
-      ])
-    )
-    .then(runGenerators(__dirname, 'templates'))
-    .then(copyFiles(fromFile(__dirname, 'static'), toFile('.')))
-    .then(initializeBaseContext())
-    .then(async (ctx) => {
-      const { dependencies } = await connectionGenerator(ctx)
-
-      return {
-        ...ctx,
-        dependencies
-      }
-    })
-    .then(
-      when<AppGeneratorContext>(
-        ({ authStrategies }) => authStrategies.length > 0,
-        async (ctx) => {
-          const { dependencies } = await authenticationGenerator({
-            ...ctx,
-            service: 'user',
-            path: 'users',
-            entity: 'user'
-          })
-
-          return {
-            ...ctx,
-            dependencies
-          }
-        }
-      )
-    )
-    .then(
-      install<AppGeneratorContext>(
-        ({ transports, framework, dependencyVersions, dependencies, schema }) => {
-          const hasSocketio = transports.includes('websockets')
-
-          dependencies.push(
-            '@feathersjs/feathers',
-            '@feathersjs/errors',
-            '@feathersjs/schema',
-            '@feathersjs/configuration',
-            '@feathersjs/transport-commons',
-            '@feathersjs/adapter-commons',
-            '@feathersjs/authentication',
-            '@feathersjs/authentication-client',
-            'winston'
-          )
-
-          if (hasSocketio) {
-            dependencies.push('@feathersjs/socketio')
-          }
-
-          if (framework === 'koa') {
-            dependencies.push('@feathersjs/koa')
-          }
-
-          if (framework === 'express') {
-            dependencies.push('@feathersjs/express', 'compression')
-          }
-
-          if (schema === 'typebox') {
-            dependencies.push('@feathersjs/typebox')
-          }
-
-          return addVersions(dependencies, dependencyVersions)
-        },
-        false,
-        ctx.packager
-      )
-    )
-    .then(
-      install<AppGeneratorContext>(
-        ({ language, devDependencies, dependencyVersions }) => {
-          devDependencies.push(
-            'nodemon',
-            'axios',
-            'mocha',
-            'cross-env',
-            'prettier',
-            '@feathersjs/cli',
-            '@feathersjs/rest-client'
-          )
-
-          if (language === 'ts') {
-            devDependencies.push('@types/mocha', '@types/node', 'nodemon', 'ts-node', 'typescript', 'shx')
-          }
-
-          return addVersions(devDependencies, dependencyVersions)
-        },
-        true,
-        ctx.packager
-      )
-    )