@modern-js/plugin-server 2.42.2 → 2.44.0

package/dist/cjs/cli.js

@@ -32,30 +32,43 @@ __export(cli_exports, {
   serverPlugin: () => serverPlugin
 });
 module.exports = __toCommonJS(cli_exports);
-var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
-var import_server_utils = require("@modern-js/server-utils");
+var import_fs_extra = __toESM(require("@modern-js/utils/fs-extra"));
 var import_utils = require("@modern-js/utils");
+var import_server_utils = require("@modern-js/server-utils");
+function checkHasCache(appDir) {
+  const tsFilepath = import_path.default.resolve(appDir, "server", "cache.ts");
+  const jsfilepath = import_path.default.resolve(appDir, "server", "cache.js");
+  return import_fs_extra.default.existsSync(tsFilepath) || import_fs_extra.default.existsSync(jsfilepath);
+}
 const TS_CONFIG_FILENAME = "tsconfig.json";
 const serverPlugin = () => ({
   name: "@modern-js/plugin-server",
   setup: (api) => ({
-    config() {
-      return {};
+    collectServerPlugins({ plugins }) {
+      plugins.push({
+        "@modern-js/plugin-server": "@modern-js/plugin-server/server"
+      });
+      return {
+        plugins
+      };
     },
     async afterBuild() {
       const { appDirectory, distDirectory } = api.useAppContext();
+      if (checkHasCache(appDirectory)) {
+        return;
+      }
       const modernConfig = api.useResolvedConfigContext();
       const distDir = import_path.default.resolve(distDirectory);
       const serverDir = import_path.default.resolve(appDirectory, import_utils.SERVER_DIR);
       const sharedDir = import_path.default.resolve(appDirectory, import_utils.SHARED_DIR);
       const tsconfigPath = import_path.default.resolve(appDirectory, TS_CONFIG_FILENAME);
       const sourceDirs = [];
-      if (import_fs.default.existsSync(serverDir)) {
+      if (import_fs_extra.default.existsSync(serverDir)) {
         sourceDirs.push(serverDir);
-      }
-      if (import_fs.default.existsSync(sharedDir)) {
-        sourceDirs.push(sharedDir);
+        if (import_fs_extra.default.existsSync(sharedDir)) {
+          sourceDirs.push(sharedDir);
+        }
       }
       const { server } = modernConfig;
       const { alias } = modernConfig.source;
@@ -71,14 +84,6 @@ const serverPlugin = () => ({
           tsconfigPath
         });
       }
-    },
-    collectServerPlugins({ plugins }) {
-      plugins.push({
-        "@modern-js/plugin-server": "@modern-js/plugin-server/server"
-      });
-      return {
-        plugins
-      };
     }
   })
 });

package/dist/esm/cli.js

@@ -1,17 +1,28 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import fs from "fs";
 import path from "path";
+import fs from "@modern-js/utils/fs-extra";
+import { SERVER_DIR, SHARED_DIR } from "@modern-js/utils";
 import { compile } from "@modern-js/server-utils";
-import { SHARED_DIR, SERVER_DIR } from "@modern-js/utils";
+function checkHasCache(appDir) {
+  var tsFilepath = path.resolve(appDir, "server", "cache.ts");
+  var jsfilepath = path.resolve(appDir, "server", "cache.js");
+  return fs.existsSync(tsFilepath) || fs.existsSync(jsfilepath);
+}
 var TS_CONFIG_FILENAME = "tsconfig.json";
 var serverPlugin = function() {
   return {
     name: "@modern-js/plugin-server",
     setup: function(api) {
       return {
-        config: function config() {
-          return {};
+        collectServerPlugins: function collectServerPlugins(param) {
+          var plugins = param.plugins;
+          plugins.push({
+            "@modern-js/plugin-server": "@modern-js/plugin-server/server"
+          });
+          return {
+            plugins
+          };
         },
         afterBuild: function afterBuild() {
           return _async_to_generator(function() {
@@ -20,6 +31,11 @@ var serverPlugin = function() {
               switch (_state.label) {
                 case 0:
                   _api_useAppContext = api.useAppContext(), appDirectory = _api_useAppContext.appDirectory, distDirectory = _api_useAppContext.distDirectory;
+                  if (checkHasCache(appDirectory)) {
+                    return [
+                      2
+                    ];
+                  }
                   modernConfig = api.useResolvedConfigContext();
                   distDir = path.resolve(distDirectory);
                   serverDir = path.resolve(appDirectory, SERVER_DIR);
@@ -28,9 +44,9 @@ var serverPlugin = function() {
                   sourceDirs = [];
                   if (fs.existsSync(serverDir)) {
                     sourceDirs.push(serverDir);
-                  }
-                  if (fs.existsSync(sharedDir)) {
-                    sourceDirs.push(sharedDir);
+                    if (fs.existsSync(sharedDir)) {
+                      sourceDirs.push(sharedDir);
+                    }
                   }
                   server = modernConfig.server;
                   alias = modernConfig.source.alias;
@@ -62,15 +78,6 @@ var serverPlugin = function() {
               }
             });
           })();
-        },
-        collectServerPlugins: function collectServerPlugins(param) {
-          var plugins = param.plugins;
-          plugins.push({
-            "@modern-js/plugin-server": "@modern-js/plugin-server/server"
-          });
-          return {
-            plugins
-          };
         }
       };
     }

package/dist/esm-node/cli.js

@@ -1,16 +1,29 @@
-import fs from "fs";
 import path from "path";
+import fs from "@modern-js/utils/fs-extra";
+import { SERVER_DIR, SHARED_DIR } from "@modern-js/utils";
 import { compile } from "@modern-js/server-utils";
-import { SHARED_DIR, SERVER_DIR } from "@modern-js/utils";
+function checkHasCache(appDir) {
+  const tsFilepath = path.resolve(appDir, "server", "cache.ts");
+  const jsfilepath = path.resolve(appDir, "server", "cache.js");
+  return fs.existsSync(tsFilepath) || fs.existsSync(jsfilepath);
+}
 const TS_CONFIG_FILENAME = "tsconfig.json";
 const serverPlugin = () => ({
   name: "@modern-js/plugin-server",
   setup: (api) => ({
-    config() {
-      return {};
+    collectServerPlugins({ plugins }) {
+      plugins.push({
+        "@modern-js/plugin-server": "@modern-js/plugin-server/server"
+      });
+      return {
+        plugins
+      };
     },
     async afterBuild() {
       const { appDirectory, distDirectory } = api.useAppContext();
+      if (checkHasCache(appDirectory)) {
+        return;
+      }
       const modernConfig = api.useResolvedConfigContext();
       const distDir = path.resolve(distDirectory);
       const serverDir = path.resolve(appDirectory, SERVER_DIR);
@@ -19,9 +32,9 @@ const serverPlugin = () => ({
       const sourceDirs = [];
       if (fs.existsSync(serverDir)) {
         sourceDirs.push(serverDir);
-      }
-      if (fs.existsSync(sharedDir)) {
-        sourceDirs.push(sharedDir);
+        if (fs.existsSync(sharedDir)) {
+          sourceDirs.push(sharedDir);
+        }
       }
       const { server } = modernConfig;
       const { alias } = modernConfig.source;
@@ -37,14 +50,6 @@ const serverPlugin = () => ({
           tsconfigPath
         });
       }
-    },
-    collectServerPlugins({ plugins }) {
-      plugins.push({
-        "@modern-js/plugin-server": "@modern-js/plugin-server/server"
-      });
-      return {
-        plugins
-      };
     }
   })
 });

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.42.2",
+  "version": "2.44.0",
   "types": "./dist/types/cli.d.ts",
   "jsnext:source": "./src/cli",
   "main": "./dist/cjs/cli.js",
@@ -51,20 +51,20 @@
   },
   "dependencies": {
     "@swc/helpers": "0.5.3",
-    "@modern-js/server-utils": "2.42.2",
-    "@modern-js/utils": "2.42.2"
+    "@modern-js/utils": "2.44.0",
+    "@modern-js/server-utils": "2.44.0"
   },
   "devDependencies": {
     "typescript": "^5",
     "@types/jest": "^29",
     "@types/node": "^14",
     "jest": "^29",
-    "@modern-js/server-core": "2.42.2",
-    "@modern-js/app-tools": "2.42.2",
-    "@modern-js/core": "2.42.2",
-    "@scripts/build": "2.42.2",
-    "@modern-js/types": "2.42.2",
-    "@scripts/jest-config": "2.42.2"
+    "@modern-js/server-core": "2.44.0",
+    "@modern-js/app-tools": "2.44.0",
+    "@modern-js/core": "2.44.0",
+    "@scripts/build": "2.44.0",
+    "@modern-js/types": "2.44.0",
+    "@scripts/jest-config": "2.44.0"
   },
   "sideEffects": [
     "*.css",