5htp 0.2.2 → 0.2.3-1

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.2.2",
+	"version": "0.2.3-1",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp.git",
 	"license": "MIT",
@@ -22,7 +22,6 @@
 		"@babel/plugin-proposal-private-methods": "^7.14.5",
 		"@babel/plugin-proposal-private-property-in-object": "^7.15.4",
 		"@babel/plugin-transform-react-constant-elements": "^7.14.5",
-		"@babel/plugin-transform-react-jsx-self": "^7.14.9",
 		"@babel/preset-env": "^7.15.6",
 		"@babel/preset-react": "^7.14.5",
 		"@babel/preset-typescript": "^7.15.0",
@@ -72,7 +71,7 @@
 		"replace-once": "^1.0.0",
 		"speed-measure-webpack-plugin": "^1.5.0",
 		"terser-webpack-plugin": "^5.2.4",
-		"ts-alias": "^0.0.6",
+		"ts-alias": "^0.0.7",
 		"ts-node": "^10.9.1",
 		"tslog": "^3.3.4",
 		"webfont": "^11.2.26",
@@ -85,7 +84,6 @@
 		"webpack-virtual-modules": "^0.4.3"
 	},
 	"devDependencies": {
-		"@babel/plugin-transform-react-jsx-source": "^7.19.6",
 		"@types/favicons": "^6.2.2",
 		"@types/fs-extra": "^9.0.12",
 		"@types/node": "^16.9.1",

package/skeleton/src/client/components/LoginModal.tsx

@@ -26,7 +26,7 @@ export default ({ close }: ModalProps) => {
 
     const login = () => api.post('/login', { username }).then(() => {
         close(true);
-        return page.go('/app');
+        return router.go('/app');
     });
 
     return (

package/skeleton/src/client/pages/app/index.tsx

@@ -22,7 +22,7 @@ route.page('/app', {  }, ({}, { api }) => ({
 
     // Get data from your API here
 
-}), ({ }, { api, page, user, socket }) => {
+}), ({ }, { api, router, user, socket }) => {
 
     /*----------------------------------
     - INIT
@@ -42,7 +42,7 @@ route.page('/app', {  }, ({}, { api }) => ({
     /*----------------------------------
     - ACTIONS
     ----------------------------------*/
-    const logout = () => api.post('/auth/logout').then(() => page.go('/'))
+    const logout = () => api.post('/auth/logout').then(() => router.go('/'))
 
     /*----------------------------------
     - RENDER

package/src/commands/dev.ts

@@ -26,7 +26,6 @@ export const run = () => new Promise<void>(async () => {
     const multiCompiler = await createCompilers(app, 'dev', {
         before: () => {
 
-            console.log('before');
             stopApp();
 
         }, 

package/src/compiler/client/index.ts

@@ -29,6 +29,8 @@ import cli from '../..';
 // Type
 import type App from '../../app';
 
+const debug = false;
+
 /*----------------------------------
 - CONFIG
 ----------------------------------*/
@@ -59,7 +61,7 @@ export default function createCompiler( app: App, mode: TCompileMode ): webpack.
     delete aliases["@server"]; 
     delete aliases["@/server"];
 
-    console.log("client aliases", aliases);
+    debug && console.log("client aliases", aliases);
     const config: webpack.Configuration = {
 
         ...commonConfig,

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

@@ -76,6 +76,7 @@ module.exports = (app: App, side: TAppSide, dev: boolean): webpack.RuleSetRule[]
                 // https://github.com/babel/babel/tree/master/packages/babel-preset-react
                 [require('@babel/preset-react'), {
                     //pragma: "h"
+                    development: dev
                 }],
 
             ],
@@ -96,11 +97,7 @@ module.exports = (app: App, side: TAppSide, dev: boolean): webpack.RuleSetRule[]
                 ...(dev ? [
 
                     ...(side === 'client' ? [
-
-                        [require("@babel/plugin-transform-react-jsx-source"), {}],
-
-                        // HMR Preact avec support des hooks
-                        //['@prefresh/babel-plugin'],
+                        
 
                     ] : [])
 
@@ -127,7 +124,7 @@ module.exports = (app: App, side: TAppSide, dev: boolean): webpack.RuleSetRule[]
 
                 //require("./plugins/pages")({ side }),
 
-                require('./routes/routes')({ side, app }),
+                require('./routes/routes')({ side, app, debug: false }),
 
                 ...(side === 'client' ? [] : [
 

package/src/compiler/common/babel/routes/imports.ts

@@ -26,7 +26,7 @@ const alphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
 
 module.exports = (app: App, side: TAppSide, dev: boolean): ImportTransformer => ({
 
-    debug: true,
+    debug: false,
 
     test: (request) => (
         side === 'client'

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

@@ -17,19 +17,19 @@ import App, { TAppSide } from '../../../../app';
 
 type TOptions = {
     side: TAppSide,
-    app: App
+    app: App,
+    debug?: boolean
 }
 
 module.exports = (options: TOptions) => (
     [Plugin, options]
 )
 
-const debug = true;
 
 /*----------------------------------
 - PLUGIN
 ----------------------------------*/
-function Plugin(babel, { app, side }: TOptions) {
+function Plugin(babel, { app, side, debug }: TOptions) {
 
     const t = babel.types as typeof types;
 

package/src/compiler/index.ts

@@ -86,7 +86,7 @@ export default async function createCompilers(
             compiling[name] = new Promise((resolve) => finished = resolve);
 
             timeStart = new Date();
-            console.info(`[${name}] ########## Compiling ...`);
+            console.info(`[${name}] Compiling ...`);
         });
 
         /* TODO: Ne pas résoudre la promise tant que la recompilation des données indexées (icones, identité, ...) 
@@ -100,7 +100,7 @@ export default async function createCompilers(
             const timeEnd = new Date();
             const time = timeEnd.getTime() - timeStart.getTime();
             if (stats.hasErrors()) {
-                console.error(`############## Failed to compile '${name}' after ${time} ms`);
+                console.error(`[${name}] Failed to compile after ${time} ms`);
 
                 // Exit process with code 0, so the CI container can understand building failed
                 // Only in prod, because in dev, we want the compiler watcher continue running
@@ -108,7 +108,7 @@ export default async function createCompilers(
                     process.exit(0);
 
             } else {
-                console.info(`############## [${name}] Finished compilation after ${time} ms`);
+                console.info(`[${name}] Finished compilation after ${time} ms`);
             }
 
             // Mark as finished

package/src/compiler/server/index.ts

@@ -34,12 +34,14 @@ const getCorePluginsList = (app: App,) => {
     return corePlugins;
 }
 
+const debug = false;
+
 /*----------------------------------
 - CONFIG
 ----------------------------------*/
 export default function createCompiler( app: App, mode: TCompileMode ): webpack.Configuration {
 
-    console.info(`Creating compiler for server (${mode}).`);
+    debug && console.info(`Creating compiler for server (${mode}).`);
     const dev = mode === 'dev';
 
     const commonConfig = createCommonConfig(app, 'server', mode);
@@ -51,7 +53,7 @@ export default function createCompiler( app: App, mode: TCompileMode ): webpack.
     delete aliases["@client/services"]; 
     delete aliases["@/client/services"];
 
-    console.log(`[${mode}] node_modules dirs:`, commonConfig.resolveLoader?.modules,
+    debug && console.log(`[${mode}] node_modules dirs:`, commonConfig.resolveLoader?.modules,
         '\nModule aliases for webpack:', aliases);
     const config: webpack.Configuration = {
 

package/src/index.ts

@@ -37,6 +37,7 @@ export class CLI {
     public constructor(
         public paths = new Paths( process.cwd() )
     ) {
+        console.log(`[cli] 5HTP CLI`, process.env.npm_package_version);
         console.log(`[cli] Start debugger ...`);
         new Logger({ name: "cli", overwriteConsole: true });
 

package/src/paths.ts

@@ -132,7 +132,7 @@ export default class Paths {
         const filepath = infos.relative;
 
         // Before:  /home/.../src/client/pages/landing/index.tsx
-        // After:   landing_index
+        // After:   landing
         let chunkId = filenameToImportName(filepath);
 
         // nsure it's non-empty
@@ -149,8 +149,7 @@ export default class Paths {
             rootDir: this.core.cli
         });
 
-        console.log('Applying Aliases ...', aliases);
-
+        //console.log('Applying Aliases ...', aliases);
         moduleAlias.addAliases( aliases.forModuleAlias() );
 
     }