5htp 0.6.3-8 → 0.6.4

package/app/index.ts

@@ -56,7 +56,13 @@ export class App {
     public paths = {
 
         root: cli.paths.appRoot,
-        bin: path.join( cli.paths.appRoot, 'bin'),
+        binBuild: path.join( cli.paths.appRoot, 'bin'),
+        binDev: path.join( cli.paths.appRoot, 'bin-dev'),
+        get bin() {
+            return cli.commandName === 'dev'
+                ? this.binDev
+                : this.binBuild;
+        },
         data: path.join( cli.paths.appRoot, 'var', 'data'),
         public: path.join( cli.paths.appRoot, 'public'),
         pages: path.join( cli.paths.appRoot, 'client', 'pages'),
@@ -192,4 +198,4 @@ export class App {
 
 export const app = new App
 
-export default app
+export default app

package/commands/build.ts

@@ -2,22 +2,35 @@
 - DEPENDANCES
 ----------------------------------*/
 
-// Npm
-import prompts from 'prompts';
-
 // Configs
+import cli from '..';
 import Compiler from '../compiler';
+import type { TCompileMode } from '../compiler/common';
 
 /*----------------------------------
 - TYPES
 ----------------------------------*/
 
+const buildModes: TCompileMode[] = ['dev', 'prod'];
+
+function getBuildMode(): TCompileMode {
+
+    const selectedModes = buildModes.filter(mode => cli.args[mode] === true);
+
+    if (selectedModes.length > 1)
+        throw new Error(`Build mode is ambiguous. Use only one mode among: ${buildModes.join(', ')}`);
+
+    return selectedModes[0] || 'dev';
+}
+
 /*----------------------------------
 - COMMAND
 ----------------------------------*/
-export const run = (): Promise<void> => new Promise(async (resolve) => {
+export const run = (): Promise<void> => new Promise(async (resolve, reject) => {
 
-    const compiler = new Compiler('prod');
+    const mode = getBuildMode();
+
+    const compiler = new Compiler(mode);
 
     const multiCompiler = await compiler.create();
 
@@ -25,10 +38,24 @@ export const run = (): Promise<void> => new Promise(async (resolve) => {
 
         if (error) {
             console.error("An error occurred during the compilation:", error);
-            throw error;
+            reject(error);
+            return;
+        }
+
+        if (stats?.hasErrors()) {
+            reject(new Error(`Build failed in ${mode} mode.`));
+            return;
         }
 
-        //resolve();
+        multiCompiler.close((closeError) => {
+
+            if (closeError) {
+                reject(closeError);
+                return;
+            }
+
+            resolve();
+        });
 
     });
-});
+});

package/compiler/client/index.ts

@@ -35,6 +35,7 @@ export default function createCompiler( app: App, mode: TCompileMode ): webpack.
 
     console.info(`Creating compiler for client (${mode}).`);
     const dev = mode === 'dev';
+    const buildCheck = dev && cli.commandName === 'build';
 
     const commonConfig = createCommonConfig(app, 'client', mode);
 
@@ -78,7 +79,7 @@ export default function createCompiler( app: App, mode: TCompileMode ): webpack.
 
         output: {
 
-            pathinfo: dev,
+            pathinfo: dev && !buildCheck,
             path: app.paths.bin + '/public',
             filename: '[name].js', // Output client.js
             assetModuleFilename: '[hash][ext]',
@@ -157,7 +158,7 @@ export default function createCompiler( app: App, mode: TCompileMode ): webpack.
             // Emit a file with assets cli.paths
             // https://github.com/webdeveric/webpack-assets-manifest#options
             new WebpackAssetsManifest({
-                output: app.paths.root + `/bin/asset-manifest.json`,
+                output: app.paths.bin + `/asset-manifest.json`,
                 publicPath: true,
                 writeToDisk: true, // Force la copie du fichier sur e disque, au lieu d'en mémoire en mode dev
                 customize: ({ key, value }) => {
@@ -167,7 +168,7 @@ export default function createCompiler( app: App, mode: TCompileMode ): webpack.
                 },
                 done: (manifest, stats) => {
                     // Write chunk-manifest.json.json
-                    const chunkFileName = app.paths.root + `/bin/chunk-manifest.json`;
+                    const chunkFileName = app.paths.bin + `/chunk-manifest.json`;
                     try {
                         const fileFilter = file => !file.endsWith('.map');
                         const addPath = file => manifest.getPublicPath(file);
@@ -226,7 +227,7 @@ export default function createCompiler( app: App, mode: TCompileMode ): webpack.
         ],
 
         // https://webpack.js.org/configuration/devtool/#devtool
-        devtool: 'source-map',
+        devtool: buildCheck ? false : 'source-map',
         /*devServer: {
             hot: true,
         },*/

package/compiler/common/index.ts

@@ -45,6 +45,7 @@ export default function createCommonConfig(
 ): webpack.Configuration {
 
     const dev = mode === 'dev';
+    const buildCheck = dev && cli.commandName === 'build';
     const config: webpack.Configuration = {
 
         // Project root
@@ -127,13 +128,17 @@ export default function createCommonConfig(
         // "webpack" The "path" argument must be of type string. Received undefined
         // https://github.com/webpack/webpack/issues/12616
         // Update: Hum it's fixed, just had to update webpack deps
-        cache: dev,
+        cache: dev && !buildCheck,
 
-        profile: true,
+        profile: !buildCheck,
 
         // Pour bundle-stats
         // https://github.com/relative-ci/bundle-stats/tree/master/packages/cli#webpack-configuration
-        stats: {
+        stats: buildCheck ? {
+            colors: true,
+            errorDetails: true,
+            timings: true,
+        } : {
             cached: dev,
             cachedAssets: dev,
             chunks: dev,
@@ -151,4 +156,4 @@ export default function createCommonConfig(
 
     return config;
 
-}
+}

package/compiler/server/index.ts

@@ -43,6 +43,7 @@ export default function createCompiler( app: App, mode: TCompileMode ): webpack.
 
     debug && console.info(`Creating compiler for server (${mode}).`);
     const dev = mode === 'dev';
+    const buildCheck = dev && cli.commandName === 'build';
 
     const commonConfig = createCommonConfig(app, 'server', mode);
     const { aliases } = app.aliases.server.forWebpack({
@@ -69,7 +70,7 @@ export default function createCompiler( app: App, mode: TCompileMode ): webpack.
 
         output: {
 
-            pathinfo: dev,
+            pathinfo: dev && !buildCheck,
 
             libraryTarget: 'commonjs2',
 
@@ -198,7 +199,9 @@ export default function createCompiler( app: App, mode: TCompileMode ): webpack.
         },
 
         // https://webpack.js.org/configuration/devtool/#devtool
-        devtool: dev 
+        devtool: buildCheck
+            ? false
+            : dev 
             ? 'eval-source-map' // Recommended choice for development builds with high quality SourceMaps.
             : 'source-map', // Recommended choice for production builds with high quality SourceMaps.
 
@@ -209,4 +212,4 @@ export default function createCompiler( app: App, mode: TCompileMode ): webpack.
     };
 
     return config;
-};
+};

package/index.ts

@@ -33,6 +33,8 @@ export class CLI {
 
     // Context
     public args: TArgsObject = {};
+
+    public commandName: string | null = null;
     
     public debug: boolean = false;
 
@@ -112,6 +114,7 @@ export class CLI {
 
     public async runCommand(command: string) {
 
+        this.commandName = command;
         this.debug && console.info(`Running command ${command}`, this.args);
 
         // Check existance

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.6.3-8",
+	"version": "0.6.4",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp.git",
 	"license": "MIT",

package/readme.md

@@ -36,10 +36,20 @@ Requires Node.js `18.20+` or any compatible `20.x` release.
 
 `5htp dev`
 
-4. Build for production:
+Dev compilation output is written to `bin-dev`.
+
+4. Build output files with the development config:
 
 `5htp build`
 
+`5htp build dev`
+
+5. Build for production:
+
+`5htp build prod`
+
+Build output is written to `bin`.
+
 ## To be done:
 
 - [ ] Update templates & documentation