@pandacss/config 0.0.0-dev-20230428204429 → 0.0.0-dev-20230503105030

package/dist/index.js

@@ -53,87 +53,18 @@ function findConfigFile({ cwd, file }) {
 
 // src/load-config.ts
 var import_error = require("@pandacss/error");
-var import_logger2 = require("@pandacss/logger");
-
-// src/bundle-require.ts
 var import_logger = require("@pandacss/logger");
-var import_fs2 = require("fs");
-var import_path3 = require("path");
-
-// src/bundle-config.ts
-var import_esbuild = require("esbuild");
-async function bundleConfigFile(fileName) {
-  const result = await (0, import_esbuild.build)({
-    absWorkingDir: process.cwd(),
-    entryPoints: [fileName],
-    outfile: "out.js",
-    write: false,
-    platform: "node",
-    bundle: true,
-    format: "cjs",
-    sourcemap: false,
-    metafile: true,
-    mainFields: ["module", "main"]
-  });
-  const { text } = result.outputFiles[0];
-  return {
-    code: text,
-    dependencies: result.metafile ? Object.keys(result.metafile.inputs) : []
-  };
-}
-
-// src/load-bundled.ts
-var import_fs = __toESM(require("fs"));
-var import_path2 = __toESM(require("path"));
-function loadBundledFile(fileName, code) {
-  const extension = import_path2.default.extname(fileName);
-  const realFileName = import_fs.default.realpathSync(fileName);
-  const loader = require.extensions[extension];
-  require.extensions[extension] = (mod, filename) => {
-    if (filename === realFileName) {
-      mod._compile(code, filename);
-    } else {
-      loader(mod, filename);
-    }
-  };
-  delete require.cache[require.resolve(fileName)];
-  const raw = require(fileName);
-  const config = raw.default ?? raw;
-  require.extensions[extension] = loader;
-  return config;
-}
-
-// src/bundle-require.ts
-async function bundleAndRequire(filepath, cwd) {
-  const filePath = require.resolve(filepath, { paths: [cwd] });
-  let config;
-  let dependencies;
-  const done = import_logger.logger.time.debug(`Bundling config file ${(0, import_logger.quote)((0, import_path3.relative)(cwd, filePath))}`);
-  try {
-    const realFileName = (0, import_fs2.realpathSync)(filePath);
-    dependencies = [realFileName];
-    delete require.cache[filePath];
-    const mod = require(realFileName);
-    config = mod.default ?? mod;
-  } catch {
-    const bundle = await bundleConfigFile(filePath);
-    dependencies = bundle.dependencies;
-    try {
-      config = await loadBundledFile(filePath, bundle.code);
-    } catch {
-      config = require("node-eval")(bundle.code).default;
-    }
-  }
-  done();
-  return {
-    config,
-    dependencies
-  };
-}
 
 // src/merge-config.ts
 var import_merge_anything = require("merge-anything");
 
+// src/bundle.ts
+var import_bundle_n_require = require("bundle-n-require");
+async function bundle(filePath, cwd) {
+  const { mod: config, dependencies } = await (0, import_bundle_n_require.bundleNRequire)(filePath, { cwd });
+  return { config, dependencies };
+}
+
 // src/utils.ts
 var isObject = (value) => {
   return Object.prototype.toString.call(value) === "[object Object]";
@@ -210,7 +141,7 @@ async function getResolvedConfig(config, cwd) {
   const configs2 = await Promise.all(
     presets.slice().reverse().map(async (preset) => {
       if (typeof preset === "string") {
-        const presetModule = await bundleAndRequire(preset, cwd);
+        const presetModule = await bundle(preset, cwd);
         return getResolvedConfig(presetModule.config, cwd);
       } else {
         return getResolvedConfig(preset, cwd);
@@ -228,8 +159,8 @@ async function loadConfigFile(options) {
   if (!filePath) {
     throw new import_error.ConfigNotFoundError();
   }
-  import_logger2.logger.debug("config:path", filePath);
-  const result = await bundleAndRequire(filePath, cwd);
+  import_logger.logger.debug("config:path", filePath);
+  const result = await bundle(filePath, cwd);
   if (typeof result.config !== "object") {
     throw new import_error.ConfigError(`\u{1F4A5} Config must export or return an object.`);
   }

package/dist/index.mjs

@@ -1,11 +1,3 @@
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined")
-    return require.apply(this, arguments);
-  throw new Error('Dynamic require of "' + x + '" is not supported');
-});
-
 // src/find-config.ts
 import findUp from "escalade/sync";
 import { resolve } from "path";
@@ -22,87 +14,18 @@ function findConfigFile({ cwd, file }) {
 
 // src/load-config.ts
 import { ConfigError, ConfigNotFoundError } from "@pandacss/error";
-import { logger as logger2 } from "@pandacss/logger";
-
-// src/bundle-require.ts
-import { logger, quote } from "@pandacss/logger";
-import { realpathSync } from "fs";
-import { relative } from "path";
-
-// src/bundle-config.ts
-import { build } from "esbuild";
-async function bundleConfigFile(fileName) {
-  const result = await build({
-    absWorkingDir: process.cwd(),
-    entryPoints: [fileName],
-    outfile: "out.js",
-    write: false,
-    platform: "node",
-    bundle: true,
-    format: "cjs",
-    sourcemap: false,
-    metafile: true,
-    mainFields: ["module", "main"]
-  });
-  const { text } = result.outputFiles[0];
-  return {
-    code: text,
-    dependencies: result.metafile ? Object.keys(result.metafile.inputs) : []
-  };
-}
-
-// src/load-bundled.ts
-import fs from "fs";
-import path from "path";
-function loadBundledFile(fileName, code) {
-  const extension = path.extname(fileName);
-  const realFileName = fs.realpathSync(fileName);
-  const loader = __require.extensions[extension];
-  __require.extensions[extension] = (mod, filename) => {
-    if (filename === realFileName) {
-      mod._compile(code, filename);
-    } else {
-      loader(mod, filename);
-    }
-  };
-  delete __require.cache[__require.resolve(fileName)];
-  const raw = __require(fileName);
-  const config = raw.default ?? raw;
-  __require.extensions[extension] = loader;
-  return config;
-}
-
-// src/bundle-require.ts
-async function bundleAndRequire(filepath, cwd) {
-  const filePath = __require.resolve(filepath, { paths: [cwd] });
-  let config;
-  let dependencies;
-  const done = logger.time.debug(`Bundling config file ${quote(relative(cwd, filePath))}`);
-  try {
-    const realFileName = realpathSync(filePath);
-    dependencies = [realFileName];
-    delete __require.cache[filePath];
-    const mod = __require(realFileName);
-    config = mod.default ?? mod;
-  } catch {
-    const bundle = await bundleConfigFile(filePath);
-    dependencies = bundle.dependencies;
-    try {
-      config = await loadBundledFile(filePath, bundle.code);
-    } catch {
-      config = __require("node-eval")(bundle.code).default;
-    }
-  }
-  done();
-  return {
-    config,
-    dependencies
-  };
-}
+import { logger } from "@pandacss/logger";
 
 // src/merge-config.ts
 import { mergeAndConcat } from "merge-anything";
 
+// src/bundle.ts
+import { bundleNRequire } from "bundle-n-require";
+async function bundle(filePath, cwd) {
+  const { mod: config, dependencies } = await bundleNRequire(filePath, { cwd });
+  return { config, dependencies };
+}
+
 // src/utils.ts
 var isObject = (value) => {
   return Object.prototype.toString.call(value) === "[object Object]";
@@ -179,7 +102,7 @@ async function getResolvedConfig(config, cwd) {
   const configs2 = await Promise.all(
     presets.slice().reverse().map(async (preset) => {
       if (typeof preset === "string") {
-        const presetModule = await bundleAndRequire(preset, cwd);
+        const presetModule = await bundle(preset, cwd);
         return getResolvedConfig(presetModule.config, cwd);
       } else {
         return getResolvedConfig(preset, cwd);
@@ -197,8 +120,8 @@ async function loadConfigFile(options) {
   if (!filePath) {
     throw new ConfigNotFoundError();
   }
-  logger2.debug("config:path", filePath);
-  const result = await bundleAndRequire(filePath, cwd);
+  logger.debug("config:path", filePath);
+  const result = await bundle(filePath, cwd);
   if (typeof result.config !== "object") {
     throw new ConfigError(`\u{1F4A5} Config must export or return an object.`);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pandacss/config",
-  "version": "0.0.0-dev-20230428204429",
+  "version": "0.0.0-dev-20230503105030",
   "description": "Find and load panda config",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -14,13 +14,12 @@
     "dist"
   ],
   "dependencies": {
+    "bundle-n-require": "^1.0.1",
     "merge-anything": "^5.1.4",
-    "esbuild": "0.17.18",
     "escalade": "3.1.1",
-    "node-eval": "2.0.0",
-    "@pandacss/logger": "0.0.0-dev-20230428204429",
-    "@pandacss/error": "0.0.0-dev-20230428204429",
-    "@pandacss/types": "0.0.0-dev-20230428204429"
+    "@pandacss/logger": "0.0.0-dev-20230503105030",
+    "@pandacss/error": "0.0.0-dev-20230503105030",
+    "@pandacss/types": "0.0.0-dev-20230503105030"
   },
   "scripts": {
     "build": "pnpm tsup src/index.ts --format=esm,cjs --shims --dts",