fix: load custom framework in midwayjs/web (#883)

midwayjs · Mar 3, 2021 · 7a11cac · 7a11cac
1 parent 1201d6f
commit 7a11cac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/packages-serverless/egg-layer/index.js b/packages-serverless/egg-layer/index.js
@@ -16,6 +16,14 @@ module.exports = engine => {
       // 从 package.json 中获取 egg 框架
       const packageJSON = require(resolve(baseDir, 'package.json'));
       framework = packageJSON.egg && packageJSON.egg.framework;
+      // 支持自定义框架
+      if (
+        packageJSON['dependencies'] &&
+        packageJSON['dependencies']['@midwayjs/web'] &&
+        framework !== '@midwayjs/web'
+      ) {
+        framework = '@midwayjs/web';
+      }
       const localFrameWorkPath = resolve(__dirname, 'framework');
       require(localFrameWorkPath).getFramework(
         process.env.EGG_FRAMEWORK_DIR ||

diff --git a/packages/core/src/util/webRouterCollector.ts b/packages/core/src/util/webRouterCollector.ts
@@ -1,4 +1,4 @@
-import { LightFramework } from './emptyFramework';
+import { EmptyFramework } from './emptyFramework';
 import {
   CONTROLLER_KEY,
   ControllerOption,
@@ -90,7 +90,7 @@ export class WebRouterCollector {
 
   protected async analyze() {
     if (!MidwayContainer.parentDefinitionMetadata) {
-      const framework = new LightFramework();
+      const framework = new EmptyFramework();
       await framework.initialize({
         baseDir: this.baseDir,
       });