rimecms 0.25.5 → 0.25.7

package/dist/core/config/types.d.ts

@@ -130,8 +130,8 @@ export type PanelConfig = {
     };
     /** a relative path from the "static" directory or an external url
      * @example
-     * // for static/panel/custom.css
-     * css : '/panel/custom.css'
+     * // for static/assets/custom.css
+     * css : '/assets/custom.css'
      */
     css?: string;
 };

package/dist/core/dev/cli/init/index.js

@@ -152,8 +152,8 @@ export const init = async ({ force, name: incomingName, skipInstall }) => {
     async function copyAssets() {
         try {
             const currentDir = path.dirname(fileURLToPath(import.meta.url));
-            await mkdir(path.resolve(process.cwd(), 'static/panel/fonts'), { recursive: true });
-            await cp(path.join(currentDir, '../../../../panel/fonts'), path.resolve(process.cwd(), 'static/panel/fonts'), {
+            await mkdir(path.resolve(process.cwd(), 'static/assets/panel/fonts'), { recursive: true });
+            await cp(path.join(currentDir, '../../../../panel/fonts'), path.resolve(process.cwd(), 'static/assets/panel/fonts'), {
                 recursive: true
             });
             logger.info('[✓] Copied assets');

package/dist/panel/style/font.css

@@ -1,20 +1,20 @@
 @font-face {
 	font-family: 'Lora';
-	src: url('/panel/fonts/Lora-Italic-VariableFont_wght.ttf') format('truetype');
+	src: url('/assets/panel/fonts/Lora-Italic-VariableFont_wght.ttf') format('truetype');
 	font-weight: 100 1000;
 	font-style: Italic;
 }
 
 @font-face {
 	font-family: 'Lora';
-	src: url('/panel/fonts/Lora-VariableFont_wght.ttf') format('truetype');
+	src: url('/assets/panel/fonts/Lora-VariableFont_wght.ttf') format('truetype');
 	font-weight: 100 1000;
 	font-style: normal;
 }
 
 @font-face {
 	font-family: 'Chivo';
-	src: url('/panel/fonts/ChivoMono-Italic-VariableFont_wght.ttf') format('truetype');
+	src: url('/assets/panel/fonts/ChivoMono-Italic-VariableFont_wght.ttf') format('truetype');
 	font-weight: 100 1000;
 	font-style: Italic;
 }
@@ -23,8 +23,8 @@
 	--rz-font-scale: 0.8;
 
 	--rz-font-sans:
-		-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji',
-		'Segoe UI Emoji', 'Segoe UI Symbol';
+		-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif,
+		'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
 	--rz-font-mono: 'SFMono-Regular', Consolas, Liberation Mono, Menlo, Courier, monospace;
 	--rz-font-serif: 'Lora';
 

package/dist/util/string.js

@@ -174,6 +174,7 @@ export const sanitize = (value) => {
         return value || '';
     if (!parser)
         parser = Parser();
+    const WHITESPACE_MARKER = '\uE000';
     const decode = (value) => value
         .replace(/&/g, '&')
         .replace(/"/g, '"')
@@ -182,12 +183,20 @@ export const sanitize = (value) => {
         .replace(/'/g, "'")
         .replace(/'/g, "'")
         .replace(/&/g, '&');
+    const encodeTextSpace = (html) => html
+        .split(/(<[^>]*>)/g)
+        .map((segment) => segment.startsWith('<') && segment.endsWith('>')
+        ? segment
+        : segment.replace(/ /g, WHITESPACE_MARKER))
+        .join('');
+    const restoreWhitespace = (str) => str.replace(new RegExp(WHITESPACE_MARKER, 'g'), ' ');
     // Decode multiple levels of encoding on input
     let decodedValue = value;
     while (decodedValue.match(/&amp;|&quot;|&lt;|&gt;|&#x27;|&#39;|&#38;/)) {
         decodedValue = decode(decodedValue);
     }
-    const { root } = parser.parseFromString(decodedValue);
+    const protectedInput = encodeTextSpace(decodedValue);
+    const { root } = parser.parseFromString(protectedInput);
     const allowedTags = new Set(['strong', 'b', 'em', 'i', 'u', 'br', 'a']);
     const dangerousTags = new Set(['script', 'style', 'iframe', 'object', 'embed', 'svg']);
     const eventHandlers = /^on[a-z]+$/i;
@@ -197,7 +206,7 @@ export const sanitize = (value) => {
             return '';
         // Handle text nodes
         if (node.nodeName === '#text') {
-            return node.nodeValue || '';
+            return (node.nodeValue || '').replace(new RegExp(WHITESPACE_MARKER, 'g'), ' ');
         }
         // Handle comment nodes - remove them
         if (node.nodeName === '#comment') {
@@ -260,5 +269,5 @@ export const sanitize = (value) => {
         return '';
     };
     const sanitized = root.children ? root.children.map(processNode).join('') : '';
-    return decode(sanitized);
+    return decode(restoreWhitespace(sanitized));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rimecms",
-	"version": "0.25.5",
+	"version": "0.25.7",
 	"homepage": "https://github.com/bienbiendev/rime",
 	"scripts": {
 		"dev": "vite dev",