@pandacss/node 0.0.0-dev-20221222091824 → 0.0.0-dev-20221228072806

package/dist/index.js

@@ -1816,7 +1816,7 @@ function createContext(conf, io = fileSystem) {
     async write(file, css2) {
       const fileName = chunks.format(file);
       const oldCss = await chunks.readFile(file);
-      const newCss = (0, import_core3.discardDuplicate)([oldCss.trim(), css2.trim()].filter(Boolean).join("\n\n"));
+      const newCss = (0, import_core3.mergeCss)(oldCss, css2);
       import_logger4.logger.debug({ type: "chunk:write", file, path: fileName });
       return write(paths.chunk, [{ file: fileName, code: newCss }]);
     },
@@ -2098,7 +2098,7 @@ var Builder = class {
   configChanged = true;
   updateFile(file, css2) {
     const oldCss = this.fileCssMap?.get(file) ?? "";
-    const newCss = (0, import_core4.discardDuplicate)([oldCss, css2].join("\n\n"));
+    const newCss = (0, import_core4.mergeCss)(oldCss, css2);
     this.fileCssMap?.set(file, newCss);
   }
   async setup() {
@@ -2255,15 +2255,10 @@ async function createAssetWatcher(ctx, callback) {
 }
 process.setMaxListeners(Infinity);
 async function watch(ctx, options) {
-  const chunkDirWatcher = await createAssetWatcher(ctx, options.onAssetChange);
-  const contentWatcher = await createContentWatcher(ctx, options.onContentChange);
+  await createAssetWatcher(ctx, options.onAssetChange);
+  await createContentWatcher(ctx, options.onContentChange);
   const configWatcher = await createConfigWatcher(ctx.conf);
-  async function close() {
-    await chunkDirWatcher.close();
-    await contentWatcher.close();
-  }
   configWatcher.on("change", async () => {
-    await close();
     import_logger7.logger.info("Config changed, restarting...");
     await options.onConfigChange();
   });

package/dist/index.mjs

@@ -1,5 +1,5 @@
 // src/index.ts
-import { discardDuplicate as discardDuplicate3 } from "@pandacss/core";
+import { discardDuplicate as discardDuplicate2 } from "@pandacss/core";
 
 // src/chunks.ts
 import { Stylesheet } from "@pandacss/core";
@@ -1550,7 +1550,7 @@ function getBaseCss(ctx) {
 }
 
 // src/builder.ts
-import { discardDuplicate as discardDuplicate2, Stylesheet as Stylesheet3 } from "@pandacss/core";
+import { discardDuplicate, mergeCss as mergeCss2, Stylesheet as Stylesheet3 } from "@pandacss/core";
 import { ConfigNotFoundError } from "@pandacss/error";
 import { logger as logger5 } from "@pandacss/logger";
 import { toHash } from "@pandacss/shared";
@@ -1566,8 +1566,8 @@ import { lookItUpSync } from "look-it-up";
 import {
   assignCompositions,
   Conditions,
-  discardDuplicate,
   getStaticCss as getStaticCssCore,
+  mergeCss,
   Stylesheet as Stylesheet2,
   Utility
 } from "@pandacss/core";
@@ -1777,7 +1777,7 @@ function createContext(conf, io = fileSystem) {
     async write(file, css2) {
       const fileName = chunks.format(file);
       const oldCss = await chunks.readFile(file);
-      const newCss = discardDuplicate([oldCss.trim(), css2.trim()].filter(Boolean).join("\n\n"));
+      const newCss = mergeCss(oldCss, css2);
       logger4.debug({ type: "chunk:write", file, path: fileName });
       return write(paths.chunk, [{ file: fileName, code: newCss }]);
     },
@@ -2059,7 +2059,7 @@ var Builder = class {
   configChanged = true;
   updateFile(file, css2) {
     const oldCss = this.fileCssMap?.get(file) ?? "";
-    const newCss = discardDuplicate2([oldCss, css2].join("\n\n"));
+    const newCss = mergeCss2(oldCss, css2);
     this.fileCssMap?.set(file, newCss);
   }
   async setup() {
@@ -2115,7 +2115,7 @@ var Builder = class {
     const rootCssContent = root.toString();
     root.removeAll();
     root.append(
-      discardDuplicate2(`
+      discardDuplicate(`
     ${rootCssContent}
     ${this.toString()}
     `)
@@ -2216,15 +2216,10 @@ async function createAssetWatcher(ctx, callback) {
 }
 process.setMaxListeners(Infinity);
 async function watch(ctx, options) {
-  const chunkDirWatcher = await createAssetWatcher(ctx, options.onAssetChange);
-  const contentWatcher = await createContentWatcher(ctx, options.onContentChange);
+  await createAssetWatcher(ctx, options.onAssetChange);
+  await createContentWatcher(ctx, options.onContentChange);
   const configWatcher = await createConfigWatcher(ctx.conf);
-  async function close() {
-    await chunkDirWatcher.close();
-    await contentWatcher.close();
-  }
   configWatcher.on("change", async () => {
-    await close();
     logger7.info("Config changed, restarting...");
     await options.onConfigChange();
   });
@@ -2336,7 +2331,7 @@ async function setupPostcss(cwd) {
 export {
   Builder,
   createContext,
-  discardDuplicate3 as discardDuplicate,
+  discardDuplicate2 as discardDuplicate,
   emitAndExtract,
   emitArtifacts,
   execCommand,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pandacss/node",
-  "version": "0.0.0-dev-20221222091824",
+  "version": "0.0.0-dev-20221228072806",
   "description": "The core css panda library",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -30,15 +30,15 @@
     "telejson": "7.0.4",
     "ts-pattern": "4.0.6",
     "ts-morph": "17.0.1",
-    "@pandacss/types": "0.0.0-dev-20221222091824",
-    "@pandacss/is-valid-prop": "0.0.0-dev-20221222091824",
-    "@pandacss/error": "0.0.0-dev-20221222091824",
-    "@pandacss/parser": "0.0.0-dev-20221222091824",
-    "@pandacss/shared": "0.0.0-dev-20221222091824",
-    "@pandacss/token-dictionary": "0.0.0-dev-20221222091824",
-    "@pandacss/logger": "0.0.0-dev-20221222091824",
-    "@pandacss/core": "0.0.0-dev-20221222091824",
-    "@pandacss/config": "0.0.0-dev-20221222091824"
+    "@pandacss/types": "0.0.0-dev-20221228072806",
+    "@pandacss/is-valid-prop": "0.0.0-dev-20221228072806",
+    "@pandacss/error": "0.0.0-dev-20221228072806",
+    "@pandacss/parser": "0.0.0-dev-20221228072806",
+    "@pandacss/shared": "0.0.0-dev-20221228072806",
+    "@pandacss/token-dictionary": "0.0.0-dev-20221228072806",
+    "@pandacss/logger": "0.0.0-dev-20221228072806",
+    "@pandacss/core": "0.0.0-dev-20221228072806",
+    "@pandacss/config": "0.0.0-dev-20221228072806"
   },
   "devDependencies": {
     "@types/fs-extra": "9.0.13",
@@ -46,7 +46,7 @@
     "@types/glob-parent": "^5.1.1",
     "@types/pluralize": "0.0.29",
     "@types/lodash.merge": "4.6.7",
-    "@pandacss/fixture": "0.0.0-dev-20221222091824"
+    "@pandacss/fixture": "0.0.0-dev-20221228072806"
   },
   "scripts": {
     "build": "tsup src/index.ts --format=cjs,esm --shims --dts",