@modern-js/server 1.1.3-beta.1 → 1.1.3

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @modern-js/server
 
+## 1.1.3
+
+### Patch Changes
+
+- 085a6a58: refactor server plugin
+- 085a6a58: refactor server plugin
+- 085a6a58: refactor server conifg
+- 085a6a58: support server runtime
+- 085a6a58: feat: refactor server plugin
+- Updated dependencies [085a6a58]
+- Updated dependencies [085a6a58]
+- Updated dependencies [085a6a58]
+- Updated dependencies [d280ea33]
+- Updated dependencies [d4fcc73a]
+- Updated dependencies [085a6a58]
+- Updated dependencies [ed1f6b12]
+- Updated dependencies [a5ebbb00]
+- Updated dependencies [085a6a58]
+  - @modern-js/core@1.1.3
+  - @modern-js/server-plugin@1.1.2
+  - @modern-js/server-utils@1.1.2
+  - @modern-js/utils@1.1.3
+
 ## 1.1.2
 
 ### Patch Changes

package/dist/js/modern/libs/render/cache/type.js

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

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

@@ -230,7 +230,7 @@ export class ModernDevServer extends ModernServer {
     const {
       mock
     } = AGGRED_DIR;
-    const defaultWatched = [`${pwd}/${mock}/**/*`, `${pwd}/${SERVER_DIR}/**/*`, `${pwd}/${API_DIR}/**/*`, `${pwd}/${SHARED_DIR}/**/*`];
+    const defaultWatched = [`${pwd}/${mock}/**/*`, `${pwd}/${SERVER_DIR}/**/*`, `${pwd}/${API_DIR}/!(typings)/**`, `${pwd}/${SHARED_DIR}/**/*`];
     const watcher = new Watcher();
     watcher.createDepTree(); // 监听文件变动，如果有变动则给 client，也就是 start 启动的插件发消息
 

package/dist/js/modern/server/index.js

@@ -7,7 +7,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import path from 'path';
 import { serverManager } from '@modern-js/server-plugin';
 import { logger as defaultLogger } from '@modern-js/utils';
-import { AppContext, initAppContext, initAppDir, loadUserConfig } from '@modern-js/core';
+import { AppContext, initAppContext, initAppDir, loadUserConfig, ConfigContext } from '@modern-js/core';
 import { ModernServer } from "./modern-server";
 import { APIModernServer, WebModernServer } from "./modern-server-split";
 import { measure as defaultMeasure } from "../libs/measure";
@@ -115,6 +115,7 @@ export class Server {
     } = this;
     const appContext = await this.initAppContext();
     serverManager.run(() => {
+      ConfigContext.set(this.options.config);
       AppContext.set(_objectSpread(_objectSpread({}, appContext), {}, {
         distDirectory: path.join(options.pwd, options.config.output.path || 'dist')
       }));

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

@@ -231,9 +231,7 @@ export class ModernServer {
       const mode = fs.existsSync(path.join(apiDir, AGGRED_DIR.lambda)) ? ApiServerMode.frame : ApiServerMode.func; // if use lambda/, mean framework style of writing, then discard user extension
 
       const apiExtension = mergeExtension(pluginAPIExt);
-      this.frameAPIHandler = await this.prepareAPIHandler(mode, _objectSpread(_objectSpread({}, apiExtension), {}, {
-        modernJsConfig: this.conf
-      }));
+      this.frameAPIHandler = await this.prepareAPIHandler(mode, apiExtension);
     }
   }
   /* —————————————————————— function will be overwrite —————————————————————— */

package/dist/js/modern/type.js

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

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

@@ -259,7 +259,7 @@ class ModernDevServer extends _modernServer.ModernServer {
     const {
       mock
     } = _constants.AGGRED_DIR;
-    const defaultWatched = [`${pwd}/${mock}/**/*`, `${pwd}/${_utils.SERVER_DIR}/**/*`, `${pwd}/${_utils.API_DIR}/**/*`, `${pwd}/${_utils.SHARED_DIR}/**/*`];
+    const defaultWatched = [`${pwd}/${mock}/**/*`, `${pwd}/${_utils.SERVER_DIR}/**/*`, `${pwd}/${_utils.API_DIR}/!(typings)/**`, `${pwd}/${_utils.SHARED_DIR}/**/*`];
     const watcher = new _watcher.default();
     watcher.createDepTree(); // 监听文件变动，如果有变动则给 client，也就是 start 启动的插件发消息
 

package/dist/js/node/server/index.js

@@ -132,6 +132,8 @@ class Server {
     const appContext = await this.initAppContext();
 
     _serverPlugin.serverManager.run(() => {
+      _core.ConfigContext.set(this.options.config);
+
       _core.AppContext.set(_objectSpread(_objectSpread({}, appContext), {}, {
         distDirectory: _path.default.join(options.pwd, options.config.output.path || 'dist')
       }));

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

@@ -266,9 +266,7 @@ class ModernServer {
       const mode = _utils.fs.existsSync(_path.default.join(apiDir, _constants.AGGRED_DIR.lambda)) ? _constants.ApiServerMode.frame : _constants.ApiServerMode.func; // if use lambda/, mean framework style of writing, then discard user extension
 
       const apiExtension = (0, _utils2.mergeExtension)(pluginAPIExt);
-      this.frameAPIHandler = await this.prepareAPIHandler(mode, _objectSpread(_objectSpread({}, apiExtension), {}, {
-        modernJsConfig: this.conf
-      }));
+      this.frameAPIHandler = await this.prepareAPIHandler(mode, apiExtension);
     }
   }
   /* —————————————————————— function will be overwrite —————————————————————— */

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.3-beta.1",
+  "version": "1.1.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -26,14 +26,6 @@
       "default": "./dist/js/treeshaking/index.js"
     }
   },
-  "scripts": {
-    "prepare": "pnpm build",
-    "prepublishOnly": "pnpm build --platform",
-    "new": "modern new",
-    "build": "modern build",
-    "dev": "modern build --watch",
-    "test": "modern test --passWithNoTests"
-  },
   "dependencies": {
     "@babel/core": "^7.15.0",
     "@babel/compat-data": "^7.15.0",
@@ -41,12 +33,12 @@
     "@babel/preset-typescript": "^7.15.0",
     "@babel/register": "^7.15.3",
     "@babel/runtime": "^7",
-    "@modern-js/core": "workspace:^1.1.2",
-    "@modern-js/hmr-client": "workspace:^1.1.1",
-    "@modern-js/server-plugin": "workspace:^1.1.1",
-    "@modern-js/server-utils": "workspace:^1.1.1",
-    "@modern-js/bff-utils": "workspace:^1.1.1",
-    "@modern-js/utils": "workspace:^1.1.2",
+    "@modern-js/core": "^1.1.3",
+    "@modern-js/hmr-client": "^1.1.1",
+    "@modern-js/server-plugin": "^1.1.2",
+    "@modern-js/server-utils": "^1.1.2",
+    "@modern-js/bff-utils": "^1.1.1",
+    "@modern-js/utils": "^1.1.3",
     "axios": "^0.21.4",
     "babel-plugin-module-resolver": "^4.1.0",
     "chokidar": "^3.5.2",
@@ -71,7 +63,7 @@
   "devDependencies": {
     "@modern-js/module-tools": "^1.1.1",
     "@modern-js/plugin-testing": "^1.1.1",
-    "@modern-js/types": "workspace:^1.1.2",
+    "@modern-js/types": "^1.1.2",
     "@types/jest": "^26",
     "@types/lru-cache": "^5.1.1",
     "@types/mime-types": "^2.1.0",
@@ -100,5 +92,11 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
+  },
+  "scripts": {
+    "new": "modern new",
+    "build": "modern build",
+    "dev": "modern build --watch",
+    "test": "modern test --passWithNoTests"
   }
-}
+}

package/src/server/dev-server/dev-server.ts

@@ -252,7 +252,7 @@ export class ModernDevServer extends ModernServer {
     const defaultWatched = [
       `${pwd}/${mock}/**/*`,
       `${pwd}/${SERVER_DIR}/**/*`,
-      `${pwd}/${API_DIR}/**/*`,
+      `${pwd}/${API_DIR}/!(typings)/**`,
       `${pwd}/${SHARED_DIR}/**/*`,
     ];
 

package/src/server/index.ts

@@ -7,6 +7,8 @@ import {
   initAppContext,
   initAppDir,
   loadUserConfig,
+  ConfigContext,
+  UserConfig,
 } from '@modern-js/core';
 import { ModernServer } from './modern-server';
 import type { ModernDevServer } from './dev-server';
@@ -117,6 +119,7 @@ export class Server {
     const { options } = this;
     const appContext = await this.initAppContext();
     serverManager.run(() => {
+      ConfigContext.set(this.options.config as UserConfig);
       AppContext.set({
         ...appContext,
         distDirectory: path.join(

package/src/server/modern-server.ts

@@ -272,10 +272,7 @@ export class ModernServer {
 
       // if use lambda/, mean framework style of writing, then discard user extension
       const apiExtension = mergeExtension(pluginAPIExt);
-      this.frameAPIHandler = await this.prepareAPIHandler(mode, {
-        ...apiExtension,
-        modernJsConfig: this.conf,
-      });
+      this.frameAPIHandler = await this.prepareAPIHandler(mode, apiExtension);
     }
   }