5htp 0.3.3 → 0.3.6

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.3.3",
+	"version": "0.3.6",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp.git",
 	"license": "MIT",
@@ -73,7 +73,6 @@
 		"ts-alias": "^0.0.7",
 		"ts-node": "^10.9.1",
 		"webfont": "^11.2.26",
-		"webpack": "^5.56.0",
 		"webpack-assets-manifest": "^5.0.6",
 		"webpack-bundle-analyzer": "^4.4.2",
 		"webpack-dev-middleware": "^5.1.0",
@@ -82,11 +81,13 @@
 		"webpack-virtual-modules": "^0.4.3"
 	},
 	"devDependencies": {
+		"@types/babel__preset-env": "^7.9.6",
 		"@types/favicons": "^6.2.2",
 		"@types/fs-extra": "^9.0.12",
 		"@types/node": "^16.9.1",
 		"@types/nodemailer": "^6.4.4",
 		"@types/prompts": "^2.0.14",
-		"@types/webpack-env": "^1.16.2"
+		"@types/webpack-env": "^1.16.2",
+		"webpack": "^5.89.0"
 	}
 }

package/src/app/index.ts

@@ -5,6 +5,7 @@
 // npm
 import path from 'path';
 import TsAlias from 'ts-alias';
+import fs from 'fs-extra';
 
 // Cre
 import cli from '..';
@@ -31,6 +32,8 @@ export class App {
 
     public env: TEnvConfig;
 
+    public packageJson: {[key: string]: any};
+
     public paths = {
 
         root: cli.paths.appRoot,
@@ -71,6 +74,8 @@ export class App {
         const configParser = new ConfigParser( cli.paths.appRoot );
         this.identity = configParser.identity();
         this.env = configParser.env();
+        this.packageJson = this.loadPkg();
+        
     }
 
     /*----------------------------------
@@ -95,6 +100,10 @@ export class App {
             debug: false
         }),
     }
+
+    private loadPkg() {
+        return fs.readJSONSync(this.paths.root + '/package.json');
+    }
 }
 
 export const app = new App

package/src/commands/deploy/web.ts

@@ -42,11 +42,9 @@ export async function run() {
     fs.emptyDirSync(temp);
 
     // Merge package.json: framework + app
-    const appPkg = fs.readJSONSync(app.paths.root + '/package.json');
-    const corePkg = fs.readJSONSync(cli.paths.core.root + '/package.json');
     fs.outputJSONSync(temp + '/package.json', {
         ...appPkg,
-        dependencies: mergeDeps(corePkg, appPkg),
+        dependencies: mergeDeps(cli.packageJson, appPkg),
         devDependencies: {}
     }, { spaces: 4 });
 

package/src/compiler/common/babel/index.ts

@@ -3,11 +3,8 @@
 ----------------------------------*/
 
 // Npm
-import path from 'path';
 import type webpack from 'webpack';
-import * as types from '@babel/types'
-import PresetReact from '@babel/preset-react';
-
+import PresetBabel, { Options } from '@babel/preset-env';
 // Core
 import PluginIndexage from '../plugins/indexage';
 
@@ -19,11 +16,31 @@ import type { TAppSide, App } from '@cli/app';
 ----------------------------------*/
 module.exports = (app: App, side: TAppSide, dev: boolean): webpack.RuleSetRule[] => {
 
-    const pkg = {
-        app: require(app.paths.root + '/package.json'),
-        core: require(cli.paths.core.root + '/package.json'),
+    const babelPresetEnvConfig: Options = side === 'client'  ? {
+
+        // Ajoute automatiquement les polyfills babel
+        // https://stackoverflow.com/a/61517521/12199605
+        "useBuiltIns": "usage", // alternative mode: "entry"
+        "corejs": 3, // default would be 2
+
+        targets: {
+            browsers: dev
+                ? 'last 2 versions'
+                : app.packageJson.browserslist,
+        },
+        forceAllTransforms: !dev, // for UglifyJS
+        modules: false,
+        debug: false,
+        bugfixes: !dev
+    } : {
+        targets: {
+            node: true,//pkg.engines.node.match(/(\d+\.?)+/)[0],
+        },
+        modules: false,
+        useBuiltIns: false,
+        debug: false,
     }
-    
+
     return [{
         loader: 'babel-loader',
         options: { 
@@ -46,27 +63,7 @@ module.exports = (app: App, side: TAppSide, dev: boolean): webpack.RuleSetRule[]
             presets: [
 
                 // https://github.com/babel/babel-preset-env
-                [require('@babel/preset-env'), side === 'client' ? {
-
-                    // Ajoute automatiquement les polyfills babel
-                    // https://stackoverflow.com/a/61517521/12199605
-                    "useBuiltIns": "usage", // alternative mode: "entry"
-                    "corejs": 3, // default would be 2
-
-                    targets: {
-                        browsers: pkg.app.browserslist,
-                    },
-                    forceAllTransforms: !dev, // for UglifyJS
-                    modules: false,
-                    debug: false,
-                } : {
-                    targets: {
-                        node: true,//pkg.engines.node.match(/(\d+\.?)+/)[0],
-                    },
-                    modules: false,
-                    useBuiltIns: false,
-                    debug: false,
-                }],
+                [PresetBabel, babelPresetEnvConfig],
 
                 [require("@babel/preset-typescript"), {
                     useDefineForClassFields: true,

package/src/compiler/common/files/style.ts

@@ -9,11 +9,6 @@ import type App from '../../../app';
 
 module.exports = (app: App, dev: Boolean, client: boolean) => {
 
-    // OBSOLETE: A projet can have multiple themes, 
-    //      And the user have to choose in which score he wants to use a theme (by importing it)
-    const paletteLess = fs.readFileSync( app.paths.src + '/client/assets/themes/main.less', 'utf8');
-    const themeVars = lessToJs(paletteLess, { resolveVariables: true, stripPrefix: true });
-
     return [
 
         // Apply PostCSS plugins including autoprefixer
@@ -53,8 +48,6 @@ module.exports = (app: App, dev: Boolean, client: boolean) => {
                     // Défault = parens-division depuis 4.0.0
                     // https://lesscss.org/usage/#less-options-math
                     math: 'always',
-
-                    globalVars: themeVars
                 },
             }
         },

package/src/compiler/common/index.ts

@@ -16,7 +16,7 @@ import InjectDeps from './plugins/indexage/injection-dependances';
 import cli from '../..';
 
 // Type
-import type App from '../../app';
+import type { App } from '../../app';
 import type { TAppSide } from '../../app';
 
 /*----------------------------------
@@ -68,11 +68,16 @@ export default function createCommonConfig( app: App, side: TAppSide, mode: TCom
             // https://webpack.js.org/plugins/define-plugin/
             new webpack.DefinePlugin({
 
+                // Flags
                 __DEV__: dev,
                 SERVER: side === 'server',
-                BUILD_DATE: JSON.stringify(dayjs().format('YY.MM.DD-HH.mm')),
 
+                // Core
+                CORE_VERSION: JSON.stringify( cli.packageJson.version ),
                 CORE_PATH: JSON.stringify(cli.paths.core.root),
+
+                // Application
+                BUILD_DATE: JSON.stringify(dayjs().format('YY.MM.DD-HH.mm')),
                 APP_PATH: JSON.stringify(app.paths.root),
                 APP_NAME: JSON.stringify(app.identity.web.title),
 

package/src/index.ts

@@ -7,6 +7,7 @@ process.traceDeprecation = true;
 ----------------------------------*/
 
 // Npm
+import fs from 'fs-extra';
 import cp from 'child_process';
 
 // Libs
@@ -37,6 +38,8 @@ export class CLI {
     
     public debug: boolean = false;
 
+    public packageJson: {[key: string]: any};
+
     public constructor(
         public paths = new Paths( process.cwd() )
     ) {
@@ -45,6 +48,8 @@ export class CLI {
         this.debug && console.log(`[cli] Apply aliases ...`);
         this.paths.applyAliases();
 
+        this.packageJson = this.loadPkg();
+
         this.start();
     }
 
@@ -59,6 +64,10 @@ export class CLI {
         "build": () => import('./commands/build'),
     }
 
+    private loadPkg() {
+        return fs.readJSONSync(this.paths.core.root + '/package.json');
+    }
+
     public start() {
         
         const [, , commandName, ...argv] = process.argv;
@@ -90,7 +99,7 @@ export class CLI {
                 if (Array.isArray( curVal ))
                     curVal.push(a);
                 else
-                    options[opt] = a;
+                    options[opt] = a;   
 
                 opt = null;