@farm.js/core 0.1.0-beta.43 → 0.1.0-beta.45

package/dist/docs.mjs

@@ -11,9 +11,9 @@ import {
   isFarmDocsRequest,
   loadFarmDocsPage,
   resolveFarmDocsContentDir
-} from "./chunk-U5DLXOFP.mjs";
+} from "./chunk-XR7M5VXU.mjs";
 import "./chunk-V7RBCSDJ.mjs";
-import "./chunk-LFCB4XH7.mjs";
+import "./chunk-EHUGMAWL.mjs";
 import "./chunk-UVCIEUJC.mjs";
 import "./chunk-RQ633A5I.mjs";
 import "./chunk-USLFXFFH.mjs";
@@ -21,7 +21,7 @@ import "./chunk-E257KFBU.mjs";
 import "./chunk-7MABZJIM.mjs";
 import "./chunk-H3A35IQ2.mjs";
 import "./chunk-BNTDKO7T.mjs";
-import "./chunk-74YTBPTY.mjs";
+import "./chunk-YKAUAZA4.mjs";
 import "./chunk-7ZVN3YZI.mjs";
 import "./chunk-GY2STC2S.mjs";
 import "./chunk-A5VG2BDG.mjs";

package/dist/index.cjs

@@ -6274,6 +6274,7 @@ var init_image_config = __esm({
 // src/layers.ts
 var layers_exports = {};
 __export(layers_exports, {
+  createFarmConfigResolutionPlugin: () => createFarmConfigResolutionPlugin,
   getFarmAppDirectories: () => getFarmAppDirectories,
   getFarmLayerAliases: () => getFarmLayerAliases,
   getFarmSourceRoots: () => getFarmSourceRoots,
@@ -6375,11 +6376,66 @@ function getFarmLayerAliases(layers) {
     (layers ?? []).map((layer) => [`#layers/${layer.name}`, import_node_path2.default.join(layer.root, layer.srcDir)])
   );
 }
+function toExternalSpecifier(resolvedPath) {
+  return import_node_path2.default.isAbsolute(resolvedPath) ? (0, import_node_url2.pathToFileURL)(resolvedPath).href : resolvedPath;
+}
+function createFarmConfigResolutionPlugin(options) {
+  const configEntryChecks = /* @__PURE__ */ new Map();
+  return {
+    name: "farm-config-package-resolution",
+    setup(pluginBuild) {
+      pluginBuild.onResolve({ filter: /^@farm\.js\/core$/ }, async (args) => {
+        if (args.pluginData?.farmConfigExternal || args.kind !== "import-statement" || !args.importer) {
+          return;
+        }
+        let configEntryCheck = configEntryChecks.get(args.importer);
+        if (!configEntryCheck) {
+          configEntryCheck = onlyImportsFarmConfigHelpers(args.importer, options.transform);
+          configEntryChecks.set(args.importer, configEntryCheck);
+        }
+        if (!await configEntryCheck) return;
+        const resolved = await pluginBuild.resolve(FARM_CONFIG_ENTRY, {
+          importer: args.importer,
+          kind: args.kind,
+          namespace: args.namespace,
+          resolveDir: args.resolveDir,
+          pluginData: { farmConfigExternal: true }
+        });
+        if (resolved.errors.length > 0 || !resolved.path) return;
+        return {
+          path: toExternalSpecifier(resolved.path),
+          external: true,
+          warnings: resolved.warnings
+        };
+      });
+      pluginBuild.onResolve({ filter: /^[^./]/ }, async (args) => {
+        if (args.kind === "entry-point" || import_node_path2.default.isAbsolute(args.path) || WINDOWS_ABSOLUTE_PATH_RE.test(args.path)) {
+          return;
+        }
+        if (args.pluginData?.farmConfigExternal) return;
+        const resolved = await pluginBuild.resolve(args.path, {
+          importer: args.importer,
+          kind: args.kind,
+          namespace: args.namespace,
+          resolveDir: args.resolveDir,
+          pluginData: { farmConfigExternal: true }
+        });
+        if (resolved.errors.length > 0 || !resolved.path) {
+          return { path: args.path, external: true };
+        }
+        return {
+          path: toExternalSpecifier(resolved.path),
+          external: true,
+          warnings: resolved.warnings
+        };
+      });
+    }
+  };
+}
 async function loadFarmConfigFile(configPath, options) {
   const { build: build3, transform } = await import("esbuild");
   const cacheRoot = import_node_path2.default.resolve(options.cacheRoot || options.root);
   const configCacheDir = import_node_path2.default.join(cacheRoot, ".farm", ".config-loader");
-  const configEntryChecks = /* @__PURE__ */ new Map();
   await (0, import_promises.mkdir)(configCacheDir, { recursive: true });
   const modulePath = import_node_path2.default.join(
     configCacheDir,
@@ -6393,55 +6449,7 @@ async function loadFarmConfigFile(configPath, options) {
     format: "esm",
     platform: "node",
     target: `node${process.versions.node.split(".")[0]}`,
-    plugins: [
-      {
-        name: "farm-config-package-resolution",
-        setup(pluginBuild) {
-          pluginBuild.onResolve({ filter: /^@farm.js\/core$/ }, async (args) => {
-            if (args.pluginData?.farmConfigExternal || args.kind !== "import-statement" || !args.importer) {
-              return;
-            }
-            let configEntryCheck = configEntryChecks.get(args.importer);
-            if (!configEntryCheck) {
-              configEntryCheck = onlyImportsFarmConfigHelpers(args.importer, transform);
-              configEntryChecks.set(args.importer, configEntryCheck);
-            }
-            if (!await configEntryCheck) return;
-            const resolved = await pluginBuild.resolve(FARM_CONFIG_ENTRY, {
-              importer: args.importer,
-              kind: args.kind,
-              namespace: args.namespace,
-              resolveDir: args.resolveDir,
-              pluginData: { farmConfigExternal: true }
-            });
-            if (resolved.errors.length > 0 || !resolved.path) return;
-            return {
-              path: resolved.path,
-              external: true,
-              warnings: resolved.warnings
-            };
-          });
-          pluginBuild.onResolve({ filter: /^[^./]/ }, async (args) => {
-            if (args.pluginData?.farmConfigExternal) return;
-            const resolved = await pluginBuild.resolve(args.path, {
-              importer: args.importer,
-              kind: args.kind,
-              namespace: args.namespace,
-              resolveDir: args.resolveDir,
-              pluginData: { farmConfigExternal: true }
-            });
-            if (resolved.errors.length > 0 || !resolved.path) {
-              return { path: args.path, external: true };
-            }
-            return {
-              path: resolved.path,
-              external: true,
-              warnings: resolved.warnings
-            };
-          });
-        }
-      }
-    ],
+    plugins: [createFarmConfigResolutionPlugin({ transform })],
     jsx: "automatic",
     logLevel: "silent",
     sourcemap: "inline"
@@ -6654,7 +6662,7 @@ function isPathLayerSource(source) {
 function normalizeRealPath(value) {
   return import_node_path2.default.resolve((0, import_node_fs.realpathSync)(value));
 }
-var import_node_fs, import_promises, import_node_module2, import_node_path2, import_node_url2, FARM_CORE_PACKAGE, FARM_CONFIG_ENTRY, FARM_CORE_REFERENCE_RE, FARM_CONFIG_HELPER_IMPORT_RE, FARM_CONFIG_HELPER_SPECIFIER_RE, CONFIG_FILENAMES, LAYER_LOCAL_CONFIG_KEYS;
+var import_node_fs, import_promises, import_node_module2, import_node_path2, import_node_url2, FARM_CORE_PACKAGE, FARM_CONFIG_ENTRY, FARM_CORE_REFERENCE_RE, FARM_CONFIG_HELPER_IMPORT_RE, FARM_CONFIG_HELPER_SPECIFIER_RE, CONFIG_FILENAMES, LAYER_LOCAL_CONFIG_KEYS, WINDOWS_ABSOLUTE_PATH_RE;
 var init_layers = __esm({
   "src/layers.ts"() {
     "use strict";
@@ -6701,6 +6709,9 @@ var init_layers = __esm({
     __name(getFarmSourceRoots, "getFarmSourceRoots");
     __name(getFarmAppDirectories, "getFarmAppDirectories");
     __name(getFarmLayerAliases, "getFarmLayerAliases");
+    WINDOWS_ABSOLUTE_PATH_RE = /^(?:[A-Za-z]:[\\/]|\\\\)/;
+    __name(toExternalSpecifier, "toExternalSpecifier");
+    __name(createFarmConfigResolutionPlugin, "createFarmConfigResolutionPlugin");
     __name(loadFarmConfigFile, "loadFarmConfigFile");
     __name(onlyImportsFarmConfigHelpers, "onlyImportsFarmConfigHelpers");
     __name(getEsbuildLoader, "getEsbuildLoader");
@@ -15177,7 +15188,7 @@ var init_server3 = __esm({
 var version;
 var init_package = __esm({
   "package.json"() {
-    version = "0.1.0-beta.43";
+    version = "0.1.0-beta.45";
   }
 });
 
@@ -25044,7 +25055,7 @@ async function loadConfig(rootDir, configPath, mode = process.env.NODE_ENV === "
   ].filter(Boolean);
   for (const relativePath2 of searchPaths) {
     try {
-      const absolutePath = relativePath2.startsWith("/") ? relativePath2 : import_path9.default.join(root, relativePath2);
+      const absolutePath = import_path9.default.isAbsolute(relativePath2) ? relativePath2 : import_path9.default.join(root, relativePath2);
       const normalizedPath = import_path9.default.resolve(absolutePath);
       if (!existsSync20(normalizedPath)) {
         continue;