@adonisjs/assembler 5.5.3-0 → 5.6.1

package/build/commands/Invoke.d.ts

@@ -6,6 +6,7 @@ export default class Configure extends BaseCommand {
     static commandName: string;
     static description: string;
     static aliases: string[];
+    private appType;
     /**
      * Use yarn when building for production to install dependencies
      */

package/build/commands/Invoke.js

@@ -25,6 +25,10 @@ const Manifest_1 = require("../src/Manifest");
  * Configure a package
  */
 class Configure extends standalone_1.BaseCommand {
+    constructor() {
+        super(...arguments);
+        this.appType = process.env['ADONIS_CREATE_APP_BOILERPLATE'] || 'web';
+    }
     /**
      * Configure encore
      */
@@ -85,7 +89,7 @@ class Configure extends standalone_1.BaseCommand {
         /**
          * Create "tests/functional/hello_world.spec.ts" file
          */
-        const helloWorldTestFile = new sink_1.files.MustacheFile(this.application.appRoot, 'tests/functional/hello_world.spec.ts', (0, path_1.join)(__dirname, '..', 'templates/tests/functional/hello_world.spec.txt'));
+        const helloWorldTestFile = new sink_1.files.MustacheFile(this.application.appRoot, 'tests/functional/hello_world.spec.ts', (0, path_1.join)(__dirname, '..', `templates/tests/functional/hello_world_${this.appType}.spec.txt`));
         if (!helloWorldTestFile.exists()) {
             helloWorldTestFile.apply({}).commit();
             sink_1.logger.action('create').succeeded('tests/functional/hello_world.spec.ts');
@@ -111,8 +115,43 @@ class Configure extends standalone_1.BaseCommand {
                 },
             ],
         });
+        rcFile.addProvider('@japa/preset-adonis/TestsProvider');
         rcFile.commit();
         sink_1.logger.action('update').succeeded('.adonisrc.json');
+        /**
+         * Create ".env.test" file
+         */
+        const testEnvFile = new sink_1.files.NewLineFile(this.application.appRoot, '.env.test');
+        if (!testEnvFile.exists()) {
+            testEnvFile.add('NODE_ENV=test');
+            /**
+             * Set additional .env variables for "web" boilerplate
+             */
+            if (this.appType === 'web') {
+                testEnvFile.add(['ASSETS_DRIVER=fake', 'SESSION_DRIVER=memory']);
+            }
+            testEnvFile.commit();
+            sink_1.logger.action('create').succeeded('.env.test');
+        }
+        /**
+         * Update "tsconfig.json"
+         */
+        const tsConfig = new sink_1.files.JsonFile(this.application.appRoot, 'tsconfig.json');
+        const existingTypes = tsConfig.get('compilerOptions.types') || [];
+        if (!existingTypes.includes('@japa/preset-adonis/build/adonis-typings')) {
+            existingTypes.push('@japa/preset-adonis/build/adonis-typings');
+        }
+        tsConfig.set('compilerOptions.types', existingTypes);
+        tsConfig.commit();
+        sink_1.logger.action('update').succeeded('tsconfig.json');
+        /**
+         * Set additional .env variables for "web" boilerplate
+         */
+        if (this.appType === 'web') {
+            testEnvFile.add(['ASSETS_DRIVER=fake', 'SESSION_DRIVER=memory']);
+        }
+        testEnvFile.commit();
+        sink_1.logger.action('create').succeeded('.env.test');
         /**
          * Install required dependencies
          */

package/build/config/paths.d.ts

@@ -3,5 +3,5 @@ export declare const DEFAULT_BUILD_DIR = "build";
 export declare const RCFILE_NAME = ".adonisrc.json";
 export declare const ENV_FILES: string[];
 export declare const SERVER_ENTRY_FILE = "server.ts";
-export declare const TESTS_ENTRY_FILE = "tests.ts";
+export declare const TESTS_ENTRY_FILE = "test.ts";
 export declare const TSCONFIG_FILE_NAME = "tsconfig.json";

package/build/config/paths.js

@@ -14,5 +14,5 @@ exports.DEFAULT_BUILD_DIR = 'build';
 exports.RCFILE_NAME = '.adonisrc.json';
 exports.ENV_FILES = ['.env', '.env.testing'];
 exports.SERVER_ENTRY_FILE = 'server.ts';
-exports.TESTS_ENTRY_FILE = 'tests.ts';
+exports.TESTS_ENTRY_FILE = 'test.ts';
 exports.TSCONFIG_FILE_NAME = 'tsconfig.json';

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

@@ -2,8 +2,10 @@
  * Parses the env file inside the project root.
  */
 export declare class EnvParser {
+    private envFileName;
     private envContents;
     private parser;
+    constructor(envFileName?: string);
     /**
      * Parse .env file contents
      */

package/build/src/EnvParser/index.js

@@ -16,7 +16,8 @@ const env_1 = require("@adonisjs/env");
  * Parses the env file inside the project root.
  */
 class EnvParser {
-    constructor() {
+    constructor(envFileName = '.env') {
+        this.envFileName = envFileName;
         this.envContents = {};
         this.parser = new env_1.EnvParser(false);
     }
@@ -25,7 +26,7 @@ class EnvParser {
      */
     async parse(rootDir) {
         try {
-            this.envContents = this.parser.parse(await (0, fs_extra_1.readFile)((0, path_1.join)(rootDir, '.env'), 'utf-8'));
+            this.envContents = this.parser.parse(await (0, fs_extra_1.readFile)((0, path_1.join)(rootDir, this.envFileName), 'utf-8'));
         }
         catch { }
     }

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

@@ -44,6 +44,10 @@ export declare class TestsServer {
      */
     private isTestFile;
     constructor(appRoot: string, filters: JapaFlags, nodeArgs?: string[], logger?: typeof uiLogger);
+    /**
+     * Clear terminal screen
+     */
+    private clearScreen;
     /**
      * Returns the glob paths for test suites. Returns all if no
      * filter is applied. Otherwise only the filtered suites
@@ -54,6 +58,11 @@ export declare class TestsServer {
      * Kill current process
      */
     private kill;
+    /**
+     * Returns the HOST and the PORT environment variables
+     * for the HTTP server
+     */
+    private getEnvironmentVariables;
     /**
      * Run tests. Use [[watch]] to also watch for file
      * changes

package/build/src/Test/index.js

@@ -21,6 +21,8 @@ const RcFile_1 = require("../RcFile");
 const Manifest_1 = require("../Manifest");
 const process_1 = require("./process");
 const paths_1 = require("../../config/paths");
+const EnvParser_1 = require("../EnvParser");
+const get_port_1 = __importDefault(require("get-port"));
 /**
  * Exposes the API to watch project for compilition changes and
  * run/re-run tests
@@ -77,6 +79,12 @@ class TestsServer {
             });
         };
     }
+    /**
+     * Clear terminal screen
+     */
+    clearScreen() {
+        process.stdout.write('\u001Bc');
+    }
     /**
      * Returns the glob paths for test suites. Returns all if no
      * filter is applied. Otherwise only the filtered suites
@@ -99,6 +107,26 @@ class TestsServer {
     kill() {
         process.exit();
     }
+    /**
+     * Returns the HOST and the PORT environment variables
+     * for the HTTP server
+     */
+    async getEnvironmentVariables() {
+        const envParser = new EnvParser_1.EnvParser('.env.test');
+        await envParser.parse(this.appRoot);
+        const envOptions = envParser.asEnvObject(['PORT', 'TZ', 'HOST']);
+        const HOST = process.env.HOST || envOptions.HOST || '0.0.0.0';
+        let PORT = Number(process.env.PORT || envOptions.PORT);
+        /**
+         * Use the port defined inside ".env.test" file or use
+         * a random port
+         */
+        PORT = await (0, get_port_1.default)({
+            port: !isNaN(PORT) ? [PORT] : [],
+            host: HOST,
+        });
+        return { HOST, PORT: String(PORT) };
+    }
     /**
      * Run tests. Use [[watch]] to also watch for file
      * changes
@@ -107,6 +135,7 @@ class TestsServer {
         if (this.busy) {
             return;
         }
+        this.clearScreen();
         const filters = { ...this.filters };
         /**
          * Overwrite files filter when a specific file path
@@ -116,7 +145,7 @@ class TestsServer {
             filters['--files'] = [filePath];
         }
         this.busy = true;
-        const { hasErrors } = await new process_1.TestProcess(paths_1.TESTS_ENTRY_FILE, this.appRoot, filters, this.nodeArgs, this.logger, {}).run();
+        const { hasErrors } = await new process_1.TestProcess(paths_1.TESTS_ENTRY_FILE, this.appRoot, filters, this.nodeArgs, this.logger, await this.getEnvironmentVariables()).run();
         this.busy = false;
         if (!this.watchingFileSystem) {
             if (hasErrors) {

package/build/templates/test-entrypoint.txt

@@ -12,7 +12,7 @@
 |
 */
 
-process.env.NODE_ENV = 'testing'
+process.env.NODE_ENV = 'test'
 
 import 'reflect-metadata'
 import sourceMapSupport from 'source-map-support'

package/build/templates/tests/functional/hello_world_api.spec.txt

@@ -0,0 +1,8 @@
+import { test } from '@japa/runner'
+
+test('display welcome page', async ({ client }) => {
+  const response = await client.get('/')
+
+  response.assertStatus(200)
+  response.assertBodyContains({ hello: 'world' })
+})

package/build/templates/tests/functional/hello_world_slim.spec.txt

@@ -0,0 +1,8 @@
+import { test } from '@japa/runner'
+
+test('display welcome page', async ({ client }) => {
+  const response = await client.get('/')
+
+  response.assertStatus(200)
+  response.assertTextIncludes('Hello world')
+})

package/build/templates/tests-contract.txt

@@ -12,7 +12,7 @@ declare module '@japa/runner' {
     // Extend context
   }
 
-  interface Test<DataSet> {
+  interface Test<TestData> {
     // Extend test
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/assembler",
-  "version": "5.5.3-0",
+  "version": "5.6.1",
   "description": "Core commands to compiler and build AdonisJs project",
   "main": "build/ace-manifest.json",
   "files": [
@@ -45,7 +45,7 @@
   "homepage": "https://github.com/adonisjs/assembler#readme",
   "devDependencies": {
     "@adonisjs/ace": "^11.2.3",
-    "@adonisjs/core": "^5.6.2",
+    "@adonisjs/core": "^5.7.3",
     "@adonisjs/mrm-preset": "^5.0.3",
     "@poppinss/dev-utils": "^2.0.3",
     "@types/node": "^17.0.23",
@@ -54,7 +54,7 @@
     "cross-env": "^7.0.3",
     "cz-conventional-changelog": "^3.3.0",
     "del-cli": "^4.0.1",
-    "eslint": "^8.12.0",
+    "eslint": "^8.13.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-adonis": "^2.1.0",
     "eslint-plugin-prettier": "^4.0.0",
@@ -89,14 +89,14 @@
     "anyBranch": false
   },
   "dependencies": {
-    "@adonisjs/application": "^5.2.1",
-    "@adonisjs/env": "^3.0.8",
+    "@adonisjs/application": "^5.2.3",
+    "@adonisjs/env": "^3.0.9",
     "@adonisjs/ioc-transformer": "^2.3.3",
     "@adonisjs/require-ts": "^2.0.11",
     "@adonisjs/sink": "^5.2.2",
     "@poppinss/chokidar-ts": "^3.3.5",
     "@poppinss/cliui": "^3.0.2",
-    "@poppinss/utils": "^4.0.3",
+    "@poppinss/utils": "^4.0.4",
     "cpy": "^8.1.2",
     "emittery": "^0.10.2",
     "execa": "^5.1.1",
@@ -112,7 +112,7 @@
   },
   "publishConfig": {
     "access": "public",
-    "tag": "next"
+    "tag": "latest"
   },
   "mrmConfig": {
     "core": true,