@newlogic-digital/core 1.0.0-beta.3 → 1.0.2

package/README.md

@@ -10,16 +10,18 @@
 
 # ⚙️ Newlogic Core
 
-Modern principles for creating web applications. Powered by Vite and Vituum
+Starter for creating web applications. Powered by Vite and Vituum.
 
+- ⚡️ Powered by Vite
 - 💡 Modern principles
 - 🚀️ Fast development
 - 🛠️ Integrated tools
 - 📦 Modular structure
 - ✉️ Email templates
-- ⚡ Vite as webserver
 
-Newlogic Core is an integration for [Vituum](https://vituum.dev), and contains set of tools that can be used to create modern web applications. Use of modern Javascript, CSS, ES modules, dynamic imports, etc.
+Newlogic Core is an integration for [Vituum](https://vituum.dev), and contains set of tools that can be used to create modern web applications.
+
+We use it as our main front-end tool at [Newlogic Digital](https://www.newlogic.cz/) to create wonders.
 
 ## 🛠️ Integrated tools
 * **[Vite](https://vitejs.dev)** next-generation frontend tooling
@@ -36,15 +38,15 @@ PHP programmers often **don't want to configure anything**, basic idea is to add
 
 It doesn't matter if you use Nette, Symfony or Laravel - the structure can be freely adjusted as needed - `resources` and` public`, `src` and` dist` or `app/assets` and` www` 
 
-It's up to you - all paths are freely configurable in `vite.config.js` config
+It's up to you - all paths are freely configurable via `vite.config.js` config
 
 ### 📦 Modularity
 
 Newlogic Core uses [Vituum](https://vituum.dev) and [Vite](https://vitejs.dev) for frontend tooling.
 
-Source files are divided by modules inside `src` directory - styles, scripts, templates, emails, assets. It is optional which modules you want to use for the project, simple delete the directory. You really only use what you want to use.
+Source files are divided by modules inside `src` directory - styles, scripts, templates, data, emails, assets. It is optional which modules you want to use for the project, simple delete the directory. You really only use what you want to use.
 
-## 🪄 Instalation
+## 🪄 Get started
 
 ```sh
 npm i @newlogic-digital/core --save-dev
@@ -53,10 +55,11 @@ npm i @newlogic-digital/core --save-dev
 ### Requirements
 
 - [Node.js LTS (16.x)](https://nodejs.org/en/download/)
+- [Vituum](https://vituum.dev/)
 
 ### Config
 
-Each Newlogic Core project has to have config via `vite.config.js`
+Each **Newlogic Core** project needs to have config via `vite.config.js`
 
 ```js
 import { defineConfig } from 'vituum'

package/index.js

@@ -7,11 +7,34 @@ import lodash from 'lodash'
 import minifier from 'html-minifier-terser'
 import fs from 'fs'
 import { dirname, resolve } from 'path'
-import Prism from 'prismjs'
-import loadLanguages from 'prismjs/components/index.js'
-import NormalizeWhitespace from 'prismjs/plugins/normalize-whitespace/prism-normalize-whitespace.js'
+import postHtml from 'posthtml'
+import highlight from './prism.js'
 
-loadLanguages(['markup', 'css', 'javascript'])
+const posthtmlPrism = {
+    name: '@vituum/vite-plugin-posthtml-prism',
+    enforce: 'post',
+    transformIndexHtml: {
+        enforce: 'post',
+        transform: async(html, { filename }) => {
+            filename = filename.replace('?raw', '')
+
+            if (!filename.endsWith('ui.json')) {
+                console.log(filename)
+                return
+            }
+
+            const plugins = [highlight({ inline: false  })]
+
+            const result = await postHtml(plugins).process(html)
+
+            return result.html
+        }
+    }
+}
+
+const wrapPreCode = (code, lang) => {
+    return `<pre class="language-${lang}"><code class="language-${lang}">${code}</code></pre>`
+}
 
 const stripIndent = (string) => {
     const indent = () => {
@@ -33,7 +56,27 @@ const stripIndent = (string) => {
     return string.replace(regex, '')
 }
 
+const parseMinifyHtml = async (input, name) => {
+    const minify = await minifier.minify(input, {
+        collapseWhitespace: true,
+        collapseInlineTagWhitespace: false,
+        minifyCSS: true,
+        removeAttributeQuotes: true,
+        quoteCharacter: '\'',
+        minifyJS: true
+    })
+
+    if (name) {
+        return JSON.stringify({
+            [name]: minify
+        })
+    } else {
+        return JSON.stringify(minify)
+    }
+}
+
 const defaultConfig = {
+    format: 'twig',
     posthtml: {},
     juice: {},
     tailwind: {},
@@ -121,26 +164,15 @@ const defaultConfig = {
                         const name = Reflect.apply(Twig.expression.parse, this, [token.stack, context])
                         const output = this.parse(token.output, context)
 
-                        const minify = await minifier.minify(output, {
-                            collapseWhitespace: true,
-                            collapseInlineTagWhitespace: false,
-                            minifyCSS: true,
-                            removeAttributeQuotes: true,
-                            quoteCharacter: '\'',
-                            minifyJS: true
-                        })
-
                         if (name === '_null') {
                             return {
                                 chain,
-                                output: JSON.stringify(minify)
+                                output: await parseMinifyHtml(output)
                             }
                         } else {
                             return {
                                 chain,
-                                output: JSON.stringify({
-                                    [name]: minify
-                                })
+                                output: await parseMinifyHtml(output, name)
                             }
                         }
                     }
@@ -179,52 +211,9 @@ const defaultConfig = {
                             type = type.replace(":mirror", "")
                         }
 
-                        const Normalize = new NormalizeWhitespace({
-                            'remove-trailing': true,
-                            'remove-indent': true,
-                            'left-trim': true,
-                            'right-trim': true,
-                        });
-
-                        const wrap = (code, lang) => {
-                            return `<pre class="language-${lang}"><code>${code}</code></pre>`
-                        }
-
-                        const highlight = (str, lang) => {
-                            if (!lang) {
-                                return wrap(str, 'text')
-                            }
-                            lang = lang.toLowerCase()
-                            const rawLang = lang
-                            if (lang === 'vue' || lang === 'html') {
-                                lang = 'markup'
-                            }
-                            if (lang === 'md') {
-                                lang = 'markdown'
-                            }
-                            if (lang === 'ts') {
-                                lang = 'typescript'
-                            }
-                            if (lang === 'py') {
-                                lang = 'python'
-                            }
-                            if (!Prism.languages[lang]) {
-                                try {
-                                    loadLanguages([lang])
-                                } catch (e) {
-                                    console.warn(`Syntax highlight for language "${lang}" is not supported.`)
-                                }
-                            }
-                            if (Prism.languages[lang]) {
-                                const code = Prism.highlight(Normalize.normalize(str), Prism.languages[lang], lang)
-                                return wrap(code, rawLang)
-                            }
-                            return wrap(str, 'text')
-                        }
-
                         return {
                             chain: chain,
-                            output: `${mirror ? output : ""}${highlight(output, type)}`
+                            output: `${mirror ? output : ""}${wrapPreCode(output, type)}`
                         };
                     }
                 });
@@ -238,7 +227,22 @@ const defaultConfig = {
         ]
     },
     latte: {
-        isStringFilter: (filename) => dirname(filename).endsWith('emails')
+        isStringFilter: (filename) => dirname(filename).endsWith('emails'),
+        globals: {
+            srcPath: resolve(process.cwd(), 'src'),
+            templatesPath: resolve(process.cwd(), 'src/templates')
+        },
+        functions: {
+            pages: () => {
+                return fs.readdirSync(resolve(process.cwd(), 'src/views')).filter(file => fs.statSync(resolve(process.cwd(), 'src/views/' + file)).isFile())
+            }
+        },
+        filters: {
+            json: async (input, name) => {
+                return await parseMinifyHtml(input, name)
+            },
+            code: 'node_modules/@newlogic-digital/core/latte/CodeFilter.php'
+        }
     }
 }
 
@@ -248,13 +252,22 @@ const integration = (userConfig = {}) => {
     return {
         config: {
             integrations: [posthtml(userConfig.posthtml), juice(userConfig.juice), tailwind(userConfig.tailwind), twig(userConfig.twig), latte(userConfig.latte)],
+            plugins: [posthtmlPrism],
             server: {
                 open: true,
                 https: true,
                 reload: file => (file.endsWith('.tpl') || file.endsWith('.latte')) && !file.includes('temp/')
             },
             templates: {
-                format: 'twig'
+                format: userConfig.format
+            },
+            imports: {
+                paths: ['./src/styles/**', './src/scripts/**', '!./src/styles/Utils/**']
+            },
+            vite: {
+                server: {
+                    origin: fs.existsSync(resolve(process.cwd(), 'app/settings.php')) ? (fs.readFileSync(resolve(process.cwd(), 'app/settings.php')).toString().match(/VITE_URL = '(.+)';/) || [null, null])[1] : null
+                }
             }
         }
     }

package/package.json

@@ -1,21 +1,24 @@
 {
   "name": "@newlogic-digital/core",
   "type": "module",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.2",
   "main": "index.js",
   "author": "New Logic Studio s.r.o.",
   "description": "Set of tools that can be used to create modern web applications",
   "license": "MIT",
+  "scripts": {
+    "npm-publish": "npm publish --tag next"
+  },
   "dependencies": {
     "@vituum/tailwind": "^0.1.2",
     "@vituum/posthtml": "^0.1.0",
     "@vituum/juice": "^0.1.3",
-    "@vituum/twig": "^0.1.0",
-    "@vituum/latte": "^0.1.0",
-    "prismjs": "~1.28.0",
+    "@vituum/twig": "^0.1.1",
+    "@vituum/latte": "^0.1.1",
+    "prismjs": "~1.29.0",
     "html-minifier-terser": "^7.0.0",
     "lodash": "^4.17.21",
-    "vituum": "^0.0.21"
+    "vituum": "^0.0.27"
   },
   "files": [
     "index.js"