5htp 0.4.6-4 → 0.4.6

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.4.6-4",
+	"version": "0.4.6",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp.git",
 	"license": "MIT",
@@ -39,7 +39,6 @@
 		"@types/universal-analytics": "^0.4.5",
 		"@types/webpack-env": "^1.16.2",
 		"@types/ws": "^7.4.7",
-		"babel-loader": "^10.0.0",
 		"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",
@@ -89,6 +88,7 @@
 		"@types/node": "^16.9.1",
 		"@types/nodemailer": "^6.4.4",
 		"@types/prompts": "^2.0.14",
-		"@types/webpack-env": "^1.16.2"
+		"@types/webpack-env": "^1.16.2",
+		"babel-loader": "^10.0.0"
 	}
 }

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

@@ -42,25 +42,7 @@ module.exports = (app: App, side: TAppSide, dev: boolean): webpack.RuleSetRule[]
     }
 
     return [{
-        loader: require.resolve('babel-loader'),
-        exclude: (filePath) => {
-            // 1) If not in "node_modules" at all => transpile it
-            if (!filePath.includes('node_modules')) {
-                return false;
-            }
-        
-            // 2) If it’s "node_modules/5htp-core" but NOT "node_modules/5htp-core/node_modules",
-            //    then transpile. Otherwise, exclude.
-            if (
-                filePath.includes('node_modules/5htp-core') &&
-                !filePath.includes('node_modules/5htp-core/node_modules')
-            ) {
-                return false;
-            }
-        
-            // 3) Everything else in node_modules is excluded
-            return true;
-          },
+        loader: 'babel-loader',
         options: { 
             
             // https://github.com/babel/babel-loader#options

package/src/compiler/index.ts

@@ -147,8 +147,7 @@ export default class Compiler {
             // The last override the first if there are duplicates
             '@server/services/': path.join(cli.paths.core.src, 'server', 'services'),
             '@/server/services/': path.join(app.paths.src, 'server', 'services'),
-            // Temp disabled because compile issue on vercel
-            //'': path.join(app.paths.root, 'node_modules'),
+            '': path.join(app.paths.root, 'node_modules'),
         }
 
         const servicesIndex: {[id: string]: TServiceMetas} = {};

package/src/compiler/server/index.ts

@@ -147,8 +147,7 @@ export default function createCompiler( app: App, mode: TCompileMode ): webpack.
                         cli.paths.core.root + '/src/server',
 
                         // Complle 5HTP modules so they can refer to the framework instance and aliases
-                        // Temp disabled because compile issue on vercel
-                        //...getCorePluginsList(app)
+                        ...getCorePluginsList(app)
                     ],
                     rules: require('../common/babel')(app, 'server', dev)
                 },