@gigadrive/network-config 3.3.2 → 3.4.0

package/dist/index.mjs

@@ -254,28 +254,48 @@ var getDefaultPathMap = Effect3.fn("getDefaultPathMap")(function* (directory) {
   return result;
 });
 
-// src/detection/frameworks/nextjs.ts
+// src/nextjs-manifest.ts
 var isRecord2 = (value) => typeof value === "object" && value !== null;
-var normalizeRelativePath = (value, allowCurrentDirectory = false) => {
+var isPortableRelativePath = (value, allowCurrentDirectory = false) => {
+  if (typeof value !== "string") return false;
   const normalized = value.replaceAll("\\", "/").replace(/^\.\//, "").replace(/\/+$/, "");
-  if (!allowCurrentDirectory && (!normalized || normalized === ".") || normalized.startsWith("/") || /^[A-Za-z]:/.test(normalized) || normalized.includes(":") || normalized.split("/").some((segment) => segment === "..")) {
-    return void 0;
-  }
-  return normalized || ".";
+  return (allowCurrentDirectory || normalized !== "" && normalized !== ".") && !normalized.startsWith("/") && !/^[A-Za-z]:/.test(normalized) && !normalized.includes(":") && !normalized.split("/").some((segment) => segment === "..");
 };
-var parseBuildManifest = (content) => {
+var isStringRecord = (value) => isRecord2(value) && Object.values(value).every((item) => typeof item === "string");
+var isJsonValue = (value) => {
+  if (value === null || typeof value === "string" || typeof value === "boolean") return true;
+  if (typeof value === "number") return Number.isFinite(value);
+  if (Array.isArray(value)) return value.every(isJsonValue);
+  return isRecord2(value) && Object.values(value).every(isJsonValue);
+};
+var isRouteOutput = (value) => isRecord2(value) && typeof value.id === "string" && ["PAGES", "PAGES_API", "APP_PAGE", "APP_ROUTE", "MIDDLEWARE"].includes(String(value.type)) && isPortableRelativePath(value.filePath) && typeof value.pathname === "string" && typeof value.sourcePage === "string" && (value.runtime === "nodejs" || value.runtime === "edge") && isStringRecord(value.assets) && isRecord2(value.config);
+var isPrerenderOutput = (value) => isRecord2(value) && value.type === "PRERENDER" && typeof value.id === "string" && typeof value.pathname === "string" && typeof value.parentOutputId === "string" && typeof value.groupId === "number" && isRecord2(value.config) && (value.fallback === void 0 || isRecord2(value.fallback) && (value.fallback.filePath === void 0 || isPortableRelativePath(value.fallback.filePath)));
+var isStaticOutput = (value) => isRecord2(value) && value.type === "STATIC_FILE" && typeof value.id === "string" && typeof value.pathname === "string" && isPortableRelativePath(value.filePath);
+var isEntrypoint = (value) => isRecord2(value) && typeof value.id === "string" && (value.runtime === "nodejs" || value.runtime === "edge") && isPortableRelativePath(value.filePath) && Array.isArray(value.outputIds) && value.outputIds.every((item) => typeof item === "string") && isStringRecord(value.assets) && isRecord2(value.config);
+var isImagePolicy = (value) => isRecord2(value) && Array.isArray(value.localPatterns) && Array.isArray(value.remotePatterns) && value.remotePatterns.every((pattern) => isRecord2(pattern) && typeof pattern.hostname === "string") && Array.isArray(value.widths) && value.widths.every((item) => typeof item === "number" && Number.isInteger(item) && item > 0) && Array.isArray(value.heights) && value.heights.every((item) => typeof item === "number" && Number.isInteger(item) && item > 0) && Array.isArray(value.qualities) && value.qualities.every((item) => typeof item === "number" && item >= 1 && item <= 100) && Array.isArray(value.formats) && value.formats.every((item) => ["image/avif", "image/webp", "image/jpeg", "image/png"].includes(String(item))) && typeof value.minimumCacheTTL === "number" && typeof value.dangerouslyAllowSVG === "boolean" && typeof value.contentSecurityPolicy === "string" && (value.contentDispositionType === "inline" || value.contentDispositionType === "attachment") && typeof value.maximumRedirects === "number" && typeof value.maximumResponseBody === "number" && isRecord2(value.variants);
+var parseGigadriveNextBuildManifest = (content) => {
   try {
     const value = JSON.parse(content);
-    if (!isRecord2(value) || value.version !== 1 || value.output !== "standalone" && value.output !== "export" || typeof value.distDir !== "string" || typeof value.repoRootToProject !== "string") {
+    if (!isRecord2(value)) return void 0;
+    if (value.version === 1) {
+      if (value.output !== "standalone" && value.output !== "export" || !isPortableRelativePath(value.distDir) || !isPortableRelativePath(value.repoRootToProject, true) || typeof value.nextVersion !== "string" || typeof value.buildId !== "string") {
+        return void 0;
+      }
+      return value;
+    }
+    if (value.version !== 2 || value.mode !== "adapter-v2" && value.mode !== "export" || !isPortableRelativePath(value.distDir) || !isPortableRelativePath(value.repoRootToProject, true) || typeof value.nextVersion !== "string" || typeof value.buildId !== "string" || !isRecord2(value.config) || typeof value.config.basePath !== "string" || typeof value.config.trailingSlash !== "boolean" || typeof value.config.cacheComponents !== "boolean" || value.config.images !== void 0 && !isImagePolicy(value.config.images) || !isRecord2(value.routing) || !isJsonValue(value.routing) || !isRecord2(value.outputs) || !Array.isArray(value.outputs.pages) || !value.outputs.pages.every(isRouteOutput) || !Array.isArray(value.outputs.pagesApi) || !value.outputs.pagesApi.every(isRouteOutput) || !Array.isArray(value.outputs.appPages) || !value.outputs.appPages.every(isRouteOutput) || !Array.isArray(value.outputs.appRoutes) || !value.outputs.appRoutes.every(isRouteOutput) || !Array.isArray(value.outputs.prerenders) || !value.outputs.prerenders.every(isPrerenderOutput) || !Array.isArray(value.outputs.staticFiles) || !value.outputs.staticFiles.every(isStaticOutput) || value.outputs.middleware !== void 0 && !isRouteOutput(value.outputs.middleware) || !Array.isArray(value.entrypoints) || !value.entrypoints.every(isEntrypoint) || !isStringRecord(value.outputEntrypoints)) {
       return void 0;
     }
-    const distDir = normalizeRelativePath(value.distDir);
-    const repoRootToProject = normalizeRelativePath(value.repoRootToProject, true);
-    return distDir && repoRootToProject ? { version: 1, output: value.output, distDir, repoRootToProject } : void 0;
+    const entrypointIds = new Set(value.entrypoints.map((item) => item.id));
+    if (Object.values(value.outputEntrypoints).some((entrypointId) => !entrypointIds.has(entrypointId)))
+      return void 0;
+    return value;
   } catch {
     return void 0;
   }
 };
+
+// src/detection/frameworks/nextjs.ts
 var toPortablePath = (value) => value.replaceAll("\\", "/");
 var createStaticExportConfig = Effect4.fn("nextjs.createStaticExportConfig")(function* (defaults, projectFolder) {
   const pathService = yield* Path3.Path;
@@ -355,6 +375,116 @@ var createStandaloneConfig = Effect4.fn("nextjs.createStandaloneConfig")(functio
     }
   };
 });
+var createAdapterV2Config = Effect4.fn("nextjs.createAdapterV2Config")(function* (defaults, projectFolder, manifest) {
+  const pathService = yield* Path3.Path;
+  let repoRoot = projectFolder;
+  if (manifest.repoRootToProject !== ".") {
+    repoRoot = manifest.repoRootToProject.split("/").reduce((root) => pathService.dirname(root), repoRoot);
+  }
+  const artifactUseCount = /* @__PURE__ */ new Map();
+  for (const entrypoint of manifest.entrypoints) {
+    for (const [targetPath, sourcePath] of Object.entries(entrypoint.assets)) {
+      const identity = `${targetPath}\0${sourcePath}`;
+      artifactUseCount.set(identity, (artifactUseCount.get(identity) ?? 0) + 1);
+    }
+  }
+  const sharedFilePathMap = {};
+  for (const [identity, useCount] of artifactUseCount) {
+    if (useCount < 2) continue;
+    const [targetPath, sourcePath] = identity.split("\0");
+    sharedFilePathMap[pathService.join(repoRoot, sourcePath)] = targetPath;
+  }
+  const sharedArtifacts = Object.keys(sharedFilePathMap).length > 0 ? [{ id: "next-shared", filePathMap: sharedFilePathMap }] : [];
+  const entrypoints = manifest.entrypoints.map((entrypoint) => {
+    const filePathMap = {};
+    for (const [targetPath, sourcePath] of Object.entries({
+      ...entrypoint.assets,
+      ...entrypoint.wasmAssets
+    })) {
+      const identity = `${targetPath}\0${sourcePath}`;
+      if ((artifactUseCount.get(identity) ?? 0) >= 2) continue;
+      filePathMap[pathService.join(repoRoot, sourcePath)] = targetPath;
+    }
+    filePathMap[pathService.join(repoRoot, entrypoint.filePath)] = entrypoint.filePath;
+    return {
+      displayName: entrypoint.id,
+      path: entrypoint.filePath,
+      runtime: "node-22",
+      memory: defaults.memory,
+      maxDuration: entrypoint.config.maxDuration ?? defaults.maxDuration,
+      streaming: true,
+      environmentVariables: {
+        GIGADRIVE_NEXT_ENTRYPOINT_ID: entrypoint.id,
+        GIGADRIVE_NEXT_RUNTIME: entrypoint.runtime,
+        NEXT_BUILD_ID: manifest.buildId,
+        ...entrypoint.config.env
+      },
+      package: {
+        trace: false,
+        rootOverwrite: repoRoot,
+        filePathMap,
+        ...sharedArtifacts.length > 0 ? { sharedArtifactIds: sharedArtifacts.map((artifact) => artifact.id) } : {}
+      }
+    };
+  });
+  const assetPaths = [];
+  const assetOverrides = {};
+  for (const output of manifest.outputs.staticFiles) {
+    const absolutePath = pathService.join(repoRoot, output.filePath);
+    const projectRelativePath = toPortablePath(pathService.relative(projectFolder, absolutePath));
+    if (projectRelativePath.startsWith("../")) continue;
+    assetPaths.push(projectRelativePath);
+    assetOverrides[projectRelativePath] = { path: output.pathname.replace(/^\//, "") };
+  }
+  const prerenders = manifest.outputs.prerenders.map((output) => {
+    if (!output.fallback?.filePath) return output;
+    const absolutePath = pathService.join(repoRoot, output.fallback.filePath);
+    const projectRelativePath = toPortablePath(pathService.relative(projectFolder, absolutePath));
+    if (projectRelativePath.startsWith("../")) return output;
+    const internalAssetPath = `_gigadrive/prerender/${encodeURIComponent(output.id)}.html`;
+    assetPaths.push(projectRelativePath);
+    assetOverrides[projectRelativePath] = { path: internalAssetPath };
+    return {
+      ...output,
+      fallback: { ...output.fallback, filePath: `/${internalAssetPath}` }
+    };
+  });
+  const framework = {
+    mode: manifest.mode,
+    distDir: manifest.distDir,
+    repoRootToProject: manifest.repoRootToProject,
+    nextVersion: manifest.nextVersion,
+    buildId: manifest.buildId,
+    config: manifest.config,
+    routing: manifest.routing,
+    outputs: manifest.outputs,
+    entrypoints: manifest.entrypoints,
+    outputEntrypoints: manifest.outputEntrypoints
+  };
+  return {
+    ...defaults,
+    entrypoint: void 0,
+    routes: [],
+    assetPaths,
+    assetOverrides,
+    assetsDir: manifest.distDir,
+    assetsPrefixToStrip: "",
+    package: void 0,
+    normalizedConfig: {
+      entrypoints,
+      routes: [],
+      framework: {
+        ...framework,
+        outputs: { ...framework.outputs, prerenders },
+        type: "nextjs",
+        schemaVersion: 2
+      },
+      images: manifest.config.images,
+      sharedArtifacts,
+      userArchive: { rootOverwrite: repoRoot }
+    }
+  };
+});
 var nextjs = {
   slug: "nextjs",
   name: "Next.js",
@@ -376,8 +506,11 @@ var nextjs = {
   refineDefaultConfig: (defaults, projectFolder) => Effect4.gen(function* () {
     const fs = yield* FileSystem4.FileSystem;
     const manifestContent = yield* fs.readFileString(`${projectFolder}/.gigadrive/nextjs.json`).pipe(Effect4.catchAll(() => Effect4.succeed(void 0)));
-    const manifest = manifestContent ? parseBuildManifest(manifestContent) : void 0;
+    const manifest = manifestContent ? parseGigadriveNextBuildManifest(manifestContent) : void 0;
     if (!manifest) return defaults;
+    if (manifest.version === 2) {
+      return manifest.mode === "export" ? yield* createStaticExportConfig(defaults, projectFolder) : yield* createAdapterV2Config(defaults, projectFolder, manifest);
+    }
     return manifest.output === "export" ? yield* createStaticExportConfig(defaults, projectFolder) : yield* createStandaloneConfig(defaults, projectFolder, manifest);
   })
 };
@@ -585,7 +718,7 @@ var generateConfig = Effect6.fn("generateConfig")(function* (framework, packageM
     entrypoint: defaults.entrypoint,
     commands
   });
-  const entrypoints = defaults.entrypoint ? [
+  const entrypoints = defaults.normalizedConfig?.entrypoints ?? (defaults.entrypoint ? [
     {
       path: defaults.entrypoint,
       runtime: defaults.runtime,
@@ -595,14 +728,14 @@ var generateConfig = Effect6.fn("generateConfig")(function* (framework, packageM
       symlinks: defaults.symlinks,
       package: defaults.package
     }
-  ] : [];
-  const routes = defaults.entrypoint ? defaults.routes.map((route) => ({
+  ] : []);
+  const routes = defaults.normalizedConfig?.routes ?? (defaults.entrypoint ? defaults.routes.map((route) => ({
     path: route.source,
     destination: route.destination,
     handler: defaults.streaming ? "SERVERLESS_FUNCTION_STREAMING" : "SERVERLESS_FUNCTION",
     methods: ["ANY"],
     headers: {}
-  })) : [];
+  })) : []);
   const config = {
     regions: [...AVAILABLE_REGIONS],
     environmentVariables: { ...defaults.environmentVariables },
@@ -611,7 +744,8 @@ var generateConfig = Effect6.fn("generateConfig")(function* (framework, packageM
     routes,
     excludeFiles: defaults.excludeFiles && defaults.excludeFiles.length > 0 ? [...defaults.excludeFiles] : void 0,
     warnings: [`Auto-detected framework: ${framework.name}. Create a gigadrive.yaml to customize.`],
-    errors: []
+    errors: [],
+    ...defaults.normalizedConfig
   };
   if (defaults.assetsDir || defaults.assetPaths) {
     config.assets = {
@@ -973,6 +1107,24 @@ var toArray = (value) => {
   return Array.isArray(value) ? value : [value];
 };
 var runtimeStreamsByDefault = (runtime) => runtime == null || runtime.startsWith("node-") || runtime.startsWith("bun-");
+var normalizeImagePolicy = (images) => {
+  if (!images) return void 0;
+  return {
+    localPatterns: images.localPatterns ?? [{ pathname: "/**" }],
+    remotePatterns: images.remotePatterns ?? [],
+    widths: images.widths ?? [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
+    heights: images.heights ?? [],
+    qualities: images.qualities ?? [75],
+    formats: images.formats ?? ["image/avif", "image/webp"],
+    minimumCacheTTL: images.minimumCacheTTL ?? 14400,
+    dangerouslyAllowSVG: images.dangerouslyAllowSVG ?? false,
+    contentSecurityPolicy: images.contentSecurityPolicy ?? "default-src 'self'; script-src 'none'; sandbox;",
+    contentDispositionType: images.contentDispositionType ?? "attachment",
+    maximumRedirects: images.maximumRedirects ?? 3,
+    maximumResponseBody: images.maximumResponseBody ?? 50 * 1024 * 1024,
+    variants: images.variants ?? {}
+  };
+};
 var normalizeRouteDestination = (destination) => {
   const [withoutHash] = destination.split("#", 1);
   const [withoutQuery] = withoutHash.split("?", 1);
@@ -1135,6 +1287,7 @@ var V4ConfigParser = class extends Effect13.Service()("V4ConfigParser", {
         },
         environmentVariables: config.env ?? {},
         commands: config.build_commands ?? [],
+        images: normalizeImagePolicy(config.images),
         entrypoints,
         errors: [],
         warnings: [],
@@ -1256,7 +1409,8 @@ var VercelBuildOutputParser = class extends Effect14.Service()("VercelBuildOutpu
       }
       const functionData = yield* loadFunctions(config, parseResult, projectFolder);
       const assetOverrides = loadAssetOverrides(config, parseResult);
-      const merged = deepMerge(parseResult, functionData, assetOverrides);
+      const imagePolicy = loadImagePolicy(config);
+      const merged = deepMerge(parseResult, functionData, assetOverrides, imagePolicy);
       merged.regions = [...new Set(merged.regions)];
       return merged;
     });
@@ -1378,6 +1532,27 @@ var loadAssetOverrides = (config, parseResult) => {
     }
   };
 };
+var loadImagePolicy = (config) => {
+  if (!config.images) return {};
+  const images = config.images;
+  return {
+    images: {
+      localPatterns: images.localPatterns ?? [{ pathname: "/**" }],
+      remotePatterns: [...images.remotePatterns ?? [], ...images.domains.map((hostname) => ({ hostname }))],
+      widths: images.sizes,
+      heights: [],
+      qualities: images.qualities ?? [75],
+      formats: images.formats ?? ["image/webp"],
+      minimumCacheTTL: images.minimumCacheTTL ?? 60,
+      dangerouslyAllowSVG: images.dangerouslyAllowSVG ?? false,
+      contentSecurityPolicy: images.contentSecurityPolicy ?? "default-src 'self'; script-src 'none'; sandbox;",
+      contentDispositionType: images.contentDispositionType === "inline" ? "inline" : "attachment",
+      maximumRedirects: 3,
+      maximumResponseBody: 50 * 1024 * 1024,
+      variants: {}
+    }
+  };
+};
 
 // src/v4/schema.json
 var schema_default = {
@@ -1408,6 +1583,91 @@ var schema_default = {
       type: ["boolean", "null"],
       description: "If true, the assets will be cached at the edge during deployment. This may increase the deployment time, depending on the size of the assets. Defaults to false."
     },
+    images: {
+      type: ["object", "null"],
+      description: "Managed image optimization policy for this deployment.",
+      additionalProperties: false,
+      properties: {
+        localPatterns: {
+          type: "array",
+          maxItems: 64,
+          items: {
+            type: "object",
+            additionalProperties: false,
+            properties: {
+              pathname: { type: "string", minLength: 1, maxLength: 2048 },
+              search: { type: "string", maxLength: 2048 }
+            }
+          }
+        },
+        remotePatterns: {
+          type: "array",
+          maxItems: 64,
+          items: {
+            type: "object",
+            required: ["hostname"],
+            additionalProperties: false,
+            properties: {
+              protocol: { type: "string", enum: ["http", "https"] },
+              hostname: { type: "string", minLength: 1, maxLength: 253 },
+              port: { type: "string", pattern: "^[0-9]{0,5}$" },
+              pathname: { type: "string", minLength: 1, maxLength: 2048 },
+              search: { type: "string", maxLength: 2048 }
+            }
+          }
+        },
+        widths: {
+          type: "array",
+          minItems: 1,
+          maxItems: 64,
+          uniqueItems: true,
+          items: { type: "integer", minimum: 1, maximum: 8192 }
+        },
+        heights: {
+          type: "array",
+          maxItems: 64,
+          uniqueItems: true,
+          items: { type: "integer", minimum: 1, maximum: 8192 }
+        },
+        qualities: {
+          type: "array",
+          minItems: 1,
+          maxItems: 100,
+          uniqueItems: true,
+          items: { type: "integer", minimum: 1, maximum: 100 }
+        },
+        formats: {
+          type: "array",
+          minItems: 1,
+          maxItems: 4,
+          uniqueItems: true,
+          items: { type: "string", enum: ["image/avif", "image/webp", "image/jpeg", "image/png"] }
+        },
+        minimumCacheTTL: { type: "integer", minimum: 0, maximum: 31536e3 },
+        dangerouslyAllowSVG: { type: "boolean" },
+        contentSecurityPolicy: { type: "string", maxLength: 4096 },
+        contentDispositionType: { type: "string", enum: ["inline", "attachment"] },
+        maximumRedirects: { type: "integer", minimum: 0, maximum: 10 },
+        maximumResponseBody: { type: "integer", minimum: 1024, maximum: 104857600 },
+        variants: {
+          type: "object",
+          maxProperties: 100,
+          propertyNames: { pattern: "^[A-Za-z0-9][A-Za-z0-9_-]{0,63}$" },
+          additionalProperties: {
+            type: "object",
+            minProperties: 1,
+            additionalProperties: false,
+            properties: {
+              width: { type: "integer", minimum: 1, maximum: 8192 },
+              height: { type: "integer", minimum: 1, maximum: 8192 },
+              quality: { type: "integer", minimum: 1, maximum: 100 },
+              format: { type: "string", enum: ["image/avif", "image/webp", "image/jpeg", "image/png"] },
+              fit: { type: "string", enum: ["contain", "cover", "fill", "inside", "outside"] }
+            }
+          }
+        }
+      }
+    },
     regions: {
       type: ["array", "null"],
       description: 'The regions to which the project will be deployed. Use "global" to deploy to all regions. More regions will incur higher costs.',
@@ -1807,6 +2067,7 @@ export {
   mergeWithFrameworkDefaults,
   parseConfig,
   parseConfigRaw,
+  parseGigadriveNextBuildManifest,
   postProcessConfig,
   readDependencies
 };