@plumeria/turbopack-loader 13.1.4 → 13.2.0

package/dist/index.js

@@ -49,10 +49,10 @@ function cleanStaleThemeRules(currentCss, optInCss) {
     }
     let cleanedCss = currentCss;
     for (const hash of hashes) {
-        const propRegex = new RegExp(`--${hash}-[a-zA-Z0-9-]+:[^;}]+(?:;|(?=\\}))`, 'g');
+        const propRegex = new RegExp(`--${hash}-[a-zA-Z0-9-]+:[^}]*?(?:;|(?=\\}))`, 'g');
         cleanedCss = cleanedCss.replace(propRegex, '');
     }
-    const emptyBlockRegex = /(?<=^|[}])[^{}]*\{\s*\}/g;
+    const emptyBlockRegex = /(?<=^|[}{])[^{}]*\{\s*\}/g;
     let prevCss;
     do {
         prevCss = cleanedCss;
@@ -955,7 +955,7 @@ async function loader(source) {
             });
             const classParts = [];
             if (existingClass)
-                classParts.push(JSON.stringify(existingClass));
+                classParts.push(existingClass);
             if (Object.keys(baseIndependent).length > 0) {
                 const className = processStyleRecords(baseIndependent)
                     .map((r) => r.hash)
@@ -1250,18 +1250,30 @@ async function loader(source) {
                 const classNameAttr = attributes.find((attr) => attr.type === 'JSXAttribute' &&
                     attr.name.type === 'Identifier' &&
                     attr.name.value === 'className');
-                let existingClass = '';
-                if (classNameAttr?.value?.type === 'StringLiteral') {
-                    existingClass = classNameAttr.value.value;
+                let existingClassExpr = '';
+                if (classNameAttr) {
                     replacements.push({
                         start: classNameAttr.span.start - baseByteOffset,
                         end: classNameAttr.span.end - baseByteOffset,
                         content: '',
                     });
+                    if (classNameAttr.value?.type === 'StringLiteral') {
+                        existingClassExpr = JSON.stringify(classNameAttr.value.value);
+                    }
+                    else if (classNameAttr.value?.type === 'JSXExpressionContainer') {
+                        const start = classNameAttr.value.expression.span.start -
+                            baseByteOffset;
+                        const end = classNameAttr.value.expression.span.end -
+                            baseByteOffset;
+                        existingClassExpr = sourceBuffer
+                            .subarray(start, end)
+                            .toString('utf-8');
+                    }
                 }
                 const styleAttrExisting = attributes.find((attr) => attr.type === 'JSXAttribute' &&
                     attr.name.type === 'Identifier' &&
                     attr.name.value === 'style');
+                let existingStyleExpr = '';
                 if (styleAttrExisting) {
                     replacements.push({
                         start: styleAttrExisting.span.start - baseByteOffset,
@@ -1270,16 +1282,19 @@ async function loader(source) {
                     });
                     if (styleAttrExisting.value?.type === 'JSXExpressionContainer') {
                         const innerExpr = styleAttrExisting.value?.expression;
-                        if (innerExpr?.type === 'ObjectExpression') {
-                            const start = innerExpr.span.start - baseByteOffset;
-                            const end = innerExpr.span.end - baseByteOffset;
-                            const innerSource = sourceBuffer
-                                .subarray(start, end)
-                                .toString('utf-8');
+                        const start = innerExpr.span.start - baseByteOffset;
+                        const end = innerExpr.span.end - baseByteOffset;
+                        const innerSource = sourceBuffer
+                            .subarray(start, end)
+                            .toString('utf-8');
+                        if (innerExpr.type === 'ObjectExpression') {
                             const stripped = innerSource.slice(1, -1).trim();
                             if (stripped)
                                 dynamicStyleParts.push(stripped);
                         }
+                        else {
+                            existingStyleExpr = `...(${innerSource})`;
+                        }
                     }
                 }
                 args = args.filter((arg) => {
@@ -1364,10 +1379,10 @@ async function loader(source) {
                     }
                     return true;
                 });
-                const styleAttr = dynamicStyleParts.length > 0
-                    ? ` style={{${dynamicStyleParts.join(', ')}}}`
+                const styleAttr = dynamicStyleParts.length > 0 || existingStyleExpr
+                    ? ` style={{ ${existingStyleExpr ? existingStyleExpr + ', ' : ''}${dynamicStyleParts.join(', ')} }}`
                     : '';
-                const { classParts, isOptimizable, baseStyle } = buildClassParts(args, dynamicClassParts, existingClass);
+                const { classParts, isOptimizable, baseStyle } = buildClassParts(args, dynamicClassParts, existingClassExpr);
                 if (isOptimizable &&
                     (args.length > 0 ||
                         Object.keys(baseStyle).length > 0 ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/turbopack-loader",
-  "version": "13.1.4",
+  "version": "13.2.0",
   "description": "Plumeria Turbopack-loader",
   "author": "Refirst 11",
   "license": "MIT",
@@ -22,7 +22,7 @@
     "zero-virtual.css"
   ],
   "dependencies": {
-    "@plumeria/utils": "^13.1.4"
+    "@plumeria/utils": "^13.2.0"
   },
   "devDependencies": {
     "@swc/core": "1.15.40",