@newlogic-digital/core 2.0.0-alpha.8 → 2.0.0-beta.1

package/index.js

@@ -10,7 +10,6 @@ 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 parseMinifyHtml from './src/minify.js'
 import highlight from './src/prism.js'
 import twigOptions from './src/twig.js'
 import FastGlob from 'fast-glob'
@@ -46,6 +45,7 @@ const posthtmlPrism = {
 const defaultOptions = {
     mode: null,
     cert: 'localhost',
+    format: ['latte'],
     emails: {
         outputDir: resolve(process.cwd(), 'public/email'),
         appDir: resolve(process.cwd(), 'app/Templates/Emails')
@@ -56,6 +56,7 @@ const defaultOptions = {
         }
     },
     posthtml: {
+        enforce: 'pre',
         root: resolve(process.cwd(), 'src')
     },
     juice: {
@@ -79,9 +80,7 @@ const defaultOptions = {
             }
         },
         filters: {
-            json: async (input, name) => {
-                return await parseMinifyHtml(input, name)
-            },
+            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']
@@ -96,12 +95,21 @@ const defaultOptions = {
 const plugin = (options = {}) => {
     options = merge(defaultOptions, options)
 
+    const templatesPlugins = []
+
+    if (options.format.includes('twig')) {
+        templatesPlugins.push(twig(options.twig))
+    }
+
+    if (options.format.includes('latte')) {
+        templatesPlugins.push(latte(options.latte))
+    }
+
     const plugins = [
         vituum(options.vituum),
         tailwindcss(options.tailwindcss),
         posthtml(options.posthtml),
-        latte(options.latte),
-        twig(options.twig),
+        ...templatesPlugins,
         juice(options.juice),
         send(options.send),
         posthtmlPrism
@@ -117,23 +125,23 @@ const plugin = (options = {}) => {
 
             let defaultInput = [
                 './src/styles/*.{css,pcss,scss,sass,less,styl,stylus}',
-                './src/scripts/*.{js,ts,mjs}',
-                './src/views/**/*.{json,latte,twig,liquid,njk,hbs,pug,html}',
-                '!./src/views/**/*.{latte,twig,liquid,njk,hbs,pug,html}.json'
+                './src/scripts/*.{js,ts,mjs}'
             ]
 
             if (!options.mode) {
                 options.mode = userEnv.mode
             }
 
-            if (userEnv.mode === 'headless') {
-                userEnv.mode = 'production'
-
+            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/styles/*.{css,pcss,scss,sass,less,styl,stylus}',
                     './src/scripts/*.{js,ts,mjs}'
                 ]
-            } else if (userEnv.mode === 'emails') {
+            }
+
+            if (options.mode === 'emails') {
                 userEnv.mode = 'production'
 
                 defaultInput = [
@@ -142,12 +150,18 @@ const plugin = (options = {}) => {
                 ]
             }
 
+            const outDir = resolve(userConfig.root ?? process.cwd(), 'public')
+
+            if (userConfig.build && !userConfig.build.outDir) {
+                userConfig.build.outDir = outDir
+            }
+
             userConfig.build = Object.assign({
                 manifest: true,
                 emptyOutDir: false,
                 modulePreload: false,
                 assetsInlineLimit: 0,
-                outDir: resolve(userConfig.root ?? process.cwd(), 'public'),
+                outDir,
                 rollupOptions: {
                     input: defaultInput
                 }

package/latte/JsonFilter.js

@@ -0,0 +1,7 @@
+import parseMinifyHtml from '../src/minify.js'
+
+const json = async (input, name) => {
+    return await parseMinifyHtml(input, name)
+}
+
+export default json

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@newlogic-digital/core",
   "type": "module",
-  "version": "2.0.0-alpha.8",
+  "version": "2.0.0-beta.1",
   "main": "index.js",
   "author": "New Logic Studio s.r.o.",
   "description": "Set of tools that can be used to create modern web applications",
@@ -11,13 +11,13 @@
     "eslint": "eslint '**/*.js' --fix"
   },
   "dependencies": {
-    "@vituum/vite-plugin-posthtml": "^1.0.0-alpha.3",
-    "@vituum/vite-plugin-juice": "^1.0.0-alpha.2",
-    "@vituum/vite-plugin-latte": "^1.0.0-alpha.5",
-    "@vituum/vite-plugin-twig": "^1.0.0-alpha.4",
-    "@vituum/vite-plugin-tailwindcss": "^1.0.0-alpha.2",
-    "@vituum/vite-plugin-send": "^1.0.0-alpha.2",
-    "vituum": "^1.0.0-alpha.18",
+    "@vituum/vite-plugin-posthtml": "^1.0.0-beta.1",
+    "@vituum/vite-plugin-juice": "^1.0.0-beta.1",
+    "@vituum/vite-plugin-latte": "^1.0.0-beta.1",
+    "@vituum/vite-plugin-twig": "^1.0.0-beta.1",
+    "@vituum/vite-plugin-tailwindcss": "^1.0.0-beta.1",
+    "@vituum/vite-plugin-send": "^1.0.0-beta.1",
+    "vituum": "^1.0.0-beta.3",
     "posthtml": "^0.16.6",
     "posthtml-prism": "^2.0.0",
     "prismjs": "^1.29.0",
@@ -36,9 +36,14 @@
   },
   "files": [
     "latte",
+    "types",
     "index.js",
     "src"
   ],
+  "exports": {
+    ".": "./index.js",
+    "./types": "./types/*"
+  },
   "engines": {
     "node": ">=16.0.0",
     "npm": ">=8.0.0"

package/types/index.d.ts

@@ -0,0 +1,18 @@
+interface Emails {
+    outputDir?: string
+    appDir?: string
+}
+
+export interface PluginUserConfig {
+    mode?: string
+    format?: string[]
+    cert?: string
+    emails?: Emails
+    vituum?: import('vituum/types').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
+    tailwindcss?: import('@vituum/vite-plugin-tailwindcss/types').PluginUserConfig
+    latte?: import('@vituum/vite-plugin-latte/types').PluginUserConfig
+    twig?: import('@vituum/vite-plugin-twig/types').PluginUserConfig
+}