5htp 0.0.8 → 0.0.9-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.8",
+	"version": "0.0.9-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.5",
+		"ts-alias": "^0.0.5-1",
 		"ts-node": "^10.9.1",
 		"tslog": "^3.3.4",
 		"webfont": "^11.2.26",

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%);
 
@@ -148,7 +148,7 @@ i.solid {
 
 &.c1, 
 &.primary { 
-    .build-theme(@c1, @c1 + #aaa);
+    .build-theme-bg(@c1, @c1 + #aaa);
 
     @cBgHighlight: @c1 + #111;
     --cBgHighlight: @cBgHighlight;

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

@@ -48,7 +48,7 @@ route.page('/app', {  }, ({}, { api }) => ({
     - RENDER
     ----------------------------------*/
     return <>
-        {greetings( user.name )}
+        {greetings( user.email )}
 
         <strong class="xxl">Connected users: {connected}</strong>
 

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/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/common/utils/fixNpmLink.ts

@@ -0,0 +1,46 @@
+/*----------------------------------
+- DEPENDANCES
+----------------------------------*/
+
+// Npm
+import path from 'path';
+import fs from 'fs-extra';
+
+// App
+import type App from '../../../app';
+
+/*----------------------------------
+- TYPES
+----------------------------------*/
+
+/*----------------------------------
+- UTTILS
+----------------------------------*/
+export const fixNpmLinkIssues = ( app: App ) => {
+
+    const corePath = path.join(app.paths.root, '/node_modules/5htp-core');
+    if (!fs.lstatSync( corePath ).isSymbolicLink())
+        return;
+
+    console.info(`Fix NPM link issues ...`);
+
+    const appModules = path.join(app.paths.root, 'node_modules');
+    const coreModules = path.join(corePath, 'node_modules');
+
+    // 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( coreModules, path.join(app.paths.bin, 'node_modules') );
+
+    // Same problem: when 5htp-core is installed via npm link, 
+    // Typescript doesn't detect React and shows mission JSX errors
+    const preactCoreModule = path.join(coreModules, 'preact');
+    const preactAppModule = path.join(appModules, 'preact');
+    const reactAppModule = path.join(appModules, 'react');
+
+    if (!fs.existsSync( preactAppModule ))
+        fs.symlinkSync( preactCoreModule, preactAppModule );
+    if (!fs.existsSync( reactAppModule ))
+        fs.symlinkSync( path.join(preactCoreModule, 'compat'), reactAppModule );
+}

package/src/compiler/index.ts

@@ -14,10 +14,9 @@ const smp = new SpeedMeasurePlugin({ disable: true });
 import createServerConfig from './server';
 import createClientConfig from './client';
 import { TCompileMode } from './common';
-import cli from '../';
+import { fixNpmLinkIssues } from './common/utils/fixNpmLink'; 
 
 // types
-
 import type App from '../app';
 
 type TCompilerCallback = () => void
@@ -40,19 +39,28 @@ export default async function createCompilers(
     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)
-        fs.symlinkSync( 
-            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.
-    fs.symlinkSync( 
-        path.join(app.paths.root, '/node_modules/5htp-core/node_modules'), 
-        path.join(app.paths.bin, '/node_modules') 
-    );
+    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) 
+            );
+    }
+
+    /* FIX issue with npm link
+        When we install a module with npm link, this module's deps are not installed in the parent project scope
+        Which causes some issues:
+        - The module's deps are not found by Typescript
+        - Including React, so VSCode shows that JSX is missing
+    */
+    fixNpmLinkIssues(app);
 
     // Create compilers
     const multiCompiler = webpack([
@@ -93,6 +101,7 @@ export default async function createCompilers(
             const time = timeEnd.getTime() - timeStart.getTime();
             if (stats.hasErrors()) {
                 console.error(`############## Failed to compile '${name}' after ${time} ms`);
+                process.exit(0);
             } else {
                 console.info(`############## [${name}] Finished compilation after ${time} ms`);
             }

package/src/compiler/server/index.ts

@@ -4,6 +4,7 @@
 
 // Npm
 import webpack from 'webpack';
+import fs from 'fs-extra';
 
 // Minimizers
 const TerserPlugin = require("terser-webpack-plugin");
@@ -16,6 +17,23 @@ import createCommonConfig, { TCompileMode, regex } from '../common';
 // Type
 import type App from '../../app';
 
+const getCorePluginsList = (app: App,) => {
+
+    const corePlugins: string[] = [];
+
+    if (fs.existsSync( app.paths.root + '/node_modules' ))
+        for (const moduleName of fs.readdirSync( app.paths.root + '/node_modules' ))
+            if (moduleName.startsWith('5htp-'))
+                corePlugins.push(app.paths.root + '/node_modules/' + moduleName + '/src');
+
+    if (fs.existsSync( cli.paths.core.root + '/node_modules' ))
+        for (const moduleName of fs.readdirSync( cli.paths.core.root+ '/node_modules' ))
+            if (moduleName.startsWith('5htp-'))
+                corePlugins.push(cli.paths.core.root + '/node_modules/' + moduleName + '/src');
+
+    return corePlugins;
+}
+
 /*----------------------------------
 - CONFIG
 ----------------------------------*/
@@ -70,11 +88,14 @@ export default function createCompiler( app: App, mode: TCompileMode ): webpack.
             function ({ request }, callback) {
 
                 const shouldCompile = request !== undefined && (
-                    request[0] === '.'
-                    ||
-                    request[0] === '/'
+                    // Local files
+                    request[0] === '.' || request[0] === '/'
                     ||
+                    // Aliased modules
                     app.aliases.server.containsAlias(request)
+                    ||
+                    // Compile 5HTP modules
+                    request.startsWith('5htp-')
                 )
 
                 //console.log('isNodeModule', request, isNodeModule);
@@ -119,7 +140,10 @@ export default function createCompiler( app: App, mode: TCompileMode ): webpack.
 
                         // Dossiers server uniquement pour le bundle server
                         app.paths.root + '/src/server',
-                        cli.paths.core.root + '/src/server'
+                        cli.paths.core.root + '/src/server',
+
+                        // Complle 5HTP modules so they can refer to the framework instance and aliases
+                        ...getCorePluginsList(app)
                     ],
                     rules: require('../common/babel')(app, 'server', dev)
                 }, 

package/skeleton/.github/workflows/ci.yml

@@ -1,93 +0,0 @@
-name: Node.js CI
-
-on:
-    push:
-        branches: [main]
-
-env:
-    AWS_REGION: eu-west-3 
-    ECR_REPOSITORY: megacharger 
-    ECS_SERVICE: megacharger  
-    ECS_CLUSTER: main-cluster 
-    ECS_TASK_DEFINITION: .github/workflows/ecs-task.json
-    CONTAINER_NAME: megacharger 
-    
-jobs:
-    build:
-        name: Build
-        runs-on: ubuntu-latest
-        steps:
-            # git pull
-            - uses: actions/checkout@v3
-            # Use Node.JS
-            - name: Use Node.js
-              uses: actions/setup-node@v3
-              with:
-                  node-version: '18.x'
-            # Install node deps
-            - run: npm ci
-            # Install 5htp CLI
-            - run: npm i --prefix=$HOME/.local -g 5htp;
-            # Buold app
-            - run: 5htp build
-
-            - uses: actions/upload-artifact@v2
-              with:
-                name: built-app
-                path: |
-                    ./bin
-                    ./public
-                    ./package.json
-                    ./package-lock.json
-                    ./identity.yaml
-                    ./Dockerfile
-                    ./.github/workflows/ecs-task.json
-
-    deploy:
-        name: Deploy
-        runs-on: ubuntu-latest
-        environment: production
-        needs: build
-        steps:
-            - uses: actions/download-artifact@v2
-              with:
-                name: built-app
-
-            - name: Configure AWS credentials
-              uses: aws-actions/configure-aws-credentials@13d241b293754004c80624b5567555c4a39ffbe3
-              with:
-                aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-                aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-                aws-region: ${{ env.AWS_REGION }}
-            
-            - run: ls -al
-
-            - name: Login to Amazon ECR
-              id: login-ecr
-              uses: aws-actions/amazon-ecr-login@aaf69d68aa3fb14c1d5a6be9ac61fe15b48453a2
-
-            - name: Build, tag, and push image to Amazon ECR
-              id: build-image
-              env:
-                ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
-                IMAGE_TAG: ${{ github.sha }}
-              run: |
-                docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
-                docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
-                echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
-
-            - name: Fill in the new image ID in the Amazon ECS task definition
-              id: task-def
-              uses: aws-actions/amazon-ecs-render-task-definition@97587c9d45a4930bf0e3da8dd2feb2a463cf4a3a
-              with:
-                task-definition: ${{ env.ECS_TASK_DEFINITION }}
-                container-name: ${{ env.CONTAINER_NAME }}
-                image: ${{ steps.build-image.outputs.image }}
-
-            - name: Deploy Amazon ECS task definition
-              uses: aws-actions/amazon-ecs-deploy-task-definition@v1
-              with:
-                task-definition: ${{ steps.task-def.outputs.task-definition }}
-                service: ${{ env.ECS_SERVICE }}
-                cluster: ${{ env.ECS_CLUSTER }}
-                wait-for-service-stability: true

package/skeleton/.github/workflows/ecs-task.json

@@ -1,77 +0,0 @@
-{
-    "taskDefinitionArn": "arn:aws:ecs:eu-west-3:909466428160:task-definition/run-app:8",
-    "containerDefinitions": [
-        {
-            "name": "megacharger",
-            "image": "909466428160.dkr.ecr.eu-west-3.amazonaws.com/megacharger",
-            "cpu": 0,
-            "portMappings": [
-                {
-                    "containerPort": 3010,
-                    "hostPort": 3010,
-                    "protocol": "tcp"
-                }
-            ],
-            "essential": true,
-            "environment": [],
-            "mountPoints": [],
-            "volumesFrom": [],
-            "logConfiguration": {
-                "logDriver": "awslogs",
-                "options": {
-                    "awslogs-group": "/ecs/run-app",
-                    "awslogs-region": "eu-west-3",
-                    "awslogs-stream-prefix": "ecs"
-                }
-            }
-        }
-    ],
-    "family": "run-app",
-    "taskRoleArn": "arn:aws:iam::909466428160:role/ecsTaskExecutionRole",
-    "executionRoleArn": "arn:aws:iam::909466428160:role/ecsTaskExecutionRole",
-    "networkMode": "awsvpc",
-    "revision": 8,
-    "volumes": [],
-    "status": "ACTIVE",
-    "requiresAttributes": [
-        {
-            "name": "com.amazonaws.ecs.capability.logging-driver.awslogs"
-        },
-        {
-            "name": "ecs.capability.execution-role-awslogs"
-        },
-        {
-            "name": "com.amazonaws.ecs.capability.ecr-auth"
-        },
-        {
-            "name": "com.amazonaws.ecs.capability.docker-remote-api.1.19"
-        },
-        {
-            "name": "com.amazonaws.ecs.capability.task-iam-role"
-        },
-        {
-            "name": "ecs.capability.execution-role-ecr-pull"
-        },
-        {
-            "name": "com.amazonaws.ecs.capability.docker-remote-api.1.18"
-        },
-        {
-            "name": "ecs.capability.task-eni"
-        }
-    ],
-    "placementConstraints": [],
-    "compatibilities": [
-        "EC2",
-        "FARGATE"
-    ],
-    "runtimePlatform": {
-        "operatingSystemFamily": "LINUX"
-    },
-    "requiresCompatibilities": [
-        "FARGATE"
-    ],
-    "cpu": "256",
-    "memory": "512",
-    "registeredAt": "2022-10-17T11:13:18.185000+02:00",
-    "registeredBy": "arn:aws:iam::909466428160:user/github-ci"
-}