@plumeria/turbopack-loader 18.3.3 → 18.3.5

package/dist/index.js

@@ -603,16 +603,17 @@ async function loader(source) {
                     if (utils_1.t.isIdentifier(node.id)) {
                         idSpans.add(node.id.span.start);
                     }
-                    let selector = '';
                     const selectorExpr = init.arguments[0].expression;
-                    if (utils_1.t.isStringLiteral(selectorExpr)) {
-                        selector = selectorExpr.value;
+                    const selector = (0, utils_1.resolveThemeSelector)(selectorExpr, mergedStaticTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable);
+                    if (!selector) {
+                        throwCompilationError(`Plumeria: createTheme needs a selector it can read at build time. ` +
+                            `Pass a string literal such as ".dark", or a name this file declares as one.`, selectorExpr);
                     }
                     if (selector.startsWith('@') && !(0, zss_engine_1.isAtRule)(selector)) {
                         throwCompilationError(`Plumeria: Unsupported at-rule: "${selector}". createTheme only supports nesting at-rules such as @media, @container, @supports, @layer, and @scope.`, selectorExpr);
                     }
                     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)({ _themeSelector: selector, ...obj }, 1, 8);
+                    const hash = (0, utils_1.themeHashOf)(selector, obj);
                     if (utils_1.t.isIdentifier(node.id)) {
                         const uniqueKey = `${resourcePath}-${node.id.value}`;
                         scannedTables.createThemeHashTable[uniqueKey] = hash;
@@ -624,7 +625,7 @@ async function loader(source) {
                         const themeHashMap = {};
                         for (const [key, value] of Object.entries(obj)) {
                             const cssVarName = (0, zss_engine_1.camelToKebabCase)(key);
-                            const atomicHash = (0, zss_engine_1.genBase36Hash)({ [key]: value }, 1, 8);
+                            const atomicHash = (0, zss_engine_1.genBase36Hash)({ _theme: hash, [key]: value }, 1, 8);
                             themeHashMap[key] = `var(--${atomicHash}-${cssVarName})`;
                         }
                         localCreateStyles[node.id.value] = {
@@ -783,16 +784,17 @@ async function loader(source) {
                     else if (propName === 'createTheme' &&
                         args.length >= 2 &&
                         utils_1.t.isObjectExpression(args[1].expression)) {
-                        let selector = '';
                         const selectorExpr = args[0].expression;
-                        if (utils_1.t.isStringLiteral(selectorExpr)) {
-                            selector = selectorExpr.value;
+                        const selector = (0, utils_1.resolveThemeSelector)(selectorExpr, mergedStaticTable, mergedCreateStaticHashTable, scannedTables.createStaticObjectTable);
+                        if (!selector) {
+                            throwCompilationError(`Plumeria: createTheme needs a selector it can read at build time. ` +
+                                `Pass a string literal such as ".dark", or a name this file declares as one.`, selectorExpr);
                         }
                         if (selector.startsWith('@') && !(0, zss_engine_1.isAtRule)(selector)) {
                             throwCompilationError(`Plumeria: Unsupported at-rule: "${selector}". createTheme only supports nesting at-rules such as @media, @container, @supports, @layer, and @scope.`, selectorExpr);
                         }
                         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)({ _themeSelector: selector, ...obj }, 1, 8);
+                        const hash = (0, utils_1.themeHashOf)(selector, obj);
                         scannedTables.createThemeObjectTable[hash] = obj;
                         if (scannedTables.createThemeSelectorTable) {
                             scannedTables.createThemeSelectorTable[hash] = selector;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/turbopack-loader",
-  "version": "18.3.3",
+  "version": "18.3.5",
   "description": "Plumeria Turbopack-loader",
   "author": "Refirst 11",
   "license": "MIT",
@@ -29,8 +29,8 @@
     "zero-virtual.css"
   ],
   "dependencies": {
-    "@plumeria/compiler": "^18.3.3",
-    "@plumeria/utils": "^18.3.3"
+    "@plumeria/compiler": "^18.3.5",
+    "@plumeria/utils": "^18.3.5"
   },
   "devDependencies": {
     "@swc/core": "1.15.47",