lesli 5.0.6 → 5.0.9

data/lib/webpack/base.js

@@ -37,148 +37,149 @@ var dayjs = require("dayjs")
 var webpack = require("webpack")
 var TerserPlugin = require("terser-webpack-plugin")
 var { VueLoaderPlugin } = require("vue-loader")
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const RemoveEmptyScriptsPlugin = require('webpack-remove-empty-scripts');
 
 
 // · 
-module.exports = env => {
+module.exports = env => ({
 
-    return {
+    watch: env.watch == "true",
+    mode: env.production ? "production" : "development",
 
-        watch: env.watch == "true",
-        mode: env.production ? "production" : "development",
 
+    // Show only necessary stats when compiling
+    stats: {
+        all: false,
+        assets: true,
+        assetsSort: '!size',
+        env: true,
+        errors: true,
+        errorDetails: true,
+        errorsCount: true,
+        warnings: true,
+    },
 
-        // Show only necessary stats when compiling
-        stats: {
-            all: false,
-            assets: true,
-            assetsSort: '!size',
-            env: true,
-            errors: true,
-            errorDetails: true,
-            errorsCount: true,
-            warnings: true,
-        },
-    
 
-        // Set max size limit for JS bundles to 0.98 MB
-        performance: {
-            maxAssetSize: 1100000,
-            maxEntrypointSize: 1100000,
-            assetFilter: function(assetFilename) {
-                return !(['cloud_development/application.js'].includes(assetFilename));
-            }
-        },
+    // Set max size limit for JS bundles to 0.98 MB
+    performance: {
+        maxAssetSize: 1100000,
+        maxEntrypointSize: 1100000
+    },
+
     
-        
-        // Use a custom plugin to remove all the comments
-        // from the javascript files
-        optimization: {
-            minimize: env.production,
-            minimizer: [
-                new TerserPlugin({
-                    terserOptions: {
-                        format: {
-                            comments: false,
-                        },
+    // Use a custom plugin to remove all the comments
+    // from the javascript files
+    optimization: {
+        minimize: env.production,
+        minimizer: [
+            new TerserPlugin({
+                terserOptions: {
+                    format: {
+                        comments: false,
                     },
-                    extractComments: false,
-                    parallel: true
-                })
-            ]
-        },
-    
-    
-        // Defined the core apps as main entry apps
-        // engine javascript apps are defined dynamically
-        entry: { },
-    
-    
-        // Set the name of the compiled javascript files
-        output: {
-            path: "",
-            filename: "[name].js"
-        },
-    
-    
-        // resolvers & path alias
-        resolve: {
-    
-            // include folder so we can import direct from node modules
-            modules: [path.resolve("node_modules")],
-            alias: {
-    
-                vue: "vue/dist/vue.esm-bundler.js",
-    
-                // Set aliases as shortcuts to import modules
-                Lesli: path.resolve("lib", "vue"), 
-                LesliBell: path.resolve("../", "LesliBell", "lib", "vue"),
-                LesliAdmin: path.resolve("../", "LesliAdmin", "lib", "vue"),
-                LesliAudit: path.resolve("../", "LesliAudit", "lib", "vue"),
-                LesliBabel: path.resolve("../", "LesliBabel", "lib", "vue"),
-                LesliGuard: path.resolve("../", "LesliGuard", "lib", "vue"),
-                LesliLetter: path.resolve("../", "LesliLetter", "lib", "vue"),
-                LesliDriver: path.resolve("../", "LesliDriver", "lib", "vue"),
-                LesliSupport: path.resolve("../", "LesliSupport", "lib", "vue"),
-
-
-
-                CloudAdmin: path.resolve("app", "vue", "admin"),
-                CloudTalk: path.resolve("engines", "cloud_talk", "lib", "vue"),
-                CloudTeam: path.resolve("engines", "cloud_team", "lib", "vue"),
-                CloudTime: path.resolve("engines", "cloud_time", "lib", "vue"),
-                CloudWork: path.resolve("engines", "cloud_work", "lib", "vue"),
-                CloudBabel: path.resolve("engines", "cloud_babel", "lib", "vue"),
-                CloudFocus: path.resolve("engines", "cloud_focus", "lib", "vue"),
-                CloudMailer: path.resolve("engines", "cloud_mailer", "lib", "vue"),
-                CloudSocial: path.resolve("engines", "cloud_social", "lib", "vue"),
-                CloudShared: path.resolve("engines", "cloud_shared", "lib", "vue"),
-                CloudScraper: path.resolve("engines", "cloud_scraper", "lib", "vue"),
-                CloudAuthority: path.resolve("engines", "cloud_authority", "lib", "vue"),
-
-                LesliBuilder: path.resolve("engines", "lesli_builder", "lib", "vue")
-            }
-        },
-        module: {
-            rules: [{
-                test: /\.vue$/,
-                use: {
-                    loader: "vue-loader",
-                    options: {
-                        compilerOptions: {
-                            // ignore custom html components & elements
-                            isCustomElement: tag => tag === 'trix-editor'
-                        }
+                },
+                extractComments: false,
+                parallel: true
+            })
+        ]
+    },
+
+
+    // Defined the core apps as main entry apps
+    // engine javascript apps are defined dynamically
+    entry: { },
+
+
+    // Set the name of the compiled javascript files
+    output: {
+        path: "",
+        filename: "[name].js"
+    },
+
+
+    // resolvers & path alias
+    resolve: {
+
+        // include folder so we can import direct from node modules
+        modules: [path.resolve("node_modules")],
+        alias: {
+
+            vue: "vue/dist/vue.esm-bundler.js",
+
+            // Set aliases as shortcuts to import modules
+            Lesli: path.resolve("lib"), 
+            LesliVue: path.resolve("lib", "vue"), 
+            LesliStyle: path.resolve("lib", "scss"), 
+
+            LesliBell: path.resolve("../", "LesliBell", "lib"),
+            LesliAdmin: path.resolve("../", "LesliAdmin", "lib"),
+            LesliAudit: path.resolve("../", "LesliAudit", "lib"),
+            LesliBabel: path.resolve("../", "LesliBabel", "lib"),
+            LesliGuard: path.resolve("../", "LesliGuard", "lib"),
+            LesliLetter: path.resolve("../", "LesliLetter", "lib"),
+            LesliDriver: path.resolve("../", "LesliDriver", "lib"),
+            LesliSupport: path.resolve("../", "LesliSupport", "lib"),
+            LesliDashboard: path.resolve("../", "LesliDashboard", "lib"),
+
+            LesliBuilder: path.resolve("engines", "lesli_builder", "lib", "vue")
+        }
+    },
+    module: {
+        rules: [{
+            test: /\.vue$/,
+            use: {
+                loader: "vue-loader",
+                options: {
+                    compilerOptions: {
+                        // ignore custom html components & elements
+                        isCustomElement: tag => tag === 'trix-editor'
                     }
                 }
-            }, {
-                test: /\.css$/,
-                use: [
-                    "style-loader", // creates style nodes from JS strings
-                    "css-loader",   // translates CSS into CommonJS
-                ]
-            }, {
-                test: /\.m?js$/,
-                exclude: /(node_modules)/,
-                use: {
-                    loader: "babel-loader",
-                    options: {
-                        presets: [["@babel/preset-env", { "targets": "defaults" }]]
-                    }
+            }
+        }, {
+            test: /\.css$/,
+            use: [
+                "style-loader", // creates style nodes from JS strings
+                "css-loader",   // translates CSS into CommonJS
+            ]
+        }, {
+            test: /\.m?js$/,
+            exclude: /(node_modules)/,
+            use: {
+                loader: "babel-loader",
+                options: {
+                    presets: [["@babel/preset-env", { "targets": "defaults" }]]
                 }
-            }]
-        },
-        plugins: [
-            new VueLoaderPlugin(),
-    
-            // custom constants
-            new webpack.DefinePlugin({
-                lesli_application_production: JSON.stringify(env.production),
-                lesli_application_development: JSON.stringify(!env.production),
-                lesli_application_version: JSON.stringify(dayjs().format("YYMMDD.HHmm")),
-                __VUE_OPTIONS_API__: true,
-                __VUE_PROD_DEVTOOLS__: true
-            })
-        ]
-    }
-}
+            }
+        },{
+            test: /\.(scss)$/,
+            use: [
+                MiniCssExtractPlugin.loader, 
+                {
+                    loader:'css-loader',
+                    options: { url: false } 
+                }, 
+                'sass-loader'
+            ]
+        }]
+    },
+    plugins: [
+        new VueLoaderPlugin(),
+
+        new RemoveEmptyScriptsPlugin(),
+
+        new MiniCssExtractPlugin({
+            filename: 'stylesheets/[name].css'
+        }),
+
+        // custom constants
+        new webpack.DefinePlugin({
+            lesli_application_production: JSON.stringify(env.production),
+            lesli_application_development: JSON.stringify(!env.production),
+            lesli_application_version: JSON.stringify(dayjs().format("YYMMDD.HHmm")),
+            __VUE_OPTIONS_API__: true,
+            __VUE_PROD_DEVTOOLS__: true
+        })
+    ]
+})

data/lib/webpack/core.js

@@ -65,11 +65,17 @@ module.exports = (env, requestedEngines) => {
         entry: {
             "lesli/users/registrations": "Lesli/devise/registrations.js",
             "lesli/users/confirmations": "Lesli/devise/confirmations.js",
-            "lesli/users/passwords": "Lesli/devise/passwords.js",
-            
+            "lesli/users/passwords": "Lesli/devise/passwords.js"
+        },
+        entry: {
+            "lesli/templates/public": "Lesli/scss/templates/public.scss",
+            "lesli/templates/application": "Lesli/scss/templates/application.scss",
+            "lesli/users/sessions": ["Lesli/vue/devise/sessions.js", "Lesli/scss/devise/sessions.scss"]
         },
         output: {
-            path: path.resolve("app", "assets", "javascripts")
+            // the output for stylesheets is defined in the webpack file itself
+            path: path.resolve("app", "assets"),
+            filename: 'javascripts/[name].js'
         }
     }
 

data/lib/webpack/engines.js

@@ -116,7 +116,9 @@ module.exports = (env, requestedEngines) => {
         var config = {
             entry: {},
             output: {
-                path: path.resolve(pathEngines, engine.dir, "app", "assets", "javascripts")
+                // the output for stylesheets is defined in the webpack file itself
+                path: path.resolve(pathEngines, engine.dir, "app", "assets"),
+                filename: 'javascripts/[name].js'
             }
         }
 
@@ -143,7 +145,10 @@ module.exports = (env, requestedEngines) => {
             const appname = path.parse(file).name
 
             // add vue apps found into the webpack compilation pipeline
-            config.entry[(`${engine.code}/${appname}`)] = `${engine.dir}/${appname}`
+            config.entry[(`${engine.code}/${appname}`)] = [
+                `${engine.dir}/vue/${appname}.js`,
+                `${engine.dir}/scss/${appname}.scss`
+            ]
 
         })
 

data/lib/webpack/version.js

@@ -1,9 +1,11 @@
 
 const fs = require("fs")
-const debug = require("lesli-js/debug/nodejs")
 const dayjs = require("dayjs")
+const { useLesliDebug } = require("lesli-vue/composables")
 const advancedFormat = require("dayjs/plugin/advancedFormat")
 dayjs.extend(advancedFormat)
+const debug = useLesliDebug()
+
 
 // · Update compilation version for frontend and backend
 module.exports = (env, engine) => {
@@ -23,6 +25,7 @@ module.exports = (env, engine) => {
             return console.log(err)
         }
 
+        // Unix Timestamp in second
         let build = dayjs().format("X")
 
         data = data.split("\n")

data/readme.md

@@ -56,16 +56,15 @@ Lesli is officially released and will be supported as of version 5.1
 ### Demo
 
 * online demo (soon)
-* docker run leslitech/lesli-demo:5.0
+* [docker demo](https://github.com/LesliTech/lesli-docker-demo)
 
 
 <br />
 
 ### Documentation
-* [Website](https://www.lesli.dev/lesli/)
-* [Roadmap](./docs/roadmap.md)
+* [Website](https://www.lesli.dev/)
 * [Database](./docs/database.md)
-* [Documentation](https://www.lesli.dev/documentation/)
+* [Documentation](https://www.lesli.dev/docs.html)
 
 
 <br />
@@ -78,8 +77,11 @@ bundle add lesli
 ```
 
 ```shell
-# Setup database
+# Setup database for production
 rake lesli:db:setup
+
+# Setup database for development
+rake lesli:db:dev
 ```
 
 ```ruby