@adonisjs/assembler 6.1.0-0 → 6.1.2-0

package/build/src/dev_server.js

@@ -2,8 +2,8 @@ import getPort from 'get-port';
 import picomatch from 'picomatch';
 import { cliui } from '@poppinss/cliui';
 import { EnvLoader, EnvParser } from '@adonisjs/env';
-import { run } from './run.js';
 import { watch } from './watch.js';
+import { run, runNode } from './run.js';
 const ui = cliui();
 export class DevServer {
     #cwd;
@@ -15,6 +15,7 @@ export class DevServer {
     #isMetaFileWithReloadsEnabled;
     #isMetaFileWithReloadsDisabled;
     #watcher;
+    #assetsServerProcess;
     #onError;
     #onClose;
     get #colors() {
@@ -65,7 +66,7 @@ export class DevServer {
         return getPort({ port: 3333 });
     }
     #startHTTPServer(port, mode) {
-        this.#httpServerProcess = run(this.#cwd, {
+        this.#httpServerProcess = runNode(this.#cwd, {
             script: this.#scriptFile,
             env: { PORT: port, ...this.#options.env },
             nodeArgs: this.#options.nodeArgs,
@@ -96,6 +97,25 @@ export class DevServer {
             this.#watcher?.close();
         });
     }
+    #startAssetsServer() {
+        const assetsBundler = this.#options.assets;
+        if (!assetsBundler?.serve) {
+            return;
+        }
+        this.#logger.info(`starting "${assetsBundler.driver}" dev server...`);
+        this.#assetsServerProcess = run(assetsBundler.cmd, {
+            script: this.#scriptFile,
+            scriptArgs: this.#options.scriptArgs,
+        });
+        this.#assetsServerProcess
+            .then((result) => {
+            this.#logger.warning(`"${assetsBundler.driver}" dev server closed with status code "${result.exitCode}"`);
+        })
+            .catch((error) => {
+            this.#logger.warning(`unable to connect to "${assetsBundler.driver}" dev server`);
+            this.#logger.fatal(error);
+        });
+    }
     #restart(port) {
         if (this.#httpServerProcess) {
             this.#httpServerProcess.removeAllListeners();
@@ -119,13 +139,15 @@ export class DevServer {
         this.#clearScreen();
         this.#logger.info('starting HTTP server...');
         this.#startHTTPServer(String(await this.#getPort()), 'nonblocking');
+        this.#startAssetsServer();
     }
     async startAndWatch(ts, options) {
+        const port = String(await this.#getPort());
         this.#isWatching = true;
         this.#clearScreen();
-        const port = String(await this.#getPort());
         this.#logger.info('starting HTTP server...');
         this.#startHTTPServer(port, 'blocking');
+        this.#startAssetsServer();
         const output = watch(this.#cwd, ts, options || {});
         if (!output) {
             this.#onClose?.(1);

package/build/src/run.d.ts

@@ -1,3 +1,4 @@
 /// <reference types="node" resolution-mode="require"/>
 import type { RunOptions } from './types.js';
-export declare function run(cwd: string | URL, options: RunOptions): import("execa").ExecaChildProcess<string>;
+export declare function runNode(cwd: string | URL, options: RunOptions): import("execa").ExecaChildProcess<string>;
+export declare function run(cwd: string | URL, options: Omit<RunOptions, 'nodeArgs'>): import("execa").ExecaChildProcess<string>;

package/build/src/run.js

@@ -1,10 +1,10 @@
-import { execaNode } from 'execa';
+import { execaNode, execa } from 'execa';
 const DEFAULT_NODE_ARGS = [
     '--loader=ts-node/esm',
     '--no-warnings',
     '--experimental-import-meta-resolve',
 ];
-export function run(cwd, options) {
+export function runNode(cwd, options) {
     const childProces = execaNode(options.script, options.scriptArgs, {
         nodeOptions: DEFAULT_NODE_ARGS.concat(options.nodeArgs),
         preferLocal: true,
@@ -17,3 +17,15 @@ export function run(cwd, options) {
     });
     return childProces;
 }
+export function run(cwd, options) {
+    const childProces = execa(options.script, options.scriptArgs, {
+        preferLocal: true,
+        windowsHide: false,
+        localDir: cwd,
+        cwd,
+        buffer: false,
+        stdio: 'inherit',
+        env: options.env,
+    });
+    return childProces;
+}

package/build/src/types.d.ts

@@ -17,6 +17,15 @@ export type DevServerOptions = {
         pattern: string;
         reloadServer: boolean;
     }[];
+    assets?: {
+        serve: false;
+        driver?: string;
+        cmd?: string;
+    } | {
+        serve: true;
+        driver: string;
+        cmd: string;
+    };
 };
 export type BundlerOptions = {
     metaFiles?: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/assembler",
-  "version": "6.1.0-0",
+  "version": "6.1.2-0",
   "description": "Provides utilities to run AdonisJS development server and build project for production",
   "main": "build/index.js",
   "type": "module",
@@ -42,12 +42,9 @@
     "@japa/run-failed-tests": "^1.1.1",
     "@japa/runner": "^2.5.1",
     "@japa/spec-reporter": "^1.3.3",
-    "@poppinss/cliui": "^6.1.1-0",
-    "@poppinss/dev-utils": "^2.0.3",
     "@swc/core": "^1.3.36",
-    "@types/node": "^18.14.1",
+    "@types/node": "^18.14.3",
     "c8": "^7.13.0",
-    "copyfiles": "^2.4.1",
     "cross-env": "^7.0.3",
     "del-cli": "^5.0.0",
     "eslint": "^8.34.0",
@@ -64,7 +61,8 @@
   },
   "dependencies": {
     "@adonisjs/env": "^4.2.0-0",
-    "@poppinss/chokidar-ts": "^4.0.0-0",
+    "@poppinss/chokidar-ts": "^4.1.0-0",
+    "@poppinss/cliui": "^6.1.1-0",
     "@types/fs-extra": "^11.0.1",
     "@types/picomatch": "^2.3.0",
     "cpy": "^9.0.1",
@@ -74,6 +72,9 @@
     "picomatch": "^2.3.1",
     "slash": "^5.0.0"
   },
+  "peerDependencies": {
+    "typescript": "^4.0.0 || ^5.0.0"
+  },
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/adonisjs/assembler.git"