@bleedingdev/modern-js-app-tools 3.8.2-ultramodern.9 → 3.8.3-ultramodern.2

package/dist/esm-node/plugins/deploy/platforms/cloudflare-output-verifier/index.mjs

@@ -1,134 +1,2 @@
 import "node:module";
-import promises from "node:fs/promises";
-import node_path from "node:path";
-import { createCloudflareOutputPlan } from "../cloudflare-output-plan.mjs";
-import { verifyDeliveryUnitIdentity } from "./identity.mjs";
-import { addIssue, assertEqual, assertFlag } from "./issues.mjs";
-import { verifyManifestShape } from "./manifest.mjs";
-import { getEffectBffWorker, getWorkerBundleReferences, missingWorkerBundleMessage, resolveWorkerBundleReference, verifyWorkerBundleReferences, verifyWorkerImport } from "./worker-bundles.mjs";
-const pathExists = async (filePath)=>{
-    try {
-        await promises.access(filePath);
-        return true;
-    } catch  {
-        return false;
-    }
-};
-const readJson = async (filePath)=>JSON.parse(await promises.readFile(filePath, 'utf-8'));
-const verifyCloudflareOutput = async (options)=>{
-    const outputDirectory = node_path.resolve(options.outputDirectory);
-    const issues = [];
-    const outputPlan = createCloudflareOutputPlan(outputDirectory);
-    for (const relativePath of outputPlan.requiredFiles){
-        const filePath = node_path.join(outputDirectory, relativePath);
-        if (!await pathExists(filePath)) addIssue(issues, {
-            code: 'missing-file',
-            message: `Cloudflare output is missing ${relativePath}.`,
-            path: filePath
-        });
-    }
-    const manifestPath = outputPlan.paths.workerManifest;
-    const wranglerPath = outputPlan.paths.wranglerConfig;
-    const packagePath = outputPlan.paths.outputPackage;
-    const workerPackagePath = outputPlan.paths.workerPackage;
-    const manifest = await pathExists(manifestPath) ? await readJson(manifestPath) : void 0;
-    const wrangler = await pathExists(wranglerPath) ? await readJson(wranglerPath) : void 0;
-    const outputPackage = await pathExists(packagePath) ? await readJson(packagePath) : void 0;
-    const workerPackage = await pathExists(workerPackagePath) ? await readJson(workerPackagePath) : void 0;
-    if (manifest) {
-        verifyManifestShape(issues, manifest, manifestPath);
-        verifyDeliveryUnitIdentity(issues, manifest, manifestPath, options.deliveryUnit);
-        const workerReferences = getWorkerBundleReferences(manifest);
-        const providedWorkerPackages = new Set(workerPackage?.dependencies && 'object' == typeof workerPackage.dependencies ? Object.keys(workerPackage.dependencies) : []);
-        if (workerReferences.length > 0 && !await pathExists(workerPackagePath)) addIssue(issues, {
-            code: 'missing-file',
-            message: 'Cloudflare output is missing worker/package.json for referenced worker bundles.',
-            path: workerPackagePath
-        });
-        if (manifest.bff?.runtimeFramework === 'effect' && !getEffectBffWorker(manifest)) addIssue(issues, {
-            code: 'missing-worker-bundle',
-            message: 'Cloudflare Effect BFF manifest points to a missing worker bundle.'
-        });
-        for (const workerReference of workerReferences){
-            const resolvedWorker = resolveWorkerBundleReference(issues, outputDirectory, workerReference, manifestPath);
-            if (!resolvedWorker) continue;
-            const workerExists = await pathExists(resolvedWorker.path);
-            if (!workerExists) addIssue(issues, {
-                code: 'missing-worker-bundle',
-                message: missingWorkerBundleMessage(workerReference),
-                path: resolvedWorker.path
-            });
-            if (workerExists) {
-                const workerSource = await promises.readFile(resolvedWorker.path, 'utf-8');
-                await verifyWorkerBundleReferences(issues, resolvedWorker, workerSource, {
-                    providedPackages: providedWorkerPackages,
-                    workerRoot: outputPlan.paths.workerBundle
-                });
-                if ('effect-bff' === resolvedWorker.kind && (workerSource.includes(';entityKind;') || workerSource.includes(';entityKind,entityKind;'))) addIssue(issues, {
-                    code: 'invalid-worker-bundle',
-                    message: 'Cloudflare Effect BFF worker bundle contains invalid Drizzle entityKind marker references.',
-                    path: resolvedWorker.path
-                });
-            }
-        }
-    }
-    if (wrangler) {
-        assertEqual(issues, wrangler.main, outputPlan.wrangler.main, {
-            code: 'invalid-wrangler',
-            message: `wrangler.json main must be ${outputPlan.wrangler.main}.`,
-            path: wranglerPath
-        });
-        assertEqual(issues, wrangler.assets?.binding, outputPlan.wrangler.assets.binding, {
-            code: 'invalid-wrangler',
-            message: 'wrangler.json assets.binding must be ASSETS.',
-            path: wranglerPath
-        });
-        assertEqual(issues, wrangler.assets?.directory, outputPlan.wrangler.assets.directory, {
-            code: 'invalid-wrangler',
-            message: 'wrangler.json assets.directory must be ./public.',
-            path: wranglerPath
-        });
-        assertEqual(issues, wrangler.assets?.run_worker_first, outputPlan.wrangler.assets.run_worker_first, {
-            code: 'invalid-wrangler',
-            message: 'wrangler.json assets.run_worker_first must be true.',
-            path: wranglerPath
-        });
-        for (const flag of outputPlan.wrangler.requiredCompatibilityFlags)assertFlag(issues, wrangler.compatibility_flags, flag, {
-            code: 'invalid-wrangler',
-            message: `wrangler.json compatibility_flags must include ${flag}.`,
-            path: wranglerPath
-        });
-    }
-    if (outputPackage) assertEqual(issues, outputPackage.type, outputPlan.packages.output.type, {
-        code: 'invalid-package',
-        message: '.output/package.json must declare type module.',
-        path: packagePath
-    });
-    if (workerPackage) assertEqual(issues, workerPackage.type, outputPlan.packages.worker.type, {
-        code: 'invalid-package',
-        message: '.output/worker/package.json must declare type commonjs.',
-        path: workerPackagePath
-    });
-    for (const leakedPath of outputPlan.publicLeakDirectories){
-        const publicPath = node_path.join(outputPlan.paths.publicAssets, leakedPath);
-        if (await pathExists(publicPath)) addIssue(issues, {
-            code: 'public-output-leak',
-            message: `Framework-owned ${leakedPath} output leaked into public assets.`,
-            path: publicPath
-        });
-    }
-    if (false !== options.importWorker && await pathExists(outputPlan.paths.workerEntry)) await verifyWorkerImport(issues, outputPlan.paths.workerEntry, manifest);
-    return {
-        ok: 0 === issues.length,
-        issues
-    };
-};
-const assertCloudflareOutput = async (options)=>{
-    const result = await verifyCloudflareOutput(options);
-    if (!result.ok) throw new Error([
-        'Cloudflare output verification failed:',
-        ...result.issues.map((issue)=>`- ${issue.code}: ${issue.message}${issue.path ? ` (${issue.path})` : ''}`)
-    ].join('\n'));
-};
-export { verifyCloudflareOutputMutationPolicy } from "./mutation-policy.mjs";
-export { assertCloudflareOutput, verifyCloudflareOutput };
+export * from "@modern-js/app-tools-extensions/cloudflare-output-verifier";

package/dist/esm-node/plugins/deploy/platforms/templates/netlify-entry.cjs

@@ -1,78 +1,57 @@
 const fs = require('node:fs/promises');
 const path = require('node:path');
 const { createNetlifyFunction } = require('@modern-js/prod-server/netlify');
-
 p_genPluginImportsCode;
-
-if (!process.env.NODE_ENV) {
-  process.env.NODE_ENV = 'production';
-}
-
+if (!process.env.NODE_ENV) process.env.NODE_ENV = 'production';
 let requestHandler = null;
 let handlerCreationPromise = null;
-
 async function loadRoutes(routeFilepath) {
-  try {
-    await fs.access(routeFilepath);
-    const content = await fs.readFile(routeFilepath, 'utf-8');
-    const routeSpec = JSON.parse(content);
-    return routeSpec.routes || [];
-  } catch (error) {
-    console.warn(
-      'route.json not found or invalid, continuing with empty routes.',
-    );
-    return [];
-  }
+    try {
+        await fs.access(routeFilepath);
+        const content = await fs.readFile(routeFilepath, 'utf-8');
+        const routeSpec = JSON.parse(content);
+        return routeSpec.routes || [];
+    } catch (error) {
+        console.warn('route.json not found or invalid, continuing with empty routes.');
+        return [];
+    }
 }
-
 async function initServer() {
-  const routeFilepath = path.join(__dirname, p_ROUTE_SPEC_FILE);
-  const routes = await loadRoutes(routeFilepath);
-
-  const dynamicProdOptions = p_dynamicProdOptions;
-
-  const prodServerOptions = {
-    pwd: __dirname,
-    routes,
-    disableCustomHook: true,
-    appContext: {
-      sharedDirectory: p_sharedDirectory,
-      apiDirectory: p_apiDirectory,
-      lambdaDirectory: p_lambdaDirectory,
-      bffRuntimeFramework: p_bffRuntimeFramework,
-    },
-    plugins: p_plugins,
-    serverConfigPath: p_serverDirectory,
-    ...dynamicProdOptions,
-  };
-
-  const requestHandler = await createNetlifyFunction(prodServerOptions);
-
-  return requestHandler;
+    const routeFilepath = path.join(__dirname, p_ROUTE_SPEC_FILE);
+    const routes = await loadRoutes(routeFilepath);
+    const dynamicProdOptions = p_dynamicProdOptions;
+    const prodServerOptions = {
+        pwd: __dirname,
+        routes,
+        disableCustomHook: true,
+        appContext: {
+            sharedDirectory: p_sharedDirectory,
+            apiDirectory: p_apiDirectory,
+            lambdaDirectory: p_lambdaDirectory,
+            bffRuntimeFramework: p_bffRuntimeFramework
+        },
+        plugins: p_plugins,
+        serverConfigPath: p_serverDirectory,
+        ...dynamicProdOptions
+    };
+    const requestHandler = await createNetlifyFunction(prodServerOptions);
+    return requestHandler;
 }
-
 async function createHandler() {
-  if (!handlerCreationPromise) {
-    handlerCreationPromise = (async () => {
-      try {
-        requestHandler = await initServer();
-      } catch (error) {
-        console.error('Error creating server:', error);
-        process.exit(1);
-      }
+    if (!handlerCreationPromise) handlerCreationPromise = (async ()=>{
+        try {
+            requestHandler = await initServer();
+        } catch (error) {
+            console.error('Error creating server:', error);
+            process.exit(1);
+        }
     })();
-  }
-  await handlerCreationPromise;
-  return requestHandler;
+    await handlerCreationPromise;
+    return requestHandler;
 }
-
 createHandler();
-
-const handler = async (request, context) => {
-  if (!requestHandler) {
-    await createHandler();
-  }
-  return requestHandler(request, context);
+const handler = async (request, context)=>{
+    if (!requestHandler) await createHandler();
+    return requestHandler(request, context);
 };
-
 module.exports.default = handler;

package/dist/esm-node/plugins/deploy/platforms/templates/netlify-entry.mjs

@@ -2,80 +2,58 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { createNetlifyFunction } from '@modern-js/prod-server/netlify';
-
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-
 p_genPluginImportsCode;
-
-if (!process.env.NODE_ENV) {
-  process.env.NODE_ENV = 'production';
-}
-
+if (!process.env.NODE_ENV) process.env.NODE_ENV = 'production';
 let requestHandler = null;
 let handlerCreationPromise = null;
-
 async function loadRoutes(routeFilepath) {
-  try {
-    await fs.access(routeFilepath);
-    const content = await fs.readFile(routeFilepath, 'utf-8');
-    const routeSpec = JSON.parse(content);
-    return routeSpec.routes || [];
-  } catch (error) {
-    console.warn(
-      'route.json not found or invalid, continuing with empty routes.',
-    );
-    return [];
-  }
+    try {
+        await fs.access(routeFilepath);
+        const content = await fs.readFile(routeFilepath, 'utf-8');
+        const routeSpec = JSON.parse(content);
+        return routeSpec.routes || [];
+    } catch (error) {
+        console.warn('route.json not found or invalid, continuing with empty routes.');
+        return [];
+    }
 }
-
 async function initServer() {
-  const routeFilepath = path.join(__dirname, p_ROUTE_SPEC_FILE);
-  const routes = await loadRoutes(routeFilepath);
-
-  const dynamicProdOptions = p_dynamicProdOptions;
-
-  const prodServerOptions = {
-    pwd: __dirname,
-    routes,
-    disableCustomHook: true,
-    appContext: {
-      sharedDirectory: p_sharedDirectory,
-      apiDirectory: p_apiDirectory,
-      lambdaDirectory: p_lambdaDirectory,
-      bffRuntimeFramework: p_bffRuntimeFramework,
-    },
-    plugins: p_plugins,
-    serverConfigPath: p_serverDirectory,
-    ...dynamicProdOptions,
-  };
-
-  const requestHandler = await createNetlifyFunction(prodServerOptions);
-
-  return requestHandler;
+    const routeFilepath = path.join(__dirname, p_ROUTE_SPEC_FILE);
+    const routes = await loadRoutes(routeFilepath);
+    const dynamicProdOptions = p_dynamicProdOptions;
+    const prodServerOptions = {
+        pwd: __dirname,
+        routes,
+        disableCustomHook: true,
+        appContext: {
+            sharedDirectory: p_sharedDirectory,
+            apiDirectory: p_apiDirectory,
+            lambdaDirectory: p_lambdaDirectory,
+            bffRuntimeFramework: p_bffRuntimeFramework
+        },
+        plugins: p_plugins,
+        serverConfigPath: p_serverDirectory,
+        ...dynamicProdOptions
+    };
+    const requestHandler = await createNetlifyFunction(prodServerOptions);
+    return requestHandler;
 }
-
 async function createHandler() {
-  if (!handlerCreationPromise) {
-    handlerCreationPromise = (async () => {
-      try {
-        requestHandler = await initServer();
-      } catch (error) {
-        console.error('Error creating server:', error);
-        process.exit(1);
-      }
+    if (!handlerCreationPromise) handlerCreationPromise = (async ()=>{
+        try {
+            requestHandler = await initServer();
+        } catch (error) {
+            console.error('Error creating server:', error);
+            process.exit(1);
+        }
     })();
-  }
-  await handlerCreationPromise;
-  return requestHandler;
+    await handlerCreationPromise;
+    return requestHandler;
 }
-
 createHandler();
-
-const handler = async (request, context) => {
-  if (!requestHandler) {
-    await createHandler();
-  }
-  return requestHandler(request, context);
+const handler = async (request, context)=>{
+    if (!requestHandler) await createHandler();
+    return requestHandler(request, context);
 };
-
 export default handler;

package/dist/esm-node/plugins/deploy/platforms/templates/node-entry.cjs

@@ -1,61 +1,44 @@
 const fs = require('node:fs/promises');
 const path = require('node:path');
 const { createProdServer } = require('@modern-js/prod-server');
-
 p_genPluginImportsCode;
-
-if (!process.env.NODE_ENV) {
-  process.env.NODE_ENV = 'production';
-}
-
+if (!process.env.NODE_ENV) process.env.NODE_ENV = 'production';
 async function loadRoutes(routeFilepath) {
-  try {
-    await fs.access(routeFilepath);
-    const content = await fs.readFile(routeFilepath, 'utf-8');
-    const routeSpec = JSON.parse(content);
-    return routeSpec.routes || [];
-  } catch (error) {
-    console.warn(
-      'route.json not found or invalid, continuing with empty routes.',
-    );
-    return [];
-  }
+    try {
+        await fs.access(routeFilepath);
+        const content = await fs.readFile(routeFilepath, 'utf-8');
+        const routeSpec = JSON.parse(content);
+        return routeSpec.routes || [];
+    } catch (error) {
+        console.warn('route.json not found or invalid, continuing with empty routes.');
+        return [];
+    }
 }
-
 async function main() {
-  const routeFilepath = path.join(__dirname, p_ROUTE_SPEC_FILE);
-  const routes = await loadRoutes(routeFilepath);
-
-  const dynamicProdOptions = p_dynamicProdOptions;
-  const prodServerOptions = {
-    pwd: __dirname,
-    routes,
-    disableCustomHook: true,
-    appContext: {
-      sharedDirectory: p_sharedDirectory,
-      apiDirectory: p_apiDirectory,
-      lambdaDirectory: p_lambdaDirectory,
-      bffRuntimeFramework: p_bffRuntimeFramework,
-    },
-    plugins: p_plugins,
-    serverConfigPath: p_serverDirectory,
-    ...dynamicProdOptions,
-  };
-
-  const app = await createProdServer(prodServerOptions);
-  const port = process.env.PORT || 8080;
-  app.listen(
-    {
-      host: '::',
-      port,
-    },
-    () => {
-      console.log(
-        `\x1b[32mServer is listening on http://[::]:${port}`,
-        '\x1b[0m',
-      );
-    },
-  );
+    const routeFilepath = path.join(__dirname, p_ROUTE_SPEC_FILE);
+    const routes = await loadRoutes(routeFilepath);
+    const dynamicProdOptions = p_dynamicProdOptions;
+    const prodServerOptions = {
+        pwd: __dirname,
+        routes,
+        disableCustomHook: true,
+        appContext: {
+            sharedDirectory: p_sharedDirectory,
+            apiDirectory: p_apiDirectory,
+            lambdaDirectory: p_lambdaDirectory,
+            bffRuntimeFramework: p_bffRuntimeFramework
+        },
+        plugins: p_plugins,
+        serverConfigPath: p_serverDirectory,
+        ...dynamicProdOptions
+    };
+    const app = await createProdServer(prodServerOptions);
+    const port = process.env.PORT || 8080;
+    app.listen({
+        host: '::',
+        port
+    }, ()=>{
+        console.log(`\x1b[32mServer is listening on http://[::]:${port}`, '\x1b[0m');
+    });
 }
-
 main();

package/dist/esm-node/plugins/deploy/platforms/templates/node-entry.mjs

@@ -2,63 +2,45 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { createProdServer } from '@modern-js/prod-server';
-
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-
 p_genPluginImportsCode;
-
-if (!process.env.NODE_ENV) {
-  process.env.NODE_ENV = 'production';
-}
-
+if (!process.env.NODE_ENV) process.env.NODE_ENV = 'production';
 async function loadRoutes(routeFilepath) {
-  try {
-    await fs.access(routeFilepath);
-    const content = await fs.readFile(routeFilepath, 'utf-8');
-    const routeSpec = JSON.parse(content);
-    return routeSpec.routes || [];
-  } catch (error) {
-    console.warn(
-      'route.json not found or invalid, continuing with empty routes.',
-    );
-    return [];
-  }
+    try {
+        await fs.access(routeFilepath);
+        const content = await fs.readFile(routeFilepath, 'utf-8');
+        const routeSpec = JSON.parse(content);
+        return routeSpec.routes || [];
+    } catch (error) {
+        console.warn('route.json not found or invalid, continuing with empty routes.');
+        return [];
+    }
 }
-
 async function main() {
-  const routeFilepath = path.join(__dirname, p_ROUTE_SPEC_FILE);
-  const routes = await loadRoutes(routeFilepath);
-
-  const dynamicProdOptions = p_dynamicProdOptions;
-  const prodServerOptions = {
-    pwd: __dirname,
-    routes,
-    disableCustomHook: true,
-    appContext: {
-      sharedDirectory: p_sharedDirectory,
-      apiDirectory: p_apiDirectory,
-      lambdaDirectory: p_lambdaDirectory,
-      bffRuntimeFramework: p_bffRuntimeFramework,
-    },
-    plugins: p_plugins,
-    serverConfigPath: p_serverDirectory,
-    ...dynamicProdOptions,
-  };
-
-  const app = await createProdServer(prodServerOptions);
-  const port = process.env.PORT || 8080;
-  app.listen(
-    {
-      host: '::',
-      port,
-    },
-    () => {
-      console.log(
-        `\x1b[32mServer is listening on http://[::]:${port}`,
-        '\x1b[0m',
-      );
-    },
-  );
+    const routeFilepath = path.join(__dirname, p_ROUTE_SPEC_FILE);
+    const routes = await loadRoutes(routeFilepath);
+    const dynamicProdOptions = p_dynamicProdOptions;
+    const prodServerOptions = {
+        pwd: __dirname,
+        routes,
+        disableCustomHook: true,
+        appContext: {
+            sharedDirectory: p_sharedDirectory,
+            apiDirectory: p_apiDirectory,
+            lambdaDirectory: p_lambdaDirectory,
+            bffRuntimeFramework: p_bffRuntimeFramework
+        },
+        plugins: p_plugins,
+        serverConfigPath: p_serverDirectory,
+        ...dynamicProdOptions
+    };
+    const app = await createProdServer(prodServerOptions);
+    const port = process.env.PORT || 8080;
+    app.listen({
+        host: '::',
+        port
+    }, ()=>{
+        console.log(`\x1b[32mServer is listening on http://[::]:${port}`, '\x1b[0m');
+    });
 }
-
 main();