5htp 0.0.7-1 → 0.0.8-2

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp",
 	"description": "5-HTP, scientifically called 5-Hydroxytryptophan, is the precursor of happiness neurotransmitter.",
-	"version": "0.0.7-1",
+	"version": "0.0.8-2",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-cli.git",
 	"license": "MIT",
@@ -72,7 +72,7 @@
 		"replace-once": "^1.0.0",
 		"speed-measure-webpack-plugin": "^1.5.0",
 		"terser-webpack-plugin": "^5.2.4",
-		"ts-alias": "^0.0.4",
+		"ts-alias": "^0.0.5",
 		"ts-node": "^10.9.1",
 		"tslog": "^3.3.4",
 		"webfont": "^11.2.26",

package/readme.md

@@ -0,0 +1,30 @@
+# 5-HTP Framework
+
+Opinionated, Lightweight & Full Stack Typescript framework, designed for productivity, modularity and performance.
+
+**/!\ This is a side-project. I cannot guarantee the maintenance.**
+
+## Get Started
+
+1. Install:
+
+`npm i -g 5htp`
+
+2. Create a project:
+
+`5htp init`
+
+3. Launch dev server:
+
+`5htp dev`
+
+4. Build for production:
+
+`5htp build`
+
+## To be done:
+
+- Fix Typescript errors
+- Improve stability
+- Improve modularity
+- Make it less opinionated

package/skeleton/src/client/assets/theme.less

@@ -20,7 +20,7 @@
 
 // Spacing
 @spacing: 1.2em;
-@spacingComponent: @spacing;
+@spacing: @spacing;
 @spacingLayout: @spacing * 2;
 
 // Responsive
@@ -58,8 +58,8 @@
     --pageWidth: @pageWidth;
     --focusWidth: @focusWidth;
 
-    --c1: @c1;
-    --c2: @c2;
+    --cAccent: @c1;
+    --cAccent2: @c2;
 
     --bgOverlay: fade(@c1 + #666, 70%);
 

package/skeleton/src/client/pages/landing/_layout/index.less

@@ -42,7 +42,7 @@
 
             > i {
                 font-size: 5em;
-                color: var(--c1);
+                color: var(--cAccent);
             }
         }
     }

package/skeleton/src/server/routes/general.ts

@@ -7,7 +7,7 @@
 // Core
 import app, { $ } from '@server/app';
 const route = $.router;
-import { Introuvable, ErreurSaisie } from '@common/errors';
+import { NotFound, InputError } from '@common/errors';
 
 // App
 

package/src/app/index.ts

@@ -32,7 +32,7 @@ export default class App {
         src: cli.paths.appRoot + '/src',
         bin: cli.paths.appRoot + '/bin',
         data: cli.paths.appRoot + '/var/data',
-        public: cli.paths.appRoot + '/bin/public',
+        public: cli.paths.appRoot + '/public',
         pages: cli.paths.appRoot + '/src/client/pages',
         cache: cli.paths.appRoot + '/src/.cache',
 
@@ -55,9 +55,21 @@ export default class App {
     ----------------------------------*/
 
     public aliases = {
-        client: new TsAlias(this.paths.root + '/src/client'),
-        server: new TsAlias(this.paths.root + '/src/server'),
+        client: new TsAlias({
+            rootDir: this.paths.root + '/src/client',
+            modulesDir: [ 
+                cli.paths.appRoot + '/node_modules',  
+                cli.paths.coreRoot + '/node_modules'
+            ],
+            debug: false
+        }),
+        server: new TsAlias({
+            rootDir: this.paths.root + '/src/server',
+            modulesDir: [ 
+                cli.paths.appRoot + '/node_modules',  
+                cli.paths.coreRoot + '/node_modules'
+            ],
+            debug: false
+        }),
     }
-
-    
 }

package/src/commands/dev.ts

@@ -36,9 +36,6 @@ export const run = () => new Promise<void>(async () => {
         }
     });
 
-    // Allow the dev servet to fetch the frameworg node modules
-    //fs.createSymlinkSync( cli.paths.core.cli + '/node_modules', app.paths.bin + '/node_modules', 'dir' );
-
     multiCompiler.watch({
 
         // https://webpack.js.org/configuration/watch/#watchoptions

package/src/compiler/client/index.ts

@@ -54,7 +54,7 @@ export default function createCompiler( app: App, mode: TCompileMode ): webpack.
     const { aliases } = app.aliases.client.forWebpack(app.paths.root + '/node_modules');
     // Disable access to server-side libs from client side
     delete aliases["@server"]; 
-    delete aliases["@/server"]; 
+    delete aliases["@/server"];
 
     const config: webpack.Configuration = {
 

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

@@ -5,7 +5,7 @@ import type App from '../../../app';
 module.exports = (app: App, dev: boolean, client: boolean): webpack.RuleSetRule[] => {
 
     return [{
-        test: /\.(bmp|gif|jpg|jpeg|png|ico|svg)$/,
+        test: /\.(bmp|gif|jpg|jpeg|png|ico|svg|webp)$/,
         type: 'asset',
         parser: {
             dataUrlCondition: {

package/src/compiler/index.ts

@@ -3,6 +3,7 @@
 ----------------------------------*/
 
 // Npm
+import path from 'path';
 import webpack from 'webpack';
 import fs from 'fs-extra';
 
@@ -13,7 +14,6 @@ const smp = new SpeedMeasurePlugin({ disable: true });
 import createServerConfig from './server';
 import createClientConfig from './client';
 import { TCompileMode } from './common';
-import cli from '../';
 
 // types
 
@@ -37,6 +37,31 @@ export default async function createCompilers(
 
     // Cleanup
     fs.emptyDirSync( app.paths.bin );
+    fs.ensureDirSync( path.join(app.paths.bin, 'public') )
+    const publicFiles = fs.readdirSync(app.paths.public);
+    for (const publicFile of publicFiles) {
+        // Dev: faster to use symlink
+        if (mode === 'dev')
+            fs.symlinkSync( 
+                path.join(app.paths.public, publicFile), 
+                path.join(app.paths.bin, 'public', publicFile) 
+            );
+        // Prod: Symlink not always supported by CI / Containers solutions
+        else
+            fs.copySync( 
+                path.join(app.paths.public, publicFile), 
+                path.join(app.paths.bin, 'public', publicFile) 
+            );
+    }
+
+    // When the 5htp package is installed from npm link,
+    // Modules are installed locally and not glbally as with with the 5htp package from NPM.
+    // So we need to symbilnk the http-core node_modules in one of the parents of server.js.
+    // It avoids errors like: "Error: Cannot find module 'intl'"
+    fs.symlinkSync( 
+        path.join(app.paths.root, '/node_modules/5htp-core/node_modules'), 
+        path.join(app.paths.bin, '/node_modules') 
+    );
 
     // Create compilers
     const multiCompiler = webpack([

package/src/paths.ts

@@ -125,7 +125,9 @@ export default class Paths {
 
     public applyAliases() {
 
-        const aliases = new TsAlias( this.core.cli );
+        const aliases = new TsAlias({
+            rootDir: this.core.cli
+        });
 
         console.log('Applying Aliases ...', aliases);