@newlogic-digital/core 4.0.0-next.1 → 4.0.0-next.2

package/index.js

@@ -10,6 +10,7 @@ import twigOptions from './src/twig.js'
 import browserslistToEsbuild from 'browserslist-to-esbuild'
 import browserslist from 'browserslist'
 import { Features as LightningCssFeatures, browserslistToTargets } from 'lightningcss'
+import process from 'node:process'
 
 const { name } = getPackageInfo(import.meta.url)
 
@@ -17,62 +18,62 @@ const { name } = getPackageInfo(import.meta.url)
  * @type {import('@newlogic-digital/core/types').PluginUserConfig}
  */
 const defaultOptions = {
-    mode: null,
-    cert: 'localhost',
-    format: ['latte'],
-    advancedChunks: {},
-    input: {
-        assets: [
-            './src/styles/*.{css,pcss,scss,sass,less,styl,stylus}',
-            './src/scripts/*.{js,ts,mjs}'
-        ],
-        pages: [
-            './src/pages/**/*.{json,latte,twig,liquid,njk,hbs,pug,html}',
-            '!./src/pages/**/*.{latte,twig,liquid,njk,hbs,pug,html}.json',
-            '!./src/pages/email/**/*'
-        ],
-        emails: [
-            './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'
-        ]
+  mode: null,
+  cert: 'localhost',
+  format: ['latte'],
+  advancedChunks: {},
+  input: {
+    assets: [
+      './src/styles/*.{css,pcss,scss,sass,less,styl,stylus}',
+      './src/scripts/*.{js,ts,mjs}',
+    ],
+    pages: [
+      './src/pages/**/*.{json,latte,twig,liquid,njk,hbs,pug,html}',
+      '!./src/pages/**/*.{latte,twig,liquid,njk,hbs,pug,html}.json',
+      '!./src/pages/email/**/*',
+    ],
+    emails: [
+      './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',
+    ],
+  },
+  vituum: {
+    imports: {
+      paths: ['./src/styles/*/**', '!./src/styles/emails/*', './src/scripts/*/**'],
     },
-    vituum: {
-        imports: {
-            paths: ['./src/styles/*/**', '!./src/styles/emails/*', './src/scripts/*/**']
-        }
+  },
+  juice: {
+    paths: ['src/pages/email'],
+    postcss: {
+      globalData: {
+        files: ['./src/styles/emails/theme/config.css'],
+      },
     },
-    juice: {
-        paths: ['src/pages/email'],
-        postcss: {
-            globalData: {
-                files: ['./src/styles/emails/theme/config.css']
-            }
-        }
+  },
+  css: {
+    transformer: 'postcss',
+    lightningcss: {},
+  },
+  tailwindcss: {},
+  send: {},
+  latte: {
+    globals: {
+      srcPath: resolve(process.cwd(), 'src'),
+      templatesPath: resolve(process.cwd(), 'src/templates'),
+      template: './src/templates/layouts/default.latte',
     },
-    css: {
-        transformer: 'postcss',
-        lightningcss: {}
+    functions: {
+      pages: () => {
+        return fs.readdirSync(resolve(process.cwd(), 'src/pages')).filter(file => fs.statSync(resolve(process.cwd(), 'src/pages/' + file)).isFile())
+      },
     },
-    tailwindcss: {},
-    send: {},
-    latte: {
-        globals: {
-            srcPath: resolve(process.cwd(), 'src'),
-            templatesPath: resolve(process.cwd(), 'src/templates'),
-            template: './src/templates/layouts/default.latte'
-        },
-        functions: {
-            pages: () => {
-                return fs.readdirSync(resolve(process.cwd(), 'src/pages')).filter(file => fs.statSync(resolve(process.cwd(), 'src/pages/' + file)).isFile())
-            }
-        },
-        filters: {
-            json: resolve(process.cwd(), 'node_modules/@newlogic-digital/core/latte/JsonFilter.js'),
-            code: 'node_modules/@newlogic-digital/core/latte/CodeFilter.php'
-        }
+    filters: {
+      json: resolve(process.cwd(), 'node_modules/@newlogic-digital/core/latte/JsonFilter.js'),
+      code: 'node_modules/@newlogic-digital/core/latte/CodeFilter.php',
     },
-    twig: twigOptions
+  },
+  twig: twigOptions,
 }
 
 /**
@@ -80,161 +81,162 @@ const defaultOptions = {
  * @returns [import('vite').Plugin]
  */
 const plugin = async (options = {}) => {
-    options = merge(defaultOptions, options)
+  options = merge(defaultOptions, options)
 
-    const templatesPlugins = []
-    const tailwindcssPlugin = []
+  const templatesPlugins = []
+  const tailwindcssPlugin = []
 
-    if (options.format.includes('twig')) {
-        const twig = (await import('@vituum/vite-plugin-twig')).default
+  if (options.format.includes('twig')) {
+    const twig = (await import('@vituum/vite-plugin-twig')).default
 
-        templatesPlugins.push(twig(options.twig))
-    }
+    templatesPlugins.push(twig(options.twig))
+  }
 
-    if (options.format.includes('latte')) {
-        templatesPlugins.push(latte(options.latte))
-    }
+  if (options.format.includes('latte')) {
+    templatesPlugins.push(latte(options.latte))
+  }
+
+  if (options.css.transformer === 'postcss') {
+    const tailwindcss = (await import('@vituum/vite-plugin-tailwindcss')).default
 
-    if (options.css.transformer === 'postcss') {
-        const tailwindcss = (await import('@vituum/vite-plugin-tailwindcss')).default
+    tailwindcssPlugin.push(tailwindcss(options.tailwindcss))
+  }
 
-        tailwindcssPlugin.push(tailwindcss(options.tailwindcss))
+  if (options.css.transformer === 'lightningcss') {
+    if (!fs.existsSync(resolve(process.cwd(), 'src/+.css'))) {
+      fs.writeFileSync(resolve(process.cwd(), 'src/+.css'), '@import "./styles/main.css";')
     }
 
-    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
 
-        // @ts-ignore
-        // const tailwindcss = (await import('@tailwindcss/vite')).default
-        //
-        // tailwindcssPlugin.push(tailwindcss(options.tailwindcss))
-    }
+    tailwindcssPlugin.push(tailwindcss(options.tailwindcss))
+  }
 
-    const plugins = [
-        vituum(options.vituum),
-        ...tailwindcssPlugin,
-        ...templatesPlugins,
-        juice(options.juice),
-        send(options.send)
-    ]
-
-    return [{
-        name,
-        enforce: 'pre',
-        /**
+  const plugins = [
+    vituum(options.vituum),
+    ...tailwindcssPlugin,
+    ...templatesPlugins,
+    juice(options.juice),
+    send(options.send),
+  ]
+
+  return [{
+    name,
+    enforce: 'pre',
+    /**
          * @param {import('vite').UserConfig} userConfig
          * @param {import('vite').ConfigEnv} userEnv
          */
-        config(userConfig, userEnv) {
-            // @ts-ignore
-            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 = [
-                ...(options?.input?.assets ?? [])
-            ]
-
-            if (!options.mode) {
-                options.mode = userEnv.mode
-            }
+    config(userConfig, userEnv) {
+      // @ts-ignore
+      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 = [
+        ...(options?.input?.assets ?? []),
+      ]
+
+      if (!options.mode) {
+        options.mode = userEnv.mode
+      }
+
+      if (options.mode === 'development') {
+        defaultInput = [
+          ...(options?.input?.pages ?? []),
+          ...(options?.input?.assets ?? []),
+        ]
+      }
 
-            if (options.mode === 'development') {
-                defaultInput = [
-                    ...(options?.input?.pages ?? []),
-                    ...(options?.input?.assets ?? [])
-                ]
-            }
+      if (userEnv.command === 'build') {
+        userConfig.publicDir = userConfig.publicDir ?? false
+      }
 
-            if (userEnv.command === 'build') {
-                userConfig.publicDir = userConfig.publicDir ?? false
-            }
+      const outDir = resolve(userConfig.root ?? process.cwd(), 'public')
 
-            const outDir = resolve(userConfig.root ?? process.cwd(), 'public')
+      if (userConfig.build && !userConfig.build.outDir) {
+        userConfig.build.outDir = outDir
+      }
 
-            if (userConfig.build && !userConfig.build.outDir) {
-                userConfig.build.outDir = outDir
-            }
+      userConfig.optimizeDeps = Object.assign({
+        entries: [],
+      }, userConfig.optimizeDeps ?? {})
 
-            userConfig.optimizeDeps = Object.assign({
-                entries: []
-            }, userConfig.optimizeDeps ?? {})
-
-            userConfig.css = Object.assign({
-                transformer: options.css.transformer
-            }, userConfig.css ?? {})
-
-            userConfig.css.lightningcss = Object.assign({
-                targets: browserslistToTargets(browserslist()),
-                exclude: (options.mode !== 'emails') ? LightningCssFeatures.Nesting : 0,
-                drafts: {
-                    customMedia: true
-                }
-            }, userConfig.css.lightningcss ?? {})
-
-            userConfig.build = Object.assign({
-                target: browserslistToEsbuild(),
-                manifest: (options.mode === 'emails') ? false : 'manifest.json',
-                emptyOutDir: false,
-                modulePreload: false,
-                assetsInlineLimit: 0,
-                outDir
-            }, userConfig.build ?? {})
-
-            if (options.mode === 'emails') {
-                userEnv.mode = 'production'
-
-                defaultInput = [
-                    ...(options?.input?.emails ?? [])
-                ]
-
-                userConfig.build.rolldownOptions = Object.assign({
-                    input: defaultInput,
-                    output: {
-                        assetFileNames: 'assets/email/[name].[ext]'
-                    }
-                }, userConfig.build.rolldownOptions ?? {})
-            } else {
-                userConfig.build.rolldownOptions = Object.assign({
-                    input: defaultInput,
-                    output: {
-                        advancedChunks: options.advancedChunks ?? {
-                            groups: [
-                                {
-                                    name: 'swup',
-                                    test: /swup/
-                                },
-                                {
-                                    name: '@hotwired/stimulus',
-                                    test: /@hotwired\/stimulus/
-                                },
-                                {
-                                    name: 'naja',
-                                    test: /naja/
-                                }
-                            ]
-                        }
-                    }
-                }, userConfig.build.rolldownOptions ?? {})
-            }
+      userConfig.css = Object.assign({
+        transformer: options.css.transformer,
+      }, userConfig.css ?? {})
+
+      userConfig.css.lightningcss = Object.assign({
+        targets: browserslistToTargets(browserslist()),
+        exclude: (options.mode !== 'emails') ? LightningCssFeatures.Nesting : 0,
+        drafts: {
+          customMedia: true,
+        },
+      }, userConfig.css.lightningcss ?? {})
+
+      userConfig.build = Object.assign({
+        target: browserslistToEsbuild(),
+        manifest: (options.mode === 'emails') ? false : 'manifest.json',
+        emptyOutDir: false,
+        modulePreload: false,
+        assetsInlineLimit: 0,
+        outDir,
+      }, userConfig.build ?? {})
+
+      if (options.mode === 'emails') {
+        userEnv.mode = 'production'
+
+        defaultInput = [
+          ...(options?.input?.emails ?? []),
+        ]
 
-            userConfig.server = Object.assign({
-                host: true,
-                cors: true,
-                fsServe: {
-                    strict: false
+        userConfig.build.rolldownOptions = Object.assign({
+          input: defaultInput,
+          output: {
+            assetFileNames: 'assets/email/[name].[ext]',
+          },
+        }, userConfig.build.rolldownOptions ?? {})
+      }
+      else {
+        userConfig.build.rolldownOptions = Object.assign({
+          input: defaultInput,
+          output: {
+            advancedChunks: options.advancedChunks ?? {
+              groups: [
+                {
+                  name: 'swup',
+                  test: /swup/,
+                },
+                {
+                  name: '@hotwired/stimulus',
+                  test: /@hotwired\/stimulus/,
+                },
+                {
+                  name: 'naja',
+                  test: /naja/,
                 },
-                https: isHttps
-                    ? {
-                            key: fs.readFileSync(join(os.homedir(), `.ssh/${options.cert}-key.pem`)),
-                            cert: fs.readFileSync(join(os.homedir(), `.ssh/${options.cert}.pem`))
-                        }
-                    : false
-            }, userConfig.server ?? {})
-        }
-    }, ...plugins]
+              ],
+            },
+          },
+        }, userConfig.build.rolldownOptions ?? {})
+      }
+
+      userConfig.server = Object.assign({
+        host: true,
+        cors: true,
+        fsServe: {
+          strict: false,
+        },
+        https: isHttps
+          ? {
+              key: fs.readFileSync(join(os.homedir(), `.ssh/${options.cert}-key.pem`)),
+              cert: fs.readFileSync(join(os.homedir(), `.ssh/${options.cert}.pem`)),
+            }
+          : false,
+      }, userConfig.server ?? {})
+    },
+  }, ...plugins]
 }
 
 export default plugin

package/latte/JsonFilter.js

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@newlogic-digital/core",
   "type": "module",
-  "version": "4.0.0-next.1",
+  "version": "4.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",
@@ -14,22 +14,15 @@
   "dependencies": {
     "@vituum/vite-plugin-juice": "^2.0.0-next.1",
     "@vituum/vite-plugin-latte": "^2.0.0-next.2",
-    "@vituum/vite-plugin-posthtml": "^2.0.0-next.1",
     "@vituum/vite-plugin-send": "^2.0.0-next.1",
     "browserslist": "^4.28.1",
     "browserslist-to-esbuild": "^2.1.1",
-    "fast-glob": "^3.3.3",
-    "fs-extra": "^11.3.2",
-    "html-minifier-terser": "^7.2.0",
     "lightningcss": "^1.30.2",
-    "lodash": "^4.17.21",
-    "picocolors": "^1.1.1",
-    "posthtml": "^0.16.7",
-    "posthtml-prism": "^2.0.1",
-    "prismjs": "^1.30.0",
-    "vituum": "^2.0.0-next.3"
+    "vituum": "^2.0.0-next.5"
   },
   "devDependencies": {
+    "@eslint/js": "^9.39",
+    "@stylistic/eslint-plugin": "^5.6",
     "@types/node": "^25.0.3",
     "eslint": "^9.39.2",
     "rolldown": "^1.0.0-beta.55",

package/src/minify.js

@@ -1,22 +1,23 @@
 import minifier from 'html-minifier-terser'
 
 const parseMinifyHtml = async (input, name) => {
-    const minify = await minifier.minify(input, {
-        collapseWhitespace: true,
-        collapseInlineTagWhitespace: false,
-        minifyCSS: true,
-        removeAttributeQuotes: true,
-        quoteCharacter: '\'',
-        minifyJS: true
-    })
+  const minify = await minifier.minify(input, {
+    collapseWhitespace: true,
+    collapseInlineTagWhitespace: false,
+    minifyCSS: true,
+    removeAttributeQuotes: true,
+    quoteCharacter: '\'',
+    minifyJS: true,
+  })
 
-    if (name) {
-        return JSON.stringify({
-            [name]: minify
-        })
-    } else {
-        return JSON.stringify(minify)
-    }
+  if (name) {
+    return JSON.stringify({
+      [name]: minify,
+    })
+  }
+  else {
+    return JSON.stringify(minify)
+  }
 }
 
 export default parseMinifyHtml

package/src/twig.js

@@ -1,174 +1,177 @@
 import fs from 'fs'
 import { resolve } from 'path'
 import parseMinifyHtml from './minify.js'
+import process from 'node:process'
 
 const wrapPreCode = (code, lang) => {
-    return `<pre class="language-${lang}"><code class="language-${lang}">${code}</code></pre>`
+  return `<pre class="language-${lang}"><code class="language-${lang}">${code}</code></pre>`
 }
 
 const stripIndent = (string) => {
-    const indent = () => {
-        const match = string.match(/^[ \t]*(?=\S)/gm)
+  const indent = () => {
+    const match = string.match(/^[ \t]*(?=\S)/gm)
 
-        if (!match) {
-            return 0
-        }
-
-        return match.reduce((r, a) => Math.min(r, a.length), Infinity)
+    if (!match) {
+      return 0
     }
 
-    if (indent() === 0) {
-        return string
-    }
+    return match.reduce((r, a) => Math.min(r, a.length), Infinity)
+  }
+
+  if (indent() === 0) {
+    return string
+  }
 
-    const regex = new RegExp(`^[ \\t]{${indent()}}`, 'gm')
+  const regex = new RegExp(`^[ \\t]{${indent()}}`, 'gm')
 
-    return string.replace(regex, '')
+  return string.replace(regex, '')
 }
 
 export default {
-    namespaces: {
-        src: resolve(process.cwd(), 'src'),
-        templates: resolve(process.cwd(), 'src/templates')
+  namespaces: {
+    src: resolve(process.cwd(), 'src'),
+    templates: resolve(process.cwd(), 'src/templates'),
+  },
+  functions: {
+    pages: () => {
+      return fs.readdirSync('src/views').filter(file => fs.statSync('src/views/' + file).isFile())
     },
-    functions: {
-        pages: () => {
-            return fs.readdirSync('src/views').filter(file => fs.statSync('src/views/' + file).isFile())
-        },
-        fetch: (data) => {
-            if (typeof data !== 'undefined') {
-                if (data.indexOf('http') > -1) {
-                    return data
-                } else {
-                    let slash = data.indexOf('/') + 1
-                    if (slash > 1) {
-                        slash = 0
-                    }
-
-                    return fs.readFileSync(process.cwd() + '/' + data.substring(slash, data.length), 'utf8').toString()
-                }
-            }
-        },
-        randomColor: () => {
-            return '#' + Math.random().toString(16).slice(2, 8)
-        },
-        placeholder: (width, height) => {
-            const colors = ['333', '444', '666', '222', '777', '888', '111']
-            return 'https://via.placeholder.com/' + width + 'x' + height + '/' + colors[Math.floor(Math.random() * colors.length)] + '.webp'
-        },
-        lazy: (width, height) => {
-            const svg = encodeURIComponent(stripIndent('<svg width="' + width + '" height="' + height + '" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 ' + width + ' ' + height + '"></svg>'))
+    fetch: (data) => {
+      if (typeof data !== 'undefined') {
+        if (data.indexOf('http') > -1) {
+          return data
+        }
+        else {
+          let slash = data.indexOf('/') + 1
+          if (slash > 1) {
+            slash = 0
+          }
 
-            return 'data:image/svg+xml;charset=UTF-8,' + svg
-        },
-        ratio: (width, height) => {
-            return (height / width) * 100
+          return fs.readFileSync(process.cwd() + '/' + data.substring(slash, data.length), 'utf8').toString()
         }
+      }
     },
-    filters: {
-        asset: (url) => {
-            return url
-        },
-        rem: (value) => {
-            return `${value / 16}rem`
-        },
-        encode64: (path) => {
-            const svg = encodeURIComponent(stripIndent(path))
+    randomColor: () => {
+      return '#' + Math.random().toString(16).slice(2, 8)
+    },
+    placeholder: (width, height) => {
+      const colors = ['333', '444', '666', '222', '777', '888', '111']
+      return 'https://via.placeholder.com/' + width + 'x' + height + '/' + colors[Math.floor(Math.random() * colors.length)] + '.webp'
+    },
+    lazy: (width, height) => {
+      const svg = encodeURIComponent(stripIndent('<svg width="' + width + '" height="' + height + '" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 ' + width + ' ' + height + '"></svg>'))
 
-            return 'data:image/svg+xml;charset=UTF-8,' + svg
+      return 'data:image/svg+xml;charset=UTF-8,' + svg
+    },
+    ratio: (width, height) => {
+      return (height / width) * 100
+    },
+  },
+  filters: {
+    asset: (url) => {
+      return url
+    },
+    rem: (value) => {
+      return `${value / 16}rem`
+    },
+    encode64: (path) => {
+      const svg = encodeURIComponent(stripIndent(path))
+
+      return 'data:image/svg+xml;charset=UTF-8,' + svg
+    },
+    exists: (path) => {
+      if (path.indexOf('/') === 0) {
+        path = path.slice(1)
+      }
+
+      return fs.existsSync(resolve(process.cwd(), path))
+    },
+    tel: (value) => {
+      return value.replace(/\s+/g, '').replace('(', '').replace(')', '')
+    },
+  },
+  extensions: [
+    (Twig) => {
+      Twig.exports.extendTag({
+        type: 'json',
+        regex: /^json\s+(.+)$|^json$/,
+        next: ['endjson'],
+        open: true,
+        compile: function (token) {
+          const expression = token.match[1] ?? '\'_null\''
+
+          token.stack = Reflect.apply(Twig.expression.compile, this, [{
+            type: Twig.expression.type.expression,
+            value: expression,
+          }]).stack
+
+          delete token.match
+          return token
         },
-        exists: (path) => {
-            if (path.indexOf('/') === 0) {
-                path = path.slice(1)
+        parse: async function (token, context, chain) {
+          const name = Reflect.apply(Twig.expression.parse, this, [token.stack, context])
+          const output = this.parse(token.output, context)
+
+          if (name === '_null') {
+            return {
+              chain,
+              output: await parseMinifyHtml(output),
             }
-
-            return fs.existsSync(resolve(process.cwd(), path))
+          }
+          else {
+            return {
+              chain,
+              output: await parseMinifyHtml(output, name),
+            }
+          }
         },
-        tel: (value) => {
-            return value.replace(/\s+/g, '').replace('(', '').replace(')', '')
-        }
+      })
+      Twig.exports.extendTag({
+        type: 'endjson',
+        regex: /^endjson$/,
+        next: [],
+        open: false,
+      })
     },
-    extensions: [
-        (Twig) => {
-            Twig.exports.extendTag({
-                type: 'json',
-                regex: /^json\s+(.+)$|^json$/,
-                next: ['endjson'],
-                open: true,
-                compile: function (token) {
-                    const expression = token.match[1] ?? '\'_null\''
-
-                    token.stack = Reflect.apply(Twig.expression.compile, this, [{
-                        type: Twig.expression.type.expression,
-                        value: expression
-                    }]).stack
-
-                    delete token.match
-                    return token
-                },
-                parse: async function (token, context, chain) {
-                    const name = Reflect.apply(Twig.expression.parse, this, [token.stack, context])
-                    const output = this.parse(token.output, context)
-
-                    if (name === '_null') {
-                        return {
-                            chain,
-                            output: await parseMinifyHtml(output)
-                        }
-                    } else {
-                        return {
-                            chain,
-                            output: await parseMinifyHtml(output, name)
-                        }
-                    }
-                }
-            })
-            Twig.exports.extendTag({
-                type: 'endjson',
-                regex: /^endjson$/,
-                next: [],
-                open: false
-            })
+    (Twig) => {
+      Twig.exports.extendTag({
+        type: 'code',
+        regex: /^code\s+(.+)$/,
+        next: ['endcode'], // match the type of the end tag
+        open: true,
+        compile: function (token) {
+          const expression = token.match[1]
+
+          token.stack = Reflect.apply(Twig.expression.compile, this, [{
+            type: Twig.expression.type.expression,
+            value: expression,
+          }]).stack
+
+          delete token.match
+          return token
         },
-        (Twig) => {
-            Twig.exports.extendTag({
-                type: 'code',
-                regex: /^code\s+(.+)$/,
-                next: ['endcode'], // match the type of the end tag
-                open: true,
-                compile: function (token) {
-                    const expression = token.match[1]
-
-                    token.stack = Reflect.apply(Twig.expression.compile, this, [{
-                        type: Twig.expression.type.expression,
-                        value: expression
-                    }]).stack
-
-                    delete token.match
-                    return token
-                },
-                parse: function (token, context, chain) {
-                    let type = Reflect.apply(Twig.expression.parse, this, [token.stack, context])
-                    const output = this.parse(token.output, context)
-                    let mirror = false
-
-                    if (type.includes(':mirror')) {
-                        mirror = true
-                        type = type.replace(':mirror', '')
-                    }
-
-                    return {
-                        chain,
-                        output: `${mirror ? output : ''}${wrapPreCode(output, type)}`
-                    }
-                }
-            })
-            Twig.exports.extendTag({
-                type: 'endcode',
-                regex: /^endcode$/,
-                next: [],
-                open: false
-            })
-        }
-    ]
+        parse: function (token, context, chain) {
+          let type = Reflect.apply(Twig.expression.parse, this, [token.stack, context])
+          const output = this.parse(token.output, context)
+          let mirror = false
+
+          if (type.includes(':mirror')) {
+            mirror = true
+            type = type.replace(':mirror', '')
+          }
+
+          return {
+            chain,
+            output: `${mirror ? output : ''}${wrapPreCode(output, type)}`,
+          }
+        },
+      })
+      Twig.exports.extendTag({
+        type: 'endcode',
+        regex: /^endcode$/,
+        next: [],
+        open: false,
+      })
+    },
+  ],
 }

package/src/prism.js

@@ -1,90 +0,0 @@
-import Prism from 'prismjs'
-import { render } from 'posthtml-render'
-import loadLanguages from 'prismjs/components/index.js'
-import NormalizeWhitespace from 'prismjs/plugins/normalize-whitespace/prism-normalize-whitespace.js'
-
-const Normalize = new NormalizeWhitespace({
-    'remove-trailing': true,
-    'remove-indent': true,
-    'left-trim': true,
-    'right-trim': true
-})
-
-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)
-        }
-    }
-}
-
-const highlightNode = (node) => {
-    const attrs = node.attrs || {}
-    const classList = `${attrs.class || ''}`.trimStart()
-
-    if ('prism-ignore' in attrs) {
-        delete node.attrs['prism-ignore']
-
-        return node
-    }
-
-    if (classList.includes('prism-ignore')) {
-        node.attrs.class = node.attrs.class.replace('prism-ignore', '').trim()
-
-        return node
-    }
-
-    const lang = getExplicitLanguage(classList)
-
-    if (lang && !classList.includes(`language-${lang}`)) {
-        attrs.class = `${classList || ''} language-${lang}`.trimStart()
-    }
-
-    node.attrs = attrs
-
-    if (node.content) {
-        const html = (node.content[0].tag && !node.content[0].content) ? `<${node.content[0].tag}>` : render(node.content)
-
-        node.content = mapStringOrNode(html, lang)
-    }
-
-    return node
-}
-
-const mapStringOrNode = (stringOrNode, lang = null) => {
-    if (typeof stringOrNode === 'string') {
-        if (lang) {
-            if (!Object.keys(Prism.languages).includes(lang)) {
-                loadLanguages.silent = true
-                loadLanguages([lang])
-            }
-
-            return Prism.highlight(Normalize.normalize(stringOrNode), Prism.languages[lang], lang)
-        }
-
-        return Prism.highlight(Normalize.normalize(stringOrNode), Prism.languages.markup, 'markup')
-    }
-
-    highlightNode(stringOrNode)
-
-    return stringOrNode
-}
-
-const getExplicitLanguage = (classList) => {
-    const matches = classList.match(/(?:lang|language)-(\w*)/)
-
-    return matches === null ? null : matches[1]
-}
-
-const plugin = (options) => {
-    options = options || {}
-    options.inline = options.inline || false
-
-    return tree => createPrismPlugin(options)(tree)
-}
-
-export default plugin