@modern-js/app-tools 2.49.3-alpha.10 → 2.49.3-alpha.3

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.49.3-alpha.10",
+  "version": "2.49.3-alpha.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -81,19 +81,19 @@
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
     "@modern-js/core": "2.49.2",
-    "@modern-js/plugin-data-loader": "2.49.2",
     "@modern-js/plugin": "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/prod-server": "2.49.2",
     "@modern-js/rsbuild-plugin-esbuild": "2.49.2",
+    "@modern-js/plugin-lint": "2.49.2",
+    "@modern-js/server": "2.49.2",
+    "@modern-js/server-utils": "2.49.2",
     "@modern-js/server-core": "2.49.2",
-    "@modern-js/uni-builder": "2.49.2",
-    "@modern-js/node-bundle-require": "2.49.2",
     "@modern-js/types": "2.49.2",
+    "@modern-js/uni-builder": "2.49.2",
     "@modern-js/utils": "2.49.2",
-    "@modern-js/server": "2.49.2",
-    "@modern-js/server-utils": "2.49.2"
+    "@modern-js/plugin-data-loader": "2.49.2"
   },
   "devDependencies": {
     "@rsbuild/plugin-swc": "0.6.10",

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

@@ -1,36 +0,0 @@
-"use strict";
-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";
-}
-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 [];
-  }
-}
-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,
-    ...dynamicProdOptions
-  };
-  const app = await createProdServer(prodServerOptions);
-  const port = process.env.PORT || 8080;
-  app.listen(port, () => {
-    console.log("\\x1b[32mServer is listening on port", port, "\\x1b[0m");
-  });
-}
-main();

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

@@ -1,16 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var platform_exports = {};
-module.exports = __toCommonJS(platform_exports);

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

@@ -1,57 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var vercel_exports = {};
-__export(vercel_exports, {
-  genVercelEntry: () => genVercelEntry
-});
-module.exports = __toCommonJS(vercel_exports);
-var import_node_path = __toESM(require("node:path"));
-var import_utils = require("@modern-js/utils");
-var import_utils2 = require("../utils");
-async function genVercelEntry({ config, plugins, appContext } = {}) {
-  const defaultConfig = {
-    output: {
-      path: "."
-    }
-  };
-  const pluginImportCode = (0, import_utils2.genPluginImportsCode)(plugins || []);
-  const dynamicProdOptions = {
-    config: `${JSON.stringify(config || defaultConfig)}`,
-    serverConfigFile: import_utils.DEFAULT_SERVER_CONFIG,
-    plugins: `${(0, import_utils2.getPluginsCode)(plugins || [])}`,
-    appContext: `${appContext ? (0, import_utils2.severAppContextTemplate)(appContext) : "undefined"}`
-  };
-  let entryCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./vercelEntry.js"))).toString();
-  entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions));
-  return entryCode;
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  genVercelEntry
-});

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

@@ -1,55 +0,0 @@
-"use strict";
-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";
-}
-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 [];
-  }
-}
-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,
-    ...dynamicProdOptions
-  };
-  const app = await createProdServer(prodServerOptions);
-  return app.getRequestListener();
-}
-async function createHandler() {
-  if (!handlerCreationPromise) {
-    handlerCreationPromise = (async () => {
-      try {
-        requestHandler = await initServer();
-      } catch (error) {
-        console.error("Error creating server:", error);
-        process.exit(1);
-      }
-    })();
-  }
-  await handlerCreationPromise;
-  return requestHandler;
-}
-createHandler();
-module.exports = async (req, res) => {
-  if (!requestHandler) {
-    await createHandler();
-  }
-  return requestHandler(req, res);
-};

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

@@ -1,99 +0,0 @@
-var _async_to_generator = require("@swc/helpers/_/_async_to_generator");
-var _object_spread = require("@swc/helpers/_/_object_spread");
-var _ts_generator = require("@swc/helpers/_/_ts_generator");
-var fs = require("node:fs/promises");
-var path = require("node:path");
-var createProdServer = require("@modern-js/prod-server").createProdServer;
-p_genPluginImportsCode;
-if (!process.env.NODE_ENV) {
-  process.env.NODE_ENV = "production";
-}
-function loadRoutes(routeFilepath) {
-  return _loadRoutes.apply(this, arguments);
-}
-function _loadRoutes() {
-  _loadRoutes = _async_to_generator._(function(routeFilepath) {
-    var content, routeSpec, error;
-    return _ts_generator._(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          _state.trys.push([
-            0,
-            3,
-            ,
-            4
-          ]);
-          return [
-            4,
-            fs.access(routeFilepath)
-          ];
-        case 1:
-          _state.sent();
-          return [
-            4,
-            fs.readFile(routeFilepath, "utf-8")
-          ];
-        case 2:
-          content = _state.sent();
-          routeSpec = JSON.parse(content);
-          return [
-            2,
-            routeSpec.routes || []
-          ];
-        case 3:
-          error = _state.sent();
-          console.warn("route.json not found or invalid, continuing with empty routes.");
-          return [
-            2,
-            []
-          ];
-        case 4:
-          return [
-            2
-          ];
-      }
-    });
-  });
-  return _loadRoutes.apply(this, arguments);
-}
-function main() {
-  return _main.apply(this, arguments);
-}
-function _main() {
-  _main = _async_to_generator._(function() {
-    var routeFilepath, routes, dynamicProdOptions, prodServerOptions, app, port;
-    return _ts_generator._(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          routeFilepath = path.join(__dirname, p_ROUTE_SPEC_FILE);
-          return [
-            4,
-            loadRoutes(routeFilepath)
-          ];
-        case 1:
-          routes = _state.sent();
-          dynamicProdOptions = p_dynamicProdOptions;
-          prodServerOptions = _object_spread._({
-            pwd: __dirname,
-            routes,
-            disableCustomHook: true
-          }, dynamicProdOptions);
-          return [
-            4,
-            createProdServer(prodServerOptions)
-          ];
-        case 2:
-          app = _state.sent();
-          port = process.env.PORT || 8080;
-          app.listen(port, function() {
-            console.log("\\x1b[32mServer is listening on port", port, "\\x1b[0m");
-          });
-          return [
-            2
-          ];
-      }
-    });
-  });
-  return _main.apply(this, arguments);
-}
-main();

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

@@ -1,47 +0,0 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import path from "node:path";
-import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG, fs as fse } from "@modern-js/utils";
-import { genPluginImportsCode, getPluginsCode, severAppContextTemplate } from "../utils";
-function genVercelEntry() {
-  return _genVercelEntry.apply(this, arguments);
-}
-function _genVercelEntry() {
-  _genVercelEntry = _async_to_generator(function() {
-    var _ref, config, plugins, appContext, defaultConfig, pluginImportCode, dynamicProdOptions, entryCode;
-    var _arguments = arguments;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          _ref = _arguments.length > 0 && _arguments[0] !== void 0 ? _arguments[0] : {}, config = _ref.config, plugins = _ref.plugins, appContext = _ref.appContext;
-          defaultConfig = {
-            output: {
-              path: "."
-            }
-          };
-          pluginImportCode = genPluginImportsCode(plugins || []);
-          dynamicProdOptions = {
-            config: "".concat(JSON.stringify(config || defaultConfig)),
-            serverConfigFile: DEFAULT_SERVER_CONFIG,
-            plugins: "".concat(getPluginsCode(plugins || [])),
-            appContext: "".concat(appContext ? severAppContextTemplate(appContext) : "undefined")
-          };
-          return [
-            4,
-            fse.readFile(path.join(__dirname, "./vercelEntry.js"))
-          ];
-        case 1:
-          entryCode = _state.sent().toString();
-          entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", '"'.concat(ROUTE_SPEC_FILE, '"')).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions));
-          return [
-            2,
-            entryCode
-          ];
-      }
-    });
-  });
-  return _genVercelEntry.apply(this, arguments);
-}
-export {
-  genVercelEntry
-};

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

@@ -1,197 +0,0 @@
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-var require_vercelEntry = __commonJS({
-  "src/plugins/deploy/platforms/vercelEntry.js"(exports, module) {
-    var _async_to_generator = require("@swc/helpers/_/_async_to_generator");
-    var _object_spread = require("@swc/helpers/_/_object_spread");
-    var _ts_generator = require("@swc/helpers/_/_ts_generator");
-    var fs = require("node:fs/promises");
-    var path = require("node:path");
-    var createProdServer = require("@modern-js/prod-server").createProdServer;
-    p_genPluginImportsCode;
-    if (!process.env.NODE_ENV) {
-      process.env.NODE_ENV = "production";
-    }
-    var requestHandler = null;
-    var handlerCreationPromise = null;
-    function loadRoutes(routeFilepath) {
-      return _loadRoutes.apply(this, arguments);
-    }
-    function _loadRoutes() {
-      _loadRoutes = _async_to_generator._(function(routeFilepath) {
-        var content, routeSpec, error;
-        return _ts_generator._(this, function(_state) {
-          switch (_state.label) {
-            case 0:
-              _state.trys.push([
-                0,
-                3,
-                ,
-                4
-              ]);
-              return [
-                4,
-                fs.access(routeFilepath)
-              ];
-            case 1:
-              _state.sent();
-              return [
-                4,
-                fs.readFile(routeFilepath, "utf-8")
-              ];
-            case 2:
-              content = _state.sent();
-              routeSpec = JSON.parse(content);
-              return [
-                2,
-                routeSpec.routes || []
-              ];
-            case 3:
-              error = _state.sent();
-              console.warn("route.json not found or invalid, continuing with empty routes.");
-              return [
-                2,
-                []
-              ];
-            case 4:
-              return [
-                2
-              ];
-          }
-        });
-      });
-      return _loadRoutes.apply(this, arguments);
-    }
-    function initServer() {
-      return _initServer.apply(this, arguments);
-    }
-    function _initServer() {
-      _initServer = _async_to_generator._(function() {
-        var routeFilepath, routes, dynamicProdOptions, prodServerOptions, app;
-        return _ts_generator._(this, function(_state) {
-          switch (_state.label) {
-            case 0:
-              routeFilepath = path.join(__dirname, p_ROUTE_SPEC_FILE);
-              return [
-                4,
-                loadRoutes(routeFilepath)
-              ];
-            case 1:
-              routes = _state.sent();
-              dynamicProdOptions = p_dynamicProdOptions;
-              prodServerOptions = _object_spread._({
-                pwd: __dirname,
-                routes,
-                disableCustomHook: true
-              }, dynamicProdOptions);
-              return [
-                4,
-                createProdServer(prodServerOptions)
-              ];
-            case 2:
-              app = _state.sent();
-              return [
-                2,
-                app.getRequestListener()
-              ];
-          }
-        });
-      });
-      return _initServer.apply(this, arguments);
-    }
-    function createHandler() {
-      return _createHandler.apply(this, arguments);
-    }
-    function _createHandler() {
-      _createHandler = _async_to_generator._(function() {
-        return _ts_generator._(this, function(_state) {
-          switch (_state.label) {
-            case 0:
-              if (!handlerCreationPromise) {
-                handlerCreationPromise = _async_to_generator._(function() {
-                  var error;
-                  return _ts_generator._(this, function(_state2) {
-                    switch (_state2.label) {
-                      case 0:
-                        _state2.trys.push([
-                          0,
-                          2,
-                          ,
-                          3
-                        ]);
-                        return [
-                          4,
-                          initServer()
-                        ];
-                      case 1:
-                        requestHandler = _state2.sent();
-                        return [
-                          3,
-                          3
-                        ];
-                      case 2:
-                        error = _state2.sent();
-                        console.error("Error creating server:", error);
-                        process.exit(1);
-                        return [
-                          3,
-                          3
-                        ];
-                      case 3:
-                        return [
-                          2
-                        ];
-                    }
-                  });
-                })();
-              }
-              return [
-                4,
-                handlerCreationPromise
-              ];
-            case 1:
-              _state.sent();
-              return [
-                2,
-                requestHandler
-              ];
-          }
-        });
-      });
-      return _createHandler.apply(this, arguments);
-    }
-    createHandler();
-    module.exports = function() {
-      var _ref = _async_to_generator._(function(req, res) {
-        return _ts_generator._(this, function(_state) {
-          switch (_state.label) {
-            case 0:
-              if (!!requestHandler)
-                return [
-                  3,
-                  2
-                ];
-              return [
-                4,
-                createHandler()
-              ];
-            case 1:
-              _state.sent();
-              _state.label = 2;
-            case 2:
-              return [
-                2,
-                requestHandler(req, res)
-              ];
-          }
-        });
-      });
-      return function(req, res) {
-        return _ref.apply(this, arguments);
-      };
-    }();
-  }
-});
-export default require_vercelEntry();

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

@@ -1,35 +0,0 @@
-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";
-}
-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 [];
-  }
-}
-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,
-    ...dynamicProdOptions
-  };
-  const app = await createProdServer(prodServerOptions);
-  const port = process.env.PORT || 8080;
-  app.listen(port, () => {
-    console.log("\\x1b[32mServer is listening on port", port, "\\x1b[0m");
-  });
-}
-main();

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

@@ -1,23 +0,0 @@
-import path from "node:path";
-import { ROUTE_SPEC_FILE, DEFAULT_SERVER_CONFIG, fs as fse } from "@modern-js/utils";
-import { genPluginImportsCode, getPluginsCode, severAppContextTemplate } from "../utils";
-async function genVercelEntry({ config, plugins, appContext } = {}) {
-  const defaultConfig = {
-    output: {
-      path: "."
-    }
-  };
-  const pluginImportCode = genPluginImportsCode(plugins || []);
-  const dynamicProdOptions = {
-    config: `${JSON.stringify(config || defaultConfig)}`,
-    serverConfigFile: DEFAULT_SERVER_CONFIG,
-    plugins: `${getPluginsCode(plugins || [])}`,
-    appContext: `${appContext ? severAppContextTemplate(appContext) : "undefined"}`
-  };
-  let entryCode = (await fse.readFile(path.join(__dirname, "./vercelEntry.js"))).toString();
-  entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions));
-  return entryCode;
-}
-export {
-  genVercelEntry
-};

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

@@ -1,63 +0,0 @@
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-var require_vercelEntry = __commonJS({
-  "src/plugins/deploy/platforms/vercelEntry.js"(exports, module) {
-    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";
-    }
-    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 [];
-      }
-    }
-    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,
-        ...dynamicProdOptions
-      };
-      const app = await createProdServer(prodServerOptions);
-      return app.getRequestListener();
-    }
-    async function createHandler() {
-      if (!handlerCreationPromise) {
-        handlerCreationPromise = (async () => {
-          try {
-            requestHandler = await initServer();
-          } catch (error) {
-            console.error("Error creating server:", error);
-            process.exit(1);
-          }
-        })();
-      }
-      await handlerCreationPromise;
-      return requestHandler;
-    }
-    createHandler();
-    module.exports = async (req, res) => {
-      if (!requestHandler) {
-        await createHandler();
-      }
-      return requestHandler(req, res);
-    };
-  }
-});
-export default require_vercelEntry();

package/dist/types/plugins/deploy/platforms/nodeEntry.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/types/plugins/deploy/platforms/platform.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/types/plugins/deploy/platforms/vercelEntry.d.ts

@@ -1,2 +0,0 @@
-declare function _exports(req: any, res: any): Promise<any>;
-export = _exports;