5htp 0.4.0 → 0.4.1

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.4.0",
+	"version": "0.4.1",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp.git",
 	"license": "MIT",
@@ -40,7 +40,7 @@
 		"@types/webpack-env": "^1.16.2",
 		"@types/ws": "^7.4.7",
 		"babel-loader": "^8.2.2",
-		"babel-plugin-glob-import": "^0.0.7",
+		"babel-plugin-glob-import": "^0.0.8-1",
 		"babel-plugin-transform-imports": "^2.0.0",
 		"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
 		"brotli-webpack-plugin": "^1.1.0",

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

@@ -140,7 +140,7 @@ module.exports = (app: App, side: TAppSide, dev: boolean): webpack.RuleSetRule[]
 
             overrides: [
 
-                require('./plugins/icones-svg'),
+                require('./plugins/icones-svg')(app),
                 
                 // Universal forms
                 //require('./plugins/form'),

package/src/compiler/common/babel/plugins/icones-svg.ts

@@ -4,30 +4,29 @@
 
 // Npm
 import * as types from '@babel/types'
-
 import { PluginObj } from '@babel/core';
 
+import type { App } from '../../../../app';
+
 export type TIndexIcones = { [chemin: string]: { id: string, nom: string, fichier: string } };
 
 /*----------------------------------
 - WEBPACK RULE
 ----------------------------------*/
-module.exports = {
+module.exports = (app: App) => ({
     test: /\.(tsx|jsx|ts)$/,  // <i src="icon" /> et /* @icon */"icon"
     plugins: [
-        [Plugin]
+        [Plugin, { app }]
     ]
-}
+})
 
 const debug = false;
 
-const defaultIconsPack = 'regular';
-
 /*----------------------------------
 - PLUGIN
 ----------------------------------*/
 const ids: string[] = []
-function Plugin (babel) {
+function Plugin (babel, { app }: { app: App }) {
 
     const t = babel.types as typeof types;
 
@@ -57,7 +56,7 @@ function Plugin (babel) {
                 let [dossierIcone, nomIcone] = nomBrut.split('/');
                 if (nomIcone === undefined) {
                     nomIcone = dossierIcone;
-                    dossierIcone = defaultIconsPack;
+                    dossierIcone = app.identity.iconsPack || 'regular';
                 }
 
                 // Extraction des infos

package/src/compiler/common/index.ts

@@ -91,7 +91,7 @@ export default function createCommonConfig( app: App, side: TAppSide, mode: TCom
                 //'injection-dependances': new InjectDeps,
             }),
 
-            ...(cli.args.analyze === side ? [
+            ...(side === 'client' && cli.args.analyze ? [
 
                 new BundleAnalyzerPlugin({
                     defaultSizes: 'stat',
@@ -100,8 +100,6 @@ export default function createCommonConfig( app: App, side: TAppSide, mode: TCom
 
             ] : []),
 
-
-
             ...(dev ? [
 
                 // HMR

package/src/compiler/common/plugins/indexage/icones-svg/index.ts

@@ -13,7 +13,7 @@ import cli from '@cli';
 
 // Types
 import type { TIndexIcones } from '../../../babel/plugins/icones-svg';
-import type App from '@cli/app';
+import type { App } from '../../../../../app';
 
 /*----------------------------------
 - UTILS

package/src/index.ts

@@ -75,9 +75,7 @@ export class CLI {
         if (this.commands[commandName] === undefined)
             throw new Error(`Command ${commandName} does not exists.`);
 
-        const options = {
-            workdir: process.cwd()
-        }
+        this.args.workdir = process.cwd();
 
         let opt: string | null = null;
         for (const a of argv) {
@@ -85,37 +83,35 @@ export class CLI {
             if (a[0] === '-') {
 
                 opt = a.substring(1);
-                if (!(opt in options)) 
+                if (!(opt in this.args)) 
                     throw new Error(`Unknown option: ${opt}`);
 
                 // Init with default value
-                if (typeof options[opt] === "boolean")
-                    options[opt] = true;
+                if (typeof this.args[opt] === "boolean")
+                    this.args[opt] = true;
 
             } else if (opt !== null) {
 
-                const curVal = options[opt];
+                const curVal = this.args[opt];
 
                 if (Array.isArray( curVal ))
                     curVal.push(a);
                 else
-                    options[opt] = a;   
+                    this.args[opt] = a;   
 
                 opt = null;
 
             } else {
 
-                //args.push(a);
+                this.args[ a ] = true;
 
             }
         }
 
-        this.runCommand(commandName, options);
+        this.runCommand(commandName);
     }
 
-    public async runCommand(command: string, args: TArgsObject) {
-
-        this.args = args;
+    public async runCommand(command: string) {
 
         this.debug && console.info(`Running command ${command}`, this.args);