fix: 修复部分 App 生命周期不生效的问题 (#898)

fix #895
remaxjs · May 6, 2020 · e6c6bf1 · e6c6bf1 · vercel · May 6, 2020
1 parent 1d3ffec
commit e6c6bf1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 22 deletions.
diff --git a/packages/remax-cli/src/__tests__/fixtures/reactDomAlias/expected/pages/index.js b/packages/remax-cli/src/__tests__/fixtures/reactDomAlias/expected/pages/index.js
@@ -1732,6 +1732,11 @@ function createAppConfig(App) {
       _container: new _AppContainer__WEBPACK_IMPORTED_MODULE_3__["default"](_this),
       _pages: [],
       _instance: react__WEBPACK_IMPORTED_MODULE_1__["createRef"](),
+      onLaunch: function onLaunch(options) {
+        this._render();
+
+        return this.callLifecycle(_lifecycle__WEBPACK_IMPORTED_MODULE_5__["AppLifecycle"].launch, options);
+      },
       callLifecycle: function callLifecycle(lifecycle) {
         var _a;
 
@@ -1780,11 +1785,6 @@ function createAppConfig(App) {
       }
     };
     var lifecycleEvent = {
-      onLaunch: function onLaunch(options) {
-        this._render();
-
-        return this.callLifecycle(_lifecycle__WEBPACK_IMPORTED_MODULE_5__["AppLifecycle"].launch, options);
-      },
       onShow: function onShow(options) {
         return this.callLifecycle(_lifecycle__WEBPACK_IMPORTED_MODULE_5__["AppLifecycle"].show, options);
       },

diff --git a/packages/remax-cli/src/build/babel/appEvent.ts b/packages/remax-cli/src/build/babel/appEvent.ts
@@ -25,11 +25,7 @@ export default (entry: string) => {
           return;
         }
 
-        const parentNode = path.parentPath.node;
-
-        if (t.isCallExpression(parentNode) && (parentNode.callee as any)?.name === '_defineProperty') {
-          appEvents.set(entry, appEvents.get(entry)?.add(node.value) ?? new Set([node.value]));
-        }
+        appEvents.set(entry, appEvents.get(entry)?.add(node.value) ?? new Set([node.value]));
       },
       Identifier: (path: NodePath<t.Identifier>) => {
         if (skip) {
@@ -43,12 +39,6 @@ export default (entry: string) => {
           return;
         }
 
-        // 非函数定义不处理
-        // 非函数定义不处理
-        if (!t.isFunctionExpression(path.parentPath.node)) {
-          return;
-        }
-
         appEvents.set(entry, appEvents.get(entry)?.add(node.name) ?? new Set([node.name]));
       },
     },

diff --git a/packages/remax-runtime/src/createAppConfig.ts b/packages/remax-runtime/src/createAppConfig.ts
@@ -22,6 +22,12 @@ export default function createAppConfig(this: any, App: any) {
 
       _instance: React.createRef<any>(),
 
+      onLaunch(options: any) {
+        this._render();
+
+        return this.callLifecycle(AppLifecycle.launch, options);
+      },
+
       callLifecycle(lifecycle: AppLifecycle, ...args: any[]) {
         const callbacks = AppInstanceContext.lifecycleCallback[lifecycle] || [];
         let result;
@@ -67,12 +73,6 @@ export default function createAppConfig(this: any, App: any) {
     };
 
     const lifecycleEvent: any = {
-      onLaunch(options: any) {
-        this._render();
-
-        return this.callLifecycle(AppLifecycle.launch, options);
-      },
-
       onShow(options: any) {
         return this.callLifecycle(AppLifecycle.show, options);
       },