@newlogic-digital/core 3.0.0-next.3 → 3.0.0-next.5

package/index.js

@@ -1,56 +1,18 @@
 import fs from 'node:fs'
 import os from 'node:os'
-import { dirname, resolve, join, relative } from 'node:path'
-import postHtml from 'posthtml'
+import { resolve, join } from 'node:path'
 import vituum from 'vituum'
-import posthtml from '@vituum/vite-plugin-posthtml'
 import latte from '@vituum/vite-plugin-latte'
-import twig from '@vituum/vite-plugin-twig'
 import juice from '@vituum/vite-plugin-juice'
 import send from '@vituum/vite-plugin-send'
-import tailwindcss from '@vituum/vite-plugin-tailwindcss'
 import { getPackageInfo, merge } from 'vituum/utils/common.js'
-import highlight from './src/prism.js'
 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'
+import browserslist from 'browserslist'
+import { Features as LightningCssFeatures, browserslistToTargets } from 'lightningcss'
 
 const { name } = getPackageInfo(import.meta.url)
 
-const posthtmlPrism = {
-    name: '@newlogic-digital/vite-plugin-posthtml-prism',
-    enforce: 'post',
-    transformIndexHtml: {
-        order: 'post',
-        handler: async (html, { filename }) => {
-            filename = filename.replace('?raw', '')
-
-            if (!filename.replace('.html', '').endsWith('ui.json')) {
-                return
-            }
-
-            const plugins = [highlight({ inline: false })]
-
-            const result = await postHtml(plugins).process(html)
-
-            return result.html
-        }
-    }
-}
-
-const postcssImportSupports = {
-    name: 'postcss-import-supports',
-    transform(code, path) {
-        if (path.endsWith('.css')) {
-            return {
-                code: code.replace('@media supports', '@supports')
-            }
-        }
-    }
-}
-
 /**
  * @type {import('@newlogic-digital/core/types').PluginUserConfig}
  */
@@ -59,30 +21,26 @@ const defaultOptions = {
     cert: 'localhost',
     format: ['latte'],
     manualChunks: {},
-    emails: {
-        outputDir: resolve(process.cwd(), 'public/email'),
-        appDir: resolve(process.cwd(), 'app/Templates/Emails')
-    },
     vituum: {
         pages: {
             dir: './src/pages'
         }
     },
-    posthtml: {
-        root: resolve(process.cwd(), 'src')
-    },
     juice: {
         paths: ['src/pages/email'],
         postcss: {
             globalData: {
-                files: ['./src/emails/styles/main/base/config.css']
+                files: ['./src/styles/emails/theme/config.css']
             }
         }
     },
+    css: {
+        transformer: 'postcss',
+        lightningcss: {}
+    },
     tailwindcss: {},
     send: {},
     latte: {
-        renderTransformedHtml: filename => dirname(filename).endsWith('email'),
         globals: {
             srcPath: resolve(process.cwd(), 'src'),
             templatesPath: resolve(process.cwd(), 'src/templates'),
@@ -96,8 +54,7 @@ const defaultOptions = {
         filters: {
             json: resolve(process.cwd(), 'node_modules/@newlogic-digital/core/latte/JsonFilter.js'),
             code: 'node_modules/@newlogic-digital/core/latte/CodeFilter.php'
-        },
-        ignoredPaths: ['**/views/email/**/!(*.test).latte', '**/emails/!(*.test).latte']
+        }
     },
     twig: twigOptions
 }
@@ -106,12 +63,15 @@ const defaultOptions = {
  * @param {import('@newlogic-digital/core/types').PluginUserConfig} options
  * @returns [import('vite').Plugin]
  */
-const plugin = (options = {}) => {
+const plugin = async (options = {}) => {
     options = merge(defaultOptions, options)
 
     const templatesPlugins = []
+    const tailwindcssPlugin = []
 
     if (options.format.includes('twig')) {
+        const twig = (await import('@vituum/vite-plugin-twig')).default
+
         templatesPlugins.push(twig(options.twig))
     }
 
@@ -119,15 +79,24 @@ const plugin = (options = {}) => {
         templatesPlugins.push(latte(options.latte))
     }
 
+    if (options.css.transformer === 'postcss') {
+        const tailwindcss = (await import('@vituum/vite-plugin-tailwindcss')).default
+
+        tailwindcssPlugin.push(tailwindcss(options.tailwindcss))
+    }
+
+    if (options.css.transformer === 'lightningcss') {
+        const tailwindcss = (await import('@tailwindcss/vite')).default
+
+        tailwindcssPlugin.push(tailwindcss(options.tailwindcss))
+    }
+
     const plugins = [
         vituum(options.vituum),
-        tailwindcss(options.tailwindcss),
-        posthtml(options.posthtml),
+        ...tailwindcssPlugin,
         ...templatesPlugins,
         juice(options.juice),
-        send(options.send),
-        posthtmlPrism,
-        postcssImportSupports
+        send(options.send)
     ]
 
     return [{
@@ -160,15 +129,6 @@ const plugin = (options = {}) => {
                 userConfig.publicDir = userConfig.publicDir ?? false
             }
 
-            if (options.mode === 'emails') {
-                userEnv.mode = 'production'
-
-                defaultInput = [
-                    './src/pages/email/**/*.{json,latte,twig,liquid,njk,hbs,pug,html}',
-                    '!./src/pages/email/**/*.{latte,twig,liquid,njk,hbs,pug,html}.json'
-                ]
-            }
-
             const outDir = resolve(userConfig.root ?? process.cwd(), 'public')
 
             if (userConfig.build && !userConfig.build.outDir) {
@@ -179,29 +139,58 @@ const plugin = (options = {}) => {
                 entries: []
             }, userConfig.optimizeDeps ?? {})
 
+            userConfig.css = Object.assign({
+                transformer: options.css.transformer
+            }, userConfig.css ?? {})
+
+            userConfig.css.lightningcss = Object.assign({
+                targets: browserslistToTargets(browserslist()),
+                exclude: LightningCssFeatures.Nesting,
+                drafts: {
+                    customMedia: true
+                }
+            }, userConfig.css.lightningcss ?? {})
+
             userConfig.build = Object.assign({
                 target: browserslistToEsbuild(),
-                manifest: 'manifest.json',
+                manifest: (options.mode === 'emails') ? false : 'manifest.json',
                 emptyOutDir: false,
                 modulePreload: false,
                 assetsInlineLimit: 0,
                 outDir
             }, userConfig.build ?? {})
 
-            userConfig.build.rollupOptions = Object.assign({
-                input: defaultInput,
-                output: {
-                    manualChunks: {
-                        swup: ['swup'],
-                        stimulus: ['@hotwired/stimulus'],
-                        naja: ['naja'],
-                        ...options.manualChunks
+            if (options.mode === 'emails') {
+                userEnv.mode = 'production'
+
+                defaultInput = [
+                    './src/pages/email/**/*.{json,latte,twig,liquid,njk,hbs,pug,html}',
+                    './src/styles/emails/*.{css,pcss,scss,sass,less,styl,stylus}',
+                    '!./src/pages/email/**/*.{latte,twig,liquid,njk,hbs,pug,html}.json'
+                ]
+
+                userConfig.build.rollupOptions = Object.assign({
+                    input: defaultInput,
+                    output: {
+                        assetFileNames: 'assets/email/[name].[ext]'
                     }
-                }
-            }, userConfig.build.rollupOptions ?? {})
+                }, userConfig.build.rollupOptions ?? {})
+            } else {
+                userConfig.build.rollupOptions = Object.assign({
+                    input: defaultInput,
+                    output: {
+                        manualChunks: options.manualChunks ?? {
+                            swup: ['swup'],
+                            stimulus: ['@hotwired/stimulus'],
+                            naja: ['naja']
+                        }
+                    }
+                }, userConfig.build.rollupOptions ?? {})
+            }
 
             userConfig.server = Object.assign({
                 host: true,
+                cors: true,
                 fsServe: {
                     strict: false
                 },
@@ -212,20 +201,6 @@ const plugin = (options = {}) => {
                         }
                     : 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) => {
-                    return path.replace(resolve(process.cwd(), options.emails.outputDir), resolve(process.cwd(), options.emails.appDir)).replace('.html', '.latte')
-                })
-
-                await Promise.all(emails.map((file, i) =>
-                    fse.move(file, emailsProd[i], { overwrite: true })
-                ))
-
-                console.info(`${pc.cyan('@newlogic-digital/core')} ${pc.green(`all email files were moved to ${relative(process.cwd(), options.emails.appDir)}`)}`)
-            }
         }
     }, ...plugins]
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@newlogic-digital/core",
   "type": "module",
-  "version": "3.0.0-next.3",
+  "version": "3.0.0-next.5",
   "main": "index.js",
   "author": "New Logic Studio s.r.o.",
   "description": "Set of tools that can be used to create modern web applications",
@@ -12,30 +12,34 @@
     "publish-next": "npm publish --tag next"
   },
   "dependencies": {
-    "@vituum/vite-plugin-juice": "^1.2.0",
+    "@tailwindcss/vite": "^4.0.0",
+    "@vituum/vite-plugin-juice": "^1.3.0",
     "@vituum/vite-plugin-latte": "^1.2.1",
     "@vituum/vite-plugin-posthtml": "^1.1.0",
     "@vituum/vite-plugin-send": "^1.1.0",
-    "@vituum/vite-plugin-tailwindcss": "^1.1.0",
-    "@vituum/vite-plugin-twig": "^1.1.0",
+    "browserslist": "^4.24.0",
+    "browserslist-to-esbuild": "^2.1.1",
     "fast-glob": "^3.3.2",
     "fs-extra": "^11.2.0",
     "html-minifier-terser": "^7.2.0",
+    "lightningcss": "^1.29.1",
     "lodash": "^4.17.21",
-    "picocolors": "^1.0.1",
+    "picocolors": "^1.1.0",
     "posthtml": "^0.16.6",
     "posthtml-prism": "^2.0.1",
     "prismjs": "^1.29.0",
-    "vituum": "^1.1.1",
-    "browserslist": "^4.23.3",
-    "browserslist-to-esbuild": "^2.1.1"
+    "vituum": "^1.1.1"
+  },
+  "optionalDependencies": {
+    "@vituum/vite-plugin-tailwindcss": "^1.2.0",
+    "@vituum/vite-plugin-twig": "^1.1.0"
   },
   "devDependencies": {
-    "@types/node": "^22.2.0",
-    "eslint": "^9.9.0",
-    "neostandard": "^0.11.2",
-    "typescript": "^5.5.4",
-    "vite": "^5.4.0"
+    "@types/node": "^22.7.5",
+    "eslint": "^9.12.0",
+    "neostandard": "^0.11.6",
+    "typescript": "^5.6.2",
+    "vite": "^5.4.8"
   },
   "files": [
     "latte",

package/types/index.d.ts

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