@newlogic-digital/core 0.9.11 → 0.9.14

package/modules/Scripts.js

@@ -186,7 +186,7 @@ export class Scripts {
                                     preventAssignment: true,
                                     values: Object.assign({
                                         'process.env.NODE_ENV': JSON.stringify('production'),
-                                        [Config.paths.input.assets]: `${Config.paths.output.assets.replace(Config.paths.output.root + "/", "")}`
+                                        [Config.paths.input.assets]: `${Config.paths.output.assets.replace(Config.paths.output.root + "/", Config.paths.base.length > 0 ? Config.paths.base + "/" : "")}`
                                     }, assetsManifest)
                                 }),
                                 Config.scripts.optimizations && terser(),

package/modules/Templates.js

@@ -13,6 +13,8 @@ import loadLanguages from 'prismjs/components/index.js'
 import NormalizeWhitespace from 'prismjs/plugins/normalize-whitespace/prism-normalize-whitespace.js'
 import {Config, Exists, Functions, Modules, root} from "./Core.js";
 
+loadLanguages(['markup', 'css', 'javascript'])
+
 export class Templates {
     get functions() {
         return Object.assign(Config.templates.functions, {
@@ -239,8 +241,6 @@ export class Templates {
                             type = type.replace(":mirror", "")
                         }
 
-                        loadLanguages(['markup', 'css', 'javascript'])
-
                         const Normalize = new NormalizeWhitespace({
                             'remove-trailing': true,
                             'remove-indent': true,
@@ -300,11 +300,11 @@ export class Templates {
             (Twig) => {
                 Twig.exports.extendTag({
                     type: "json",
-                    regex: /^json\s+(.+)$/,
+                    regex: /^json\s+(.+)$|^json$/,
                     next: ["endjson"],
                     open: true,
                     compile: function (token) {
-                        const expression = token.match[1];
+                        const expression = token.match[1] ?? `'_null'`;
 
                         token.stack = Reflect.apply(Twig.expression.compile, this, [{
                             type: Twig.expression.type.expression,
@@ -318,17 +318,26 @@ export class Templates {
                         let name = Reflect.apply(Twig.expression.parse, this, [token.stack, context]);
                         let output = this.parse(token.output, context);
 
-                        return {
-                            chain: chain,
-                            output: JSON.stringify({
-                                [name]: minifier.minify(output, {
-                                    collapseWhitespace: true,
-                                    collapseInlineTagWhitespace: false,
-                                    minifyCSS: true,
-                                    minifyJS: true
+                        const minify = minifier.minify(output, {
+                            collapseWhitespace: true,
+                            collapseInlineTagWhitespace: false,
+                            minifyCSS: true,
+                            minifyJS: true
+                        })
+
+                        if (name === '_null') {
+                            return {
+                                chain: chain,
+                                output: JSON.stringify(minify)
+                            };
+                        } else {
+                            return {
+                                chain: chain,
+                                output: JSON.stringify({
+                                    [name]: minify
                                 })
-                            })
-                        };
+                            };
+                        }
                     }
                 });
                 Twig.exports.extendTag({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@newlogic-digital/core",
   "type": "module",
-  "version": "0.9.11",
+  "version": "0.9.14",
   "main": "index.js",
   "author": "New Logic Studio s.r.o.",
   "description": "Set of tools that can be used to create modern web applications",
@@ -13,15 +13,15 @@
     "tailwind": "rollup modules/tailwind/index.js --file modules/tailwind/index.cjs --format cjs"
   },
   "dependencies": {
-    "@babel/core": "^7.16.12",
-    "@babel/preset-env": "^7.16.11",
-    "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-commonjs": "^21.0.1",
-    "@rollup/plugin-node-resolve": "^13.1.3",
-    "@rollup/plugin-replace": "^3.0.1",
+    "@babel/core": "^7.17.12",
+    "@babel/preset-env": "^7.17.12",
+    "@rollup/plugin-babel": "^5.3.1",
+    "@rollup/plugin-commonjs": "^22.0.0",
+    "@rollup/plugin-node-resolve": "^13.3.0",
+    "@rollup/plugin-replace": "^4.0.0",
     "adm-zip": "^0.5.9",
-    "clean-css": "^5.2.2",
-    "fs-extra": "^10.0.0",
+    "clean-css": "^5.3.0",
+    "fs-extra": "^10.1.0",
     "plugin-error": "^1.0.1",
     "through2": "^4.0.2",
     "twig": "^1.15.4",
@@ -40,23 +40,23 @@
     "lazypipe": "^1.0.2",
     "lodash": "^4.17.21",
     "postcss-custom-media": "^8.0.0",
-    "postcss-custom-properties": "^12.1.4",
+    "postcss-custom-properties": "^12.1.7",
     "postcss-custom-selectors": "^6.0.0",
-    "postcss-import": "^14.0.2",
-    "postcss-nesting": "^10.1.2",
-    "rollup": "^2.66.1",
+    "postcss-import": "^14.1.0",
+    "postcss-nesting": "^10.1.6",
+    "rollup": "^2.73.0",
     "rollup-plugin-import-map": "^2.2.2",
     "rollup-plugin-terser": "^7.0.2",
-    "vite": "~2.7.13",
-    "prismjs": "^1.26.0"
+    "vite": "~2.9.9",
+    "prismjs": "^1.28.0"
   },
   "peerDependencies": {
-    "autoprefixer": "^10.4.2",
-    "postcss": "^8.4.5",
-    "tailwindcss": "^3.0.18"
+    "autoprefixer": "^10.4.7",
+    "postcss": "^8.4.13",
+    "tailwindcss": "^3.0.24"
   },
   "devDependencies": {
-    "vitepress": "^0.21.6"
+    "vitepress": "^0.22.4"
   },
   "files": [
     "index.js",