@gustcss/postcss 0.5.3 → 0.5.4

package/dist/index.cjs

@@ -141,18 +141,19 @@ const plugin = (opts = {}) => {
 	return {
 		postcssPlugin: "gustcss",
 		Once(root, { result }) {
-			let hasDirective = false;
+			let directiveAtRule = null;
 			root.walkAtRules("gustcss", (atRule) => {
-				hasDirective = true;
-				atRule.remove();
+				if (directiveAtRule === null) directiveAtRule = atRule;
+				else atRule.remove();
 			});
-			if (!hasDirective) return;
+			if (directiveAtRule === null) return;
 			const cwd = process.cwd();
 			const binaryPath = runner.resolveBinary({ cwd });
 			const resolvedConfigPath = runner.resolveConfig({
 				cwd,
 				configPath
 			});
+			const fromFile = root.source?.input?.file ?? result.opts?.from;
 			const run = (cfgPath) => {
 				const args = runner.buildArgs({
 					mode: "stdout",
@@ -160,7 +161,7 @@ const plugin = (opts = {}) => {
 					configPath: cfgPath
 				});
 				try {
-					const result = childProcess.spawnSync(binaryPath, args, {
+					const spawnResult = childProcess.spawnSync(binaryPath, args, {
 						cwd,
 						encoding: "utf-8",
 						stdio: [
@@ -169,10 +170,11 @@ const plugin = (opts = {}) => {
 							"pipe"
 						]
 					});
-					if (result.status !== 0) throw new Error(`gustcss build failed: ${result.stderr}`);
-					if (result.stderr) process.stderr.write(result.stderr);
-					const parsed = require("postcss").parse(result.stdout);
-					root.append(parsed);
+					if (spawnResult.status !== 0) throw new Error(`gustcss build failed: ${spawnResult.stderr}`);
+					if (spawnResult.stderr) process.stderr.write(spawnResult.stderr);
+					const parsed = require("postcss").parse(spawnResult.stdout, { from: fromFile });
+					if (directiveAtRule) directiveAtRule.replaceWith(parsed);
+					else root.append(parsed);
 				} catch (error) {
 					throw new Error(`gustcss build failed: ${error.message}`);
 				}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gustcss/postcss",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "PostCSS plugin for GustCSS",
   "main": "dist/index.cjs",
   "type": "commonjs",
@@ -21,7 +21,7 @@
     "access": "public"
   },
   "dependencies": {
-    "gustcss": "^0.5.3"
+    "gustcss": "^0.5.4"
   },
   "peerDependencies": {
     "postcss": "^8.0.0"