@server/next 0.28.6 → 0.28.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@server/next",
-  "version": "0.28.6",
+  "version": "0.28.7",
   "description": "A fully-fledged web server with routing, file uploads, sessions, static files, schema validation, websockets, testing, etc.",
   "homepage": "https://server-js.com/",
   "repository": "https://github.com/franciscop/server-next.git",

package/src/jsx/jsx-runtime.js

@@ -27,13 +27,13 @@ const altAttrs = {
 const isValidChild = (child) =>
   child != null && child !== false && child !== true;
 
-// CSS helpers
-const escapeCSS = (value) => String(value).replace(/[<>&"'`]/g, "\\$&");
-
 const minifyCss = (str) =>
   str
-    .replace(/\s+/g, " ")
     .replace(/\/\*[\s\S]*?\*\//g, "")
+    .replace(/\s+/g, " ")
+    .replace(/\s*([{}:;,>~+])\s*/g, "$1")
+    .replace(/;}/g, "}")
+    .replace(/<\/style>/gi, "<\\/style>")
     .trim();
 
 // React element detection (safe for custom objects too)
@@ -104,9 +104,9 @@ const jsx = (tag, { children, ...props } = {}) => {
     children = raw(content);
   }
 
-  // style: minified + escaped raw content
+  // style: minified raw content
   if (tag === "style" && typeof children === "string") {
-    children = raw(minifyCss(escapeCSS(children)));
+    children = raw(minifyCss(children));
   }
 
   // dangerouslySetInnerHTML

package/src/jsx/jsx-runtime.test.jsx

@@ -299,20 +299,50 @@ describe("script tag", () => {
 describe("style tag", () => {
   it("renders style content", () => {
     expect(<style>{"body { color: red; }"}</style>).toRender(
-      "<style>body { color: red; }</style>",
+      "<style>body{color:red}</style>",
     );
   });
 
   it("minifies whitespace in style content", () => {
     expect(
       <style>{"body {\n  color:   red;\n  margin: 0;\n}"}</style>,
-    ).toRender("<style>body { color: red; margin: 0; }</style>");
+    ).toRender("<style>body{color:red;margin:0}</style>");
   });
 
   it("strips CSS comments", () => {
     expect(
       <style>{"/* reset */ body { margin: 0; } /* end */"}</style>,
-    ).toRender("<style>body { margin: 0; }</style>");
+    ).toRender("<style>body{margin:0}</style>");
+  });
+
+  it("preserves child combinator in selectors", () => {
+    expect(
+      <style>{":not(pre) > code { background: none; }"}</style>,
+    ).toRender("<style>:not(pre)>code{background:none}</style>");
+  });
+
+  it("preserves sibling combinators in selectors", () => {
+    expect(
+      <style>{"h2 + p { margin: 0; } h2 ~ p { color: red; }"}</style>,
+    ).toRender("<style>h2+p{margin:0}h2~p{color:red}</style>");
+  });
+
+  it("removes spaces around braces, colons, and semicolons", () => {
+    expect(
+      <style>{"a { color : red ; font-size : 1em ; }"}</style>,
+    ).toRender("<style>a{color:red;font-size:1em}</style>");
+  });
+
+  it("removes trailing semicolon before closing brace", () => {
+    expect(
+      <style>{"p { margin: 0; padding: 0; }"}</style>,
+    ).toRender("<style>p{margin:0;padding:0}</style>");
+  });
+
+  it("does not break </style> injection", () => {
+    expect(
+      <style>{"a { content: '</style>'; }"}</style>,
+    ).toRender("<style>a{content:'<\\/style>'}</style>");
   });
 });