@plumeria/turbopack-loader 13.2.1 → 13.2.2

package/dist/index.js

@@ -40,31 +40,12 @@ const path = __importStar(require("path"));
 const zss_engine_1 = require("zss-engine");
 const utils_1 = require("@plumeria/utils");
 let lastValidCss = '';
-function cleanStaleThemeRules(currentCss, optInCss) {
-    const hashRegex = /--([a-z0-9]{8})-[a-zA-Z0-9-]+:/g;
-    const hashes = new Set();
-    let match;
-    while ((match = hashRegex.exec(optInCss)) !== null) {
-        hashes.add(match[1]);
-    }
-    let cleanedCss = currentCss;
-    for (const hash of hashes) {
-        const propRegex = new RegExp(`--${hash}-[a-zA-Z0-9-]+:[^}]*?(?:;|(?=\\}))`, 'g');
-        cleanedCss = cleanedCss.replace(propRegex, '');
-    }
-    const emptyBlockRegex = /(?<=^|[}{])[^{}]*\{\s*\}/g;
-    let prevCss;
-    do {
-        prevCss = cleanedCss;
-        cleanedCss = cleanedCss.replace(emptyBlockRegex, '');
-    } while (cleanedCss !== prevCss);
-    return cleanedCss.trim();
-}
 async function loader(source) {
     const callback = this.async();
     const resourcePath = this.resourcePath;
     const isProduction = process.env.NODE_ENV === 'production';
     const VIRTUAL_FILE_PATH = path.resolve(__dirname, '..', 'zero-virtual.css');
+    let isThemeCSS = false;
     if (!lastValidCss && !isProduction) {
         try {
             lastValidCss = fs.readFileSync(VIRTUAL_FILE_PATH, 'utf-8');
@@ -419,6 +400,7 @@ async function loader(source) {
                 else if (propName === 'createTheme' &&
                     init.arguments.length >= 2 &&
                     utils_1.t.isObjectExpression(init.arguments[1].expression)) {
+                    isThemeCSS = true;
                     if (utils_1.t.isIdentifier(node.id)) {
                         idSpans.add(node.id.span.start);
                     }
@@ -431,7 +413,7 @@ async function loader(source) {
                         throw new Error(`Plumeria: Unsupported at-rule: "${selector}". createTheme only supports nesting at-rules such as @media, @container, @supports, @layer, and @scope.`);
                     }
                     const obj = (0, utils_1.objectExpressionToObject)(init.arguments[1].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
-                    const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
+                    const hash = (0, zss_engine_1.genBase36Hash)({ _themeSelector: selector, ...obj }, 1, 8);
                     if (utils_1.t.isIdentifier(node.id)) {
                         const uniqueKey = `${resourcePath}-${node.id.value}`;
                         scannedTables.createThemeHashTable[uniqueKey] = hash;
@@ -602,6 +584,7 @@ async function loader(source) {
                     else if (propName === 'createTheme' &&
                         args.length >= 2 &&
                         utils_1.t.isObjectExpression(args[1].expression)) {
+                        isThemeCSS = true;
                         let selector = '';
                         const selectorExpr = args[0].expression;
                         if (utils_1.t.isStringLiteral(selectorExpr)) {
@@ -611,7 +594,7 @@ async function loader(source) {
                             throw new Error(`Plumeria: Unsupported at-rule: "${selector}". createTheme only supports nesting at-rules such as @media, @container, @supports, @layer, and @scope.`);
                         }
                         const obj = (0, utils_1.objectExpressionToObject)(args[1].expression, mergedStaticTable, mergedKeyframesTable, mergedViewTransitionTable, mergedCreateThemeHashTable, scannedTables.createThemeObjectTable, mergedCreateTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable, mergedVariantsTable);
-                        const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
+                        const hash = (0, zss_engine_1.genBase36Hash)({ _themeSelector: selector, ...obj }, 1, 8);
                         scannedTables.createThemeObjectTable[hash] = obj;
                         if (scannedTables.createThemeSelectorTable) {
                             scannedTables.createThemeSelectorTable[hash] = selector;
@@ -1501,9 +1484,8 @@ async function loader(source) {
             }
             catch (e) {
             }
-            if (!currentCss.includes(optInCSS)) {
-                const cleanedCss = cleanStaleThemeRules(currentCss, optInCSS);
-                const nextCss = cleanedCss ? cleanedCss + '\n' + newCss : newCss;
+            if (!currentCss.includes(optInCSS) || isThemeCSS) {
+                const nextCss = currentCss + '\n' + newCss;
                 fs.writeFileSync(VIRTUAL_FILE_PATH, nextCss, 'utf-8');
                 lastValidCss = nextCss;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/turbopack-loader",
-  "version": "13.2.1",
+  "version": "13.2.2",
   "description": "Plumeria Turbopack-loader",
   "author": "Refirst 11",
   "license": "MIT",
@@ -22,10 +22,10 @@
     "zero-virtual.css"
   ],
   "dependencies": {
-    "@plumeria/utils": "^13.2.1"
+    "@plumeria/utils": "^13.2.2"
   },
   "devDependencies": {
-    "@swc/core": "1.15.40",
+    "@swc/core": "1.15.41",
     "zss-engine": "2.3.0"
   },
   "publishConfig": {