@plumeria/webpack-plugin 0.24.1 → 0.24.3

package/dist/create.js

@@ -13,37 +13,42 @@ function compileToSingleCSS(object) {
         (0, zss_engine_1.splitAtomicAndNested)(styleObj, flat, nonFlat);
         const overrideLonghand = (style) => {
             const props = Object.keys(style);
-            if (props.some((p) => p.startsWith('@'))) {
-                const finalStyle = { ...style };
-                for (const key of props) {
-                    if (key.startsWith('@')) {
-                        finalStyle[key] = overrideLonghand(style[key]);
-                    }
+            const propsToRemove = new Set();
+            const plainProps = [];
+            for (let i = 0; i < props.length; i++) {
+                if (!props[i].startsWith('@')) {
+                    plainProps.push({ key: props[i], index: i });
                 }
-                return finalStyle;
             }
-            const finalStyle = {};
-            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) {
-                    finalStyle[prop] = style[prop];
+            const shorthandsInStyle = {};
+            for (const { key, index } of plainProps) {
+                const kebab = (0, zss_engine_1.camelToKebabCase)(key);
+                if (zss_engine_1.SHORTHAND_PROPERTIES[kebab]) {
+                    shorthandsInStyle[kebab] = index;
                 }
-                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;
+            }
+            for (const { key, index } of plainProps) {
+                const kebab = (0, zss_engine_1.camelToKebabCase)(key);
+                if (!zss_engine_1.SHORTHAND_PROPERTIES[kebab]) {
+                    const longhands = zss_engine_1.LONG_TO_SHORT[kebab] || [];
+                    for (const shorthand of longhands) {
+                        if (shorthandsInStyle[shorthand] > index) {
+                            propsToRemove.add(key);
                             break;
                         }
                     }
-                    if (!isOverridden) {
-                        finalStyle[prop] = style[prop];
-                    }
+                }
+            }
+            const finalStyle = {};
+            for (const prop of props) {
+                if (propsToRemove.has(prop)) {
+                    continue;
+                }
+                if (prop.startsWith('@')) {
+                    finalStyle[prop] = overrideLonghand(style[prop]);
+                }
+                else {
+                    finalStyle[prop] = style[prop];
                 }
             }
             return finalStyle;
@@ -73,14 +78,10 @@ function compileToSingleCSS(object) {
             });
         });
         if (Object.keys(nonFlat).length > 0) {
-            const finalNonFlat = {};
-            Object.entries(nonFlat).forEach(([atRule, nestedObj]) => {
-                finalNonFlat[atRule] = overrideLonghand(nestedObj);
-            });
-            const nonFlatObj = { [key]: finalNonFlat };
+            const nonFlatObj = { [key]: nonFlat };
             const nonFlatHash = (0, zss_engine_1.genBase36Hash)(nonFlatObj, 1, 7);
             const { styleSheet } = (0, zss_engine_1.transpile)(nonFlatObj, nonFlatHash);
-            Object.entries(finalNonFlat).forEach(([atRule, nestedObj]) => {
+            Object.entries(nonFlat).forEach(([atRule, nestedObj]) => {
                 Object.entries(nestedObj).forEach(([prop]) => {
                     records.push({
                         key: atRule + prop,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/webpack-plugin",
-  "version": "0.24.1",
+  "version": "0.24.3",
   "description": "Plumeria Webpack plugin",
   "repository": {
     "type": "git",