@adonisjs/assembler 6.1.2-0 → 6.1.3-1

package/build/src/bundler.js

@@ -1,11 +1,11 @@
 import fs from 'fs-extra';
 import slash from 'slash';
 import copyfiles from 'cpy';
-import { execa } from 'execa';
-import { join, relative } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { ConfigParser } from '@poppinss/chokidar-ts';
+import { join, relative } from 'node:path';
 import { cliui } from '@poppinss/cliui';
+import { run } from './run.js';
+import { parseConfig } from './parse_config.js';
 const ui = cliui();
 export class Bundler {
     #cwd;
@@ -28,15 +28,30 @@ export class Bundler {
     async #cleanupBuildDirectory(outDir) {
         await fs.remove(outDir);
     }
+    async #buildAssets() {
+        const assetsBundler = this.#options.assets;
+        if (!assetsBundler?.serve) {
+            return true;
+        }
+        try {
+            this.#logger.info('compiling frontend assets', { suffix: assetsBundler.cmd });
+            await run(this.#cwd, {
+                stdio: 'inherit',
+                script: assetsBundler.cmd,
+                scriptArgs: [],
+            });
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
     async #runTsc(outDir) {
         try {
-            await execa('tsc', ['--outDir', outDir], {
-                cwd: this.#cwd,
-                preferLocal: true,
-                localDir: this.#cwd,
-                windowsHide: false,
-                buffer: false,
+            await run(this.#cwd, {
                 stdio: 'inherit',
+                script: 'tsc',
+                scriptArgs: ['--outDir', outDir],
             });
             return true;
         }
@@ -93,23 +108,16 @@ export class Bundler {
         return this;
     }
     async bundle(stopOnError = true, client = 'npm') {
-        const { config, error } = new ConfigParser(this.#cwd, 'tsconfig.json', this.#ts).parse();
-        if (error) {
-            const compilerHost = this.#ts.createCompilerHost({});
-            this.#logger.logError(this.#ts.formatDiagnosticsWithColorAndContext([error], compilerHost));
-            return false;
-        }
-        if (config.errors.length) {
-            const compilerHost = this.#ts.createCompilerHost({});
-            this.#logger.logError(this.#ts.formatDiagnosticsWithColorAndContext(config.errors, compilerHost));
-            return false;
-        }
+        const config = parseConfig(this.#cwd, this.#ts);
         if (!config) {
             return false;
         }
         const outDir = config.options.outDir || fileURLToPath(new URL('build/', this.#cwd));
         this.#logger.info('cleaning up output directory', { suffix: this.#getRelativeName(outDir) });
         await this.#cleanupBuildDirectory(outDir);
+        if (!(await this.#buildAssets())) {
+            return false;
+        }
         this.#logger.info('compiling typescript source', { suffix: 'tsc' });
         const buildCompleted = await this.#runTsc(outDir);
         await this.#copyFiles(['ace.js'], outDir);

package/build/src/dev_server.js

@@ -52,6 +52,39 @@ export class DevServer {
             process.stdout.write('\u001Bc');
         }
     }
+    #logViteDevServerMessage(data) {
+        const dataString = data.toString();
+        const lines = dataString.split('\n');
+        if (dataString.includes('ready in')) {
+            console.log('');
+            console.log(dataString.trim());
+            return;
+        }
+        if (dataString.includes('Local') && dataString.includes('Network')) {
+            const sticker = ui.sticker().useColors(this.#colors).useRenderer(this.#logger.getRenderer());
+            lines.forEach((line) => {
+                if (line.trim()) {
+                    sticker.add(line);
+                }
+            });
+            sticker.render();
+            return;
+        }
+        lines.forEach((line) => {
+            if (line.trim()) {
+                console.log(line);
+            }
+        });
+    }
+    #logAssetsDevServerMessage(data) {
+        const dataString = data.toString();
+        const lines = dataString.split('\n');
+        lines.forEach((line) => {
+            if (line.trim()) {
+                console.log(line);
+            }
+        });
+    }
     async #getPort() {
         if (process.env.PORT) {
             return getPort({ port: Number(process.env.PORT) });
@@ -103,10 +136,27 @@ export class DevServer {
             return;
         }
         this.#logger.info(`starting "${assetsBundler.driver}" dev server...`);
-        this.#assetsServerProcess = run(assetsBundler.cmd, {
-            script: this.#scriptFile,
+        this.#assetsServerProcess = run(this.#cwd, {
+            script: assetsBundler.cmd,
+            stdio: 'pipe',
             scriptArgs: this.#options.scriptArgs,
         });
+        this.#assetsServerProcess.stdout?.on('data', (data) => {
+            if (assetsBundler.driver === 'vite') {
+                this.#logViteDevServerMessage(data);
+            }
+            else {
+                this.#logAssetsDevServerMessage(data);
+            }
+        });
+        this.#assetsServerProcess.stderr?.on('data', (data) => {
+            if (assetsBundler.driver === 'vite') {
+                this.#logViteDevServerMessage(data);
+            }
+            else {
+                this.#logAssetsDevServerMessage(data);
+            }
+        });
         this.#assetsServerProcess
             .then((result) => {
             this.#logger.warning(`"${assetsBundler.driver}" dev server closed with status code "${result.exitCode}"`);

package/build/src/parse_config.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="node" resolution-mode="require"/>
+import type tsStatic from 'typescript';
+export declare function parseConfig(cwd: string | URL, ts: typeof tsStatic): tsStatic.ParsedCommandLine | undefined;

package/build/src/parse_config.js

@@ -0,0 +1,15 @@
+import { ConfigParser } from '@poppinss/chokidar-ts';
+export function parseConfig(cwd, ts) {
+    const { config, error } = new ConfigParser(cwd, 'tsconfig.json', ts).parse();
+    if (error) {
+        const compilerHost = ts.createCompilerHost({});
+        console.log(ts.formatDiagnosticsWithColorAndContext([error], compilerHost));
+        return;
+    }
+    if (config.errors.length) {
+        const compilerHost = ts.createCompilerHost({});
+        console.log(ts.formatDiagnosticsWithColorAndContext(config.errors, compilerHost));
+        return;
+    }
+    return config;
+}

package/build/src/run.js

@@ -5,27 +5,33 @@ const DEFAULT_NODE_ARGS = [
     '--experimental-import-meta-resolve',
 ];
 export function runNode(cwd, options) {
-    const childProces = execaNode(options.script, options.scriptArgs, {
+    const childProcess = execaNode(options.script, options.scriptArgs, {
         nodeOptions: DEFAULT_NODE_ARGS.concat(options.nodeArgs),
         preferLocal: true,
         windowsHide: false,
         localDir: cwd,
         cwd,
         buffer: false,
-        stdio: 'inherit',
-        env: options.env,
+        stdio: options.stdio || 'inherit',
+        env: {
+            ...(options.stdio === 'pipe' ? { FORCE_COLOR: 'true' } : {}),
+            ...options.env,
+        },
     });
-    return childProces;
+    return childProcess;
 }
 export function run(cwd, options) {
-    const childProces = execa(options.script, options.scriptArgs, {
+    const childProcess = execa(options.script, options.scriptArgs, {
         preferLocal: true,
         windowsHide: false,
         localDir: cwd,
         cwd,
         buffer: false,
-        stdio: 'inherit',
-        env: options.env,
+        stdio: options.stdio || 'inherit',
+        env: {
+            ...(options.stdio === 'pipe' ? { FORCE_COLOR: 'true' } : {}),
+            ...options.env,
+        },
     });
-    return childProces;
+    return childProcess;
 }

package/build/src/types.d.ts

@@ -3,33 +3,34 @@ export type RunOptions = {
     script: string;
     scriptArgs: string[];
     nodeArgs: string[];
+    stdio?: 'pipe' | 'inherit';
     env?: NodeJS.ProcessEnv;
 };
 export type WatchOptions = {
     poll?: boolean;
 };
+export type MetaFile = {
+    pattern: string;
+    reloadServer: boolean;
+};
+export type AssetsBundlerOptions = {
+    serve: false;
+    driver?: string;
+    cmd?: string;
+} | {
+    serve: true;
+    driver: string;
+    cmd: string;
+};
 export type DevServerOptions = {
     scriptArgs: string[];
     nodeArgs: string[];
     clearScreen?: boolean;
     env?: NodeJS.ProcessEnv;
-    metaFiles?: {
-        pattern: string;
-        reloadServer: boolean;
-    }[];
-    assets?: {
-        serve: false;
-        driver?: string;
-        cmd?: string;
-    } | {
-        serve: true;
-        driver: string;
-        cmd: string;
-    };
+    metaFiles?: MetaFile[];
+    assets?: AssetsBundlerOptions;
 };
 export type BundlerOptions = {
-    metaFiles?: {
-        pattern: string;
-        reloadServer: boolean;
-    }[];
+    metaFiles?: MetaFile[];
+    assets?: AssetsBundlerOptions;
 };

package/build/src/watch.js

@@ -1,15 +1,9 @@
 import { fileURLToPath } from 'node:url';
-import { ConfigParser, Watcher } from '@poppinss/chokidar-ts';
+import { Watcher } from '@poppinss/chokidar-ts';
+import { parseConfig } from './parse_config.js';
 export function watch(cwd, ts, options) {
-    const { config, error } = new ConfigParser(cwd, 'tsconfig.json', ts).parse();
-    if (error) {
-        const compilerHost = ts.createCompilerHost({});
-        console.log(ts.formatDiagnosticsWithColorAndContext([error], compilerHost));
-        return;
-    }
-    if (config.errors.length) {
-        const compilerHost = ts.createCompilerHost({});
-        console.log(ts.formatDiagnosticsWithColorAndContext(config.errors, compilerHost));
+    const config = parseConfig(cwd, ts);
+    if (!config) {
         return;
     }
     const watcher = new Watcher(typeof cwd === 'string' ? cwd : fileURLToPath(cwd), config);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/assembler",
-  "version": "6.1.2-0",
+  "version": "6.1.3-1",
   "description": "Provides utilities to run AdonisJS development server and build project for production",
   "main": "build/index.js",
   "type": "module",
@@ -42,16 +42,16 @@
     "@japa/run-failed-tests": "^1.1.1",
     "@japa/runner": "^2.5.1",
     "@japa/spec-reporter": "^1.3.3",
-    "@swc/core": "^1.3.36",
-    "@types/node": "^18.14.3",
+    "@swc/core": "^1.3.39",
+    "@types/node": "^18.15.0",
     "c8": "^7.13.0",
     "cross-env": "^7.0.3",
     "del-cli": "^5.0.0",
-    "eslint": "^8.34.0",
-    "eslint-config-prettier": "^8.6.0",
+    "eslint": "^8.36.0",
+    "eslint-config-prettier": "^8.7.0",
     "eslint-plugin-adonis": "^3.0.3",
     "eslint-plugin-prettier": "^4.2.1",
-    "github-label-sync": "^2.2.0",
+    "github-label-sync": "^2.3.1",
     "husky": "^8.0.3",
     "np": "^7.6.3",
     "p-event": "^5.0.1",
@@ -61,8 +61,8 @@
   },
   "dependencies": {
     "@adonisjs/env": "^4.2.0-0",
-    "@poppinss/chokidar-ts": "^4.1.0-0",
-    "@poppinss/cliui": "^6.1.1-0",
+    "@poppinss/chokidar-ts": "^4.1.0-1",
+    "@poppinss/cliui": "^6.1.1-1",
     "@types/fs-extra": "^11.0.1",
     "@types/picomatch": "^2.3.0",
     "cpy": "^9.0.1",