@farm.js/core 0.1.0-beta.48 → 0.1.0-beta.49

package/dist/index.cjs

@@ -263,6 +263,9 @@ function toRootRelativeUrlPath(absolutePath, projectRoot) {
   }
   return void 0;
 }
+function toPosixPath(filePath) {
+  return filePath.replace(/\\/g, "/");
+}
 function toViteModuleId(filePath, root) {
   if (!import_path.default.isAbsolute(filePath)) return filePath;
   const relativePath2 = import_path.default.relative(root, filePath);
@@ -312,6 +315,7 @@ var init_utils = __esm({
     __name(matchRoute, "matchRoute");
     __name(resolveAppPath, "resolveAppPath");
     __name(toRootRelativeUrlPath, "toRootRelativeUrlPath");
+    __name(toPosixPath, "toPosixPath");
     __name(toViteModuleId, "toViteModuleId");
     __name(fileExists, "fileExists");
     __name(globFiles, "globFiles");
@@ -4011,14 +4015,14 @@ async function prepareFarmWorkflowsForNitro(config) {
   const tasks = {};
   const scheduledTasks = createScheduledTasks(workflows);
   for (const workflow of workflows) {
-    const wrapperPath = path38.join(generatedDir, `${safeFileName(workflow.id)}.mjs`);
+    const wrapperPath = toPosixPath(path38.join(generatedDir, `${safeFileName(workflow.id)}.mjs`));
     await fs13.writeFile(wrapperPath, createNitroTaskWrapper(workflow), "utf8");
     tasks[workflow.id] = {
       handler: wrapperPath,
       description: workflow.description || `Farm workflow ${workflow.id}`
     };
   }
-  const handlerPath = path38.join(generatedDir, "http-handler.mjs");
+  const handlerPath = toPosixPath(path38.join(generatedDir, "http-handler.mjs"));
   await fs13.writeFile(
     handlerPath,
     createNitroWorkflowHTTPHandler(
@@ -4377,6 +4381,7 @@ var init_workflows = __esm({
   "src/workflows.ts"() {
     "use strict";
     init_server_http();
+    init_utils();
     DEFAULT_FARM_WORKFLOW_DIRS = ["src/jobs", "src/workflows", "src/cron"];
     DEFAULT_FARM_WORKFLOW_ROUTE = "/api/_farm/workflows";
     DEFAULT_FARM_WORKFLOW_SECRET_ENV = "CRON_SECRET";
@@ -4464,7 +4469,7 @@ async function prepareFarmCronForNitro(config) {
   const tasks = {};
   for (const job of cron.jobs) {
     const taskName = getFarmCronTaskName(job.name);
-    const wrapperPath = path38.join(generatedDir, `${safeFileName2(job.name)}.mjs`);
+    const wrapperPath = toPosixPath(path38.join(generatedDir, `${safeFileName2(job.name)}.mjs`));
     await fs13.writeFile(wrapperPath, createNitroCronTaskWrapper(job, cron.secretEnv), "utf8");
     tasks[taskName] = {
       handler: wrapperPath,
@@ -4731,6 +4736,7 @@ var DEFAULT_FARM_CRON_SECRET_ENV, FARM_CRON_MANIFEST, CRON_FIELD_RANGES;
 var init_cron = __esm({
   "src/cron.ts"() {
     "use strict";
+    init_utils();
     DEFAULT_FARM_CRON_SECRET_ENV = "CRON_SECRET";
     FARM_CRON_MANIFEST = "cron-manifest.json";
     CRON_FIELD_RANGES = [
@@ -15249,7 +15255,7 @@ var init_server3 = __esm({
 var version;
 var init_package = __esm({
   "package.json"() {
-    version = "0.1.0-beta.48";
+    version = "0.1.0-beta.49";
   }
 });
 
@@ -34332,6 +34338,7 @@ __export(src_exports, {
   storageCacheAdapter: () => storageCacheAdapter,
   titleFromMarkdown: () => titleFromMarkdown,
   toFormData: () => toFormData,
+  toPosixPath: () => toPosixPath,
   toRootRelativeUrlPath: () => toRootRelativeUrlPath,
   toViteModuleId: () => toViteModuleId,
   toggleTheme: () => toggleTheme,
@@ -42491,6 +42498,10 @@ function generateFarmDocsRuntimeConfigExpression(docs) {
   : ${JSON.stringify(docs)}`;
 }
 __name(generateFarmDocsRuntimeConfigExpression, "generateFarmDocsRuntimeConfigExpression");
+function toVirtualEntryImportSpecifier(modulePath) {
+  return JSON.stringify(modulePath.replace(/\\/g, "/"));
+}
+__name(toVirtualEntryImportSpecifier, "toVirtualEntryImportSpecifier");
 function generateVirtualEntryCode(apiRoutes, pageRoutes, layoutRoutes, routeSlots, errorRoutes, metadataImageRoutes, applicationMetadataRoutes, middlewareRoutes, redirectRoutes, configuredRewriteRoutes, configuredHeaderRoutes, notFoundPath, instrumentationPath, config, configModulePath, hasServerRuntimeIntegrations, hasRuntimeIntegrationConfig, hasConfiguredRuntimePlugins, preset, i18nCatalogs) {
   const hasPluginRuntime = hasRuntimeIntegrationConfig || hasConfiguredRuntimePlugins;
   const adapterOwnsDocsRuntime = Boolean(
@@ -42507,7 +42518,9 @@ import * as ReactDOMServer from "react-dom/server";` : `import React, * as React
   const apiRegistrations = [];
   apiRoutes.forEach((route2, index) => {
     const varName = `apiRoute${index}`;
-    apiImports.push(`import * as ${varName} from "${route2.filePath}";`);
+    apiImports.push(
+      `import * as ${varName} from ${toVirtualEntryImportSpecifier(route2.filePath)};`
+    );
     apiRegistrations.push(`
   {
     path: ${JSON.stringify(route2.path)},
@@ -42540,7 +42553,9 @@ import * as ReactDOMServer from "react-dom/server";` : `import React, * as React
   }`);
       return;
     }
-    pageImports.push(`import * as ${varName} from "${route2.modulePath}";`);
+    pageImports.push(
+      `import * as ${varName} from ${toVirtualEntryImportSpecifier(route2.modulePath)};`
+    );
     const clientMetadata = getClientModuleMetadata(route2.modulePath, config.root);
     pageRegistrations.push(`
   {
@@ -42559,7 +42574,9 @@ import * as ReactDOMServer from "react-dom/server";` : `import React, * as React
   layoutRoutes.forEach((layout2, index) => {
     const varName = `layoutRoute${index}`;
     const clientMetadata = getClientModuleMetadata(layout2.modulePath, config.root);
-    layoutImports.push(`import * as ${varName} from "${layout2.modulePath}";`);
+    layoutImports.push(
+      `import * as ${varName} from ${toVirtualEntryImportSpecifier(layout2.modulePath)};`
+    );
     layoutRegistrations.push(`
   {
     pattern: ${JSON.stringify(layout2.pattern)},
@@ -42572,7 +42589,9 @@ import * as ReactDOMServer from "react-dom/server";` : `import React, * as React
   const routeSlotRegistrations = [];
   routeSlots.forEach((slot, index) => {
     const varName = `routeSlot${index}`;
-    routeSlotImports.push(`import * as ${varName} from "${slot.modulePath}";`);
+    routeSlotImports.push(
+      `import * as ${varName} from ${toVirtualEntryImportSpecifier(slot.modulePath)};`
+    );
     routeSlotRegistrations.push(`
   {
     name: ${JSON.stringify(slot.name)},
@@ -42588,7 +42607,9 @@ import * as ReactDOMServer from "react-dom/server";` : `import React, * as React
   const errorRegistrations = [];
   errorRoutes.forEach((errorRoute, index) => {
     const varName = `errorRoute${index}`;
-    errorImports.push(`import * as ${varName} from "${errorRoute.modulePath}";`);
+    errorImports.push(
+      `import * as ${varName} from ${toVirtualEntryImportSpecifier(errorRoute.modulePath)};`
+    );
     errorRegistrations.push(`
   {
     pattern: ${JSON.stringify(errorRoute.pattern)},
@@ -42598,9 +42619,11 @@ import * as ReactDOMServer from "react-dom/server";` : `import React, * as React
   const metadataImageImports = [];
   const metadataImageRegistrations = [];
   metadataImageRoutes.forEach((image, index) => {
-    if (image.sourceType === "module") {
+    if (image.sourceType === "module" && image.modulePath) {
       const varName = `metadataImageRoute${index}`;
-      metadataImageImports.push(`import * as ${varName} from "${image.modulePath}";`);
+      metadataImageImports.push(
+        `import * as ${varName} from ${toVirtualEntryImportSpecifier(image.modulePath)};`
+      );
       metadataImageRegistrations.push(`
   {
     pattern: ${JSON.stringify(image.pattern)},
@@ -42617,7 +42640,9 @@ import * as ReactDOMServer from "react-dom/server";` : `import React, * as React
   const applicationMetadataRegistrations = [];
   applicationMetadataRoutes.forEach((metadata, index) => {
     const varName = `applicationMetadataRoute${index}`;
-    applicationMetadataImports.push(`import * as ${varName} from "${metadata.modulePath}";`);
+    applicationMetadataImports.push(
+      `import * as ${varName} from ${toVirtualEntryImportSpecifier(metadata.modulePath)};`
+    );
     applicationMetadataRegistrations.push(`
   {
     pattern: ${JSON.stringify(metadata.pattern)},
@@ -42630,7 +42655,9 @@ import * as ReactDOMServer from "react-dom/server";` : `import React, * as React
   const middlewareRegistrations = [];
   middlewareRoutes.forEach((middlewareRoute, index) => {
     const varName = `fileMiddleware${index}`;
-    middlewareImports.push(`import * as ${varName} from "${middlewareRoute.filePath}";`);
+    middlewareImports.push(
+      `import * as ${varName} from ${toVirtualEntryImportSpecifier(middlewareRoute.filePath)};`
+    );
     middlewareRegistrations.push(`
   {
     path: ${JSON.stringify(middlewareRoute.path)},
@@ -42638,7 +42665,7 @@ import * as ReactDOMServer from "react-dom/server";` : `import React, * as React
     module: ${varName},
   }`);
   });
-  const notFoundImport = notFoundPath ? `import * as CustomNotFound from "${notFoundPath}";` : "";
+  const notFoundImport = notFoundPath ? `import * as CustomNotFound from ${toVirtualEntryImportSpecifier(notFoundPath)};` : "";
   const apiRouteHelpersImport = apiRoutes.length > 0 ? `import { invokeAPIRouteEndpoint, matchAPIRoute } from "@farm.js/core/api/runtime";` : "";
   const productionRuntimeImport = `import {
   _runWithAfterRequest,
@@ -42697,10 +42724,10 @@ import { fileURLToPath as farmDocsFileURLToPath } from "node:url";` : "";
   const markdownHandlerImport = config.md?.enabled ? `import { applyMarkdownNegotiationHeaders, createMarkdownMirrorResponse } from "@farm.js/core/markdown";` : "";
   const appMarkdownImport = hasMarkdownPages ? `import { createFarmMarkdownRouteModule, createFarmMarkdownSourceResponse } from "@farm.js/core/app-markdown";` : "const createFarmMarkdownSourceResponse = null;";
   const mdxComponentsPath = typeof config.mdx?.components === "string" ? import_path13.default.isAbsolute(config.mdx.components) ? config.mdx.components : import_path13.default.join(config.root, config.mdx.components) : null;
-  const mdxComponentsImport = mdxComponentsPath ? `import * as FarmMdxComponentsModule from "${mdxComponentsPath.replace(/\\/g, "/")}";` : "";
+  const mdxComponentsImport = mdxComponentsPath ? `import * as FarmMdxComponentsModule from ${toVirtualEntryImportSpecifier(mdxComponentsPath)};` : "";
   const layerConfigPaths = (config.layers || []).map((layer) => layer.configFile).filter((configFile) => Boolean(configFile)).filter((configFile) => configFile !== configModulePath);
   const layerConfigImports = layerConfigPaths.map(
-    (configFile, index) => `import * as FarmLayerConfigModule${index} from "${configFile.replace(/\\/g, "/")}";`
+    (configFile, index) => `import * as FarmLayerConfigModule${index} from ${toVirtualEntryImportSpecifier(configFile)};`
   ).join("\n");
   const layerConfigValues = layerConfigPaths.map(
     (_configFile, index) => `(FarmLayerConfigModule${index}.default || FarmLayerConfigModule${index})`
@@ -42712,9 +42739,9 @@ import { fileURLToPath as farmDocsFileURLToPath } from "node:url";` : "";
     ])
   );
   const integrationRuntimeImport = integrationRuntimeExports.length ? `import { ${integrationRuntimeExports.join(", ")} } from "@farm.js/core/integrations";` : "";
-  const instrumentationImport = instrumentationPath ? `import * as FarmInstrumentationModule from "${instrumentationPath.replace(/\\/g, "/")}";` : "";
+  const instrumentationImport = instrumentationPath ? `import * as FarmInstrumentationModule from ${toVirtualEntryImportSpecifier(instrumentationPath)};` : "";
   const integrationImports = `
-${configModulePath ? `import * as FarmUserConfigModule from "${configModulePath}";` : ""}
+${configModulePath ? `import * as FarmUserConfigModule from ${toVirtualEntryImportSpecifier(configModulePath)};` : ""}
 ${layerConfigImports}
 ${integrationRuntimeImport}
 `;
@@ -45881,7 +45908,7 @@ export default async function farmNitroEventHandler(event) {
       ] : [],
       {
         route: "/**",
-        handler: nitroEntryPath
+        handler: toPosixPath(nitroEntryPath)
       }
     ],
     routeRules: {
@@ -46129,6 +46156,20 @@ async function registerPrebuiltSSRPackageImport(serverDir, ssrEntryFile, fs13) {
 `);
 }
 __name(registerPrebuiltSSRPackageImport, "registerPrebuiltSSRPackageImport");
+async function moveVercelOutputPath(src, dest, fs13) {
+  try {
+    await fs13.rename(src, dest);
+    return;
+  } catch (error) {
+    const code = error?.code;
+    if (code !== "EPERM" && code !== "EACCES" && code !== "EXDEV" && code !== "ENOTEMPTY") {
+      throw error;
+    }
+  }
+  await fs13.cp(src, dest, { recursive: true, force: true });
+  await fs13.rm(src, { recursive: true, force: true });
+}
+__name(moveVercelOutputPath, "moveVercelOutputPath");
 async function postProcessVercelOutput(root, outputDir, fs13, config, farmWorkflows, routeRuntimeManifest) {
   const serverDir = import_path13.default.join(outputDir, "server");
   const functionsDir = import_path13.default.join(outputDir, "functions");
@@ -46140,12 +46181,13 @@ async function postProcessVercelOutput(root, outputDir, fs13, config, farmWorkfl
   for (const file of serverContents) {
     const src = import_path13.default.join(serverDir, file);
     const dest = import_path13.default.join(nitroFuncDir, file);
-    await fs13.rename(src, dest);
+    await moveVercelOutputPath(src, dest, fs13);
   }
-  await fs13.rmdir(serverDir);
+  await fs13.rm(serverDir, { recursive: true, force: true });
   try {
-    await fs13.rename(publicDir, staticDir);
-  } catch {
+    await moveVercelOutputPath(publicDir, staticDir, fs13);
+  } catch (error) {
+    if (error?.code !== "ENOENT") throw error;
   }
   await copyFarmDocsContentForVercel(config, root, nitroFuncDir, fs13);
   await copyPrismaClientForVercel(root, nitroFuncDir, fs13);
@@ -50418,6 +50460,7 @@ __name(decodeCookiePart, "decodeCookiePart");
   storageCacheAdapter,
   titleFromMarkdown,
   toFormData,
+  toPosixPath,
   toRootRelativeUrlPath,
   toViteModuleId,
   toggleTheme,