Merge pull request #44 from AthennaIO/develop

Update dependencies and change clone URL
AthennaIO · Jan 9, 2023 · 069568f · 069568f
2 parents 5b2e2a5 + 4365481
commit 069568f
Show file tree

Hide file tree

Showing 7 changed files with 1,080 additions and 2,704 deletions.
diff --git a/app/Console/Commands/Install/DatabaseCommand.js b/app/Console/Commands/Install/DatabaseCommand.js
@@ -97,8 +97,8 @@ export class InstallDatabaseCommand extends Command {
   }
 
   async createDatabaseConfigFile(projectPath, db) {
-    const databaseConfigFile = `${projectPath}/config/database.js`
-    const message = 'Creating config/database.js file in project'
+    const databaseConfigFile = `${projectPath}/config/database.${Path.ext()}`
+    const message = `Creating config/database.${Path.ext()} file in project`
 
     const spinner = this.createSpinner(message)
 
@@ -110,7 +110,9 @@ export class InstallDatabaseCommand extends Command {
 
     try {
       await new File(
-        Path.resources(`scaffolds/databaseComponent/${db}/config/database.js`),
+        Path.resources(
+          `scaffolds/databaseComponent/${db}/config/database.${Path.ext()}`,
+        ),
       )
         .loadSync()
         .copy(databaseConfigFile)
@@ -124,8 +126,8 @@ export class InstallDatabaseCommand extends Command {
   }
 
   async addDatabaseProviderToAppConfig(projectPath) {
-    const appConfigPath = `${projectPath}/config/app.js`
-    const message = 'Registering DatabaseProvider in config/app.js'
+    const appConfigPath = `${projectPath}/config/app.${Path.ext()}`
+    const message = `Registering DatabaseProvider in config/app.${Path.ext()}`
 
     const spinner = this.createSpinner(message)
 
@@ -151,8 +153,8 @@ export class InstallDatabaseCommand extends Command {
   }
 
   async addDatabaseCommandsToKernel(projectPath) {
-    const kernelPath = `${projectPath}/app/Console/Kernel.js`
-    const message = 'Registering commands and templates in Console/Kernel.js'
+    const kernelPath = `${projectPath}/app/Console/Kernel.${Path.ext()}`
+    const message = `Registering commands and templates in Console/Kernel.${Path.ext()}`
 
     const spinner = this.createSpinner(message)
 

diff --git a/app/Console/Commands/Install/MailCommand.js b/app/Console/Commands/Install/MailCommand.js
@@ -69,8 +69,8 @@ export class InstallMailCommand extends Command {
   }
 
   async createMailConfigFile(projectPath) {
-    const mailConfigFile = `${projectPath}/config/mail.js`
-    const message = 'Creating config/mail.js file in project'
+    const mailConfigFile = `${projectPath}/config/mail.${Path.ext()}`
+    const message = `Creating config/mail.${Path.ext()} file in project`
 
     const spinner = this.createSpinner(message)
 
@@ -81,7 +81,9 @@ export class InstallMailCommand extends Command {
     }
 
     try {
-      await new File(Path.resources(`scaffolds/mailComponent/config/mail.js`))
+      await new File(
+        Path.resources(`scaffolds/mailComponent/config/mail.${Path.ext()}`),
+      )
         .loadSync()
         .copy(mailConfigFile)
 
@@ -94,8 +96,8 @@ export class InstallMailCommand extends Command {
   }
 
   async addMailProviderToAppConfig(projectPath) {
-    const appConfigPath = `${projectPath}/config/app.js`
-    const message = 'Registering MailProvider in config/app.js'
+    const appConfigPath = `${projectPath}/config/app.${Path.ext()}`
+    const message = `Registering MailProvider in config/app.${Path.ext()}`
 
     const spinner = this.createSpinner(message)
 

diff --git a/app/Console/Commands/NewCommand.js b/app/Console/Commands/NewCommand.js
@@ -29,7 +29,7 @@ export class NewCommand extends Command {
    * @type {string}
    */
   get url() {
-    return 'https://github.com/AthennaIO/Scaffold.git'
+    return 'https://github.com/AthennaIO/AthennaIO.git'
   }
 
   /**

diff --git a/app/Console/Kernel.js b/app/Console/Kernel.js
@@ -1,5 +1,4 @@
 import { CoreLoader } from '@athenna/core'
-import { TestLoader } from '@athenna/test'
 import { Folder, Path } from '@athenna/common'
 import { ArtisanLoader, ConsoleKernel } from '@athenna/artisan'
 
@@ -10,20 +9,27 @@ export class Kernel extends ConsoleKernel {
    * @return {any[]}
    */
   get commands() {
+    const appCommands = new Folder(Path.console('Commands'))
+      .loadSync()
+      .getFilesByPattern(`**/*.${Path.ext()}`, true)
+      .map(command => import(command.href))
+
+    if (Env('NODE_ENV') === 'production') {
+      return appCommands
+    }
+
     const internalCommands = [
       ...CoreLoader.loadCommands(),
-      ...TestLoader.loadCommands(),
       ...ArtisanLoader.loadCommands(),
     ]
 
-    const appCommands = new Folder(Path.console('Commands'))
+    const testCommandsPath = Path.nodeModules('@athenna/test/src/Commands')
+    const testCommands = new Folder(testCommandsPath)
       .loadSync()
       .getFilesByPattern('**/*.js', true)
       .map(command => import(command.href))
 
-    if (Env('NODE_ENV') === 'production') {
-      return appCommands
-    }
+    internalCommands.push(...testCommands)
 
     return [...internalCommands, ...appCommands]
   }
@@ -34,6 +40,15 @@ export class Kernel extends ConsoleKernel {
    * @return {any[]}
    */
   get templates() {
-    return [...TestLoader.loadTemplates(), ...ArtisanLoader.loadTemplates()]
+    if (Env('NODE_ENV') === 'production') {
+      return ArtisanLoader.loadTemplates()
+    }
+
+    const testTemplatesPath = Path.nodeModules('@athenna/test/templates')
+    const testTemplates = new Folder(testTemplatesPath)
+      .loadSync()
+      .getFilesByPattern('**/*.edge', true)
+
+    return [...testTemplates, ...ArtisanLoader.loadTemplates()]
   }
 }