@plumeria/webpack-plugin 0.21.5 → 0.22.1

package/dist/create.js

@@ -11,8 +11,33 @@ function compileToSingleCSS(object) {
         const flat = {};
         const nonFlat = {};
         (0, zss_engine_1.splitAtomicAndNested)(styleObj, flat, nonFlat);
+        const props = Object.keys(flat);
+        const finalFlat = {};
+        for (let i = 0; i < props.length; i++) {
+            const prop = props[i];
+            const kebab = (0, zss_engine_1.camelToKebabCase)(prop);
+            const isShorthand = !!zss_engine_1.SHORTHAND_PROPERTIES[kebab];
+            if (isShorthand) {
+                finalFlat[prop] = flat[prop];
+            }
+            else {
+                let isOverridden = false;
+                const shorthands = zss_engine_1.LONG_TO_SHORT[kebab] || [];
+                for (let j = i + 1; j < props.length; j++) {
+                    const futureProp = props[j];
+                    const futureKebab = (0, zss_engine_1.camelToKebabCase)(futureProp);
+                    if (shorthands.includes(futureKebab)) {
+                        isOverridden = true;
+                        break;
+                    }
+                }
+                if (!isOverridden) {
+                    finalFlat[prop] = flat[prop];
+                }
+            }
+        }
         const records = [];
-        Object.entries(flat).forEach(([prop, value]) => {
+        Object.entries(finalFlat).forEach(([prop, value]) => {
             const hashes = new Set();
             const sheets = new Set();
             (0, zss_engine_1.processAtomicProps)({ [prop]: value }, hashes, sheets);
@@ -86,16 +111,17 @@ exports.createVars = createVars;
 const createTokens = (object) => {
     const styles = {};
     Object.entries(object).forEach(([key, value]) => {
+        const kebabKey = (0, zss_engine_1.camelToKebabCase)(key);
         Object.entries(value).forEach(([subKey, subValue]) => {
             if (subKey.startsWith('@media')) {
                 styles[':root'] ||= {};
                 styles[':root'][subKey] ||= {};
-                styles[':root'][subKey][`--${key}`] = subValue;
+                styles[':root'][subKey][`--${kebabKey}`] = subValue;
             }
             else {
                 const themeSelector = subKey === 'default' ? ':root' : `:root[data-theme="${subKey}"]`;
                 styles[themeSelector] ||= {};
-                styles[themeSelector][`--${key}`] = subValue;
+                styles[themeSelector][`--${kebabKey}`] = subValue;
             }
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/webpack-plugin",
-  "version": "0.21.5",
+  "version": "0.22.1",
   "description": "Plumeria Webpack plugin",
   "repository": {
     "type": "git",
@@ -24,7 +24,7 @@
     "@rust-gear/glob": "^0.2.2",
     "@types/babel__core": "^7.20.5",
     "webpack": "^5.101.0",
-    "zss-engine": "^0.2.90"
+    "zss-engine": "^0.2.94"
   },
   "publishConfig": {
     "access": "public"