@plumeria/webpack-plugin 0.22.1 → 0.22.2

package/dist/create.js

@@ -88,12 +88,6 @@ function compileToSingleCSS(object) {
     return [...baseSheets, ...querySheets].join('\n');
 }
 function createCSS(object) {
-    const result = {};
-    Object.entries(object).forEach(([key, styleObj]) => {
-        Object.defineProperty(result, key, {
-            get: () => Object.freeze(styleObj),
-        });
-    });
     const compiledCSS = compileToSingleCSS(object);
     return compiledCSS;
 }

package/dist/virtual-css-loader.js

@@ -241,7 +241,6 @@ function resolveKeyframesTableMemberExpression(node, keyframesHashTable) {
             return keyframesHashTable[node.object.name];
         }
     }
-    return undefined;
 }
 function resolveViewTransitionTableMemberExpression(node, viewTransitionHashTable) {
     if (t.isIdentifier(node)) {
@@ -252,27 +251,20 @@ function resolveViewTransitionTableMemberExpression(node, viewTransitionHashTabl
             return viewTransitionHashTable[node.object.name];
         }
     }
-    return undefined;
 }
 function resolveConstTableMemberExpression(node, constTable) {
     if (t.isIdentifier(node.object) && t.isIdentifier(node.property)) {
         const varName = node.object.name;
         const key = node.property.name;
         const tableValue = constTable[varName];
-        if (typeof tableValue === 'string') {
-            return tableValue;
-        }
         if (tableValue && typeof tableValue === 'object' && key in tableValue) {
             return tableValue[key];
         }
     }
     return undefined;
 }
-function resolveTokensTableMemberExpressionByNode(node, tokensTable, asObject = false) {
+function resolveTokensTableMemberExpressionByNode(node, tokensTable) {
     if (t.isIdentifier(node)) {
-        if (asObject && typeof tokensTable[node.name] === 'object') {
-            return { ...tokensTable[node.name] };
-        }
         const cssVarName = (0, zss_engine_1.camelToKebabCase)(node.name);
         return `var(--${cssVarName})`;
     }
@@ -288,20 +280,18 @@ function resolveTokensTableMemberExpressionByNode(node, tokensTable, asObject =
         if (key &&
             tokensTable[varName] &&
             tokensTable[varName][key] !== undefined) {
-            if (asObject) {
-                return { [key]: tokensTable[varName][key] };
-            }
             const cssVarName = (0, zss_engine_1.camelToKebabCase)(key);
             return `var(--${cssVarName})`;
         }
     }
     return undefined;
 }
-function scanForDefineConsts() {
-    const constTableLocal = {};
+function scanForKeyframes() {
+    const keyframesHashTableLocal = {};
+    const keyframesObjectTableLocal = {};
     const files = (0, glob_1.globSync)(PATTERN_PATH, GLOB_OPTIONS);
     for (const filePath of files) {
-        if (!isCSSDefineFile(filePath, 'defineConsts'))
+        if (!isCSSDefineFile(filePath, 'keyframes'))
             continue;
         this.addDependency(filePath);
         const source = fs_1.default.readFileSync(filePath, 'utf8');
@@ -311,9 +301,7 @@ function scanForDefineConsts() {
                 ['@babel/preset-typescript', { isTSX: true, allExtensions: true }],
             ],
         });
-        if (!ast)
-            continue;
-        for (const node of ast.program.body) {
+        for (const node of ast?.program.body) {
             let declarations = [];
             if (t.isVariableDeclaration(node)) {
                 declarations = node.declarations;
@@ -329,23 +317,28 @@ function scanForDefineConsts() {
                     t.isCallExpression(decl.init) &&
                     t.isMemberExpression(decl.init.callee) &&
                     t.isIdentifier(decl.init.callee.object, { name: 'css' }) &&
-                    t.isIdentifier(decl.init.callee.property, { name: 'defineConsts' }) &&
+                    t.isIdentifier(decl.init.callee.property, { name: 'keyframes' }) &&
                     t.isObjectExpression(decl.init.arguments[0])) {
                     const varName = decl.id.name;
-                    const obj = objectExpressionToObject(decl.init.arguments[0], constTableLocal, keyframesHashTable, viewTransitionHashTable, tokensTable);
-                    constTableLocal[varName] = obj;
+                    const obj = objectExpressionToObject(decl.init.arguments[0], constTable, keyframesHashTableLocal, viewTransitionHashTable, tokensTable);
+                    const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
+                    keyframesHashTableLocal[varName] = hash;
+                    keyframesObjectTableLocal[hash] = obj;
                 }
             }
         }
     }
-    return constTableLocal;
+    return {
+        keyframesHashTableLocal,
+        keyframesObjectTableLocal,
+    };
 }
-function scanForKeyframes() {
-    const keyframesHashTableLocal = {};
-    const keyframesObjectTableLocal = {};
+function scanForViewTransition() {
+    const viewTransitionHashTableLocal = {};
+    const viewTransitionObjectTableLocal = {};
     const files = (0, glob_1.globSync)(PATTERN_PATH, GLOB_OPTIONS);
     for (const filePath of files) {
-        if (!isCSSDefineFile(filePath, 'keyframes'))
+        if (!isCSSDefineFile(filePath, 'viewTransition'))
             continue;
         this.addDependency(filePath);
         const source = fs_1.default.readFileSync(filePath, 'utf8');
@@ -355,9 +348,7 @@ function scanForKeyframes() {
                 ['@babel/preset-typescript', { isTSX: true, allExtensions: true }],
             ],
         });
-        if (!ast)
-            continue;
-        for (const node of ast.program.body) {
+        for (const node of ast?.program.body) {
             let declarations = [];
             if (t.isVariableDeclaration(node)) {
                 declarations = node.declarations;
@@ -373,28 +364,29 @@ function scanForKeyframes() {
                     t.isCallExpression(decl.init) &&
                     t.isMemberExpression(decl.init.callee) &&
                     t.isIdentifier(decl.init.callee.object, { name: 'css' }) &&
-                    t.isIdentifier(decl.init.callee.property, { name: 'keyframes' }) &&
+                    t.isIdentifier(decl.init.callee.property, {
+                        name: 'viewTransition',
+                    }) &&
                     t.isObjectExpression(decl.init.arguments[0])) {
                     const varName = decl.id.name;
-                    const obj = objectExpressionToObject(decl.init.arguments[0], constTable, keyframesHashTableLocal, viewTransitionHashTable, tokensTable);
+                    const obj = objectExpressionToObject(decl.init.arguments[0], constTable, keyframesHashTable, viewTransitionHashTableLocal, tokensTable);
                     const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
-                    keyframesHashTableLocal[varName] = hash;
-                    keyframesObjectTableLocal[hash] = obj;
+                    viewTransitionHashTableLocal[varName] = hash;
+                    viewTransitionObjectTableLocal[hash] = obj;
                 }
             }
         }
     }
     return {
-        keyframesHashTableLocal,
-        keyframesObjectTableLocal,
+        viewTransitionHashTableLocal,
+        viewTransitionObjectTableLocal,
     };
 }
-function scanForDefineTokens() {
-    const tokensTableLocal = {};
-    const defineTokensObjectTableLocal = {};
+function scanForDefineConsts() {
+    const constTableLocal = {};
     const files = (0, glob_1.globSync)(PATTERN_PATH, GLOB_OPTIONS);
     for (const filePath of files) {
-        if (!isCSSDefineFile(filePath, 'defineTokens'))
+        if (!isCSSDefineFile(filePath, 'defineConsts'))
             continue;
         this.addDependency(filePath);
         const source = fs_1.default.readFileSync(filePath, 'utf8');
@@ -404,9 +396,7 @@ function scanForDefineTokens() {
                 ['@babel/preset-typescript', { isTSX: true, allExtensions: true }],
             ],
         });
-        if (!ast)
-            continue;
-        for (const node of ast.program.body) {
+        for (const node of ast?.program.body) {
             let declarations = [];
             if (t.isVariableDeclaration(node)) {
                 declarations = node.declarations;
@@ -422,24 +412,23 @@ function scanForDefineTokens() {
                     t.isCallExpression(decl.init) &&
                     t.isMemberExpression(decl.init.callee) &&
                     t.isIdentifier(decl.init.callee.object, { name: 'css' }) &&
-                    t.isIdentifier(decl.init.callee.property, { name: 'defineTokens' }) &&
+                    t.isIdentifier(decl.init.callee.property, { name: 'defineConsts' }) &&
                     t.isObjectExpression(decl.init.arguments[0])) {
                     const varName = decl.id.name;
-                    const obj = objectExpressionToObject(decl.init.arguments[0], constTable, keyframesHashTable, viewTransitionHashTable, tokensTableLocal);
-                    tokensTableLocal[varName] = obj;
-                    defineTokensObjectTableLocal[varName] = obj;
+                    const obj = objectExpressionToObject(decl.init.arguments[0], constTableLocal, keyframesHashTable, viewTransitionHashTable, tokensTable);
+                    constTableLocal[varName] = obj;
                 }
             }
         }
     }
-    return { tokensTableLocal, defineTokensObjectTableLocal };
+    return constTableLocal;
 }
-function scanForViewTransition() {
-    const viewTransitionHashTableLocal = {};
-    const viewTransitionObjectTableLocal = {};
+function scanForDefineTokens() {
+    const tokensTableLocal = {};
+    const defineTokensObjectTableLocal = {};
     const files = (0, glob_1.globSync)(PATTERN_PATH, GLOB_OPTIONS);
     for (const filePath of files) {
-        if (!isCSSDefineFile(filePath, 'viewTransition'))
+        if (!isCSSDefineFile(filePath, 'defineTokens'))
             continue;
         this.addDependency(filePath);
         const source = fs_1.default.readFileSync(filePath, 'utf8');
@@ -449,9 +438,7 @@ function scanForViewTransition() {
                 ['@babel/preset-typescript', { isTSX: true, allExtensions: true }],
             ],
         });
-        if (!ast)
-            continue;
-        for (const node of ast.program.body) {
+        for (const node of ast?.program.body) {
             let declarations = [];
             if (t.isVariableDeclaration(node)) {
                 declarations = node.declarations;
@@ -467,23 +454,17 @@ function scanForViewTransition() {
                     t.isCallExpression(decl.init) &&
                     t.isMemberExpression(decl.init.callee) &&
                     t.isIdentifier(decl.init.callee.object, { name: 'css' }) &&
-                    t.isIdentifier(decl.init.callee.property, {
-                        name: 'viewTransition',
-                    }) &&
+                    t.isIdentifier(decl.init.callee.property, { name: 'defineTokens' }) &&
                     t.isObjectExpression(decl.init.arguments[0])) {
                     const varName = decl.id.name;
-                    const obj = objectExpressionToObject(decl.init.arguments[0], constTable, keyframesHashTable, viewTransitionHashTableLocal, tokensTable);
-                    const hash = (0, zss_engine_1.genBase36Hash)(obj, 1, 8);
-                    viewTransitionHashTableLocal[varName] = hash;
-                    viewTransitionObjectTableLocal[hash] = obj;
+                    const obj = objectExpressionToObject(decl.init.arguments[0], constTable, keyframesHashTable, viewTransitionHashTable, tokensTableLocal);
+                    tokensTableLocal[varName] = obj;
+                    defineTokensObjectTableLocal[varName] = obj;
                 }
             }
         }
     }
-    return {
-        viewTransitionHashTableLocal,
-        viewTransitionObjectTableLocal,
-    };
+    return { tokensTableLocal, defineTokensObjectTableLocal };
 }
 function isCSSDefineFile(filePath, target) {
     if (fs_1.default.statSync(filePath).isDirectory())
@@ -502,8 +483,6 @@ function isCSSDefineFile(filePath, target) {
         console.log(err);
         return false;
     }
-    if (!ast)
-        return false;
     let found = false;
     (0, core_1.traverse)(ast, {
         CallExpression(path) {
@@ -554,10 +533,6 @@ function loader(source) {
         callback(null, source);
         return;
     }
-    if (!ast) {
-        callback(null, source);
-        return;
-    }
     const localConsts = collectLocalConsts(ast);
     Object.assign(constTable, localConsts);
     const pluginAst = {

package/package.json

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