@newlogic-digital/core 4.0.0-next.9 → 4.0.0-rc.2

package/eslint-stylistic.json

@@ -0,0 +1,377 @@
+{
+  "rules": {
+    "@stylistic/array-bracket-spacing": [
+      "error",
+      "never"
+    ],
+    "@stylistic/arrow-parens": [
+      "error",
+      "as-needed",
+      {
+        "requireForBlockBody": true
+      }
+    ],
+    "@stylistic/arrow-spacing": [
+      "error",
+      {
+        "after": true,
+        "before": true
+      }
+    ],
+    "@stylistic/block-spacing": [
+      "error",
+      "always"
+    ],
+    "@stylistic/brace-style": [
+      "error",
+      "stroustrup",
+      {
+        "allowSingleLine": true
+      }
+    ],
+    "@stylistic/comma-dangle": [
+      "error",
+      "always-multiline"
+    ],
+    "@stylistic/comma-spacing": [
+      "error",
+      {
+        "after": true,
+        "before": false
+      }
+    ],
+    "@stylistic/comma-style": [
+      "error",
+      "last"
+    ],
+    "@stylistic/computed-property-spacing": [
+      "error",
+      "never",
+      {
+        "enforceForClassMembers": true
+      }
+    ],
+    "@stylistic/dot-location": [
+      "error",
+      "property"
+    ],
+    "@stylistic/eol-last": "error",
+    "@stylistic/generator-star-spacing": [
+      "error",
+      {
+        "after": true,
+        "before": false
+      }
+    ],
+    "@stylistic/indent": [
+      "error",
+      2,
+      {
+        "ArrayExpression": 1,
+        "CallExpression": {
+          "arguments": 1
+        },
+        "flatTernaryExpressions": false,
+        "FunctionDeclaration": {
+          "body": 1,
+          "parameters": 1,
+          "returnType": 1
+        },
+        "FunctionExpression": {
+          "body": 1,
+          "parameters": 1,
+          "returnType": 1
+        },
+        "ignoreComments": false,
+        "ignoredNodes": [
+          "TSUnionType",
+          "TSIntersectionType"
+        ],
+        "ImportDeclaration": 1,
+        "MemberExpression": 1,
+        "ObjectExpression": 1,
+        "offsetTernaryExpressions": true,
+        "outerIIFEBody": 1,
+        "SwitchCase": 1,
+        "tabLength": 2,
+        "VariableDeclarator": 1
+      }
+    ],
+    "@stylistic/indent-binary-ops": [
+      "error",
+      2
+    ],
+    "@stylistic/key-spacing": [
+      "error",
+      {
+        "afterColon": true,
+        "beforeColon": false
+      }
+    ],
+    "@stylistic/keyword-spacing": [
+      "error",
+      {
+        "after": true,
+        "before": true
+      }
+    ],
+    "@stylistic/lines-between-class-members": [
+      "error",
+      "always",
+      {
+        "exceptAfterSingleLine": true
+      }
+    ],
+    "@stylistic/max-statements-per-line": [
+      "error",
+      {
+        "max": 1
+      }
+    ],
+    "@stylistic/member-delimiter-style": [
+      "error",
+      {
+        "multiline": {
+          "delimiter": "none",
+          "requireLast": false
+        },
+        "multilineDetection": "brackets",
+        "overrides": {
+          "interface": {
+            "multiline": {
+              "delimiter": "none",
+              "requireLast": false
+            }
+          }
+        },
+        "singleline": {
+          "delimiter": "comma"
+        }
+      }
+    ],
+    "@stylistic/multiline-ternary": [
+      "error",
+      "always-multiline"
+    ],
+    "@stylistic/new-parens": "error",
+    "@stylistic/no-extra-parens": [
+      "error",
+      "functions"
+    ],
+    "@stylistic/no-floating-decimal": "error",
+    "@stylistic/no-mixed-operators": [
+      "error",
+      {
+        "allowSamePrecedence": true,
+        "groups": [
+          [
+            "==",
+            "!=",
+            "===",
+            "!==",
+            ">",
+            ">=",
+            "<",
+            "<="
+          ],
+          [
+            "&&",
+            "||"
+          ],
+          [
+            "in",
+            "instanceof"
+          ]
+        ]
+      }
+    ],
+    "@stylistic/no-mixed-spaces-and-tabs": "error",
+    "@stylistic/no-multi-spaces": "error",
+    "@stylistic/no-multiple-empty-lines": [
+      "error",
+      {
+        "max": 1,
+        "maxBOF": 0,
+        "maxEOF": 0
+      }
+    ],
+    "@stylistic/no-tabs": "error",
+    "@stylistic/no-trailing-spaces": "error",
+    "@stylistic/no-whitespace-before-property": "error",
+    "@stylistic/object-curly-spacing": [
+      "error",
+      "always"
+    ],
+    "@stylistic/operator-linebreak": [
+      "error",
+      "before"
+    ],
+    "@stylistic/padded-blocks": [
+      "error",
+      {
+        "blocks": "never",
+        "classes": "never",
+        "switches": "never"
+      }
+    ],
+    "@stylistic/quote-props": [
+      "error",
+      "consistent-as-needed"
+    ],
+    "@stylistic/quotes": [
+      "error",
+      "single",
+      {
+        "allowTemplateLiterals": "always",
+        "avoidEscape": false
+      }
+    ],
+    "@stylistic/rest-spread-spacing": [
+      "error",
+      "never"
+    ],
+    "@stylistic/semi": [
+      "error",
+      "never"
+    ],
+    "@stylistic/semi-spacing": [
+      "error",
+      {
+        "after": true,
+        "before": false
+      }
+    ],
+    "@stylistic/space-before-blocks": [
+      "error",
+      "always"
+    ],
+    "@stylistic/space-before-function-paren": [
+      "error",
+      {
+        "anonymous": "always",
+        "asyncArrow": "always",
+        "named": "never"
+      }
+    ],
+    "@stylistic/space-in-parens": [
+      "error",
+      "never"
+    ],
+    "@stylistic/space-infix-ops": "error",
+    "@stylistic/space-unary-ops": [
+      "error",
+      {
+        "nonwords": false,
+        "words": true
+      }
+    ],
+    "@stylistic/spaced-comment": [
+      "error",
+      "always",
+      {
+        "block": {
+          "balanced": true,
+          "exceptions": [
+            "*"
+          ],
+          "markers": [
+            "!"
+          ]
+        },
+        "line": {
+          "exceptions": [
+            "/",
+            "#"
+          ],
+          "markers": [
+            "/"
+          ]
+        }
+      }
+    ],
+    "@stylistic/template-curly-spacing": "error",
+    "@stylistic/template-tag-spacing": [
+      "error",
+      "never"
+    ],
+    "@stylistic/type-annotation-spacing": [
+      "error",
+      {}
+    ],
+    "@stylistic/type-generic-spacing": "error",
+    "@stylistic/type-named-tuple-spacing": "error",
+    "@stylistic/wrap-iife": [
+      "error",
+      "any",
+      {
+        "functionPrototypeMethods": true
+      }
+    ],
+    "@stylistic/yield-star-spacing": [
+      "error",
+      {
+        "after": true,
+        "before": false
+      }
+    ],
+    "@stylistic/jsx-closing-bracket-location": "error",
+    "@stylistic/jsx-closing-tag-location": "error",
+    "@stylistic/jsx-curly-brace-presence": [
+      "error",
+      {
+        "propElementValues": "always"
+      }
+    ],
+    "@stylistic/jsx-curly-newline": "error",
+    "@stylistic/jsx-curly-spacing": [
+      "error",
+      "never"
+    ],
+    "@stylistic/jsx-equals-spacing": "error",
+    "@stylistic/jsx-first-prop-new-line": "error",
+    "@stylistic/jsx-function-call-newline": [
+      "error",
+      "multiline"
+    ],
+    "@stylistic/jsx-indent-props": [
+      "error",
+      2
+    ],
+    "@stylistic/jsx-max-props-per-line": [
+      "error",
+      {
+        "maximum": 1,
+        "when": "multiline"
+      }
+    ],
+    "@stylistic/jsx-one-expression-per-line": [
+      "error",
+      {
+        "allow": "single-child"
+      }
+    ],
+    "@stylistic/jsx-quotes": "error",
+    "@stylistic/jsx-tag-spacing": [
+      "error",
+      {
+        "afterOpening": "never",
+        "beforeClosing": "never",
+        "beforeSelfClosing": "always",
+        "closingSlash": "never"
+      }
+    ],
+    "@stylistic/jsx-wrap-multilines": [
+      "error",
+      {
+        "arrow": "parens-new-line",
+        "assignment": "parens-new-line",
+        "condition": "parens-new-line",
+        "declaration": "parens-new-line",
+        "logical": "parens-new-line",
+        "prop": "parens-new-line",
+        "propertyValue": "parens-new-line",
+        "return": "parens-new-line"
+      }
+    ]
+  }
+}

package/index.js

@@ -2,14 +2,14 @@ import fs from 'node:fs'
 import os from 'node:os'
 import { resolve, join } from 'node:path'
 import vituum from 'vituum'
-import latte from '@vituum/vite-plugin-latte'
-import juice from '@vituum/vite-plugin-juice'
+import cssInline from '@vituum/vite-plugin-css-inline'
 import send from '@vituum/vite-plugin-send'
-import { getPackageInfo, merge } from 'vituum/utils/common.js'
+import { getPackageInfo, deepMergeWith } from 'vituum/utils/common.js'
 import browserslistToEsbuild from 'browserslist-to-esbuild'
 import browserslist from 'browserslist'
 import { Features as LightningCssFeatures, browserslistToTargets } from 'lightningcss'
 import process from 'node:process'
+import heroicons from '@newlogic-digital/vite-plugin-heroicons'
 
 const { name } = getPackageInfo(import.meta.url)
 
@@ -42,16 +42,12 @@ const defaultOptions = {
       paths: ['./src/styles/*/**', '!./src/styles/emails/*', './src/scripts/*/**'],
     },
   },
-  juice: {
+  cssInline: {
     paths: ['src/pages/email'],
-    postcss: {
-      globalData: {
-        files: ['./src/styles/emails/theme/config.css'],
-      },
-    },
+    postcss: {},
   },
   css: {
-    transformer: 'postcss',
+    transformer: 'lightningcss',
     lightningcss: {},
   },
   tailwindcss: {},
@@ -72,6 +68,7 @@ const defaultOptions = {
       code: 'node_modules/@newlogic-digital/core/latte/CodeFilter.php',
     },
   },
+  heroicons: {},
 }
 
 /**
@@ -79,53 +76,53 @@ const defaultOptions = {
  * @returns [import('vite').Plugin]
  */
 const plugin = async (options = {}) => {
-  options = merge(defaultOptions, options)
+  options = deepMergeWith(defaultOptions, options)
 
-  const templatesPlugins = []
-  const tailwindcssPlugin = []
+  const optionalPlugins = []
 
   if (options.format.includes('twig')) {
     const twig = (await import('@vituum/vite-plugin-twig')).default
 
-    templatesPlugins.push(twig(options.twig))
+    optionalPlugins.push(twig(options.twig))
   }
 
   if (options.format.includes('latte')) {
-    templatesPlugins.push(latte(options.latte))
-  }
-
-  if (options.css.transformer === 'postcss') {
-    const tailwindcss = (await import('@vituum/vite-plugin-tailwindcss')).default
+    const latte = (await import('@vituum/vite-plugin-latte')).default
 
-    tailwindcssPlugin.push(tailwindcss(options.tailwindcss))
+    optionalPlugins.push(latte(options.latte))
   }
 
   if (options.css.transformer === 'lightningcss') {
-    if (!fs.existsSync(resolve(process.cwd(), 'src/+.css'))) {
-      fs.writeFileSync(resolve(process.cwd(), 'src/+.css'), '@import "./styles/main.css";')
-    }
-
-    // @ts-ignore
     const tailwindcss = (await import('@tailwindcss/vite')).default
 
-    tailwindcssPlugin.push(tailwindcss(options.tailwindcss))
+    optionalPlugins.push(tailwindcss(options.tailwindcss))
   }
 
   const plugins = [
     vituum(options.vituum),
-    ...tailwindcssPlugin,
-    ...templatesPlugins,
-    juice(options.juice),
+    ...optionalPlugins,
+    cssInline(options.cssInline),
     send(options.send),
+    heroicons(
+      {
+        fileName: 'icons.svg',
+        iconSets: {
+          'simpleicons-solid': 'src/icons/simpleicons',
+          'icons-solid': 'src/icons/solid',
+          'icons-outline': 'src/icons/outline',
+        },
+        ...options.heroicons,
+      },
+    ),
   ]
 
   return [{
     name,
     enforce: 'pre',
     /**
-         * @param {import('vite').UserConfig} userConfig
-         * @param {import('vite').ConfigEnv} userEnv
-         */
+    * @param {import('vite').UserConfig} userConfig
+    * @param {import('vite').ConfigEnv} userEnv
+    */
     config(userConfig, userEnv) {
       // @ts-ignore
       const isHttps = userConfig?.server?.https !== false

package/package.json

@@ -1,41 +1,44 @@
 {
   "name": "@newlogic-digital/core",
   "type": "module",
-  "version": "4.0.0-next.9",
+  "version": "4.0.0-rc.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 --fix",
     "publish-next": "npm publish --tag next"
   },
   "dependencies": {
     "@minify-html/node": "^0.18.1",
-    "@vituum/vite-plugin-juice": "^2.0.0-next.1",
-    "@vituum/vite-plugin-latte": "^2.0.0-next.2",
-    "@vituum/vite-plugin-send": "^2.0.0-next.1",
+    "@newlogic-digital/vite-plugin-heroicons": "^1.0.0",
+    "@vituum/vite-plugin-css-inline": "^2.0.0",
+    "@vituum/vite-plugin-latte": "^2.0.0",
+    "@vituum/vite-plugin-send": "^2.0.0",
     "browserslist": "^4.28.1",
     "browserslist-to-esbuild": "^2.1.1",
-    "lightningcss": "^1.30.2",
-    "vituum": "^2.0.0-next.5"
+    "lightningcss": "^1.32.0",
+    "vituum": "^2.0.0"
   },
   "devDependencies": {
-    "@eslint/js": "^9.39",
-    "@stylistic/eslint-plugin": "^5.7",
-    "@types/node": "^25.0",
-    "@vituum/vite-plugin-tailwindcss": "^1.2.0",
-    "@vituum/vite-plugin-twig": "^1.1.0",
-    "eslint": "^9.39.2",
-    "rolldown": "^1.0.0-beta.60",
+    "@eslint/js": "^10.0",
+    "@stylistic/eslint-plugin": "^5.10",
+    "@tailwindcss/vite": "^4.2.1",
+    "@types/node": "^25.5",
+    "@vituum/vite-plugin-twig": "^2.0.0",
+    "eslint": "^10.0.3",
+    "globals": "^17.4.0",
+    "rolldown": "^1.0.0-rc.9",
     "typescript": "^5",
-    "vite": "^8.0.0-beta.8"
+    "vite": "^8.0.0"
   },
   "files": [
     "latte",
     "types",
     "index.js",
+    "eslint-stylistic.json",
     "src"
   ],
   "exports": {
@@ -43,7 +46,7 @@
     "./types": "./types/*"
   },
   "engines": {
-    "node": "^18.0.0 || >=20.0.0"
+    "node": "^20.19.0 || >=22.12.0"
   },
   "repository": {
     "type": "git",

package/src/createEslintStylisticConfig.js

@@ -0,0 +1,8 @@
+import stylistic from '@stylistic/eslint-plugin'
+import fs from 'node:fs'
+
+fs.writeFileSync('../eslint-stylistic.json', JSON.stringify({
+  rules: {
+    ...stylistic.configs.recommended.rules,
+  },
+}, null, 2))

package/types/index.d.ts

@@ -1,3 +1,5 @@
+import {HeroiconsOptions} from "@newlogic-digital/vite-plugin-heroicons";
+
 interface Input {
     assets?: string[]
     pages?: string[]
@@ -12,9 +14,10 @@ export interface PluginUserConfig {
     codeSplitting?: import('rolldown').OutputOptions['codeSplitting']
     vituum?: import('vituum').UserConfig,
     css?: import('vite').CSSOptions
-    juice?: import('@vituum/vite-plugin-juice').PluginUserConfig
+    cssInline?: import('@vituum/vite-plugin-css-inline').PluginUserConfig
     send?: import('@vituum/vite-plugin-send').PluginUserConfig
-    tailwindcss?: import('@vituum/vite-plugin-tailwindcss').PluginUserConfig
+    tailwindcss?: import('@tailwindcss/vite').PluginOptions
     latte?: import('@vituum/vite-plugin-latte').PluginUserConfig
     twig?: import('@vituum/vite-plugin-twig').PluginUserConfig
-}
+    heroicons?: import('@newlogic-digital/vite-plugin-heroicons').HeroiconsOptions
+}