5htp 0.4.3 → 0.4.5

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.4.3",
+	"version": "0.4.5",
 	"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.8-1",
+		"babel-plugin-glob-import": "^0.0.9-1",
 		"babel-plugin-transform-imports": "^2.0.0",
 		"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
 		"brotli-webpack-plugin": "^1.1.0",
@@ -73,12 +73,14 @@
 		"ts-alias": "^0.0.7",
 		"ts-node": "^10.9.1",
 		"webfont": "^11.2.26",
+		"webpack": "^5.89.0",
 		"webpack-assets-manifest": "^5.0.6",
 		"webpack-bundle-analyzer": "^4.4.2",
 		"webpack-dev-middleware": "^5.1.0",
 		"webpack-hot-middleware": "^2.25.0",
 		"webpack-node-externals": "^3.0.0",
-		"webpack-virtual-modules": "^0.4.3"
+		"webpack-virtual-modules": "^0.4.3",
+		"babel-plugin-transform-remove-console": "^6.9.4"
 	},
 	"devDependencies": {
 		"@types/babel__preset-env": "^7.9.6",
@@ -87,8 +89,6 @@
 		"@types/node": "^16.9.1",
 		"@types/nodemailer": "^6.4.4",
 		"@types/prompts": "^2.0.14",
-		"@types/webpack-env": "^1.16.2",
-		"babel-plugin-transform-remove-console": "^6.9.4",
-		"webpack": "^5.89.0"
+		"@types/webpack-env": "^1.16.2"
 	}
 }

package/src/compiler/client/index.ts

@@ -116,6 +116,8 @@ export default function createCompiler( app: App, mode: TCompileMode ): webpack.
                         app.paths.root + '/src/common',
                         cli.paths.core.root + '/src/common',
 
+                        app.paths.root + '/src/server/.generated/models.ts',
+
                     ],
                     rules: require('../common/babel')(app, 'client', dev)
                 },

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

@@ -117,15 +117,19 @@ module.exports = (app: App, side: TAppSide, dev: boolean): webpack.RuleSetRule[]
                             "transform": "lodash/${member}",
                             "preventFullImport": true
                         }
-                    }]
+                    }],
+
+                    ...(side === 'client' ? [
+                        
+                        [require('babel-plugin-transform-remove-console')],
+
+                    ] : [])
                 ]),
 
                 require('./routes/routes')({ side, app, debug: false }),
 
                 ...(side === 'client' ? [
 
-                    [require('babel-plugin-transform-remove-console')],
-
                 ] : [
 
                     require('./plugins/services')({ side, app, debug: false }),

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

@@ -6,6 +6,7 @@
 import type { ImportTransformer } from 'babel-plugin-glob-import';
 import * as types from '@babel/types'
 import path from 'path';
+import generate from '@babel/generator';
 
 // Core
 import cli from '@cli';
@@ -32,9 +33,9 @@ module.exports = (app: App, side: TAppSide, dev: boolean): ImportTransformer =>
         side === 'client'
         &&
         (
-            request.source === '@/client/pages/**/*.tsx' 
+            request.source === '@client/pages/**/([a-z0-9]*).tsx' 
             || 
-            request.source === '@client/pages/**/*.tsx'
+            request.source === '@/client/pages/**/([a-z0-9]*).tsx'
         )
         &&
         request.type === 'import'
@@ -59,14 +60,6 @@ module.exports = (app: App, side: TAppSide, dev: boolean): ImportTransformer =>
                 //console.log("Exclude", file, 'from pages loaders (its a layout)');
                 continue;
             }
-
-            // Excliude components
-            const filename = path.basename( file.filename );
-            const startsWithUppercase = alphabet.includes(filename[0]) && filename[0] === filename[0].toUpperCase();
-            if (startsWithUppercase) {
-                //console.log("Exclude", file, 'from pages loaders (its a component)');
-                continue;
-            }
                 
             // Page config
             const { chunkId } = cli.paths.getPageChunk(app, file.filename);
@@ -115,6 +108,11 @@ module.exports = (app: App, side: TAppSide, dev: boolean): ImportTransformer =>
                 )
             }
         }
+        
+        console.log( generate(t.variableDeclaration("const", [t.variableDeclarator(
+            t.identifier(request.imported.name),
+            t.objectExpression(pageLoaders)
+        )])).code );
 
         return [
             ...imports,

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

@@ -425,9 +425,10 @@ function Plugin(babel, { app, side, debug }: TOptions) {
                     )
                 )
             ])
-        )
+        );
 
-        //file.side === 'front' && console.log( generate(exportDeclaration).code );
+        /*(file.side === 'front' && file.path.includes('/headhunter/talents/index.tsx')) 
+            && console.log( file.path, generate(exportDeclaration).code );*/
 
         return exportDeclaration;
     }