@plumeria/webpack-plugin 1.0.4 → 2.0.1

package/dist/index.js

@@ -38,7 +38,7 @@ class PlumeriaPlugin {
             filePath,
             keyframeStyles: '',
             viewTransitionStyles: '',
-            tokenStyles: '',
+            themeStyles: '',
             baseStyles: '',
         };
         const updatedStyles = {
@@ -54,25 +54,25 @@ class PlumeriaPlugin {
         if (allStyles.length === 0) {
             return '';
         }
-        const sortedStyles = allStyles.sort((b, a) => (b.lastAccessed || 0) - (a.lastAccessed || 0));
+        const sortedStyles = allStyles.sort((a, b) => (b.lastAccessed || 0) - (a.lastAccessed || 0));
         const keyframeStylesSet = new Set();
         const viewTransitionStylesSet = new Set();
-        const tokenStylesSet = new Set();
+        const themeStylesSet = new Set();
         const baseStylesSet = new Set();
         for (const s of sortedStyles) {
             if (s.keyframeStyles?.trim().length > 0)
                 keyframeStylesSet.add(s.keyframeStyles);
             if (s.viewTransitionStyles?.trim().length > 0)
                 viewTransitionStylesSet.add(s.viewTransitionStyles);
-            if (s.tokenStyles?.trim().length > 0)
-                tokenStylesSet.add(s.tokenStyles);
+            if (s.themeStyles?.trim().length > 0)
+                themeStylesSet.add(s.themeStyles);
             if (s.baseStyles?.trim().length > 0)
                 baseStylesSet.add(s.baseStyles);
         }
         return [
             ...Array.from(keyframeStylesSet),
             ...Array.from(viewTransitionStylesSet),
-            ...Array.from(tokenStylesSet),
+            ...Array.from(themeStylesSet),
             ...Array.from(baseStylesSet),
         ]
             .filter(Boolean)

package/dist/virtual-css-loader.js

@@ -13,16 +13,16 @@ function loader(source) {
     const callback = this.async();
     this.clearDependencies();
     this.addDependency(this.resourcePath);
-    utils_1.tables.constTable = (0, utils_1.scanForDefineConsts)((path) => this.addDependency(path));
+    utils_1.tables.staticTable = (0, utils_1.scanForCreateStatic)((path) => this.addDependency(path));
     const { keyframesHashTableLocal, keyframesObjectTableLocal } = (0, utils_1.scanForKeyframes)((path) => this.addDependency(path));
     utils_1.tables.keyframesHashTable = keyframesHashTableLocal;
     utils_1.tables.keyframesObjectTable = keyframesObjectTableLocal;
     const { viewTransitionHashTableLocal, viewTransitionObjectTableLocal } = (0, utils_1.scanForViewTransition)((path) => this.addDependency(path));
     utils_1.tables.viewTransitionHashTable = viewTransitionHashTableLocal;
     utils_1.tables.viewTransitionObjectTable = viewTransitionObjectTableLocal;
-    const { tokensTableLocal, defineTokensObjectTableLocal } = (0, utils_1.scanForDefineTokens)((path) => this.addDependency(path));
-    utils_1.tables.tokensTable = tokensTableLocal;
-    utils_1.tables.defineTokensObjectTable = defineTokensObjectTableLocal;
+    const { themeTableLocal, createThemeObjectTableLocal } = (0, utils_1.scanForCreateTheme)((path) => this.addDependency(path));
+    utils_1.tables.themeTable = themeTableLocal;
+    utils_1.tables.createThemeObjectTable = createThemeObjectTableLocal;
     const extractedObjects = [];
     let ast;
     try {
@@ -38,7 +38,7 @@ function loader(source) {
         return;
     }
     const localConsts = (0, utils_1.collectLocalConsts)(ast);
-    Object.assign(utils_1.tables.constTable, localConsts);
+    Object.assign(utils_1.tables.staticTable, localConsts);
     let hasCssCreate = false;
     (0, utils_1.traverse)(ast, {
         CallExpression({ node }) {
@@ -51,7 +51,7 @@ function loader(source) {
                     args.length === 1 &&
                     utils_1.t.isObjectExpression(args[0].expression)) {
                     hasCssCreate = true;
-                    const obj = (0, utils_1.objectExpressionToObject)(args[0].expression, utils_1.tables.constTable, utils_1.tables.keyframesHashTable, utils_1.tables.viewTransitionHashTable, utils_1.tables.tokensTable);
+                    const obj = (0, utils_1.objectExpressionToObject)(args[0].expression, utils_1.tables.staticTable, utils_1.tables.keyframesHashTable, utils_1.tables.viewTransitionHashTable, utils_1.tables.themeTable);
                     if (obj) {
                         extractedObjects.push(obj);
                     }
@@ -83,9 +83,9 @@ function loader(source) {
         }, undefined, '--global').styleSheet)
             .join('\n');
     }
-    if (Object.keys(utils_1.tables.defineTokensObjectTable).length > 0) {
-        fileStyles.tokenStyles = Object.values(utils_1.tables.defineTokensObjectTable)
-            .map((obj) => (0, zss_engine_1.transpile)((0, utils_1.createTokens)(obj), undefined, '--global')
+    if (Object.keys(utils_1.tables.createThemeObjectTable).length > 0) {
+        fileStyles.themeStyles = Object.values(utils_1.tables.createThemeObjectTable)
+            .map((obj) => (0, zss_engine_1.transpile)((0, utils_1.createTheme)(obj), undefined, '--global')
             .styleSheet)
             .join('\n');
     }
@@ -131,9 +131,9 @@ function loader(source) {
             if (!css.includes(styles.viewTransitionStyles))
                 sections.push(styles.viewTransitionStyles);
         }
-        if (styles.tokenStyles?.trim()) {
-            if (!css.includes(styles.tokenStyles))
-                sections.push(styles.tokenStyles);
+        if (styles.themeStyles?.trim()) {
+            if (!css.includes(styles.themeStyles))
+                sections.push(styles.themeStyles);
         }
         if (styles.baseStyles?.trim()) {
             sections.push(styles.baseStyles);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/webpack-plugin",
-  "version": "1.0.4",
+  "version": "2.0.1",
   "description": "Plumeria Webpack plugin",
   "repository": {
     "type": "git",
@@ -16,12 +16,12 @@
     "zero-virtual.css"
   ],
   "dependencies": {
-    "@plumeria/utils": "^1.0.4"
+    "@plumeria/utils": "^2.0.1"
   },
   "devDependencies": {
     "@swc/core": "1.15.2",
     "webpack": "5.101.0",
-    "zss-engine": "1.0.0"
+    "zss-engine": "1.2.0"
   },
   "publishConfig": {
     "access": "public",