@modern-js/plugin-server 2.67.2 → 2.67.4

package/dist/cjs/server.js

@@ -103,6 +103,8 @@ var server_default = () => ({
     let factory;
     return {
       async prepare() {
+        const { metaName } = api.useAppContext();
+        await (0, import_utils2.checkServerMod)(metaName, pwd);
         await loadMod();
       },
       async reset() {

package/dist/cjs/utils.js

@@ -28,6 +28,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
+  checkServerMod: () => checkServerMod,
   loadMiddleware: () => loadMiddleware,
   loadServerMod: () => loadServerMod
 });
@@ -58,8 +59,24 @@ const loadServerMod = async (pwd = process.cwd()) => {
     middleware
   };
 };
+const checkServerMod = async (metaName, pwd = process.cwd()) => {
+  const webAppPath = import_path.default.resolve(pwd, import_utils.SERVER_DIR, WEB_APP_NAME);
+  const final = {
+    extensions: [
+      ".ts",
+      ".js"
+    ],
+    interop: true
+  };
+  const exist = (0, import_utils.findExists)(final.extensions.map((ext) => `${webAppPath}${ext}`));
+  const meta = (0, import_utils.getMeta)(metaName);
+  if (exist) {
+    console.warn(`${import_utils.chalk.red("\n[Warning]")} ${import_utils.chalk.yellow.bold(`\`server/index.ts\``)} is no longer maintained. To extend the server, please migrate to ${import_utils.chalk.yellow.bold(`\`server/${meta}.server.ts\``)};`);
+  }
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  checkServerMod,
   loadMiddleware,
   loadServerMod
 });

package/dist/esm/server.js

@@ -3,7 +3,7 @@ import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { isProd, logger } from "@modern-js/utils";
-import { loadMiddleware, loadServerMod } from "./utils";
+import { checkServerMod, loadMiddleware, loadServerMod } from "./utils";
 var HOOKS;
 (function(HOOKS2) {
   HOOKS2["AFTER_MATCH"] = "afterMatch";
@@ -115,14 +115,22 @@ function server_default() {
       return {
         prepare: function prepare() {
           return _async_to_generator(function() {
+            var metaName;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
+                  metaName = api.useAppContext().metaName;
                   return [
                     4,
-                    loadMod()
+                    checkServerMod(metaName, pwd)
                   ];
                 case 1:
+                  _state.sent();
+                  return [
+                    4,
+                    loadMod()
+                  ];
+                case 2:
                   _state.sent();
                   return [
                     2

package/dist/esm/utils.js

@@ -2,7 +2,7 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
-import { SERVER_DIR, requireExistModule } from "@modern-js/utils";
+import { SERVER_DIR, chalk, findExists, getMeta, requireExistModule } from "@modern-js/utils";
 var WEB_APP_NAME = "index";
 var loadMiddleware = function() {
   var _ref = _async_to_generator(function() {
@@ -73,7 +73,38 @@ var loadServerMod = function() {
     return _ref.apply(this, arguments);
   };
 }();
+var checkServerMod = function() {
+  var _ref = _async_to_generator(function(metaName) {
+    var pwd, webAppPath, final, exist, meta;
+    var _arguments = arguments;
+    return _ts_generator(this, function(_state) {
+      pwd = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : process.cwd();
+      webAppPath = path.resolve(pwd, SERVER_DIR, WEB_APP_NAME);
+      final = {
+        extensions: [
+          ".ts",
+          ".js"
+        ],
+        interop: true
+      };
+      exist = findExists(final.extensions.map(function(ext) {
+        return "".concat(webAppPath).concat(ext);
+      }));
+      meta = getMeta(metaName);
+      if (exist) {
+        console.warn("".concat(chalk.red("\n[Warning]"), " ").concat(chalk.yellow.bold("`server/index.ts`"), " is no longer maintained. To extend the server, please migrate to ").concat(chalk.yellow.bold("`server/".concat(meta, ".server.ts`")), ";"));
+      }
+      return [
+        2
+      ];
+    });
+  });
+  return function checkServerMod2(metaName) {
+    return _ref.apply(this, arguments);
+  };
+}();
 export {
+  checkServerMod,
   loadMiddleware,
   loadServerMod
 };

package/dist/esm-node/server.js

@@ -1,5 +1,5 @@
 import { isProd, logger } from "@modern-js/utils";
-import { loadMiddleware, loadServerMod } from "./utils";
+import { checkServerMod, loadMiddleware, loadServerMod } from "./utils";
 var HOOKS;
 (function(HOOKS2) {
   HOOKS2["AFTER_MATCH"] = "afterMatch";
@@ -77,6 +77,8 @@ var server_default = () => ({
     let factory;
     return {
       async prepare() {
+        const { metaName } = api.useAppContext();
+        await checkServerMod(metaName, pwd);
         await loadMod();
       },
       async reset() {

package/dist/esm-node/utils.js

@@ -1,5 +1,5 @@
 import path from "path";
-import { SERVER_DIR, requireExistModule } from "@modern-js/utils";
+import { SERVER_DIR, chalk, findExists, getMeta, requireExistModule } from "@modern-js/utils";
 const WEB_APP_NAME = "index";
 const loadMiddleware = async (pwd = process.cwd()) => {
   const middlewarePath = path.resolve(pwd, SERVER_DIR, "_middleware");
@@ -24,7 +24,23 @@ const loadServerMod = async (pwd = process.cwd()) => {
     middleware
   };
 };
+const checkServerMod = async (metaName, pwd = process.cwd()) => {
+  const webAppPath = path.resolve(pwd, SERVER_DIR, WEB_APP_NAME);
+  const final = {
+    extensions: [
+      ".ts",
+      ".js"
+    ],
+    interop: true
+  };
+  const exist = findExists(final.extensions.map((ext) => `${webAppPath}${ext}`));
+  const meta = getMeta(metaName);
+  if (exist) {
+    console.warn(`${chalk.red("\n[Warning]")} ${chalk.yellow.bold(`\`server/index.ts\``)} is no longer maintained. To extend the server, please migrate to ${chalk.yellow.bold(`\`server/${meta}.server.ts\``)};`);
+  }
+};
 export {
+  checkServerMod,
   loadMiddleware,
   loadServerMod
 };

package/dist/types/utils.d.ts

@@ -20,3 +20,4 @@ export declare const loadServerMod: (pwd?: string) => Promise<{
     };
     middleware: Middleware[];
 }>;
+export declare const checkServerMod: (metaName: string, pwd?: string) => Promise<void>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.67.2",
+  "version": "2.67.4",
   "types": "./dist/types/cli.d.ts",
   "jsnext:source": "./src/cli",
   "main": "./dist/cjs/cli.js",
@@ -65,19 +65,19 @@
   },
   "dependencies": {
     "@swc/helpers": "0.5.13",
-    "@modern-js/server-utils": "2.67.2",
-    "@modern-js/runtime-utils": "2.67.2",
-    "@modern-js/utils": "2.67.2"
+    "@modern-js/server-utils": "2.67.4",
+    "@modern-js/runtime-utils": "2.67.4",
+    "@modern-js/utils": "2.67.4"
   },
   "devDependencies": {
     "@types/jest": "^29",
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@modern-js/app-tools": "2.67.2",
-    "@modern-js/core": "2.67.2",
-    "@modern-js/server-core": "2.67.2",
-    "@modern-js/types": "2.67.2",
+    "@modern-js/app-tools": "2.67.4",
+    "@modern-js/core": "2.67.4",
+    "@modern-js/server-core": "2.67.4",
+    "@modern-js/types": "2.67.4",
     "@scripts/build": "2.66.0",
     "@scripts/jest-config": "2.66.0"
   },