@plumeria/webpack-plugin 0.15.1 → 0.15.2

package/dist/index.d.ts

@@ -1,11 +1,12 @@
 import type { Compiler } from 'webpack';
+import { CSSObject } from './types';
 export declare class PlumeriaPlugin {
     private outputFileName;
     private stylesByFile;
     private outFile;
     constructor(outputFileName?: string);
     apply(compiler: Compiler): void;
-    registerFileStyles(filePath: string, styles: Partial<any>): void;
+    registerFileStyles(filePath: string, styles: CSSObject): void;
     private generateOrderedCSS;
     private writeCSS;
 }

package/dist/index.js

@@ -16,8 +16,11 @@ class PlumeriaPlugin {
     }
     apply(compiler) {
         this.outFile = path_1.default.resolve(__dirname, '..', this.outputFileName);
-        compiler.hooks.compile.tap(PLUGIN_NAME, () => {
-            this.stylesByFile.clear();
+        compiler.hooks.invalid.tap(PLUGIN_NAME, (filename) => {
+            if (filename) {
+                const absPath = path_1.default.resolve(filename);
+                this.stylesByFile.delete(absPath);
+            }
         });
         compiler.hooks.normalModuleFactory.tap(PLUGIN_NAME, (nmf) => {
             nmf.hooks.createModule.tap(PLUGIN_NAME, (createData) => {
@@ -30,7 +33,8 @@ class PlumeriaPlugin {
         });
     }
     registerFileStyles(filePath, styles) {
-        const prev = this.stylesByFile.get(filePath) || {
+        const absPath = path_1.default.resolve(filePath);
+        const prev = this.stylesByFile.get(absPath) || {
             filePath,
             globalStyles: '',
             keyframeStyles: '',
@@ -38,7 +42,7 @@ class PlumeriaPlugin {
             themeStyles: '',
             baseStyles: '',
         };
-        this.stylesByFile.set(filePath, { ...prev, ...styles });
+        this.stylesByFile.set(absPath, { ...prev, ...styles });
         this.writeCSS();
     }
     generateOrderedCSS() {
@@ -49,15 +53,15 @@ class PlumeriaPlugin {
         const themeStylesSet = new Set();
         const baseStylesSet = new Set();
         for (const s of allStyles) {
-            if (s.globalStyles)
+            if (s.globalStyles.trim().length > 0)
                 globalStylesSet.add(s.globalStyles);
-            if (s.keyframeStyles)
+            if (s.keyframeStyles.trim().length > 0)
                 keyframeStylesSet.add(s.keyframeStyles);
-            if (s.varStyles)
+            if (s.varStyles.trim().length > 0)
                 varStylesSet.add(s.varStyles);
-            if (s.themeStyles)
+            if (s.themeStyles.trim().length > 0)
                 themeStylesSet.add(s.themeStyles);
-            if (s.baseStyles)
+            if (s.baseStyles.trim().length > 0)
                 baseStylesSet.add(s.baseStyles);
         }
         return [
@@ -72,10 +76,8 @@ class PlumeriaPlugin {
     }
     writeCSS() {
         const css = this.generateOrderedCSS();
-        if (css.trim().length > 0) {
-            fs_1.default.mkdirSync(path_1.default.dirname(this.outFile), { recursive: true });
-            fs_1.default.writeFileSync(this.outFile, css, 'utf-8');
-        }
+        fs_1.default.mkdirSync(path_1.default.dirname(this.outFile), { recursive: true });
+        fs_1.default.writeFileSync(this.outFile, css, 'utf-8');
     }
 }
 exports.PlumeriaPlugin = PlumeriaPlugin;

package/dist/virtual-css-loader.js

@@ -343,12 +343,10 @@ function scanForDefineConsts() {
             for (const decl of declarations) {
                 if (t.isVariableDeclarator(decl) &&
                     t.isIdentifier(decl.id) &&
-                    decl.init &&
                     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' }) &&
-                    decl.init.arguments.length === 1 &&
                     t.isObjectExpression(decl.init.arguments[0])) {
                     const varName = decl.id.name;
                     const obj = objectExpressionToObject(decl.init.arguments[0], constTableLocal, keyframesHashTable, variableTable, themeTable);
@@ -389,12 +387,10 @@ function scanForKeyframes() {
             for (const decl of declarations) {
                 if (t.isVariableDeclarator(decl) &&
                     t.isIdentifier(decl.id) &&
-                    decl.init &&
                     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' }) &&
-                    decl.init.arguments.length === 1 &&
                     t.isObjectExpression(decl.init.arguments[0])) {
                     const varName = decl.id.name;
                     const obj = objectExpressionToObject(decl.init.arguments[0], constTable, keyframesHashTableLocal, variableTable, themeTable);
@@ -440,12 +436,10 @@ function scanForDefineVars() {
             for (const decl of declarations) {
                 if (t.isVariableDeclarator(decl) &&
                     t.isIdentifier(decl.id) &&
-                    decl.init &&
                     t.isCallExpression(decl.init) &&
                     t.isMemberExpression(decl.init.callee) &&
                     t.isIdentifier(decl.init.callee.object, { name: 'css' }) &&
                     t.isIdentifier(decl.init.callee.property, { name: 'defineVars' }) &&
-                    decl.init.arguments.length === 1 &&
                     t.isObjectExpression(decl.init.arguments[0])) {
                     const varName = decl.id.name;
                     const obj = objectExpressionToObject(decl.init.arguments[0], constTable, keyframesHashTable, variableTableLocal, themeTable);
@@ -487,12 +481,10 @@ function scanForDefineTheme() {
             for (const decl of declarations) {
                 if (t.isVariableDeclarator(decl) &&
                     t.isIdentifier(decl.id) &&
-                    decl.init &&
                     t.isCallExpression(decl.init) &&
                     t.isMemberExpression(decl.init.callee) &&
                     t.isIdentifier(decl.init.callee.object, { name: 'css' }) &&
                     t.isIdentifier(decl.init.callee.property, { name: 'defineTheme' }) &&
-                    decl.init.arguments.length === 1 &&
                     t.isObjectExpression(decl.init.arguments[0])) {
                     const varName = decl.id.name;
                     const obj = objectExpressionToObject(decl.init.arguments[0], constTable, keyframesHashTable, variableTable, themeTableLocal);
@@ -514,7 +506,6 @@ function isCSSDefineFile(filePath, target) {
             sourceType: 'module',
             presets: [
                 ['@babel/preset-typescript', { isTSX: true, allExtensions: true }],
-                '@babel/preset-react',
             ],
         });
     }
@@ -541,12 +532,9 @@ function isCSSDefineFile(filePath, target) {
     return found;
 }
 function loader(source) {
-    const callback = this.async();
+    this.clearDependencies();
     this.addDependency(this.resourcePath);
-    const files = (0, glob_1.globSync)(PATTERN_PATH, GLOB_OPTIONS);
-    for (const file of files) {
-        this.addDependency(file);
-    }
+    const callback = this.async();
     constTable = scanForDefineConsts.call(this);
     const { keyframesHashTableLocal, keyframesObjectTableLocal } = scanForKeyframes.call(this);
     keyframesHashTable = keyframesHashTableLocal;
@@ -565,7 +553,6 @@ function loader(source) {
             sourceType: 'module',
             presets: [
                 ['@babel/preset-typescript', { isTSX: true, allExtensions: true }],
-                '@babel/preset-react',
             ],
         });
     }
@@ -651,14 +638,16 @@ function loader(source) {
     const virtualCssRequest = stringifyRequest(this, `${VIRTUAL_CSS_PATH}?${urlParams.toString()}`);
     const postfix = `\nimport ${virtualCssRequest};`;
     const pluginInstance = this._compiler?.options?.plugins.find((p) => p?.constructor?.name === 'PlumeriaPlugin');
+    const fileKey = this.resourcePath;
     if (pluginInstance) {
-        if (!pluginInstance.__plumeriaRegistered) {
-            pluginInstance.__plumeriaRegistered = new Set();
+        if (!pluginInstance?.__plumeriaRegistered) {
+            pluginInstance.__plumeriaRegistered = new Map();
         }
         const cache = pluginInstance.__plumeriaRegistered;
-        if (!cache.has(virtualCssRequest)) {
-            cache.add(virtualCssRequest);
-            pluginInstance?.registerFileStyles(virtualCssRequest, fileStyles);
+        const previousRequest = cache.get(fileKey);
+        if (previousRequest !== virtualCssRequest) {
+            cache.set(fileKey, virtualCssRequest);
+            pluginInstance.registerFileStyles(fileKey, fileStyles);
         }
     }
     if (callback)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/webpack-plugin",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "description": "Plumeria Webpack plugin",
   "repository": {
     "type": "git",
@@ -17,7 +17,6 @@
   ],
   "dependencies": {
     "@babel/core": "^7.28.0",
-    "@babel/preset-react": "^7.27.1",
     "@babel/preset-typescript": "^7.27.1",
     "@babel/types": "^7.28.2"
   },