@modern-js/prod-server 1.1.5 → 1.1.7

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @modern-js/prod-server
 
+## 1.1.7
+
+### Patch Changes
+
+- d4afeba71: fix: remove cors for prod-server
+
+## 1.1.6
+
+### Patch Changes
+
+- 430d417e: optimize server side hot reload
+- Updated dependencies [6451a098]
+- Updated dependencies [d5a2cfd8]
+- Updated dependencies [437367c6]
+  - @modern-js/utils@1.7.6
+  - @modern-js/server-core@1.3.5
+
 ## 1.1.5
 
 ### Patch Changes

package/dist/js/modern/server/modern-server.js

@@ -111,13 +111,7 @@ export class ModernServer {
       distDir,
       staticGenerate,
       conf
-    } = this; // Todo: why add this middleware
-
-    this.addHandler((ctx, next) => {
-      ctx.res.setHeader('Access-Control-Allow-Origin', '*');
-      ctx.res.setHeader('Access-Control-Allow-Credentials', 'false');
-      next();
-    });
+    } = this;
     debug('final server conf', this.conf); // proxy handler, each proxy has own handler
 
     this.proxyHandler = createProxyHandler((_conf$bff = conf.bff) === null || _conf$bff === void 0 ? void 0 : _conf$bff.proxy);
@@ -167,8 +161,24 @@ export class ModernServer {
   onListening(_) {// empty
   }
 
-  onServerChange(_) {
-    this.prepareFrameHandler();
+  onServerChange({
+    filepath
+  }) {
+    const {
+      pwd
+    } = this;
+    const {
+      api,
+      server
+    } = AGGRED_DIR;
+    const apiPath = path.normalize(path.join(pwd, api));
+    const serverPath = path.normalize(path.join(pwd, server));
+    const onlyApi = filepath.startsWith(apiPath);
+    const onlyWeb = filepath.startsWith(serverPath);
+    this.prepareFrameHandler({
+      onlyWeb,
+      onlyApi
+    });
   } // exposed requestHandler
 
 
@@ -217,11 +227,15 @@ export class ModernServer {
   } // gather frame extension and get framework handler
 
 
-  async prepareFrameHandler() {
+  async prepareFrameHandler(options) {
     const {
       workDir,
       runner
-    } = this; // server hook, gather plugin inject
+    } = this;
+    const {
+      onlyApi,
+      onlyWeb
+    } = options || {}; // server hook, gather plugin inject
 
     const _createMiddlewareColl = createMiddlewareCollecter(),
           {
@@ -237,12 +251,12 @@ export class ModernServer {
     const apiDir = path.join(workDir, API_DIR);
     const serverDir = path.join(workDir, SERVER_DIR); // get api or web server handler from server-framework plugin
 
-    if (await fs.pathExists(path.join(serverDir))) {
+    if ((await fs.pathExists(path.join(serverDir))) && !onlyApi) {
       const webExtension = mergeExtension(pluginWebExt);
       this.frameWebHandler = await this.prepareWebHandler(webExtension);
     }
 
-    if (fs.existsSync(apiDir)) {
+    if (fs.existsSync(apiDir) && !onlyWeb) {
       const mode = fs.existsSync(path.join(apiDir, AGGRED_DIR.lambda)) ? ApiServerMode.frame : ApiServerMode.func;
       debug('exists api dir', mode); // if use lambda/, mean framework style of writing, then discard user extension
 

package/dist/js/node/server/modern-server.js

@@ -140,13 +140,7 @@ class ModernServer {
       distDir,
       staticGenerate,
       conf
-    } = this; // Todo: why add this middleware
-
-    this.addHandler((ctx, next) => {
-      ctx.res.setHeader('Access-Control-Allow-Origin', '*');
-      ctx.res.setHeader('Access-Control-Allow-Credentials', 'false');
-      next();
-    });
+    } = this;
     (0, _utils2.debug)('final server conf', this.conf); // proxy handler, each proxy has own handler
 
     this.proxyHandler = (0, _proxy.createProxyHandler)((_conf$bff = conf.bff) === null || _conf$bff === void 0 ? void 0 : _conf$bff.proxy);
@@ -196,8 +190,27 @@ class ModernServer {
   onListening(_) {// empty
   }
 
-  onServerChange(_) {
-    this.prepareFrameHandler();
+  onServerChange({
+    filepath
+  }) {
+    const {
+      pwd
+    } = this;
+    const {
+      api,
+      server
+    } = _constants.AGGRED_DIR;
+
+    const apiPath = _path.default.normalize(_path.default.join(pwd, api));
+
+    const serverPath = _path.default.normalize(_path.default.join(pwd, server));
+
+    const onlyApi = filepath.startsWith(apiPath);
+    const onlyWeb = filepath.startsWith(serverPath);
+    this.prepareFrameHandler({
+      onlyWeb,
+      onlyApi
+    });
   } // exposed requestHandler
 
 
@@ -247,11 +260,15 @@ class ModernServer {
   } // gather frame extension and get framework handler
 
 
-  async prepareFrameHandler() {
+  async prepareFrameHandler(options) {
     const {
       workDir,
       runner
-    } = this; // server hook, gather plugin inject
+    } = this;
+    const {
+      onlyApi,
+      onlyWeb
+    } = options || {}; // server hook, gather plugin inject
 
     const _createMiddlewareColl = (0, _utils2.createMiddlewareCollecter)(),
           {
@@ -270,12 +287,12 @@ class ModernServer {
     const serverDir = _path.default.join(workDir, SERVER_DIR); // get api or web server handler from server-framework plugin
 
 
-    if (await _utils.fs.pathExists(_path.default.join(serverDir))) {
+    if ((await _utils.fs.pathExists(_path.default.join(serverDir))) && !onlyApi) {
       const webExtension = (0, _utils2.mergeExtension)(pluginWebExt);
       this.frameWebHandler = await this.prepareWebHandler(webExtension);
     }
 
-    if (_utils.fs.existsSync(apiDir)) {
+    if (_utils.fs.existsSync(apiDir) && !onlyWeb) {
       const mode = _utils.fs.existsSync(_path.default.join(apiDir, _constants.AGGRED_DIR.lambda)) ? _constants.ApiServerMode.frame : _constants.ApiServerMode.func;
       (0, _utils2.debug)('exists api dir', mode); // if use lambda/, mean framework style of writing, then discard user extension
 

package/dist/types/server/modern-server.d.ts

@@ -45,13 +45,20 @@ export declare class ModernServer implements ModernServerInterface {
   onClose(): Promise<void>;
   onRepack(_: BuildOptions): void;
   onListening(_: Server): void;
-  protected onServerChange(_: Record<string, any>): void;
+  protected onServerChange({
+    filepath
+  }: {
+    filepath: string;
+  }): void;
   getRequestHandler(): (req: IncomingMessage, res: ServerResponse, next?: () => void) => void | ServerResponse;
   createHTTPServer(handler: (req: IncomingMessage, res: ServerResponse, next?: () => void) => void): Promise<Server>;
   protected getRoutes(): ModernRouteInterface[];
   protected addHandler(handler: ModernServerHandler): void;
   protected render404(context: ModernServerContext): void;
-  protected prepareFrameHandler(): Promise<void>;
+  protected prepareFrameHandler(options?: {
+    onlyApi: boolean;
+    onlyWeb: boolean;
+  }): Promise<void>;
   protected prepareWebHandler(extension: ReturnType<typeof mergeExtension>): Promise<Adapter>;
   protected prepareAPIHandler(mode: ApiServerMode, extension: APIServerStartInput['config']): Promise<Adapter>;
   protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.5",
+  "version": "1.1.7",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -28,7 +28,7 @@
     }
   },
   "dependencies": {
-    "@modern-js/utils": "^1.7.3",
+    "@modern-js/utils": "^1.7.6",
     "@babel/compat-data": "^7.17.0",
     "@modern-js/server-core": "^1.3.5",
     "axios": "^0.24.0",
@@ -43,8 +43,8 @@
     "ua-parser-js": "^0.7.28"
   },
   "devDependencies": {
-    "@modern-js/types": "1.5.3",
-    "@modern-js/core": "1.10.2",
+    "@modern-js/types": "1.5.4",
+    "@modern-js/core": "1.11.1",
     "@scripts/jest-config": "0.0.0",
     "@scripts/build": "0.0.0",
     "@types/cookie": "^0.4.1",
@@ -86,7 +86,8 @@
       "files": [
         "src/**/*",
         "tsconfig.json",
-        "package.json"
+        "package.json",
+        "tests/**/*"
       ],
       "output": []
     }