@adonisjs/core 5.6.1 → 5.7.1

package/build/adonis-typings/cors.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@adonisjs/http-server/build/adonis-typings" />
 declare module '@ioc:Adonis/Core/Cors' {
     import { RequestContract } from '@ioc:Adonis/Core/Request';
     import { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';

package/build/adonis-typings/exception-handler.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="@adonisjs/logger/build/adonis-typings/logger" />
+/// <reference types="@adonisjs/http-server/build/adonis-typings" />
 /**
  * The binding for the given module is defined inside `providers/AppProvider.ts`
  * file.

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

@@ -1,3 +1,4 @@
+/// <reference types="@adonisjs/http-server/build/adonis-typings" />
 import { BaseCommand } from '@adonisjs/ace';
 import type { RouteNode } from '@ioc:Adonis/Core/Route';
 /**

package/build/commands/index.js

@@ -10,6 +10,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = [
     '@adonisjs/core/build/commands/DumpRc.js',
-    '@adonisjs/core/build/commands/ListRoutes/index.js',
+    '@adonisjs/core/build/commands/ListRoutes/index',
     '@adonisjs/core/build/commands/GenerateKey.js',
 ];

package/build/instructions.js

@@ -69,6 +69,7 @@ async function instructions(projectRoot, _, { logger, files }) {
      * Create env.ts file for performing environment variable validations
      */
     const envTsFile = new files.MustacheFile(projectRoot, 'env.ts', ENV_VALIDATIONS_TEMPLATE_STUB);
+    envTsFile.apply({ assetsManager });
     if (envTsFile.exists()) {
         logger.action('create').skipped('env.ts');
     }

package/build/src/AssetsManager/Drivers/Fake.d.ts

@@ -0,0 +1,37 @@
+import { ApplicationContract } from '@ioc:Adonis/Core/Application';
+import { AssetsDriverContract } from '@ioc:Adonis/Core/AssetsManager';
+/**
+ * Fake driver stubs out the implementation of the Assets
+ * manager with empty return data.
+ *
+ * The main use case is to make assets manager work during
+ * testing without compiling the real assets
+ */
+export declare class FakeDriver implements AssetsDriverContract {
+    private application;
+    name: string;
+    hasEntrypoints: boolean;
+    publicPath: string;
+    get version(): string;
+    constructor(application: ApplicationContract);
+    /**
+     * Returns the manifest contents as object
+     */
+    manifest(): {};
+    /**
+     * Returns path to a given asset file
+     */
+    assetPath(name: string): string;
+    /**
+     * Returns the entrypoints contents as object
+     */
+    entryPoints(): {};
+    /**
+     * Returns list for all the javascript files for a given entry point
+     */
+    entryPointJsFiles(_: string): string[];
+    /**
+     * Returns list for all the css files for a given entry point
+     */
+    entryPointCssFiles(_: string): string[];
+}

package/build/src/AssetsManager/Drivers/Fake.js

@@ -0,0 +1,60 @@
+"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.FakeDriver = void 0;
+/**
+ * Fake driver stubs out the implementation of the Assets
+ * manager with empty return data.
+ *
+ * The main use case is to make assets manager work during
+ * testing without compiling the real assets
+ */
+class FakeDriver {
+    constructor(application) {
+        this.application = application;
+        this.name = 'fake';
+        this.hasEntrypoints = true;
+        this.publicPath = this.application.publicPath('assets');
+    }
+    get version() {
+        return '';
+    }
+    /**
+     * Returns the manifest contents as object
+     */
+    manifest() {
+        return {};
+    }
+    /**
+     * Returns path to a given asset file
+     */
+    assetPath(name) {
+        return `__fake('${name}')`;
+    }
+    /**
+     * Returns the entrypoints contents as object
+     */
+    entryPoints() {
+        return {};
+    }
+    /**
+     * Returns list for all the javascript files for a given entry point
+     */
+    entryPointJsFiles(_) {
+        return [];
+    }
+    /**
+     * Returns list for all the css files for a given entry point
+     */
+    entryPointCssFiles(_) {
+        return [];
+    }
+}
+exports.FakeDriver = FakeDriver;

package/build/src/AssetsManager/index.js

@@ -14,6 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetsManager = void 0;
 const utils_1 = require("@poppinss/utils");
 const stringify_attributes_1 = __importDefault(require("stringify-attributes"));
+const Fake_1 = require("./Drivers/Fake");
 const Encore_1 = require("./Drivers/Encore");
 /**
  * Assets manager exposes the API to make link and HTML fragments
@@ -28,6 +29,7 @@ class AssetsManager {
         this.application = application;
         this.drivers = {
             encore: () => new Encore_1.EncoreDriver(this.application),
+            fake: () => new Fake_1.FakeDriver(this.application),
         };
         this.booted = false;
     }

package/build/src/Bindings/Tests.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@adonisjs/http-server/build/adonis-typings" />
 import { ContainerBindings } from '@ioc:Adonis/Core/Application';
 import { CookieClientContract } from '@ioc:Adonis/Core/CookieClient';
 /**

package/build/src/Hooks/Cors/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@adonisjs/http-server/build/adonis-typings" />
 import { CorsConfig } from '@ioc:Adonis/Core/Cors';
 import { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
 /**

package/build/src/Hooks/Static/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@adonisjs/http-server/build/adonis-typings" />
 import { AssetsConfig } from '@ioc:Adonis/Core/Static';
 import { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
 /**

package/build/src/HttpExceptionHandler/index.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="@adonisjs/logger/build/adonis-typings/logger" />
+/// <reference types="@adonisjs/http-server/build/adonis-typings" />
 import { LoggerContract } from '@ioc:Adonis/Core/Logger';
 import { HttpContextContract } from '@ioc:Adonis/Core/HttpContext';
 /**

package/build/src/HttpExceptionHandler/index.js

@@ -146,7 +146,9 @@ class HttpExceptionHandler {
          *    to raise with 200
          */
         if (!error.status || error.status >= 500) {
-            ctx.logger.error({ err: error, ...this.context(ctx) }, error.message);
+            if (process.env.NODE_ENV !== 'test') {
+                ctx.logger.error({ err: error, ...this.context(ctx) }, error.message);
+            }
         }
         else if (error.status >= 400) {
             ctx.logger.warn(this.context(ctx), error.message);
@@ -163,6 +165,13 @@ class HttpExceptionHandler {
         if (typeof error.handle === 'function') {
             return error.handle(error, ctx);
         }
+        /**
+         * Send stack in the response when in test environment and
+         * there is a fatal error.
+         */
+        if (error.status >= 500 && error.stack && process.env.NODE_ENV === 'test') {
+            return ctx.response.status(error.status).send(error.stack);
+        }
         /**
          * Attempt to find the best error reporter for validation
          */

package/build/src/utils/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@adonisjs/http-server/build/adonis-typings" />
 import { Kernel } from '@adonisjs/ace';
 import { ServerContract } from '@ioc:Adonis/Core/Server';
 import { CustomServerCallback } from '@ioc:Adonis/Core/TestUtils';

package/build/templates/config/app.txt

@@ -261,7 +261,7 @@ export const assets: AssetsManagerConfig = {
   | in the future
   |
   */
-  driver: 'encore',
+  driver: Env.get('ASSETS_DRIVER'),
 
   /*
   |--------------------------------------------------------------------------

package/build/templates/env.txt

@@ -25,4 +25,7 @@ export default Env.rules({
    * you have defined inside the "contracts/drive.ts" file.
    */
   DRIVE_DISK: Env.schema.enum(['local', 's3', 'gcs'] as const),
+  {{#assetsManager}}
+  ASSETS_DRIVER: Env.schema.enum(['fake', 'encore'] as const),
+  {{/assetsManager}}
 })

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@adonisjs/core",
-	"version": "5.6.1",
+	"version": "5.7.1",
 	"description": "Core of AdonisJS",
 	"exports": {
 		".": {
@@ -65,15 +65,15 @@
 	"devDependencies": {
 		"@adonisjs/assembler": "^5.4.2",
 		"@adonisjs/mrm-preset": "^5.0.3",
-		"@adonisjs/repl": "^3.1.9",
-		"@adonisjs/require-ts": "^2.0.10",
+		"@adonisjs/repl": "^3.1.10",
+		"@adonisjs/require-ts": "^2.0.11",
 		"@adonisjs/sink": "^5.2.2",
-		"@japa/assert": "^1.3.2",
-		"@japa/preset-adonis": "^1.0.8",
-		"@japa/run-failed-tests": "^1.0.6",
-		"@japa/runner": "^2.0.5",
-		"@japa/spec-reporter": "^1.1.11",
-		"@poppinss/dev-utils": "^2.0.2",
+		"@japa/assert": "^1.3.4",
+		"@japa/preset-adonis": "^1.0.14",
+		"@japa/run-failed-tests": "^1.0.7",
+		"@japa/runner": "^2.0.7",
+		"@japa/spec-reporter": "^1.1.12",
+		"@poppinss/dev-utils": "^2.0.3",
 		"@types/node": "^17.0.23",
 		"@types/supertest": "^2.0.12",
 		"clear-module": "^4.1.2",
@@ -86,11 +86,11 @@
 		"eslint-plugin-adonis": "^2.1.0",
 		"eslint-plugin-prettier": "^4.0.0",
 		"etag": "^1.8.1",
-		"github-label-sync": "^2.0.2",
+		"github-label-sync": "^2.2.0",
 		"husky": "^7.0.4",
 		"mrm": "^4.0.0",
 		"np": "^7.6.1",
-		"prettier": "^2.6.1",
+		"prettier": "^2.6.2",
 		"reflect-metadata": "^0.1.13",
 		"strip-ansi": "^6.0.1",
 		"supertest": "^6.2.2",
@@ -118,20 +118,20 @@
 		}
 	},
 	"dependencies": {
-		"@adonisjs/ace": "^11.2.2",
-		"@adonisjs/application": "^5.2.0",
-		"@adonisjs/bodyparser": "^8.1.1",
-		"@adonisjs/drive": "^2.0.10",
-		"@adonisjs/encryption": "^4.0.7",
-		"@adonisjs/events": "^7.1.3",
-		"@adonisjs/hash": "^7.0.10",
-		"@adonisjs/http-server": "^5.7.3",
-		"@adonisjs/validator": "^12.2.3",
-		"@poppinss/cliui": "^3.0.1",
-		"@poppinss/manager": "^5.0.1",
-		"@poppinss/utils": "^4.0.2",
+		"@adonisjs/ace": "^11.2.3",
+		"@adonisjs/application": "^5.2.2",
+		"@adonisjs/bodyparser": "^8.1.2",
+		"@adonisjs/drive": "^2.1.0",
+		"@adonisjs/encryption": "^4.0.8",
+		"@adonisjs/events": "^7.2.0",
+		"@adonisjs/hash": "^7.0.11",
+		"@adonisjs/http-server": "^5.7.4",
+		"@adonisjs/validator": "^12.3.0",
+		"@poppinss/cliui": "^3.0.2",
+		"@poppinss/manager": "^5.0.2",
+		"@poppinss/utils": "^4.0.3",
 		"fs-extra": "^10.0.1",
-		"macroable": "^7.0.0",
+		"macroable": "^7.0.1",
 		"memfs": "^3.4.1",
 		"serve-static": "^1.15.0",
 		"stringify-attributes": "^2.0.0"

package/build/templates/contracts/tests.txt

@@ -1,16 +0,0 @@
-/**
- * Contract source: https://github.com/adonisjs/core/blob/master/templates/contracts/tests.txt
- *
- * Feel free to let us know via PR, if you find something broken in this contract
- * file.
- */
-
-import '@japa/runner'
-
-declare module '@japa/runner' {
-  interface TestContext {
-  }
-
-  interface Test<DataSet> {
-  }
-}

package/build/templates/tests/bootstrap.txt

@@ -1,69 +0,0 @@
-/**
- * File source: https://bit.ly/3BUZKtR
- *
- * Feel free to let us know via PR, if you find something broken in this contract
- * file.
- */
-
-import type { Config } from '@japa/runner'
-import TestUtils from '@ioc:Adonis/Core/TestUtils'
-import { assert, runFailedTests, specReporter } from '@japa/preset-adonis'
-
-/*
-|--------------------------------------------------------------------------
-| Japa Plugins
-|--------------------------------------------------------------------------
-|
-| Japa plugins allows you to add additional features to Japa. By default
-| we register the assertion plugin.
-|
-| Feel free to remove existing plugins or add more.
-|
-*/
-export const plugins: Config['plugins'] = [assert(), runFailedTests()]
-
-/*
-|--------------------------------------------------------------------------
-| Japa Reporters
-|--------------------------------------------------------------------------
-|
-| Japa reporters displays/saves the progress of tests as they are executed.
-| By default, we register the spec reporter to show a detailed report
-| of tests on the terminal.
-|
-*/
-export const reporters: Config['reporters'] = [specReporter()]
-
-/*
-|--------------------------------------------------------------------------
-| Runner hooks
-|--------------------------------------------------------------------------
-|
-| Runner hooks are executed after booting the AdonisJS app and
-| before the test files are imported.
-|
-| You can perform actions like starting the HTTP server or running migrations
-| within the runner hooks
-|
-*/
-export const runnerHooks: Required<Pick<Config, 'setup' | 'teardown'>> = {
-  setup: [() => TestUtils.ace().loadCommands(), () => TestUtils.db().migrate()],
-  teardown: [],
-}
-
-/*
-|--------------------------------------------------------------------------
-| Configure individual suites
-|--------------------------------------------------------------------------
-|
-| The configureSuite method gets called for every test suite registered
-| within ".adonisrc.json" file.
-|
-| You can use this method to configure suites. For example: Only start
-| the HTTP server when it is a functional suite.
-*/
-export const configureSuite: Config['configureSuite'] = (suite) => {
-  if (suite.name === 'functional') {
-    suite.setup(() => TestUtils.httpServer().start())
-  }
-}

package/build/templates/tests.txt

@@ -1,44 +0,0 @@
-/*
-|--------------------------------------------------------------------------
-| Tests
-|--------------------------------------------------------------------------
-|
-| The contents in this file boots the AdonisJS application and configures
-| the Japa tests runner.
-|
-| For the most part you will never edit this file. The configuration
-| for the tests can be controlled via ".adonisrc.json" and
-| "tests/bootstrap.ts" files.
-|
-*/
-
-process.env.NODE_ENV = 'testing'
-
-import 'reflect-metadata'
-import sourceMapSupport from 'source-map-support'
-import { Ignitor } from '@adonisjs/core/build/standalone'
-import { configure, processCliArgs, run, RunnerHooksHandler } from '@japa/runner'
-
-sourceMapSupport.install({ handleUncaughtExceptions: false })
-
-const kernel = new Ignitor(__dirname).kernel('test')
-
-kernel
-  .boot()
-  .then(() => import('./tests/bootstrap'))
-  .then(({ runnerHooks, ...config }) => {
-    const app: RunnerHooksHandler[] = [() => kernel.start()]
-
-    configure({
-      ...kernel.application.rcFile.tests,
-      ...processCliArgs(process.argv.slice(2)),
-      ...config,
-      ...{
-        importer: (filePath) => import(filePath),
-        setup: app.concat(runnerHooks.setup),
-        teardown: runnerHooks.teardown,
-      },
-    })
-
-    run()
-  })