@newlogic-digital/core 2.1.2 → 3.0.0-next.2

package/index.js

@@ -15,6 +15,7 @@ import twigOptions from './src/twig.js'
 import FastGlob from 'fast-glob'
 import fse from 'fs-extra'
 import pc from 'picocolors'
+import browserslistToEsbuild from 'browserslist-to-esbuild'
 
 const { name } = getPackageInfo(import.meta.url)
 
@@ -41,7 +42,7 @@ const posthtmlPrism = {
 
 const postcssImportSupports = {
     name: 'postcss-import-supports',
-    transform (code, path) {
+    transform(code, path) {
         if (path.endsWith('.css')) {
             return {
                 code: code.replace('@media supports', '@supports')
@@ -57,33 +58,39 @@ const defaultOptions = {
     mode: null,
     cert: 'localhost',
     format: ['latte'],
+    manualChunks: {},
     emails: {
         outputDir: resolve(process.cwd(), 'public/email'),
         appDir: resolve(process.cwd(), 'app/Templates/Emails')
     },
     vituum: {
         pages: {
-            dir: './src/views'
+            dir: './src/pages'
         }
     },
     posthtml: {
         root: resolve(process.cwd(), 'src')
     },
     juice: {
-        paths: ['src/views/email']
+        paths: ['src/pages/email'],
+        postcss: {
+            globalData: {
+                files: ['./src/emails/styles/main/base/config.css']
+            }
+        }
     },
     tailwindcss: {},
     send: {},
     latte: {
-        renderTransformedHtml: (filename) => dirname(filename).endsWith('email'),
+        renderTransformedHtml: filename => dirname(filename).endsWith('email'),
         globals: {
             srcPath: resolve(process.cwd(), 'src'),
             templatesPath: resolve(process.cwd(), 'src/templates'),
-            template: './src/templates/Layout/Main.latte'
+            template: './src/templates/layouts/default.latte'
         },
         functions: {
             pages: () => {
-                return fs.readdirSync(resolve(process.cwd(), 'src/views')).filter(file => fs.statSync(resolve(process.cwd(), 'src/views/' + file)).isFile())
+                return fs.readdirSync(resolve(process.cwd(), 'src/pages')).filter(file => fs.statSync(resolve(process.cwd(), 'src/pages/' + file)).isFile())
             }
         },
         filters: {
@@ -126,10 +133,10 @@ const plugin = (options = {}) => {
     return [{
         name,
         enforce: 'pre',
-        config (userConfig, userEnv) {
-            const isHttps = userConfig?.server?.https !== false &&
-                fs.existsSync(join(os.homedir(), `.ssh/${options.cert}.pem`)) &&
-                fs.existsSync(join(os.homedir(), `.ssh/${options.cert}-key.pem`))
+        config(userConfig, userEnv) {
+            const isHttps = userConfig?.server?.https !== false
+                && fs.existsSync(join(os.homedir(), `.ssh/${options.cert}.pem`))
+                && fs.existsSync(join(os.homedir(), `.ssh/${options.cert}-key.pem`))
 
             let defaultInput = [
                 './src/styles/*.{css,pcss,scss,sass,less,styl,stylus}',
@@ -142,8 +149,8 @@ const plugin = (options = {}) => {
 
             if (options.mode === 'development') {
                 defaultInput = [
-                    './src/views/**/*.{json,latte,twig,liquid,njk,hbs,pug,html}',
-                    '!./src/views/**/*.{latte,twig,liquid,njk,hbs,pug,html}.json',
+                    './src/pages/**/*.{json,latte,twig,liquid,njk,hbs,pug,html}',
+                    '!./src/pages/**/*.{latte,twig,liquid,njk,hbs,pug,html}.json',
                     './src/styles/*.{css,pcss,scss,sass,less,styl,stylus}',
                     './src/scripts/*.{js,ts,mjs}'
                 ]
@@ -157,8 +164,8 @@ const plugin = (options = {}) => {
                 userEnv.mode = 'production'
 
                 defaultInput = [
-                    './src/views/email/**/*.{json,latte,twig,liquid,njk,hbs,pug,html}',
-                    '!./src/views/email/**/*.{latte,twig,liquid,njk,hbs,pug,html}.json'
+                    './src/pages/email/**/*.{json,latte,twig,liquid,njk,hbs,pug,html}',
+                    '!./src/pages/email/**/*.{latte,twig,liquid,njk,hbs,pug,html}.json'
                 ]
             }
 
@@ -173,7 +180,7 @@ const plugin = (options = {}) => {
             }, userConfig.optimizeDeps ?? {})
 
             userConfig.build = Object.assign({
-                target: ['edge89', 'firefox89', 'chrome89', 'safari15'],
+                target: browserslistToEsbuild(),
                 manifest: 'manifest.json',
                 emptyOutDir: false,
                 modulePreload: false,
@@ -182,7 +189,15 @@ const plugin = (options = {}) => {
             }, userConfig.build ?? {})
 
             userConfig.build.rollupOptions = Object.assign({
-                input: defaultInput
+                input: defaultInput,
+                output: {
+                    manualChunks: {
+                        swup: ['swup'],
+                        stimulus: ['@hotwired/stimulus'],
+                        naja: ['naja'],
+                        ...options.manualChunks
+                    }
+                }
             }, userConfig.build.rollupOptions ?? {})
 
             userConfig.server = Object.assign({
@@ -192,16 +207,16 @@ const plugin = (options = {}) => {
                 },
                 https: isHttps
                     ? {
-                        key: fs.readFileSync(join(os.homedir(), `.ssh/${options.cert}-key.pem`)),
-                        cert: fs.readFileSync(join(os.homedir(), `.ssh/${options.cert}.pem`))
-                    }
+                            key: fs.readFileSync(join(os.homedir(), `.ssh/${options.cert}-key.pem`)),
+                            cert: fs.readFileSync(join(os.homedir(), `.ssh/${options.cert}.pem`))
+                        }
                     : false
             }, userConfig.server ?? {})
         },
         writeBundle: async () => {
             if (options.mode === 'emails') {
                 const emails = FastGlob.sync(`${resolve(process.cwd(), options.emails.outputDir)}/**`).filter(entry => !entry.endsWith('test.html'))
-                const emailsProd = emails.map(path => {
+                const emailsProd = emails.map((path) => {
                     return path.replace(resolve(process.cwd(), options.emails.outputDir), resolve(process.cwd(), options.emails.appDir)).replace('.html', '.latte')
                 })
 

package/package.json

@@ -1,38 +1,41 @@
 {
   "name": "@newlogic-digital/core",
   "type": "module",
-  "version": "2.1.2",
+  "version": "3.0.0-next.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": {
     "tsc": "tsc",
-    "eslint": "eslint '**/*.js' --fix"
+    "eslint": "eslint '**/*.js' --fix",
+    "publish-next": "npm publish --tag next"
   },
   "dependencies": {
-    "@vituum/vite-plugin-posthtml": "^1.1.0",
     "@vituum/vite-plugin-juice": "^1.2.0",
-    "@vituum/vite-plugin-latte": "^1.1.0",
-    "@vituum/vite-plugin-twig": "^1.1.0",
-    "@vituum/vite-plugin-tailwindcss": "^1.1.0",
+    "@vituum/vite-plugin-latte": "^1.2.1",
+    "@vituum/vite-plugin-posthtml": "^1.1.0",
     "@vituum/vite-plugin-send": "^1.1.0",
-    "vituum": "^1.1.0",
-    "posthtml": "^0.16.6",
-    "posthtml-prism": "^2.0.0",
-    "prismjs": "^1.29.0",
-    "html-minifier-terser": "^7.2.0",
-    "lodash": "^4.17.21",
+    "@vituum/vite-plugin-tailwindcss": "^1.1.0",
+    "@vituum/vite-plugin-twig": "^1.1.0",
     "fast-glob": "^3.3.2",
     "fs-extra": "^11.2.0",
-    "picocolors": "^1.0.0"
+    "html-minifier-terser": "^7.2.0",
+    "lodash": "^4.17.21",
+    "picocolors": "^1.0.1",
+    "posthtml": "^0.16.6",
+    "posthtml-prism": "^2.0.1",
+    "prismjs": "^1.29.0",
+    "vituum": "^1.1.1"
   },
   "devDependencies": {
-    "@types/node": "^20.11.24",
-    "eslint": "^8.57.0",
-    "eslint-config-standard": "^17.1.0",
-    "typescript": "^5.3.3",
-    "vite": "^5.1.5"
+    "@types/node": "^22.2.0",
+    "browserslist": "^4.23.3",
+    "browserslist-to-esbuild": "^2.1.1",
+    "eslint": "^9.9.0",
+    "neostandard": "^0.11.2",
+    "typescript": "^5.5.4",
+    "vite": "^5.4.0"
   },
   "files": [
     "latte",

package/src/prism.js

@@ -1,5 +1,5 @@
 import Prism from 'prismjs'
-import {render} from 'posthtml-render'
+import { render } from 'posthtml-render'
 import loadLanguages from 'prismjs/components/index.js'
 import NormalizeWhitespace from 'prismjs/plugins/normalize-whitespace/prism-normalize-whitespace.js'
 
@@ -7,22 +7,22 @@ const Normalize = new NormalizeWhitespace({
     'remove-trailing': true,
     'remove-indent': true,
     'left-trim': true,
-    'right-trim': true,
-});
+    'right-trim': true
+})
 
-const createPrismPlugin = options => {
-    return tree => {
-        const highlightCodeTags = node => tree.match.call(node, {tag: 'code'}, highlightNode)
+const createPrismPlugin = (options) => {
+    return (tree) => {
+        const highlightCodeTags = node => tree.match.call(node, { tag: 'code' }, highlightNode)
 
         if (options.inline) {
             highlightCodeTags(tree)
         } else {
-            tree.match({tag: 'pre'}, highlightCodeTags)
+            tree.match({ tag: 'pre' }, highlightCodeTags)
         }
     }
 }
 
-const highlightNode = node => {
+const highlightNode = (node) => {
     const attrs = node.attrs || {}
     const classList = `${attrs.class || ''}`.trimStart()
 
@@ -74,13 +74,13 @@ const mapStringOrNode = (stringOrNode, lang = null) => {
     return stringOrNode
 }
 
-const getExplicitLanguage = classList => {
+const getExplicitLanguage = (classList) => {
     const matches = classList.match(/(?:lang|language)-(\w*)/)
 
     return matches === null ? null : matches[1]
 }
 
-const plugin = options => {
+const plugin = (options) => {
     options = options || {}
     options.inline = options.inline || false
 

package/types/index.d.ts

@@ -7,8 +7,9 @@ export interface PluginUserConfig {
     mode?: 'development' | 'production' | 'emails'
     format?: string[]
     cert?: string
+    manualChunks?: import('rollup').ManualChunksOption
     emails?: Emails
-    vituum?: import('vituum/types').UserConfig,
+    vituum?: import('vituum').UserConfig,
     posthtml?: import('@vituum/vite-plugin-posthtml/types').PluginUserConfig
     juice?: import('@vituum/vite-plugin-juice/types').PluginUserConfig
     send?: import('@vituum/vite-plugin-send/types').PluginUserConfig