@plumeria/webpack-plugin 0.22.3 → 0.23.0

package/dist/create.js

@@ -11,31 +11,44 @@ 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;
+        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]);
                     }
                 }
-                if (!isOverridden) {
-                    finalFlat[prop] = flat[prop];
+                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];
+                }
+                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) {
+                        finalStyle[prop] = style[prop];
+                    }
                 }
             }
-        }
+            return finalStyle;
+        };
+        const finalFlat = overrideLonghand(flat);
         const records = [];
         Object.entries(finalFlat).forEach(([prop, value]) => {
             const hashes = new Set();
@@ -60,10 +73,14 @@ function compileToSingleCSS(object) {
             });
         });
         if (Object.keys(nonFlat).length > 0) {
-            const nonFlatObj = { [key]: nonFlat };
+            const finalNonFlat = {};
+            Object.entries(nonFlat).forEach(([atRule, nestedObj]) => {
+                finalNonFlat[atRule] = overrideLonghand(nestedObj);
+            });
+            const nonFlatObj = { [key]: finalNonFlat };
             const nonFlatHash = (0, zss_engine_1.genBase36Hash)(nonFlatObj, 1, 7);
             const { styleSheet } = (0, zss_engine_1.transpile)(nonFlatObj, nonFlatHash);
-            Object.entries(nonFlat).forEach(([atRule, nestedObj]) => {
+            Object.entries(finalNonFlat).forEach(([atRule, nestedObj]) => {
                 Object.entries(nestedObj).forEach(([prop]) => {
                     records.push({
                         key: atRule + prop,

package/dist/virtual-css-loader.js

@@ -42,7 +42,6 @@ const t = __importStar(require("@babel/types"));
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const create_1 = require("./create");
-const glob_1 = require("@rust-gear/glob");
 const zss_engine_1 = require("zss-engine");
 const PROJECT_ROOT = process.cwd().split('node_modules')[0];
 const PATTERN_PATH = path_1.default.join(PROJECT_ROOT, '**/*.{js,jsx,ts,tsx}');
@@ -289,7 +288,7 @@ function resolveTokensTableMemberExpressionByNode(node, tokensTable) {
 function scanForKeyframes() {
     const keyframesHashTableLocal = {};
     const keyframesObjectTableLocal = {};
-    const files = (0, glob_1.globSync)(PATTERN_PATH, GLOB_OPTIONS);
+    const files = fs_1.default.globSync(PATTERN_PATH, GLOB_OPTIONS);
     for (const filePath of files) {
         if (!isCSSDefineFile(filePath, 'keyframes'))
             continue;
@@ -336,7 +335,7 @@ function scanForKeyframes() {
 function scanForViewTransition() {
     const viewTransitionHashTableLocal = {};
     const viewTransitionObjectTableLocal = {};
-    const files = (0, glob_1.globSync)(PATTERN_PATH, GLOB_OPTIONS);
+    const files = fs_1.default.globSync(PATTERN_PATH, GLOB_OPTIONS);
     for (const filePath of files) {
         if (!isCSSDefineFile(filePath, 'viewTransition'))
             continue;
@@ -384,7 +383,7 @@ function scanForViewTransition() {
 }
 function scanForDefineConsts() {
     const constTableLocal = {};
-    const files = (0, glob_1.globSync)(PATTERN_PATH, GLOB_OPTIONS);
+    const files = fs_1.default.globSync(PATTERN_PATH, GLOB_OPTIONS);
     for (const filePath of files) {
         if (!isCSSDefineFile(filePath, 'defineConsts'))
             continue;
@@ -426,7 +425,7 @@ function scanForDefineConsts() {
 function scanForDefineTokens() {
     const tokensTableLocal = {};
     const defineTokensObjectTableLocal = {};
-    const files = (0, glob_1.globSync)(PATTERN_PATH, GLOB_OPTIONS);
+    const files = fs_1.default.globSync(PATTERN_PATH, GLOB_OPTIONS);
     for (const filePath of files) {
         if (!isCSSDefineFile(filePath, 'defineTokens'))
             continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/webpack-plugin",
-  "version": "0.22.3",
+  "version": "0.23.0",
   "description": "Plumeria Webpack plugin",
   "repository": {
     "type": "git",
@@ -21,7 +21,6 @@
     "@babel/types": "^7.28.2"
   },
   "devDependencies": {
-    "@rust-gear/glob": "^0.2.2",
     "@types/babel__core": "^7.20.5",
     "webpack": "^5.101.0",
     "zss-engine": "^0.2.94"