5htp 0.0.8-3 → 0.0.9

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-3",
+	"version": "0.0.9",
 	"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

@@ -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/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( preactCoreModule, reactAppModule );
+}

package/src/compiler/index.ts

@@ -14,9 +14,9 @@ const smp = new SpeedMeasurePlugin({ disable: true });
 import createServerConfig from './server';
 import createClientConfig from './client';
 import { TCompileMode } from './common';
+import { fixNpmLinkIssues } from './common/utils/fixNpmLink'; 
 
 // types
-
 import type App from '../app';
 
 type TCompilerCallback = () => void
@@ -54,14 +54,13 @@ export default async function createCompilers(
             );
     }
 
-    // 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') 
-    );
+    /* 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([