@plumeria/webpack-plugin 6.0.1 → 6.0.2

package/dist/index.js

@@ -14,22 +14,30 @@ if (process.env.NODE_ENV === 'production') {
     fs_1.default.writeFileSync(VIRTUAL_FILE_PATH, '/** Placeholder file */', 'utf-8');
 }
 function loader(source) {
-    const loaderContext = this;
     const callback = this.async();
     const isProduction = process.env.NODE_ENV === 'production';
     if (this.resourcePath.includes('node_modules') ||
         !source.includes('@plumeria/core')) {
         return callback(null, source);
     }
+    const fileStyles = {};
     this.clearDependencies();
     this.addDependency(this.resourcePath);
-    const scannedTables = (0, utils_1.scanAll)();
-    const fileStyles = {};
     const ast = (0, core_1.parseSync)(source, {
         syntax: 'typescript',
         tsx: true,
         target: 'es2022',
     });
+    for (const node of ast.body) {
+        if (node.type === 'ImportDeclaration') {
+            const sourcePath = node.source.value;
+            const actualPath = (0, utils_1.resolveImportPath)(sourcePath, this.resourcePath);
+            if (actualPath) {
+                this.addDependency(actualPath);
+            }
+        }
+    }
+    const scannedTables = (0, utils_1.scanAll)();
     const localConsts = (0, utils_1.collectLocalConsts)(ast);
     const resourcePath = this.resourcePath;
     const importMap = {};
@@ -38,7 +46,6 @@ function loader(source) {
             const sourcePath = node.source.value;
             const actualPath = (0, utils_1.resolveImportPath)(sourcePath, resourcePath);
             if (actualPath) {
-                loaderContext.addDependency(actualPath);
                 node.specifiers.forEach((specifier) => {
                     if (specifier.type === 'ImportSpecifier') {
                         const importedName = specifier.imported
@@ -119,6 +126,11 @@ function loader(source) {
     const localCreateStyles = {};
     const replacements = [];
     const extractedSheets = [];
+    const addSheet = (sheet) => {
+        if (!extractedSheets.includes(sheet)) {
+            extractedSheets.push(sheet);
+        }
+    };
     const processedDecls = new Set();
     const idSpans = new Set();
     const excludedSpans = new Set();
@@ -153,7 +165,7 @@ function loader(source) {
                         if (!isProduction) {
                             (0, utils_1.extractOndemandStyles)(style, extractedSheets, scannedTables);
                             records.forEach((r) => {
-                                extractedSheets.push(r.sheet);
+                                addSheet(r.sheet);
                             });
                         }
                         const atomMap = {};
@@ -314,7 +326,7 @@ function loader(source) {
                             const records = (0, utils_1.getStyleRecords)(key, style, 2);
                             if (!isProduction) {
                                 (0, utils_1.extractOndemandStyles)(style, extractedSheets, scannedTables);
-                                records.forEach((r) => extractedSheets.push(r.sheet));
+                                records.forEach((r) => addSheet(r.sheet));
                             }
                         }
                     });
@@ -348,7 +360,7 @@ function loader(source) {
                             const records = (0, utils_1.getStyleRecords)(propName, style, 2);
                             if (!isProduction) {
                                 (0, utils_1.extractOndemandStyles)(style, extractedSheets, scannedTables);
-                                records.forEach((r) => extractedSheets.push(r.sheet));
+                                records.forEach((r) => addSheet(r.sheet));
                             }
                             const atomMap = {};
                             records.forEach((r) => (atomMap[r.key] = r.hash));
@@ -561,7 +573,7 @@ function loader(source) {
                         const hash = (0, zss_engine_1.genBase36Hash)(baseStyle, 1, 8);
                         const records = (0, utils_1.getStyleRecords)(hash, baseStyle, 2);
                         if (!isProduction) {
-                            records.forEach((r) => extractedSheets.push(r.sheet));
+                            records.forEach((r) => addSheet(r.sheet));
                         }
                         const className = records.map((r) => r.hash).join(' ');
                         replacements.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plumeria/webpack-plugin",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "Plumeria Webpack plugin",
   "author": "Refirst 11",
   "license": "MIT",
@@ -22,7 +22,7 @@
     "zero-virtual.css"
   ],
   "dependencies": {
-    "@plumeria/utils": "^6.0.1"
+    "@plumeria/utils": "^6.0.2"
   },
   "devDependencies": {
     "@swc/core": "1.15.8",