5htp 0.0.6 → 0.0.8

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

@@ -11,8 +11,8 @@ import * as types from '@babel/types'
 import PluginIndexage from '../plugins/indexage';
 import BabelGlobImports from './plugins/importations';
 
-import cli from '../../..';
-import { TAppSide } from '../../..';
+import cli from '@cli';
+import type { TAppSide, default as App } from '@cli/app';
 
 // Const
 const alphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
@@ -23,239 +23,247 @@ const routesToPreload = require( cli.paths.appRoot + '/src/client/pages/preload.
 /*----------------------------------
 - REGLES
 ----------------------------------*/
-module.exports = (side: TAppSide, dev: boolean): webpack.RuleSetRule[] => ([{
-    loader: 'babel-loader',
-    options: { 
-        
-        // https://github.com/babel/babel-loader#options
+module.exports = (app: App, side: TAppSide, dev: boolean): webpack.RuleSetRule[] => {
 
-        // ATTENTION: Ne prend pas toujours compte des màj des plugins babel
-        cacheDirectory: cli.args.cache === true,
-        // Désactive car ralenti compilation
-        cacheCompression: false,
+    const pkg = {
+        app: require(app.paths.root + '/package.json'),
+        core: require(cli.paths.core.root + '/package.json'),
+    }
+    
+    return [{
+        loader: 'babel-loader',
+        options: { 
+            
+            // https://github.com/babel/babel-loader#options
 
-        metadataSubscribers: [
-            PluginIndexage.metadataContextFunctionName
-        ],
+            // ATTENTION: Ne prend pas toujours compte des màj des plugins babel
+            cacheDirectory: cli.args.cache === true,
+            // Désactive car ralenti compilation
+            cacheCompression: false,
 
-        compact: !dev,
+            metadataSubscribers: [
+                PluginIndexage.metadataContextFunctionName
+            ],
 
-        // https://babeljs.io/docs/usage/options/
-        babelrc: false,
-        presets: [
+            compact: !dev,
 
-            // https://github.com/babel/babel-preset-env
-            [require('@babel/preset-env'), side === 'client' ? {
+            // https://babeljs.io/docs/usage/options/
+            babelrc: false,
+            presets: [
 
-                // Ajoute automatiquement les polyfills babel
-                // https://stackoverflow.com/a/61517521/12199605
-                "useBuiltIns": "usage", // alternative mode: "entry"
-                "corejs": 3, // default would be 2
+                // https://github.com/babel/babel-preset-env
+                [require('@babel/preset-env'), side === 'client' ? {
 
-                targets: {
-                    browsers: cli.pkg.app.browserslist,
-                },
-                forceAllTransforms: !dev, // for UglifyJS
-                modules: false,
-                debug: false,
-            } : {
-                targets: {
-                    node: true,//pkg.engines.node.match(/(\d+\.?)+/)[0],
-                },
-                modules: false,
-                useBuiltIns: false,
-                debug: false,
-            }],
+                    // Ajoute automatiquement les polyfills babel
+                    // https://stackoverflow.com/a/61517521/12199605
+                    "useBuiltIns": "usage", // alternative mode: "entry"
+                    "corejs": 3, // default would be 2
 
-            [require("@babel/preset-typescript"), {
-                useDefineForClassFields: true,
-                //jsxPragma: "h"
-            }],
+                    targets: {
+                        browsers: pkg.app.browserslist,
+                    },
+                    forceAllTransforms: !dev, // for UglifyJS
+                    modules: false,
+                    debug: false,
+                } : {
+                    targets: {
+                        node: true,//pkg.engines.node.match(/(\d+\.?)+/)[0],
+                    },
+                    modules: false,
+                    useBuiltIns: false,
+                    debug: false,
+                }],
 
-            // JSX
-            // https://github.com/babel/babel/tree/master/packages/babel-preset-react
-            [require('@babel/preset-react'), {
-                //pragma: "h"
-            }],
+                [require("@babel/preset-typescript"), {
+                    useDefineForClassFields: true,
+                    //jsxPragma: "h"
+                }],
 
-        ],
-        plugins: [
+                // JSX
+                // https://github.com/babel/babel/tree/master/packages/babel-preset-react
+                [require('@babel/preset-react'), {
+                    //pragma: "h"
+                }],
 
-            // NOTE: On résoud les plugins et presets directement ici
-            //      Autrement, babel-loader les cherchera dans projet/node_modules
+            ],
+            plugins: [
 
+                // NOTE: On résoud les plugins et presets directement ici
+                //      Autrement, babel-loader les cherchera dans projet/node_modules
 
-            [require("@babel/plugin-proposal-decorators"), { "legacy": true }],
 
-            [require('@babel/plugin-proposal-class-properties'), { "loose": true }],
+                [require("@babel/plugin-proposal-decorators"), { "legacy": true }],
 
-            [require('@babel/plugin-proposal-private-methods'), { "loose": true }],
+                [require('@babel/plugin-proposal-class-properties'), { "loose": true }],
 
-            // Masque erreur associée à @babel/plugin-proposal-decorators legacy: true
-            [require('@babel/plugin-proposal-private-property-in-object'), { "loose": true }],
+                [require('@babel/plugin-proposal-private-methods'), { "loose": true }],
 
-            ...(dev ? [
+                // Masque erreur associée à @babel/plugin-proposal-decorators legacy: true
+                [require('@babel/plugin-proposal-private-property-in-object'), { "loose": true }],
 
-                ...(side === 'client' ? [
+                ...(dev ? [
 
-                    // HMR Preact avec support des hooks
-                    //['@prefresh/babel-plugin'],
+                    ...(side === 'client' ? [
 
-                ] : [])
+                        // HMR Preact avec support des hooks
+                        //['@prefresh/babel-plugin'],
 
-            ] : [
+                    ] : [])
 
-                // Les 3 plugins suivants sont tirés de https://github.com/jamiebuilds/babel-react-optimize
+                ] : [
 
-                // Remove unnecessary React propTypes from the production build
-                // https://github.com/oliviertassinari/babel-plugin-transform-react-remove-prop-types
-                [require('babel-plugin-transform-react-remove-prop-types')],
-                // Treat React JSX elements as value types and hoist them to the highest scope
-                // https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-react-constant-elements
-                [require('@babel/plugin-transform-react-constant-elements')],
+                    // Les 3 plugins suivants sont tirés de https://github.com/jamiebuilds/babel-react-optimize
 
-                // Pour du tree shaking manuel
-                // https://www.npmjs.com/package/babel-plugin-transform-imports
-                [require("babel-plugin-transform-imports"), {
-                    "lodash": {
-                        "transform": "lodash/${member}",
-                        "preventFullImport": true
-                    }
-                }]
-            ]),
-
-            BabelGlobImports({ 
-                debug: false,
-                removeAliases: (source: string) => cli.paths.withoutAlias(source, side)
-            }, [{
-                test: (request) => {
-                    if (request.source === '@models') {
-                        request.source = cli.paths.app.src + '/server/models/**/*.ts';
-                        return true;
-                    }
-                    return false;
-                },
-                replace: (request, matches, t) => {
-                    // Preserve default behavior
-                }
-            }, {
-                test: (request) => (
-                    side === 'client'
-                    &&
-                    (
-                        request.source === '@/client/pages/**/*.tsx' 
-                        || 
-                        request.source === '@client/pages/**/*.tsx'
-                    )
-                    &&
-                    request.type === 'import'
-                ),
-                replace: (request, matches, t) => {
-
-                    if (!('default' in request) || request.default === undefined)
-                        return;
-
-                    const imports: types.ImportDeclaration[] = [];
-
-                    // const routes = {
-                    //    <chunkId1>: () => import(/* webpackChunkName: '<chunkId>' */ "<file>"),
-                    //    <chunkId2>: () => require("<file>").default,
-                    // }
-
-                    const pageLoaders: types.ObjectProperty[] = [];
-                    for (const file of matches) {
-
-                        // Exclude layouts
-                        if (file.filename.includes("/_layout/")) {
-                            //console.log("Exclude", file, 'from pages loaders (its a layout)');
-                            continue;
-                        }
+                    // Remove unnecessary React propTypes from the production build
+                    // https://github.com/oliviertassinari/babel-plugin-transform-react-remove-prop-types
+                    [require('babel-plugin-transform-react-remove-prop-types')],
+                    // Treat React JSX elements as value types and hoist them to the highest scope
+                    // https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-react-constant-elements
+                    [require('@babel/plugin-transform-react-constant-elements')],
 
-                        // Excliude components
-                        const filename = path.basename( file.filename );
-                        if (alphabet.includes(filename[0]) && filename[0] === filename[0].toUpperCase()) {
-                            //console.log("Exclude", file, 'from pages loaders (its a component)');
-                            continue;
+                    // Pour du tree shaking manuel
+                    // https://www.npmjs.com/package/babel-plugin-transform-imports
+                    [require("babel-plugin-transform-imports"), {
+                        "lodash": {
+                            "transform": "lodash/${member}",
+                            "preventFullImport": true
                         }
-                            
-                        // Page config
-                        const { chunkId } = cli.paths.getPageChunk(file.filename);
-                        const preloadPage = routesToPreload.includes(chunkId);
-
-                        // Import type according to preloading option
-                        if (preloadPage) {
-
-                            // import <chunkId> from "<file>";
-                            imports.push(
-                                t.importDeclaration(
-                                    [t.importDefaultSpecifier( t.identifier(chunkId) )],
-                                    t.stringLiteral(file.filename)
-                                )
-                            );
-
-                            // { <chunkId>: <chunkId> }
-                            pageLoaders.push(
-                                t.objectProperty( 
-                                    t.stringLiteral(chunkId),
-                                    t.identifier(chunkId)
-                                )
-                            );
-
-                        } else {
-
-                            // <chunkId>: () => ...
-                            pageLoaders.push( 
-                                t.objectProperty( 
-                                    
-                                    t.stringLiteral(chunkId),
-                                    // () => import(/* webpackChunkName: '<chunkId>' */ "<file>")
-                                    t.arrowFunctionExpression([], t.callExpression(
-
-                                        t.import(), [t.addComment(
-                                            t.stringLiteral(file.filename),
-                                            "leading",
-                                            "webpackChunkName: '" + chunkId + "'"
-                                        )]
-                                    ))
-                                )
-                            )
+                    }]
+                ]),
+
+                BabelGlobImports({ 
+                    debug: false,
+                    removeAliases: (source: string) => app.paths.withoutAlias(source, side)
+                }, [{
+                    test: (request) => {
+                        if (request.source === '@models') {
+                            request.source = app.paths.src + '/server/models/**/*.ts';
+                            return true;
                         }
+                        return false;
+                    },
+                    replace: (request, matches, t) => {
+                        // Preserve default behavior
                     }
+                }, {
+                    test: (request) => (
+                        side === 'client'
+                        &&
+                        (
+                            request.source === '@/client/pages/**/*.tsx' 
+                            || 
+                            request.source === '@client/pages/**/*.tsx'
+                        )
+                        &&
+                        request.type === 'import'
+                    ),
+                    replace: (request, matches, t) => {
+
+                        if (!('default' in request) || request.default === undefined)
+                            return;
+
+                        const imports: types.ImportDeclaration[] = [];
+
+                        // const routes = {
+                        //    <chunkId1>: () => import(/* webpackChunkName: '<chunkId>' */ "<file>"),
+                        //    <chunkId2>: () => require("<file>").default,
+                        // }
+
+                        const pageLoaders: types.ObjectProperty[] = [];
+                        for (const file of matches) {
+
+                            // Exclude layouts
+                            if (file.filename.includes("/_layout/")) {
+                                //console.log("Exclude", file, 'from pages loaders (its a layout)');
+                                continue;
+                            }
+
+                            // Excliude components
+                            const filename = path.basename( file.filename );
+                            if (alphabet.includes(filename[0]) && filename[0] === filename[0].toUpperCase()) {
+                                //console.log("Exclude", file, 'from pages loaders (its a component)');
+                                continue;
+                            }
+                                
+                            // Page config
+                            const { chunkId } = cli.paths.getPageChunk(app, file.filename);
+                            const preloadPage = routesToPreload.includes(chunkId);
+
+                            // Import type according to preloading option
+                            if (preloadPage) {
+
+                                // import <chunkId> from "<file>";
+                                imports.push(
+                                    t.importDeclaration(
+                                        [t.importDefaultSpecifier( t.identifier(chunkId) )],
+                                        t.stringLiteral(file.filename)
+                                    )
+                                );
+
+                                // { <chunkId>: <chunkId> }
+                                pageLoaders.push(
+                                    t.objectProperty( 
+                                        t.stringLiteral(chunkId),
+                                        t.identifier(chunkId)
+                                    )
+                                );
+
+                            } else {
+
+                                // <chunkId>: () => ...
+                                pageLoaders.push( 
+                                    t.objectProperty( 
+                                        
+                                        t.stringLiteral(chunkId),
+                                        // () => import(/* webpackChunkName: '<chunkId>' */ "<file>")
+                                        t.arrowFunctionExpression([], t.callExpression(
+
+                                            t.import(), [t.addComment(
+                                                t.stringLiteral(file.filename),
+                                                "leading",
+                                                "webpackChunkName: '" + chunkId + "'"
+                                            )]
+                                        ))
+                                    )
+                                )
+                            }
+                        }
 
-                    return [
-                        ...imports,
-                        // const routes = { ... }
-                        t.variableDeclaration("const", [t.variableDeclarator(
-                            t.identifier(request.default),
-                            t.objectExpression(pageLoaders)
-                        )])
-                    ]
+                        return [
+                            ...imports,
+                            // const routes = { ... }
+                            t.variableDeclaration("const", [t.variableDeclarator(
+                                t.identifier(request.default),
+                                t.objectExpression(pageLoaders)
+                            )])
+                        ]
 
-                }
-            }])
+                    }
+                }])
 
-        ],
+            ],
 
-        overrides: [
+            overrides: [
 
-            require("./plugins/pages")({ side }),
+                require("./plugins/pages")({ side }),
 
-            require("./plugins/models")({ side }),
-            
-            require('./plugins/icones-svg'),
-            
-            require('./plugins/form'),
+                require("./plugins/models")({ side }),
+                
+                require('./plugins/icones-svg'),
+                
+                require('./plugins/form'),
 
-            /*
-            
-            ...(side === 'client' ? [
+                /*
+                
+                ...(side === 'client' ? [
 
-            ] : [
-                require('./plugins/queries');
-                require('./plugins/injection-dependances'),
-            ]),
+                ] : [
+                    require('./plugins/queries');
+                    require('./plugins/injection-dependances'),
+                ]),
 
-            */
-        ]
-    }
-}])
+                */
+            ]
+        }
+    }]
+}

package/src/compiler/common/babel/plugins/injection-dependances/index.ts

@@ -12,9 +12,9 @@ import cli from '@cli';
 /*----------------------------------
 - WEBPACK RULE
 ----------------------------------*/
-const globServices = cli.paths.app.root + '/src/server/services/**/*.ts';
+const globServices = app.paths.root + '/src/server/services/**/*.ts';
 const globModuleService = '@app/server/services/**';
-const globRoutes = cli.paths.app.root + '/src/server/routes/**/*.ts';
+const globRoutes = app.paths.root + '/src/server/routes/**/*.ts';
 
 module.exports = {
     test: [globRoutes, globServices],

package/src/compiler/common/babel/plugins/pages.ts

@@ -9,7 +9,7 @@ import generate from '@babel/generator';
 
 // Core
 import cli from '@cli';
-import { TAppSide } from '@cli/index';
+import App, { TAppSide } from '../../../../app';
 
 /*----------------------------------
 - WEBPACK RULE
@@ -33,6 +33,8 @@ const debug = false;
 ----------------------------------*/
 function Plugin(babel, { side }: TOptions) {
 
+    const app = new App();
+
     const t = babel.types as typeof types;
     let program: NodePath<types.Program>;
 
@@ -112,7 +114,7 @@ function Plugin(babel, { side }: TOptions) {
         } else
             routeArgs.unshift(t.objectExpression([]));
 
-        const { filepath, chunkId } = cli.paths.getPageChunk(filename);
+        const { filepath, chunkId } = cli.paths.getPageChunk(app, filename);
         debug && console.log(`[routes]`, filename, '=>', chunkId);
 
         // Add object property

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

@@ -1,6 +1,8 @@
 import { staticAssetName } from '../../../paths';
 
-module.exports = (dev: boolean, client: boolean) => ([
+import type App from '../../../app';
+
+module.exports = (app: App, dev: boolean, client: boolean) => ([
 
     // Allow to use ?raw at the end of the module path to iport the raw content only
     // Example: import VisualParserSource from './Parsers/visual.js?raw';

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

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

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

@@ -5,9 +5,11 @@ import lessToJs from 'less-vars-to-js';
 import fs from 'fs-extra';
 import cli from '@cli';
 
-module.exports = (dev: Boolean, client: boolean) => {
+import type App from '../../../app';
 
-    const paletteLess = fs.readFileSync( cli.paths.app.src + '/client/assets/theme.less', 'utf8');
+module.exports = (app: App, dev: Boolean, client: boolean) => {
+
+    const paletteLess = fs.readFileSync( app.paths.src + '/client/assets/theme.less', 'utf8');
     const themeVars = lessToJs(paletteLess, { resolveVariables: true, stripPrefix: true });
 
     return [
@@ -19,7 +21,7 @@ module.exports = (dev: Boolean, client: boolean) => {
 
         // Process external/third-party styles
         {
-            exclude: [/*process.env.framework + '/kernel', */cli.paths.app.src],
+            exclude: [/*process.env.framework + '/kernel', */app.paths.src],
             loader: 'css-loader',
             options: {
                 sourceMap: dev
@@ -28,7 +30,7 @@ module.exports = (dev: Boolean, client: boolean) => {
 
         // Process internal/project styles (from src folder)
         {
-            include: [/*process.env.framework + '/kernel', */cli.paths.app.src],
+            include: [/*process.env.framework + '/kernel', */app.paths.src],
             loader: 'css-loader',
             options: {
                 // CSS Loader https://github.com/webpack/css-loader

package/src/compiler/common/index.ts

@@ -13,9 +13,12 @@ import IconesSvg from './plugins/indexage/icones-svg';
 import InjectDeps from './plugins/indexage/injection-dependances';
 
 // Core
-import { TAppSide } from '@cli';
 import cli from '../..';
 
+// Type
+import type App from '../../app';
+import type { TAppSide } from '../../app';
+
 /*----------------------------------
 - CONSTANTS
 ----------------------------------*/
@@ -38,19 +41,22 @@ export type TCompileMode = 'dev' | 'prod'
 - BASE CONFIG
 ----------------------------------*/
 
-export default function createCommonConfig( side: TAppSide, mode: TCompileMode ): webpack.Configuration {
+export default function createCommonConfig( app: App, side: TAppSide, mode: TCompileMode ): webpack.Configuration {
 
     const dev = mode === 'dev';
     const config: webpack.Configuration = {
 
         // Project root
-        context: cli.paths.app.root,
+        context: app.paths.root,
 
         mode: dev ? 'development' : 'production',
 
         resolveLoader: {
             // Recherche des loaders dans framework/node_modules (psinon, webpack cherche dans le projet)
             modules: [
+                // The line below is not necessary
+                // By default, webpack is supposed to search in the project directory at first
+                //cli.paths.appRoot + '/node_modules',
                 cli.paths.core.root + '/node_modules',
                 cli.paths.core.cli + '/node_modules',
             ],
@@ -67,13 +73,13 @@ export default function createCommonConfig( side: TAppSide, mode: TCompileMode )
                 BUILD_DATE: JSON.stringify(dayjs().format('YY.MM.DD-HH.mm')),
 
                 CORE_PATH: JSON.stringify(cli.paths.core.root),
-                APP_PATH: JSON.stringify(cli.paths.app.root),
-                APP_NAME: JSON.stringify(cli.identity.web.title),
+                APP_PATH: JSON.stringify(app.paths.root),
+                APP_NAME: JSON.stringify(app.identity.web.title),
 
             }),
 
             new PluginIndexage(side === 'client' ? {
-                'icones-svg': new IconesSvg,
+                'icones-svg': new IconesSvg(app),
             } : {
                 //'injection-dependances': new InjectDeps,
             }),
@@ -107,7 +113,7 @@ export default function createCommonConfig( side: TAppSide, mode: TCompileMode )
 
             /*modules: [
                 cli.paths.core.root + '/node_modules',
-                cli.paths.app.root + '/node_modules',
+                app.paths.root + '/node_modules',
             ]*/
         },