@modern-js/app-tools 2.49.3-alpha.15 → 2.49.3-alpha.16

package/dist/cjs/plugins/deploy/dependencies.js

@@ -37,16 +37,6 @@ var import_utils = require("@modern-js/utils");
 var import_pkg_types = require("pkg-types");
 var import_mlly = require("mlly");
 var import_utils2 = require("./utils");
-const readDirRecursive = async (dir) => {
-  const files = await import_utils.fs.readdir(dir, {
-    withFileTypes: true
-  });
-  const filesAndDirs = await Promise.all(files.map(async (file) => {
-    const resPath = import_node_path.default.resolve(dir, file.name);
-    return file.isDirectory() ? readDirRecursive(resPath) : resPath;
-  }));
-  return filesAndDirs.flat();
-};
 async function isFile(file) {
   try {
     const stat = await import_utils.fs.stat(file);
@@ -59,7 +49,7 @@ async function isFile(file) {
   }
 }
 const findEntryFiles = async (rootDir) => {
-  const files = await readDirRecursive(rootDir);
+  const files = await (0, import_utils2.readDirRecursive)(rootDir);
   return files;
 };
 const handleDependencies = async (appDir, serverRootDir, include) => {

package/dist/cjs/plugins/deploy/index.js

@@ -24,6 +24,8 @@ module.exports = __toCommonJS(deploy_exports);
 var import_std_env = require("std-env");
 var import_utils = require("./utils");
 var import_node = require("./platforms/node");
+var import_vercel = require("./platforms/vercel");
+var import_netlify = require("./platforms/netlify");
 var deploy_default = () => ({
   name: "@modern-js/plugin-deploy",
   pre: [
@@ -45,7 +47,10 @@ var deploy_default = () => ({
             deployPreset = (0, import_node.createNodePreset)(appContext, modernConfig, needModernServer);
             break;
           case "vercel":
-            deployPreset = (0, import_node.createNodePreset)(appContext, modernConfig, needModernServer);
+            deployPreset = (0, import_vercel.createVercelPreset)(appContext, modernConfig, needModernServer);
+            break;
+          case "netlify":
+            deployPreset = (0, import_netlify.createNetlifyPreset)(appContext, modernConfig, needModernServer);
             break;
           default: {
             throw new Error("unknown deploy target, MODERNJS_DEPLOY should be set");

package/dist/cjs/plugins/deploy/platforms/node.js

@@ -35,7 +35,7 @@ var import_node_path = __toESM(require("node:path"));
 var import_utils = require("@modern-js/utils");
 var import_utils2 = require("../utils");
 var import_dependencies = require("../dependencies");
-const createNodePreset = (appContext, config) => {
+const createNodePreset = (appContext, config, needModernServer) => {
   const { appDirectory, distDirectory, serverInternalPlugins, sharedDirectory, apiDirectory, lambdaDirectory, metaName, entrypoints } = appContext;
   const plugins = (0, import_utils.getInternalPlugins)(appDirectory, serverInternalPlugins);
   const outputDirectory = import_node_path.default.join(appDirectory, ".output");
@@ -49,6 +49,9 @@ const createNodePreset = (appContext, config) => {
     },
     async genEntry() {
       var _config_bff;
+      if (!needModernServer) {
+        return;
+      }
       const serverConfig = {
         server: {
           port: 8080

package/dist/cjs/plugins/deploy/utils.js

@@ -34,6 +34,7 @@ __export(utils_exports, {
   getPluginsCode: () => getPluginsCode,
   getProjectUsage: () => getProjectUsage,
   linkPackage: () => linkPackage,
+  readDirRecursive: () => readDirRecursive,
   serverAppContenxtTemplate: () => serverAppContenxtTemplate,
   writePackage: () => writePackage
 });
@@ -139,6 +140,16 @@ const linkPackage = async (from, to, projectRootDir) => {
     console.error("Cannot link", from, "to", to, error);
   });
 };
+const readDirRecursive = async (dir) => {
+  const files = await import_utils.fs.readdir(dir, {
+    withFileTypes: true
+  });
+  const filesAndDirs = await Promise.all(files.map(async (file) => {
+    const resPath = import_path.default.resolve(dir, file.name);
+    return file.isDirectory() ? readDirRecursive(resPath) : resPath;
+  }));
+  return filesAndDirs.flat();
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   applyProductionCondition,
@@ -147,6 +158,7 @@ const linkPackage = async (from, to, projectRootDir) => {
   getPluginsCode,
   getProjectUsage,
   linkPackage,
+  readDirRecursive,
   serverAppContenxtTemplate,
   writePackage
 });

package/dist/esm/plugins/deploy/dependencies.js

@@ -8,52 +8,7 @@ import { nodeFileTrace, resolve } from "@vercel/nft";
 import { fs as fse, pkgUp, semver } from "@modern-js/utils";
 import { readPackageJSON } from "pkg-types";
 import { parseNodeModulePath } from "mlly";
-import { linkPackage, writePackage } from "./utils";
-var readDirRecursive = function() {
-  var _ref = _async_to_generator(function(dir) {
-    var files, filesAndDirs;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          return [
-            4,
-            fse.readdir(dir, {
-              withFileTypes: true
-            })
-          ];
-        case 1:
-          files = _state.sent();
-          return [
-            4,
-            Promise.all(files.map(function() {
-              var _ref2 = _async_to_generator(function(file) {
-                var resPath;
-                return _ts_generator(this, function(_state2) {
-                  resPath = path.resolve(dir, file.name);
-                  return [
-                    2,
-                    file.isDirectory() ? readDirRecursive(resPath) : resPath
-                  ];
-                });
-              });
-              return function(file) {
-                return _ref2.apply(this, arguments);
-              };
-            }()))
-          ];
-        case 2:
-          filesAndDirs = _state.sent();
-          return [
-            2,
-            filesAndDirs.flat()
-          ];
-      }
-    });
-  });
-  return function readDirRecursive2(dir) {
-    return _ref.apply(this, arguments);
-  };
-}();
+import { linkPackage, readDirRecursive, writePackage } from "./utils";
 function isFile(file) {
   return _isFile.apply(this, arguments);
 }

package/dist/esm/plugins/deploy/index.js

@@ -3,6 +3,8 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { provider } from "std-env";
 import { getProjectUsage } from "./utils";
 import { createNodePreset } from "./platforms/node";
+import { createVercelPreset } from "./platforms/vercel";
+import { createNetlifyPreset } from "./platforms/netlify";
 function deploy_default() {
   return {
     name: "@modern-js/plugin-deploy",
@@ -29,7 +31,10 @@ function deploy_default() {
                       deployPreset = createNodePreset(appContext, modernConfig, needModernServer);
                       break;
                     case "vercel":
-                      deployPreset = createNodePreset(appContext, modernConfig, needModernServer);
+                      deployPreset = createVercelPreset(appContext, modernConfig, needModernServer);
+                      break;
+                    case "netlify":
+                      deployPreset = createNetlifyPreset(appContext, modernConfig, needModernServer);
                       break;
                     default: {
                       throw new Error("unknown deploy target, MODERNJS_DEPLOY should be set");

package/dist/esm/plugins/deploy/platforms/node.js

@@ -4,7 +4,7 @@ import path from "node:path";
 import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG, fs as fse, getInternalPlugins } from "@modern-js/utils";
 import { genPluginImportsCode, serverAppContenxtTemplate } from "../utils";
 import { handleDependencies } from "../dependencies";
-var createNodePreset = function(appContext, config) {
+var createNodePreset = function(appContext, config, needModernServer) {
   var appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, serverInternalPlugins = appContext.serverInternalPlugins, sharedDirectory = appContext.sharedDirectory, apiDirectory = appContext.apiDirectory, lambdaDirectory = appContext.lambdaDirectory, metaName = appContext.metaName, entrypoints = appContext.entrypoints;
   var plugins = getInternalPlugins(appDirectory, serverInternalPlugins);
   var outputDirectory = path.join(appDirectory, ".output");
@@ -52,6 +52,11 @@ var createNodePreset = function(appContext, config) {
         return _ts_generator(this, function(_state) {
           switch (_state.label) {
             case 0:
+              if (!needModernServer) {
+                return [
+                  2
+                ];
+              }
               serverConfig = {
                 server: {
                   port: 8080

package/dist/esm/plugins/deploy/utils.js

@@ -238,6 +238,51 @@ var linkPackage = function() {
     return _ref.apply(this, arguments);
   };
 }();
+var readDirRecursive = function() {
+  var _ref = _async_to_generator(function(dir) {
+    var files, filesAndDirs;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          return [
+            4,
+            fse.readdir(dir, {
+              withFileTypes: true
+            })
+          ];
+        case 1:
+          files = _state.sent();
+          return [
+            4,
+            Promise.all(files.map(function() {
+              var _ref2 = _async_to_generator(function(file) {
+                var resPath;
+                return _ts_generator(this, function(_state2) {
+                  resPath = path.resolve(dir, file.name);
+                  return [
+                    2,
+                    file.isDirectory() ? readDirRecursive(resPath) : resPath
+                  ];
+                });
+              });
+              return function(file) {
+                return _ref2.apply(this, arguments);
+              };
+            }()))
+          ];
+        case 2:
+          filesAndDirs = _state.sent();
+          return [
+            2,
+            filesAndDirs.flat()
+          ];
+      }
+    });
+  });
+  return function readDirRecursive2(dir) {
+    return _ref.apply(this, arguments);
+  };
+}();
 export {
   applyProductionCondition,
   applyPublicCondition,
@@ -245,6 +290,7 @@ export {
   getPluginsCode,
   getProjectUsage,
   linkPackage,
+  readDirRecursive,
   serverAppContenxtTemplate,
   writePackage
 };

package/dist/esm-node/plugins/deploy/dependencies.js

@@ -3,17 +3,7 @@ import { nodeFileTrace, resolve } from "@vercel/nft";
 import { fs as fse, pkgUp, semver } from "@modern-js/utils";
 import { readPackageJSON } from "pkg-types";
 import { parseNodeModulePath } from "mlly";
-import { linkPackage, writePackage } from "./utils";
-const readDirRecursive = async (dir) => {
-  const files = await fse.readdir(dir, {
-    withFileTypes: true
-  });
-  const filesAndDirs = await Promise.all(files.map(async (file) => {
-    const resPath = path.resolve(dir, file.name);
-    return file.isDirectory() ? readDirRecursive(resPath) : resPath;
-  }));
-  return filesAndDirs.flat();
-};
+import { linkPackage, readDirRecursive, writePackage } from "./utils";
 async function isFile(file) {
   try {
     const stat = await fse.stat(file);

package/dist/esm-node/plugins/deploy/index.js

@@ -1,6 +1,8 @@
 import { provider } from "std-env";
 import { getProjectUsage } from "./utils";
 import { createNodePreset } from "./platforms/node";
+import { createVercelPreset } from "./platforms/vercel";
+import { createNetlifyPreset } from "./platforms/netlify";
 var deploy_default = () => ({
   name: "@modern-js/plugin-deploy",
   pre: [
@@ -22,7 +24,10 @@ var deploy_default = () => ({
             deployPreset = createNodePreset(appContext, modernConfig, needModernServer);
             break;
           case "vercel":
-            deployPreset = createNodePreset(appContext, modernConfig, needModernServer);
+            deployPreset = createVercelPreset(appContext, modernConfig, needModernServer);
+            break;
+          case "netlify":
+            deployPreset = createNetlifyPreset(appContext, modernConfig, needModernServer);
             break;
           default: {
             throw new Error("unknown deploy target, MODERNJS_DEPLOY should be set");

package/dist/esm-node/plugins/deploy/platforms/node.js

@@ -2,7 +2,7 @@ import path from "node:path";
 import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG, fs as fse, getInternalPlugins } from "@modern-js/utils";
 import { genPluginImportsCode, serverAppContenxtTemplate } from "../utils";
 import { handleDependencies } from "../dependencies";
-const createNodePreset = (appContext, config) => {
+const createNodePreset = (appContext, config, needModernServer) => {
   const { appDirectory, distDirectory, serverInternalPlugins, sharedDirectory, apiDirectory, lambdaDirectory, metaName, entrypoints } = appContext;
   const plugins = getInternalPlugins(appDirectory, serverInternalPlugins);
   const outputDirectory = path.join(appDirectory, ".output");
@@ -16,6 +16,9 @@ const createNodePreset = (appContext, config) => {
     },
     async genEntry() {
       var _config_bff;
+      if (!needModernServer) {
+        return;
+      }
       const serverConfig = {
         server: {
           port: 8080

package/dist/esm-node/plugins/deploy/utils.js

@@ -99,6 +99,16 @@ const linkPackage = async (from, to, projectRootDir) => {
     console.error("Cannot link", from, "to", to, error);
   });
 };
+const readDirRecursive = async (dir) => {
+  const files = await fse.readdir(dir, {
+    withFileTypes: true
+  });
+  const filesAndDirs = await Promise.all(files.map(async (file) => {
+    const resPath = path.resolve(dir, file.name);
+    return file.isDirectory() ? readDirRecursive(resPath) : resPath;
+  }));
+  return filesAndDirs.flat();
+};
 export {
   applyProductionCondition,
   applyPublicCondition,
@@ -106,6 +116,7 @@ export {
   getPluginsCode,
   getProjectUsage,
   linkPackage,
+  readDirRecursive,
   serverAppContenxtTemplate,
   writePackage
 };

package/dist/types/plugins/deploy/utils.d.ts

@@ -31,3 +31,4 @@ export type TracedPackage = {
 };
 export declare const writePackage: (pkg: TracedPackage, version: string, projectDir: string, _pkgPath?: string) => Promise<void>;
 export declare const linkPackage: (from: string, to: string, projectRootDir: string) => Promise<void>;
+export declare const readDirRecursive: (dir: string) => Promise<string[]>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.49.3-alpha.15",
+  "version": "2.49.3-alpha.16",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -80,20 +80,20 @@
     "mlly": "^1.6.1",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
+    "@modern-js/plugin-data-loader": "2.49.2",
     "@modern-js/core": "2.49.2",
     "@modern-js/plugin": "2.49.2",
-    "@modern-js/prod-server": "2.49.2",
-    "@modern-js/node-bundle-require": "2.49.2",
-    "@modern-js/plugin-i18n": "2.49.2",
     "@modern-js/plugin-lint": "2.49.2",
     "@modern-js/rsbuild-plugin-esbuild": "2.49.2",
+    "@modern-js/prod-server": "2.49.2",
+    "@modern-js/plugin-i18n": "2.49.2",
     "@modern-js/server-core": "2.49.2",
-    "@modern-js/server": "2.49.2",
+    "@modern-js/node-bundle-require": "2.49.2",
     "@modern-js/server-utils": "2.49.2",
-    "@modern-js/uni-builder": "2.49.2",
-    "@modern-js/utils": "2.49.2",
     "@modern-js/types": "2.49.2",
-    "@modern-js/plugin-data-loader": "2.49.2"
+    "@modern-js/utils": "2.49.2",
+    "@modern-js/uni-builder": "2.49.2",
+    "@modern-js/server": "2.49.2"
   },
   "devDependencies": {
     "@rsbuild/plugin-swc": "0.6.10",