5htp 0.0.5 → 0.0.6-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.5",
+	"version": "0.0.6-2",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-cli.git",
 	"license": "MIT",
@@ -70,7 +70,7 @@
 		"react-dev-utils": "^11.0.4",
 		"speed-measure-webpack-plugin": "^1.5.0",
 		"terser-webpack-plugin": "^5.2.4",
-		"ts-alias": "^0.0.3-1",
+		"ts-alias": "^0.0.4",
 		"ts-node": "^10.9.1",
 		"tslog": "^3.3.4",
 		"webfont": "^11.2.26",

package/src/compiler/common/index.ts

@@ -51,6 +51,7 @@ export default function createCommonConfig( side: TAppSide, mode: TCompileMode )
         resolveLoader: {
             // Recherche des loaders dans framework/node_modules (psinon, webpack cherche dans le projet)
             modules: [
+                cli.paths.appRoot + '/node_modules',
                 cli.paths.core.root + '/node_modules',
                 cli.paths.core.cli + '/node_modules',
             ],

package/src/compiler/server/index.ts

@@ -4,11 +4,6 @@
 
 // Npm
 import webpack from 'webpack';
-import TsAlias from 'ts-alias';
-import path from 'path';
-
-// Plugins
-var nodeExternals = require('webpack-node-externals');
 
 // Minimizers
 const TerserPlugin = require("terser-webpack-plugin");
@@ -27,8 +22,10 @@ export default function createCompiler( mode: TCompileMode ): webpack.Configurat
     const dev = mode === 'dev';
 
     const commonConfig = createCommonConfig('server', mode);
-
     const { aliases } = cli.paths.aliases.server.forWebpack(cli.paths.app.root + '/node_modules');
+
+    console.log(`[${mode}] node_modules dirs:`, commonConfig.resolveLoader?.modules,
+        '\nModule aliases:', aliases);
         
     const config: webpack.Configuration = {
 
@@ -82,7 +79,7 @@ export default function createCompiler( mode: TCompileMode ): webpack.Configurat
                 if (!shouldCompile) {
                     
                     // Externalize to a commonjs module using the request path
-                    return callback(null, 'commonjs ' + request);
+                    return callback(undefined, 'commonjs ' + request);
                 }
 
                 // Continue without externalizing the import

package/src/utils/config.ts

@@ -3,8 +3,11 @@
 ----------------------------------*/
 
 /*
-    WARNING: This file SHOULDN'T import deps from the project
-        Because it's imported by the CLI, which should be independant of the app escept for loading config
+    NOTE: This is a copy of core/sever/app/config
+    We can't import core deps here because it will cause the following error:
+        "Can't use import when not a module"
+    It will be possible to import core files when the CLI will be compiled as one output file with tsc
+    And for that, we need to fix the TS errors for the CLI
 */
 
 // Npm

package/tsconfig.json

@@ -25,8 +25,7 @@
 
         "paths": {
             "@cli/*": [ "./*" ],
-            "@cli": [ "./" ],
-            "@server_old/*": [ "../src/server/*" ]
+            "@cli": [ "./" ]
         },
     },