ecij 0.4.0 → 0.4.1

package/dist/index.js

@@ -14,6 +14,7 @@ function hashText(text) {
 }
 function ecij({ include = JS_TS_FILE_REGEX, exclude = [NODE_MODULES_REGEX, D_TS_FILE_REGEX], classPrefix = "css-" } = {}) {
 	const parsedFileInfoCache = /* @__PURE__ */ new Map();
+	const stylesheetImportPerFile = /* @__PURE__ */ new Map();
 	const extractedCssPerFile = /* @__PURE__ */ new Map();
 	/**
 	* Parses a file and extracts all relevant information in a single pass
@@ -95,17 +96,18 @@ function ecij({ include = JS_TS_FILE_REGEX, exclude = [NODE_MODULES_REGEX, D_TS_
 		const { declarations, localIdentifiers, importedIdentifiers } = await parseFile(context, filePath, code);
 		const cssExtractions = [];
 		const replacements = [];
-		const modulesWithSideEffects = /* @__PURE__ */ new Set();
+		const stylesheetDependencies = /* @__PURE__ */ new Set();
 		async function resolveValue(identifierName) {
 			if (localIdentifiers.has(identifierName)) return localIdentifiers.get(identifierName);
 			if (importedIdentifiers.has(identifierName)) {
 				const { source, imported } = importedIdentifiers.get(identifierName);
 				const resolvedId = await context.resolve(source, filePath);
 				if (resolvedId != null) {
+					await context.load(resolvedId);
 					const { id } = resolvedId;
-					const { declarations, exportNameToValueMap } = await parseFile(context, id);
+					const { exportNameToValueMap } = await parseFile(context, id);
 					if (exportNameToValueMap.has(imported)) {
-						if (declarations.length !== 0) modulesWithSideEffects.add(id);
+						if (stylesheetImportPerFile.has(id)) stylesheetDependencies.add(stylesheetImportPerFile.get(id));
 						return exportNameToValueMap.get(imported);
 					}
 				}
@@ -157,7 +159,7 @@ function ecij({ include = JS_TS_FILE_REGEX, exclude = [NODE_MODULES_REGEX, D_TS_
 			transformedCode: code,
 			hasExtractions: false,
 			cssContent: "",
-			modulesWithSideEffects
+			stylesheetDependencies
 		};
 		replacements.sort((a, b) => b.start - a.start);
 		let transformedCode = code;
@@ -170,13 +172,14 @@ function ecij({ include = JS_TS_FILE_REGEX, exclude = [NODE_MODULES_REGEX, D_TS_
 			transformedCode,
 			hasExtractions: true,
 			cssContent,
-			modulesWithSideEffects
+			stylesheetDependencies
 		};
 	}
 	return {
 		name: "ecij",
 		buildEnd() {
 			parsedFileInfoCache.clear();
+			stylesheetImportPerFile.clear();
 			extractedCssPerFile.clear();
 		},
 		resolveId(id) {
@@ -197,14 +200,15 @@ function ecij({ include = JS_TS_FILE_REGEX, exclude = [NODE_MODULES_REGEX, D_TS_
 				if (!code.includes("ecij")) return null;
 				const queryIndex = id.indexOf("?");
 				const cleanId = queryIndex === -1 ? id : id.slice(0, queryIndex);
-				const { transformedCode, hasExtractions, cssContent, modulesWithSideEffects } = await extractCssFromCode(this, code, cleanId);
+				const { transformedCode, hasExtractions, cssContent, stylesheetDependencies } = await extractCssFromCode(this, code, cleanId);
 				if (!hasExtractions) return null;
 				if (cssContent === "") return transformedCode;
 				const cssModuleId = `${cleanId}.${hashText(cssContent)}.css`;
 				extractedCssPerFile.set(cssModuleId, cssContent);
+				stylesheetImportPerFile.set(id, cssModuleId);
 				const importStatements = [];
-				for (const id of modulesWithSideEffects) importStatements.push(`import ${JSON.stringify(id)};\n`);
-				importStatements.push(`import ${JSON.stringify(cssModuleId)}\n;`);
+				for (const id of stylesheetDependencies) importStatements.push(`import ${JSON.stringify(id)};\n`);
+				importStatements.push(`import ${JSON.stringify(cssModuleId)};\n`);
 				return `${importStatements.join("")}${transformedCode}`;
 			}
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ecij",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Rolldown and Vite plugin to Extract CSS-in-JS",
   "keywords": [
     "css-in-js"
@@ -44,7 +44,7 @@
     "@types/node": "^25.3.2",
     "@vitest/coverage-v8": "^4.0.18",
     "oxfmt": "^0.35.0",
-    "rolldown": "1.0.0-rc.5",
+    "rolldown": "^1.0.0-rc.6",
     "rolldown-plugin-dts": "^0.22.2",
     "typescript": "^5.9.3",
     "vite": "^8.0.0-beta.16",