@feathersjs/cli 5.0.0-pre.24 → 5.0.0-pre.25

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 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.25](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.24...v5.0.0-pre.25) (2022-06-22)
+
+
+### Bug Fixes
+
+* **cli:** Generator fixes to work with the new guide ([#2674](https://github.com/feathersjs/feathers/issues/2674)) ([b773fa5](https://github.com/feathersjs/feathers/commit/b773fa5dbd7ff450cfb2f7b93e64882592262712))
+
+
+
+
+
 # [5.0.0-pre.24](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.23...v5.0.0-pre.24) (2022-06-21)
 
 

package/lib/app/templates/app.test.tpl.js

@@ -18,8 +18,8 @@ describe('Feathers application tests', () => {
     server = await app.listen(port)
   })
 
-  after(done => {
-    server.close(done)
+  after(async () => {
+    await app.teardown()
   })
 
   it('starts and shows the index page', async () => {

package/lib/app/templates/app.test.tpl.ts

@@ -18,8 +18,8 @@ describe('Feathers application tests', () => {
     server = await app.listen(port)
   })
 
-  after(done => {
-    server.close(done)
+  after(async () => {
+    await app.teardown()
   })
 
   it('starts and shows the index page', async () => {

package/lib/app/templates/channels.tpl.js

@@ -24,8 +24,8 @@ export const channels = (app: Application) => {
     // connection can be undefined if there is no
     // real-time connection, e.g. when logging in via REST
     if(connection) {
-      // Obtain the logged in user from the connection
-      // const user = connection.user
+      // Obtain the logged in user
+      // const user = authResult.user
       
       // The connection is no longer anonymous, remove it
       app.channel('anonymous').leave(connection)
@@ -52,8 +52,6 @@ export const channels = (app: Application) => {
     // Here you can add event publishers to channels set up in \`channels.js\`
     // To publish only for a specific event use \`app.publish(eventname, () => {})\`
 
-    console.log('Publishing all events to all authenticated users. See \`channels.js\` and https://docs.feathersjs.com/api/channels.html for more information.') // eslint-disable-line
-
     // e.g. to publish all service events to all authenticated users use
     return app.channel('authenticated')
   })

package/lib/app/templates/channels.tpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"channels.tpl.js","sourceRoot":"","sources":["../../../src/app/templates/channels.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsD;AACtD,2CAA4C;AAG5C,MAAM,QAAQ,GAAG,CAAC,EAAE,QAAQ,EAAuB,EAAE,EAAE,CACrD;;;;;;;;;;kFAUgF,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyDzF,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,GAAwB,EAAE,EAAE,CACnD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,sBAAY,EACV,QAAQ,EACR,IAAA,eAAM,EAAsB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,UAAU,CAAC,CAC1D,CACF,CAAA;AANU,QAAA,QAAQ,YAMlB"}
+{"version":3,"file":"channels.tpl.js","sourceRoot":"","sources":["../../../src/app/templates/channels.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsD;AACtD,2CAA4C;AAG5C,MAAM,QAAQ,GAAG,CAAC,EAAE,QAAQ,EAAuB,EAAE,EAAE,CACrD;;;;;;;;;;kFAUgF,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuDzF,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,GAAwB,EAAE,EAAE,CACnD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,sBAAY,EACV,QAAQ,EACR,IAAA,eAAM,EAAsB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,UAAU,CAAC,CAC1D,CACF,CAAA;AANU,QAAA,QAAQ,YAMlB"}

package/lib/app/templates/channels.tpl.ts

@@ -24,8 +24,8 @@ export const channels = (app: Application) => {
     // connection can be undefined if there is no
     // real-time connection, e.g. when logging in via REST
     if(connection) {
-      // Obtain the logged in user from the connection
-      // const user = connection.user
+      // Obtain the logged in user
+      // const user = authResult.user
       
       // The connection is no longer anonymous, remove it
       app.channel('anonymous').leave(connection)
@@ -52,8 +52,6 @@ export const channels = (app: Application) => {
     // Here you can add event publishers to channels set up in \`channels.js\`
     // To publish only for a specific event use \`app.publish(eventname, () => {})\`
 
-    console.log('Publishing all events to all authenticated users. See \`channels.js\` and https://docs.feathersjs.com/api/channels.html for more information.') // eslint-disable-line
-
     // e.g. to publish all service events to all authenticated users use
     return app.channel('authenticated')
   })

package/lib/app/templates/client.tpl.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate = void 0;
 const pinion_1 = require("@feathershq/pinion");
 const commons_1 = require("../../commons");
-const template = ({}) => `import { feathers, type Service, type TransportConnection } from '@feathersjs/feathers'
+const template = ({}) => `import { feathers } from '@feathersjs/feathers'
+import type { Service, TransportConnection, Params } from '@feathersjs/feathers'
 
 // A mapping of client side services
 export interface ServiceTypes {

package/lib/app/templates/client.tpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.tpl.js","sourceRoot":"","sources":["../../../src/app/templates/client.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsD;AACtD,2CAA4C;AAG5C,MAAM,QAAQ,GAAG,CAAC,EAAuB,EAAE,EAAE,CAC3C;;;;;;;;;;;;;CAaD,CAAA;AAEM,MAAM,QAAQ,GAAG,KAAK,EAAE,GAAwB,EAAE,EAAE,CACzD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,sBAAY,EACV,QAAQ,EACR,IAAA,eAAM,EAAsB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC,CACxD,CACF,CAAA;AANU,QAAA,QAAQ,YAMlB"}
+{"version":3,"file":"client.tpl.js","sourceRoot":"","sources":["../../../src/app/templates/client.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsD;AACtD,2CAA4C;AAG5C,MAAM,QAAQ,GAAG,CAAC,EAAuB,EAAE,EAAE,CAC3C;;;;;;;;;;;;;;CAcD,CAAA;AAEM,MAAM,QAAQ,GAAG,KAAK,EAAE,GAAwB,EAAE,EAAE,CACzD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,sBAAY,EACV,QAAQ,EACR,IAAA,eAAM,EAAsB,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC,CACxD,CACF,CAAA;AANU,QAAA,QAAQ,YAMlB"}

package/lib/app/templates/client.tpl.ts

@@ -3,7 +3,8 @@ import { renderSource } from '../../commons'
 import { AppGeneratorContext } from '../index'
 
 const template = ({}: AppGeneratorContext) =>
-  `import { feathers, type Service, type TransportConnection } from '@feathersjs/feathers'
+  `import { feathers } from '@feathersjs/feathers'
+import type { Service, TransportConnection, Params } from '@feathersjs/feathers'
 
 // A mapping of client side services
 export interface ServiceTypes {

package/lib/app/templates/tsconfig.json.tpl.js

@@ -9,11 +9,12 @@ const generate = (ctx) => (0, pinion_1.generator)(ctx).then((0, pinion_1.when)((
     compilerOptions: {
         target: 'es2020',
         module: 'commonjs',
-        outDir: './dist',
+        outDir: './lib',
         rootDir: `./${lib}`,
         strict: true,
         esModuleInterop: true
     },
+    include: [lib],
     exclude: ['test']
 }), (0, pinion_1.toFile)('tsconfig.json'))));
 exports.generate = generate;

package/lib/app/templates/tsconfig.json.tpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"tsconfig.json.tpl.js","sourceRoot":"","sources":["../../../src/app/templates/tsconfig.json.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAuE;AAGhE,MAAM,QAAQ,GAAG,CAAC,GAAwB,EAAE,EAAE,CACnD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,aAAI,EACF,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,EAC9B,IAAA,kBAAS,EACP,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;IACZ,SAAS,EAAE;QACT,KAAK,EAAE,IAAI;KACZ;IACD,eAAe,EAAE;QACf,MAAM,EAAE,QAAQ;QAChB,MAAM,EAAE,UAAU;QAClB,MAAM,EAAE,QAAQ;QAChB,OAAO,EAAE,KAAK,GAAG,EAAE;QACnB,MAAM,EAAE,IAAI;QACZ,eAAe,EAAE,IAAI;KACtB;IACD,OAAO,EAAE,CAAC,MAAM,CAAC;CAClB,CAAC,EACF,IAAA,eAAM,EAAC,eAAe,CAAC,CACxB,CACF,CACF,CAAA;AAtBU,QAAA,QAAQ,YAsBlB"}
+{"version":3,"file":"tsconfig.json.tpl.js","sourceRoot":"","sources":["../../../src/app/templates/tsconfig.json.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAuE;AAGhE,MAAM,QAAQ,GAAG,CAAC,GAAwB,EAAE,EAAE,CACnD,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,aAAI,EACF,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,KAAK,IAAI,EAC9B,IAAA,kBAAS,EACP,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;IACZ,SAAS,EAAE;QACT,KAAK,EAAE,IAAI;KACZ;IACD,eAAe,EAAE;QACf,MAAM,EAAE,QAAQ;QAChB,MAAM,EAAE,UAAU;QAClB,MAAM,EAAE,OAAO;QACf,OAAO,EAAE,KAAK,GAAG,EAAE;QACnB,MAAM,EAAE,IAAI;QACZ,eAAe,EAAE,IAAI;KACtB;IACD,OAAO,EAAE,CAAC,GAAG,CAAC;IACd,OAAO,EAAE,CAAC,MAAM,CAAC;CAClB,CAAC,EACF,IAAA,eAAM,EAAC,eAAe,CAAC,CACxB,CACF,CACF,CAAA;AAvBU,QAAA,QAAQ,YAuBlB"}

package/lib/app/templates/tsconfig.json.tpl.ts

@@ -13,11 +13,12 @@ export const generate = (ctx: AppGeneratorContext) =>
           compilerOptions: {
             target: 'es2020',
             module: 'commonjs',
-            outDir: './dist',
+            outDir: './lib',
             rootDir: `./${lib}`,
             strict: true,
             esModuleInterop: true
           },
+          include: [lib],
           exclude: ['test']
         }),
         toFile('tsconfig.json')

package/lib/authentication/templates/knex.tpl.js

@@ -31,10 +31,12 @@ export async function down(knex: Knex): Promise<void> {
   })
 }
 `;
-const generate = (ctx) => (0, pinion_1.generator)(ctx).then((0, pinion_1.when)((ctx) => (0, commons_1.getDatabaseAdapter)(ctx.feathers.database) === 'knex', (0, commons_1.renderSource)(migrationTemplate, (0, pinion_1.toFile)((0, pinion_1.toFile)('migrations', () => {
-    const now = new Date();
-    const migrationDate = `${now.getUTCFullYear()}${now.getUTCMonth()}${now.getUTCDay()}` +
-        `${now.getUTCHours()}${now.getUTCMinutes()}${now.getUTCSeconds() + 1}`;
+const generate = (ctx) => (0, pinion_1.generator)(ctx)
+    // We need to wait a second otherwise the migration filenames won't be in the right order
+    .then((ctx) => new Promise((resolve) => setTimeout(() => resolve(ctx), 1100)))
+    .then((0, pinion_1.when)((ctx) => (0, commons_1.getDatabaseAdapter)(ctx.feathers.database) === 'knex', (0, commons_1.renderSource)(migrationTemplate, (0, pinion_1.toFile)((0, pinion_1.toFile)('migrations', () => {
+    // Probably not great but it works to align with the Knex migration file format
+    const migrationDate = new Date().toISOString().replace(/\D/g, '').substring(0, 14);
     return `${migrationDate}_authentication`;
 })))));
 exports.generate = generate;

package/lib/authentication/templates/knex.tpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"knex.tpl.js","sourceRoot":"","sources":["../../../src/authentication/templates/knex.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAA4D;AAC5D,2CAAgE;AAGhE,MAAM,iBAAiB,GAAG,CAAC,EACzB,SAAS,EACT,cAAc,EACiB,EAAE,EAAE,CAAC;;;kCAGJ,SAAS;8BACb,cAAc;KACrC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACZ,IAAI,KAAK,OAAO;IACd,CAAC,CAAC;;6BAEiB;IACnB,CAAC,CAAC;oBACQ,IAAI,MAAM,CACvB;KACA,IAAI,CAAC,IAAI,CAAC;;;;;kCAKiB,SAAS;0BACjB,cAAc;KACjC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACZ,IAAI,KAAK,OAAO;IACd,CAAC,CAAC;;iCAEqB;IACvB,CAAC,CAAC;wBACY,IAAI,MAAM,CAC3B;KACA,IAAI,CAAC,KAAK,CAAC;;;CAGjB,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,GAAmC,EAAE,EAAE,CAC9D,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC,IAAI,CACjB,IAAA,aAAI,EACF,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,4BAAkB,EAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,MAAM,EAC7D,IAAA,sBAAY,EACV,iBAAiB,EACjB,IAAA,eAAM,EACJ,IAAA,eAAM,EAAiC,YAAY,EAAE,GAAG,EAAE;IACxD,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;IACtB,MAAM,aAAa,GACjB,GAAG,GAAG,CAAC,cAAc,EAAE,GAAG,GAAG,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,SAAS,EAAE,EAAE;QAC/D,GAAG,GAAG,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE,GAAG,CAAC,EAAE,CAAA;IAExE,OAAO,GAAG,aAAa,iBAAiB,CAAA;AAC1C,CAAC,CAAC,CACH,CACF,CACF,CACF,CAAA;AAlBU,QAAA,QAAQ,YAkBlB"}
+{"version":3,"file":"knex.tpl.js","sourceRoot":"","sources":["../../../src/authentication/templates/knex.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAA4D;AAC5D,2CAAgE;AAGhE,MAAM,iBAAiB,GAAG,CAAC,EACzB,SAAS,EACT,cAAc,EACiB,EAAE,EAAE,CAAC;;;kCAGJ,SAAS;8BACb,cAAc;KACrC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACZ,IAAI,KAAK,OAAO;IACd,CAAC,CAAC;;6BAEiB;IACnB,CAAC,CAAC;oBACQ,IAAI,MAAM,CACvB;KACA,IAAI,CAAC,IAAI,CAAC;;;;;kCAKiB,SAAS;0BACjB,cAAc;KACjC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACZ,IAAI,KAAK,OAAO;IACd,CAAC,CAAC;;iCAEqB;IACvB,CAAC,CAAC;wBACY,IAAI,MAAM,CAC3B;KACA,IAAI,CAAC,KAAK,CAAC;;;CAGjB,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,GAAmC,EAAE,EAAE,CAC9D,IAAA,kBAAS,EAAC,GAAG,CAAC;IACZ,yFAAyF;KACxF,IAAI,CACH,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,OAAO,CAAiC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC,CACxG;KACA,IAAI,CACH,IAAA,aAAI,EACF,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,4BAAkB,EAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,MAAM,EAC7D,IAAA,sBAAY,EACV,iBAAiB,EACjB,IAAA,eAAM,EACJ,IAAA,eAAM,EAAiC,YAAY,EAAE,GAAG,EAAE;IACxD,+EAA+E;IAC/E,MAAM,aAAa,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IAElF,OAAO,GAAG,aAAa,iBAAiB,CAAA;AAC1C,CAAC,CAAC,CACH,CACF,CACF,CACF,CAAA;AArBQ,QAAA,QAAQ,YAqBhB"}

package/lib/authentication/templates/knex.tpl.ts

@@ -39,21 +39,24 @@ export async function down(knex: Knex): Promise<void> {
 `
 
 export const generate = (ctx: AuthenticationGeneratorContext) =>
-  generator(ctx).then(
-    when(
-      (ctx) => getDatabaseAdapter(ctx.feathers.database) === 'knex',
-      renderSource(
-        migrationTemplate,
-        toFile(
-          toFile<AuthenticationGeneratorContext>('migrations', () => {
-            const now = new Date()
-            const migrationDate =
-              `${now.getUTCFullYear()}${now.getUTCMonth()}${now.getUTCDay()}` +
-              `${now.getUTCHours()}${now.getUTCMinutes()}${now.getUTCSeconds() + 1}`
+  generator(ctx)
+    // We need to wait a second otherwise the migration filenames won't be in the right order
+    .then(
+      (ctx) => new Promise<AuthenticationGeneratorContext>((resolve) => setTimeout(() => resolve(ctx), 1100))
+    )
+    .then(
+      when(
+        (ctx) => getDatabaseAdapter(ctx.feathers.database) === 'knex',
+        renderSource(
+          migrationTemplate,
+          toFile(
+            toFile<AuthenticationGeneratorContext>('migrations', () => {
+              // Probably not great but it works to align with the Knex migration file format
+              const migrationDate = new Date().toISOString().replace(/\D/g, '').substring(0, 14)
 
-            return `${migrationDate}_authentication`
-          })
+              return `${migrationDate}_authentication`
+            })
+          )
         )
       )
     )
-  )

package/lib/connection/templates/knex.tpl.js

@@ -44,7 +44,7 @@ const generate = (ctx) => (0, pinion_1.generator)(ctx)
     .then((0, pinion_1.mergeJSON)({
     scripts: {
         migrate: 'knex migrate:latest',
-        'migrate:create': 'knex migrate:create',
+        'migrate:make': 'knex migrate:make',
         test: 'cross-env NODE_ENV=test npm run migrate && npm run mocha'
     }
 }, (0, pinion_1.toFile)('package.json')))

package/lib/connection/templates/knex.tpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"knex.tpl.js","sourceRoot":"","sources":["../../../src/connection/templates/knex.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAiF;AAEjF,2CAAuD;AAEvD,MAAM,QAAQ,GAAG,CAAC,EAAE,QAAQ,EAA8B,EAAE,EAAE,CAC5D;;;;;;MAMI,QAAQ;;;;eAIC,QAAQ;4BACK,QAAQ;;;aAGvB,QAAQ;;CAEpB,CAAA;AAED,MAAM,QAAQ,GAAG,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAA8B,EAAE,EAAE,CAAC;yBACrD,GAAG;;;0BAGF,QAAQ;;EAEhC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,yBAAyB;CACxE,CAAA;AAED,MAAM,qBAAqB,GAAG,CAAC,EAAE,QAAQ,EAA8B,EAAE,EAAE,CAAC,OAAO,QAAQ;;;;;;KAMtF,CAAA;AAEL,MAAM,cAAc,GAAG,CAAC,EAAE,QAAQ,EAA8B,EAAE,EAAE,CAClE,YAAY,QAAQ,cAAc,QAAQ,GAAG,CAAA;AAC/C,MAAM,iBAAiB,GAAG,CAAC,EAAE,QAAQ,EAA8B,EAAE,EAAE,CAAC,iBAAiB,QAAQ,GAAG,CAAA;AACpG,MAAM,SAAS,GAAG,IAAA,eAAM,EAA6B,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,OAAO,QAAQ,EAAE,CAAC,CAAC,CAAA;AAE9F,MAAM,QAAQ,GAAG,CAAC,GAA+B,EAAE,EAAE,CAC1D,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CACH,IAAA,sBAAY,EACV,QAAQ,EACR,IAAA,eAAM,EAA6B,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAC3E,CACF;KACA,IAAI,CAAC,IAAA,sBAAY,EAAC,QAAQ,EAAE,IAAA,eAAM,EAAC,UAAU,CAAC,CAAC,CAAC;KAChD,IAAI,CACH,IAAA,kBAAS,EACP;IACE,OAAO,EAAE;QACP,OAAO,EAAE,qBAAqB;QAC9B,gBAAgB,EAAE,qBAAqB;QACvC,IAAI,EAAE,0DAA0D;KACjE;CACF,EACD,IAAA,eAAM,EAAC,cAAc,CAAC,CACvB,CACF;KACA,IAAI,CACH,IAAA,eAAM,EACJ,qBAAqB,EACrB,IAAA,eAAM,EAAC,8CAA8C,CAAC,EACtD,IAAA,eAAM,EAA6B,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IACxD,GAAG;IACH,SAAS;IACT,wBAAwB,QAAQ,EAAE;CACnC,CAAC,CACH,CACF;KACA,IAAI,CAAC,IAAA,eAAM,EAAC,IAAA,mBAAS,EAAC,cAAc,CAAC,EAAE,IAAA,eAAM,EAAC,0BAA0B,CAAC,EAAE,SAAS,CAAC,CAAC;KACtF,IAAI,CAAC,IAAA,eAAM,EAAC,IAAA,mBAAS,EAAC,iBAAiB,CAAC,EAAE,IAAA,eAAM,EAAC,yBAAyB,CAAC,EAAE,SAAS,CAAC,CAAC,CAAA;AAjChF,QAAA,QAAQ,YAiCwE"}
+{"version":3,"file":"knex.tpl.js","sourceRoot":"","sources":["../../../src/connection/templates/knex.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAiF;AAEjF,2CAAuD;AAEvD,MAAM,QAAQ,GAAG,CAAC,EAAE,QAAQ,EAA8B,EAAE,EAAE,CAC5D;;;;;;MAMI,QAAQ;;;;eAIC,QAAQ;4BACK,QAAQ;;;aAGvB,QAAQ;;CAEpB,CAAA;AAED,MAAM,QAAQ,GAAG,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAA8B,EAAE,EAAE,CAAC;yBACrD,GAAG;;;0BAGF,QAAQ;;EAEhC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,yBAAyB;CACxE,CAAA;AAED,MAAM,qBAAqB,GAAG,CAAC,EAAE,QAAQ,EAA8B,EAAE,EAAE,CAAC,OAAO,QAAQ;;;;;;KAMtF,CAAA;AAEL,MAAM,cAAc,GAAG,CAAC,EAAE,QAAQ,EAA8B,EAAE,EAAE,CAClE,YAAY,QAAQ,cAAc,QAAQ,GAAG,CAAA;AAC/C,MAAM,iBAAiB,GAAG,CAAC,EAAE,QAAQ,EAA8B,EAAE,EAAE,CAAC,iBAAiB,QAAQ,GAAG,CAAA;AACpG,MAAM,SAAS,GAAG,IAAA,eAAM,EAA6B,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,OAAO,QAAQ,EAAE,CAAC,CAAC,CAAA;AAE9F,MAAM,QAAQ,GAAG,CAAC,GAA+B,EAAE,EAAE,CAC1D,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CACH,IAAA,sBAAY,EACV,QAAQ,EACR,IAAA,eAAM,EAA6B,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAC3E,CACF;KACA,IAAI,CAAC,IAAA,sBAAY,EAAC,QAAQ,EAAE,IAAA,eAAM,EAAC,UAAU,CAAC,CAAC,CAAC;KAChD,IAAI,CACH,IAAA,kBAAS,EACP;IACE,OAAO,EAAE;QACP,OAAO,EAAE,qBAAqB;QAC9B,cAAc,EAAE,mBAAmB;QACnC,IAAI,EAAE,0DAA0D;KACjE;CACF,EACD,IAAA,eAAM,EAAC,cAAc,CAAC,CACvB,CACF;KACA,IAAI,CACH,IAAA,eAAM,EACJ,qBAAqB,EACrB,IAAA,eAAM,EAAC,8CAA8C,CAAC,EACtD,IAAA,eAAM,EAA6B,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IACxD,GAAG;IACH,SAAS;IACT,wBAAwB,QAAQ,EAAE;CACnC,CAAC,CACH,CACF;KACA,IAAI,CAAC,IAAA,eAAM,EAAC,IAAA,mBAAS,EAAC,cAAc,CAAC,EAAE,IAAA,eAAM,EAAC,0BAA0B,CAAC,EAAE,SAAS,CAAC,CAAC;KACtF,IAAI,CAAC,IAAA,eAAM,EAAC,IAAA,mBAAS,EAAC,iBAAiB,CAAC,EAAE,IAAA,eAAM,EAAC,yBAAyB,CAAC,EAAE,SAAS,CAAC,CAAC,CAAA;AAjChF,QAAA,QAAQ,YAiCwE"}

package/lib/connection/templates/knex.tpl.ts

@@ -57,7 +57,7 @@ export const generate = (ctx: ConnectionGeneratorContext) =>
         {
           scripts: {
             migrate: 'knex migrate:latest',
-            'migrate:create': 'knex migrate:create',
+            'migrate:make': 'knex migrate:make',
             test: 'cross-env NODE_ENV=test npm run migrate && npm run mocha'
           }
         },

package/lib/service/type/knex.tpl.js

@@ -41,9 +41,8 @@ const generate = (ctx) => (0, pinion_1.generator)(ctx)
     .then((0, pinion_1.inject)((0, commons_1.getSource)(exports.importTemplate), (0, pinion_1.prepend)(), toServiceFile))
     .then((0, pinion_1.inject)(exports.optionTemplate, (0, pinion_1.after)('const options ='), toServiceFile))
     .then((0, commons_1.renderSource)(migrationTemplate, (0, pinion_1.toFile)('migrations', ({ kebabName }) => {
-    const now = new Date();
-    const migrationDate = `${now.getUTCFullYear()}${now.getUTCMonth()}${now.getUTCDay()}` +
-        `${now.getUTCHours()}${now.getUTCMinutes()}${now.getUTCSeconds()}`;
+    // Probably not great but it works to align with the Knex migration file format
+    const migrationDate = new Date().toISOString().replace(/\D/g, '').substring(0, 14);
     return `${migrationDate}_${kebabName}`;
 })));
 exports.generate = generate;

package/lib/service/type/knex.tpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"knex.tpl.js","sourceRoot":"","sources":["../../../src/service/type/knex.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsF;AACtF,2CAAuD;AAGvD,MAAM,iBAAiB,GAAG,CAAC,EAAE,SAAS,EAA2B,EAAE,EAAE,CAAC;;;mCAGnC,SAAS;;;;;;;iCAOX,SAAS;;CAEzC,CAAA;AAEY,QAAA,cAAc,GAAG;4DAC8B,CAAA;AAErD,MAAM,SAAS,GAAG,CAAC,EAAE,SAAS,EAAE,SAAS,EAA2B,EAAE,EAAE,CAC7E,oBAAoB,SAAS,oCAAoC,SAAS;;;;eAI7D,SAAS,wBAAwB,SAAS,WAAW,SAAS,SAAS,SAAS;;CAE9F,CAAA;AAPY,QAAA,SAAS,aAOrB;AAEM,MAAM,cAAc,GAAG,CAAC,EAAE,SAAS,EAAE,QAAQ,EAA2B,EAAE,EAAE,CACjF;sBACoB,QAAQ,CAAC,QAAQ;aAC1B,SAAS,GAAG,CAAA;AAHZ,QAAA,cAAc,kBAGF;AAEzB,MAAM,aAAa,GAAG,IAAA,eAAM,EAA0B,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAC7F,GAAG;IACH,UAAU;IACV,GAAG,MAAM;IACT,GAAG,QAAQ,IAAI,QAAQ,EAAE;CAC1B,CAAC,CAAA;AAEK,MAAM,QAAQ,GAAG,CAAC,GAA4B,EAAE,EAAE,CACvD,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CACH,IAAA,eAAM,EAAC,IAAA,mBAAS,EAAC,iBAAS,CAAC,EAAE,IAAA,eAAM,EAA0B,sBAAsB,CAAC,EAAE,aAAa,CAAC,CACrG;KACA,IAAI,CAAC,IAAA,eAAM,EAAC,IAAA,mBAAS,EAAC,sBAAc,CAAC,EAAE,IAAA,gBAAO,GAAE,EAAE,aAAa,CAAC,CAAC;KACjE,IAAI,CAAC,IAAA,eAAM,EAAC,sBAAc,EAAE,IAAA,cAAK,EAAC,iBAAiB,CAAC,EAAE,aAAa,CAAC,CAAC;KACrE,IAAI,CACH,IAAA,sBAAY,EACV,iBAAiB,EACjB,IAAA,eAAM,EAA0B,YAAY,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;IAC9D,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;IACtB,MAAM,aAAa,GACjB,GAAG,GAAG,CAAC,cAAc,EAAE,GAAG,GAAG,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,SAAS,EAAE,EAAE;QAC/D,GAAG,GAAG,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE,GAAG,GAAG,CAAC,aAAa,EAAE,EAAE,CAAA;IAEpE,OAAO,GAAG,aAAa,IAAI,SAAS,EAAE,CAAA;AACxC,CAAC,CAAC,CACH,CACF,CAAA;AAnBQ,QAAA,QAAQ,YAmBhB"}
+{"version":3,"file":"knex.tpl.js","sourceRoot":"","sources":["../../../src/service/type/knex.tpl.ts"],"names":[],"mappings":";;;AAAA,+CAAsF;AACtF,2CAAuD;AAGvD,MAAM,iBAAiB,GAAG,CAAC,EAAE,SAAS,EAA2B,EAAE,EAAE,CAAC;;;mCAGnC,SAAS;;;;;;;iCAOX,SAAS;;CAEzC,CAAA;AAEY,QAAA,cAAc,GAAG;4DAC8B,CAAA;AAErD,MAAM,SAAS,GAAG,CAAC,EAAE,SAAS,EAAE,SAAS,EAA2B,EAAE,EAAE,CAC7E,oBAAoB,SAAS,oCAAoC,SAAS;;;;eAI7D,SAAS,wBAAwB,SAAS,WAAW,SAAS,SAAS,SAAS;;CAE9F,CAAA;AAPY,QAAA,SAAS,aAOrB;AAEM,MAAM,cAAc,GAAG,CAAC,EAAE,SAAS,EAAE,QAAQ,EAA2B,EAAE,EAAE,CACjF;sBACoB,QAAQ,CAAC,QAAQ;aAC1B,SAAS,GAAG,CAAA;AAHZ,QAAA,cAAc,kBAGF;AAEzB,MAAM,aAAa,GAAG,IAAA,eAAM,EAA0B,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAC7F,GAAG;IACH,UAAU;IACV,GAAG,MAAM;IACT,GAAG,QAAQ,IAAI,QAAQ,EAAE;CAC1B,CAAC,CAAA;AAEK,MAAM,QAAQ,GAAG,CAAC,GAA4B,EAAE,EAAE,CACvD,IAAA,kBAAS,EAAC,GAAG,CAAC;KACX,IAAI,CACH,IAAA,eAAM,EAAC,IAAA,mBAAS,EAAC,iBAAS,CAAC,EAAE,IAAA,eAAM,EAA0B,sBAAsB,CAAC,EAAE,aAAa,CAAC,CACrG;KACA,IAAI,CAAC,IAAA,eAAM,EAAC,IAAA,mBAAS,EAAC,sBAAc,CAAC,EAAE,IAAA,gBAAO,GAAE,EAAE,aAAa,CAAC,CAAC;KACjE,IAAI,CAAC,IAAA,eAAM,EAAC,sBAAc,EAAE,IAAA,cAAK,EAAC,iBAAiB,CAAC,EAAE,aAAa,CAAC,CAAC;KACrE,IAAI,CACH,IAAA,sBAAY,EACV,iBAAiB,EACjB,IAAA,eAAM,EAA0B,YAAY,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;IAC9D,+EAA+E;IAC/E,MAAM,aAAa,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IAElF,OAAO,GAAG,aAAa,IAAI,SAAS,EAAE,CAAA;AACxC,CAAC,CAAC,CACH,CACF,CAAA;AAjBQ,QAAA,QAAQ,YAiBhB"}

package/lib/service/type/knex.tpl.ts

@@ -51,10 +51,8 @@ export const generate = (ctx: ServiceGeneratorContext) =>
       renderSource(
         migrationTemplate,
         toFile<ServiceGeneratorContext>('migrations', ({ kebabName }) => {
-          const now = new Date()
-          const migrationDate =
-            `${now.getUTCFullYear()}${now.getUTCMonth()}${now.getUTCDay()}` +
-            `${now.getUTCHours()}${now.getUTCMinutes()}${now.getUTCSeconds()}`
+          // Probably not great but it works to align with the Knex migration file format
+          const migrationDate = new Date().toISOString().replace(/\D/g, '').substring(0, 14)
 
           return `${migrationDate}_${kebabName}`
         })

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/cli",
   "description": "The command line interface for creating Feathers applications",
-  "version": "5.0.0-pre.24",
+  "version": "5.0.0-pre.25",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
   "bin": {
@@ -60,19 +60,19 @@
     "prettier": "^2.7.1"
   },
   "devDependencies": {
-    "@feathersjs/authentication": "^5.0.0-pre.24",
-    "@feathersjs/authentication-local": "^5.0.0-pre.24",
-    "@feathersjs/authentication-oauth": "^5.0.0-pre.24",
-    "@feathersjs/configuration": "^5.0.0-pre.24",
-    "@feathersjs/errors": "^5.0.0-pre.24",
-    "@feathersjs/express": "^5.0.0-pre.24",
-    "@feathersjs/feathers": "^5.0.0-pre.24",
-    "@feathersjs/knex": "^5.0.0-pre.24",
-    "@feathersjs/koa": "^5.0.0-pre.24",
-    "@feathersjs/mongodb": "^5.0.0-pre.24",
-    "@feathersjs/schema": "^5.0.0-pre.24",
-    "@feathersjs/socketio": "^5.0.0-pre.24",
-    "@feathersjs/transport-commons": "^5.0.0-pre.24",
+    "@feathersjs/authentication": "^5.0.0-pre.25",
+    "@feathersjs/authentication-local": "^5.0.0-pre.25",
+    "@feathersjs/authentication-oauth": "^5.0.0-pre.25",
+    "@feathersjs/configuration": "^5.0.0-pre.25",
+    "@feathersjs/errors": "^5.0.0-pre.25",
+    "@feathersjs/express": "^5.0.0-pre.25",
+    "@feathersjs/feathers": "^5.0.0-pre.25",
+    "@feathersjs/knex": "^5.0.0-pre.25",
+    "@feathersjs/koa": "^5.0.0-pre.25",
+    "@feathersjs/mongodb": "^5.0.0-pre.25",
+    "@feathersjs/schema": "^5.0.0-pre.25",
+    "@feathersjs/socketio": "^5.0.0-pre.25",
+    "@feathersjs/transport-commons": "^5.0.0-pre.25",
     "@types/mocha": "^9.1.1",
     "@types/node": "^17.0.40",
     "@types/prettier": "^2.6.3",
@@ -83,5 +83,5 @@
     "type-fest": "^2.13.0",
     "typescript": "^4.7.3"
   },
-  "gitHead": "72779fa2938f43d7b345b6861ff0035481a07de3"
+  "gitHead": "c0ab3b603920dff6e9c912b2767cf168094d45c8"
 }