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

package/index.js

@@ -3,27 +3,16 @@ import os from 'node:os'
 import { resolve, join } from 'node:path'
 import vituum from 'vituum'
 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 twigOptions from './src/twig.js'
 import browserslistToEsbuild from 'browserslist-to-esbuild'
+import browserslist from 'browserslist'
+import { Features as LightningCssFeatures, browserslistToTargets } from 'lightningcss'
 
 const { name } = getPackageInfo(import.meta.url)
 
-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}
  */
@@ -45,6 +34,10 @@ const defaultOptions = {
             }
         }
     },
+    css: {
+        transformer: 'postcss',
+        lightningcss: {}
+    },
     tailwindcss: {},
     send: {},
     latte: {
@@ -70,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))
     }
 
@@ -83,13 +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),
+        ...tailwindcssPlugin,
         ...templatesPlugins,
         juice(options.juice),
-        send(options.send),
-        postcssImportSupports
+        send(options.send)
     ]
 
     return [{
@@ -132,6 +139,18 @@ 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: (options.mode === 'emails') ? false : 'manifest.json',
@@ -160,11 +179,10 @@ const plugin = (options = {}) => {
                 userConfig.build.rollupOptions = Object.assign({
                     input: defaultInput,
                     output: {
-                        manualChunks: {
+                        manualChunks: options.manualChunks ?? {
                             swup: ['swup'],
                             stimulus: ['@hotwired/stimulus'],
-                            naja: ['naja'],
-                            ...options.manualChunks
+                            naja: ['naja']
                         }
                     }
                 }, userConfig.build.rollupOptions ?? {})
@@ -172,6 +190,7 @@ const plugin = (options = {}) => {
 
             userConfig.server = Object.assign({
                 host: true,
+                cors: true,
                 fsServe: {
                     strict: false
                 },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@newlogic-digital/core",
   "type": "module",
-  "version": "3.0.0-next.4",
+  "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,23 +12,27 @@
     "publish-next": "npm publish --tag next"
   },
   "dependencies": {
+    "@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.2.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.1.0",
     "posthtml": "^0.16.6",
     "posthtml-prism": "^2.0.1",
     "prismjs": "^1.29.0",
-    "vituum": "^1.1.1",
-    "browserslist": "^4.24.0",
-    "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.7.5",

package/types/index.d.ts

@@ -10,6 +10,7 @@ export interface PluginUserConfig {
     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