smbls 3.8.2 → 3.8.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "smbls",
-  "version": "3.8.2",
+  "version": "3.8.4",
   "license": "CC-BY-NC-4.0",
   "repository": "https://github.com/symbo-ls/smbls",
   "gitHead": "9fc1b79b41cdc725ca6b24aec64920a599634681",

package/src/createDomql.js

@@ -253,7 +253,15 @@ const hydrateFromBrender = async (app, ctx, doc, win) => {
  * CSS stays in <style> tags so re-render is fast (no FOUC for styles).
  */
 const fallbackRender = async (domqlCreate, app, parentNode, ctx, win) => {
-  // Remove brender content but keep <style>, <script>, <link> tags
+  const doc = parentNode.ownerDocument || document
+
+  // Remove SSR emotion CSS — the client emotion instance generates different
+  // class names, so keeping the old <style> causes class mismatches.
+  // Non-emotion styles (global CSS, reset, font links) are kept for FOUC prevention.
+  const ssrEmotionStyle = doc.querySelector('style[data-emotion="smbls"]')
+  if (ssrEmotionStyle) ssrEmotionStyle.remove()
+
+  // Remove brender content (keep non-emotion <style>, <script>, <link>)
   const toRemove = []
   for (const child of parentNode.childNodes) {
     if (child.nodeType === 1) {
@@ -264,6 +272,9 @@ const fallbackRender = async (domqlCreate, app, parentNode, ctx, win) => {
   }
   toRemove.forEach(n => n.remove())
 
+  // Also remove stale data-br attributes from any remaining elements
+  doc.querySelectorAll('[data-br]').forEach(el => el.removeAttribute('data-br'))
+
   const smblsApp = await domqlCreate(app, parentNode, ctx.key, {
     verbose: ctx.verbose,
     ...ctx.domqlOptions

package/src/router.js

@@ -62,10 +62,7 @@ export const initRouter = (element, context) => {
   return routerOptions
 }
 
-let popStateFired
 export const onpopstateRouter = (element, context) => {
-  if (popStateFired) return
-  popStateFired = true
   const routerOptions = context.router || DEFAULT_ROUTING_OPTIONS
   if (!routerOptions.popState) return
   const router =