@plumeria/turbopack-loader 12.0.3 → 12.0.5

package/dist/index.js

@@ -87,6 +87,10 @@ async function loader(source) {
     };
     const localConsts = (0, utils_1.collectLocalConsts)(ast);
     const importMap = {};
+    const keyframesImportMap = {};
+    const viewTransitionImportMap = {};
+    const createImportMap = {};
+    const variantsImportMap = {};
     const createThemeImportMap = {};
     const createStaticImportMap = {};
     const plumeriaAliases = {};
@@ -122,18 +126,20 @@ async function loader(source) {
                             importMap[localName] = scannedTables.staticTable[uniqueKey];
                         }
                         if (scannedTables.keyframesHashTable[uniqueKey]) {
-                            importMap[localName] =
+                            keyframesImportMap[localName] =
                                 scannedTables.keyframesHashTable[uniqueKey];
                         }
                         if (scannedTables.viewTransitionHashTable[uniqueKey]) {
-                            importMap[localName] =
+                            viewTransitionImportMap[localName] =
                                 scannedTables.viewTransitionHashTable[uniqueKey];
                         }
                         if (scannedTables.createHashTable[uniqueKey]) {
-                            importMap[localName] = scannedTables.createHashTable[uniqueKey];
+                            createImportMap[localName] =
+                                scannedTables.createHashTable[uniqueKey];
                         }
                         if (scannedTables.variantsHashTable[uniqueKey]) {
-                            importMap[localName] = scannedTables.variantsHashTable[uniqueKey];
+                            variantsImportMap[localName] =
+                                scannedTables.variantsHashTable[uniqueKey];
                         }
                         if (scannedTables.createThemeHashTable[uniqueKey]) {
                             createThemeImportMap[localName] =
@@ -161,43 +167,48 @@ async function loader(source) {
     const mergedKeyframesTable = {};
     for (const key of Object.keys(scannedTables.keyframesHashTable)) {
         mergedKeyframesTable[key] = scannedTables.keyframesHashTable[key];
-    }
-    for (const key of Object.keys(importMap)) {
-        const val = importMap[key];
-        if (typeof val === 'string') {
-            mergedKeyframesTable[key] = val;
+        if (key.startsWith(`${resourcePath}-`)) {
+            const varName = key.slice(resourcePath.length + 1);
+            mergedKeyframesTable[varName] = scannedTables.keyframesHashTable[key];
         }
     }
+    for (const key of Object.keys(keyframesImportMap)) {
+        mergedKeyframesTable[key] = keyframesImportMap[key];
+    }
     const mergedViewTransitionTable = {};
     for (const key of Object.keys(scannedTables.viewTransitionHashTable)) {
         mergedViewTransitionTable[key] = scannedTables.viewTransitionHashTable[key];
-    }
-    for (const key of Object.keys(importMap)) {
-        const val = importMap[key];
-        if (typeof val === 'string') {
-            mergedViewTransitionTable[key] = val;
+        if (key.startsWith(`${resourcePath}-`)) {
+            const varName = key.slice(resourcePath.length + 1);
+            mergedViewTransitionTable[varName] =
+                scannedTables.viewTransitionHashTable[key];
         }
     }
+    for (const key of Object.keys(viewTransitionImportMap)) {
+        mergedViewTransitionTable[key] = viewTransitionImportMap[key];
+    }
     const mergedCreateTable = {};
     for (const key of Object.keys(scannedTables.createHashTable)) {
         mergedCreateTable[key] = scannedTables.createHashTable[key];
-    }
-    for (const key of Object.keys(importMap)) {
-        const val = importMap[key];
-        if (typeof val === 'string') {
-            mergedCreateTable[key] = val;
+        if (key.startsWith(`${resourcePath}-`)) {
+            const varName = key.slice(resourcePath.length + 1);
+            mergedCreateTable[varName] = scannedTables.createHashTable[key];
         }
     }
+    for (const key of Object.keys(createImportMap)) {
+        mergedCreateTable[key] = createImportMap[key];
+    }
     const mergedVariantsTable = {};
     for (const key of Object.keys(scannedTables.variantsHashTable)) {
         mergedVariantsTable[key] = scannedTables.variantsHashTable[key];
-    }
-    for (const key of Object.keys(importMap)) {
-        const val = importMap[key];
-        if (typeof val === 'string') {
-            mergedVariantsTable[key] = val;
+        if (key.startsWith(`${resourcePath}-`)) {
+            const varName = key.slice(resourcePath.length + 1);
+            mergedVariantsTable[varName] = scannedTables.variantsHashTable[key];
         }
     }
+    for (const key of Object.keys(variantsImportMap)) {
+        mergedVariantsTable[key] = variantsImportMap[key];
+    }
     const mergedCreateThemeHashTable = {};
     for (const key of Object.keys(scannedTables.createThemeHashTable)) {
         mergedCreateThemeHashTable[key] = scannedTables.createThemeHashTable[key];

package/package.json

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