@adonisjs/core 5.7.5 → 5.8.1

package/build/commands/ListRoutes/index.d.ts

@@ -31,6 +31,7 @@ export default class ListRoutes extends BaseCommand {
      */
     static settings: {
         loadApp: boolean;
+        stayAlive: boolean;
     };
     /**
      * Returns the display handler name

package/build/commands/ListRoutes/index.js

@@ -119,6 +119,7 @@ class ListRoutes extends ace_1.BaseCommand {
         else {
             new PrettyRenderer_1.RoutesPrettyRenderer(this).render();
         }
+        await this.application.shutdown();
     }
 }
 ListRoutes.commandName = 'list:routes';
@@ -128,6 +129,7 @@ ListRoutes.description = 'List application routes';
  */
 ListRoutes.settings = {
     loadApp: true,
+    stayAlive: true,
 };
 __decorate([
     ace_1.flags.boolean({ name: 'verbose', description: 'Display more information' }),

package/build/config.d.ts

@@ -0,0 +1,2 @@
+export { InferListFromConfig, hashConfig } from '@adonisjs/hash/build/config';
+export { InferDisksFromConfig, driveConfig } from '@adonisjs/drive/build/config';

package/build/config.js

@@ -0,0 +1,15 @@
+"use strict";
+/*
+ * @adonisjs/core
+ *
+ * (c) Harminder Virk <virk@adonisjs.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.driveConfig = exports.hashConfig = void 0;
+var config_1 = require("@adonisjs/hash/build/config");
+Object.defineProperty(exports, "hashConfig", { enumerable: true, get: function () { return config_1.hashConfig; } });
+var config_2 = require("@adonisjs/drive/build/config");
+Object.defineProperty(exports, "driveConfig", { enumerable: true, get: function () { return config_2.driveConfig; } });

package/build/src/Ignitor/Ace/App/index.js

@@ -122,7 +122,7 @@ class App {
          * If a sub-command needs application, then the main command
          * should set "loadApp" to true as well.
          */
-        if (command.commandName === this.commandName) {
+        if (command.commandName === this.commandName || command.aliases.includes(this.commandName)) {
             /**
              * Switch environment before wiring the app
              */

package/build/templates/config/app.txt

@@ -284,8 +284,8 @@ export const assets: AssetsManagerConfig = {
   */
   script: {
     attributes: {
-      defer: true
-    }
+      defer: true,
+    },
   },
 
   /*
@@ -297,7 +297,7 @@ export const assets: AssetsManagerConfig = {
   |
   */
   style: {
-    attributes: {}
-  }
+    attributes: {},
+  },
 }
 {{/assetsManager}}

package/build/templates/config/drive.txt

@@ -6,7 +6,7 @@
  */
 
 import Env from '@ioc:Adonis/Core/Env'
-import { DriveConfig } from '@ioc:Adonis/Core/Drive'
+import { driveConfig } from '@adonisjs/core/config'
 import Application from '@ioc:Adonis/Core/Application'
 
 /*
@@ -18,7 +18,7 @@ import Application from '@ioc:Adonis/Core/Application'
 | defined inside the `contracts` directory.
 |
 */
-const driveConfig: DriveConfig = {
+export default driveConfig({
   /*
   |--------------------------------------------------------------------------
   | Default disk
@@ -101,6 +101,9 @@ const driveConfig: DriveConfig = {
     //   region: Env.get('S3_REGION'),
     //   bucket: Env.get('S3_BUCKET'),
     //   endpoint: Env.get('S3_ENDPOINT'),
+    //
+    //  // For minio to work
+    //  // forcePathStyle: true,
     // },
 
     /*
@@ -140,9 +143,7 @@ const driveConfig: DriveConfig = {
       | console.
       |
       */
-    //   usingUniformAcl: false
+    //   usingUniformAcl: false,
     // },
   },
-}
-
-export default driveConfig
+})

package/build/templates/config/hash.txt

@@ -6,7 +6,7 @@
  */
 
 import Env from '@ioc:Adonis/Core/Env'
-import { HashConfig } from '@ioc:Adonis/Core/Hash'
+import { hashConfig } from '@adonisjs/core/config'
 
 /*
 |--------------------------------------------------------------------------
@@ -17,7 +17,7 @@ import { HashConfig } from '@ioc:Adonis/Core/Hash'
 | defined inside `contracts` directory.
 |
 */
-const hashConfig: HashConfig = {
+export default hashConfig({
   /*
   |--------------------------------------------------------------------------
   | Default hasher
@@ -70,6 +70,4 @@ const hashConfig: HashConfig = {
       rounds: 10,
     },
   },
-}
-
-export default hashConfig
+})

package/build/templates/contracts/drive.txt

@@ -5,19 +5,9 @@
  * file.
  */
 
+import { InferDisksFromConfig } from '@adonisjs/core/config'
+import driveConfig from '../config/drive'
+
 declare module '@ioc:Adonis/Core/Drive' {
-  interface DisksList {
-    local: {
-      config: LocalDriverConfig
-      implementation: LocalDriverContract
-    }
-    // s3: {
-    //   config: S3DriverConfig
-    //   implementation: S3DriverContract
-    // }
-    // gcs: {
-    //   config: GcsDriverConfig
-    //   implementation: GcsDriverContract
-    // }
-  }
+  interface DisksList extends InferDisksFromConfig<typeof driveConfig> {}
 }

package/build/templates/contracts/env.txt

@@ -11,14 +11,14 @@ declare module '@ioc:Adonis/Core/Env' {
   | Getting types for validated environment variables
   |--------------------------------------------------------------------------
   |
-	| The `default` export from the "../env.ts" file exports types for the
-	| validated environment variables. Here we merge them with the `EnvTypes`
-	| interface so that you can enjoy intellisense when using the "Env"
-	| module.
+  | The `default` export from the "../env.ts" file exports types for the
+  | validated environment variables. Here we merge them with the `EnvTypes`
+  | interface so that you can enjoy intellisense when using the "Env"
+  | module.
   |
   */
 
-	type CustomTypes = typeof import('../env').default
-	interface EnvTypes extends CustomTypes {
-	}
+  type CustomTypes = typeof import('../env').default
+  interface EnvTypes extends CustomTypes {
+  }
 }

package/build/templates/contracts/hash.txt

@@ -5,15 +5,9 @@
  * file.
  */
 
+import { InferListFromConfig } from '@adonisjs/core/config'
+import hashConfig from '../config/hash'
+
 declare module '@ioc:Adonis/Core/Hash' {
-  interface HashersList {
-    bcrypt: {
-      config: BcryptConfig,
-      implementation: BcryptContract,
-    },
-    argon: {
-      config: ArgonConfig,
-      implementation: ArgonContract,
-    },
-  }
+  interface HashersList extends InferListFromConfig<typeof hashConfig> {}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@adonisjs/core",
-	"version": "5.7.5",
+	"version": "5.8.1",
 	"description": "Core of AdonisJS",
 	"exports": {
 		".": {
@@ -8,12 +8,14 @@
 			"require": "./build/providers/AppProvider.js"
 		},
 		"./standalone": "./build/standalone.js",
+		"./config": "./build/config.js",
 		"./Ignitor": "./build/src/Ignitor/index.js",
 		"./commands": "./build/commands/index.js",
 		"./commands/DumpRc": "./build/commands/DumpRc.js",
 		"./commands/ListRoutes": "./build/commands/ListRoutes.js",
 		"./commands/GenerateKey": "./build/commands/GenerateKey.js",
 		"./build/standalone": "./build/standalone.js",
+		"./build/config": "./build/config.js",
 		"./build/src/Ignitor": "./build/src/Ignitor/index.js",
 		"./build/commands": "./build/commands/index.js",
 		"./build/commands/DumpRc": "./build/commands/DumpRc.js",
@@ -28,6 +30,8 @@
 		"build/providers",
 		"build/src",
 		"build/instructions.js",
+		"build/config.js",
+		"build/config.d.ts",
 		"build/standalone.js",
 		"build/standalone.d.ts"
 	],
@@ -63,41 +67,41 @@
 	},
 	"homepage": "https://github.com/adonisjs/core#readme",
 	"devDependencies": {
-		"@adonisjs/assembler": "^5.6.1",
+		"@adonisjs/assembler": "^5.6.2",
 		"@adonisjs/mrm-preset": "^5.0.3",
 		"@adonisjs/repl": "^3.1.10",
 		"@adonisjs/require-ts": "^2.0.11",
-		"@adonisjs/sink": "^5.2.3",
+		"@adonisjs/sink": "^5.3.1",
 		"@japa/assert": "^1.3.4",
 		"@japa/preset-adonis": "^1.0.15",
 		"@japa/run-failed-tests": "^1.0.7",
-		"@japa/runner": "^2.0.7",
+		"@japa/runner": "^2.0.8",
 		"@japa/spec-reporter": "^1.1.12",
 		"@poppinss/dev-utils": "^2.0.3",
-		"@types/node": "^17.0.24",
+		"@types/node": "^17.0.34",
 		"@types/supertest": "^2.0.12",
 		"clear-module": "^4.1.2",
 		"commitizen": "^4.2.4",
 		"copyfiles": "^2.4.1",
 		"cz-conventional-changelog": "^3.3.0",
 		"del-cli": "^4.0.1",
-		"eslint": "^8.13.0",
+		"eslint": "^8.15.0",
 		"eslint-config-prettier": "^8.5.0",
 		"eslint-plugin-adonis": "^2.1.0",
 		"eslint-plugin-prettier": "^4.0.0",
 		"etag": "^1.8.1",
 		"github-label-sync": "^2.2.0",
-		"husky": "^7.0.4",
+		"husky": "^8.0.1",
 		"mrm": "^4.0.0",
 		"np": "^7.6.1",
 		"prettier": "^2.6.2",
 		"reflect-metadata": "^0.1.13",
 		"strip-ansi": "^6.0.1",
-		"supertest": "^6.2.2",
+		"supertest": "^6.2.3",
 		"test-console": "^2.0.0",
-		"typescript": "^4.6.3",
-		"youch": "^3.1.1",
-		"youch-terminal": "^2.1.3"
+		"typescript": "^4.6.4",
+		"youch": "^3.2.0",
+		"youch-terminal": "^2.1.4"
 	},
 	"nyc": {
 		"exclude": [
@@ -118,21 +122,21 @@
 		}
 	},
 	"dependencies": {
-		"@adonisjs/ace": "^11.2.3",
+		"@adonisjs/ace": "^11.3.0",
 		"@adonisjs/application": "^5.2.4",
-		"@adonisjs/bodyparser": "^8.1.3",
-		"@adonisjs/drive": "^2.1.1",
+		"@adonisjs/bodyparser": "^8.1.4",
+		"@adonisjs/drive": "^2.2.0",
 		"@adonisjs/encryption": "^4.0.8",
 		"@adonisjs/events": "^7.2.1",
-		"@adonisjs/hash": "^7.0.11",
-		"@adonisjs/http-server": "^5.8.0",
-		"@adonisjs/validator": "^12.3.1",
+		"@adonisjs/hash": "^7.1.1",
+		"@adonisjs/http-server": "^5.9.0",
+		"@adonisjs/validator": "^12.3.2",
 		"@poppinss/cliui": "^3.0.2",
 		"@poppinss/manager": "^5.0.2",
 		"@poppinss/utils": "^4.0.4",
-		"fs-extra": "^10.0.1",
+		"fs-extra": "^10.1.0",
 		"macroable": "^7.0.1",
-		"memfs": "^3.4.1",
+		"memfs": "^3.4.3",
 		"serve-static": "^1.15.0",
 		"stringify-attributes": "^2.0.0"
 	},