fix: 修复 onShareAppMessage 和 onPageScroll 无效的问题

fix #1413

packages/remax-cli/src/__tests__/integration/fixtures/lifeCycle/src/pages/classPage.js

@@ -7,6 +7,10 @@ class ClassPage extends React.Component {
 
  onHide = () => {};
 
+ onShareAppMessage() {}
+
+ onPageScroll() {}
+
  render() {
  return <View>class page</View>;
  }

packages/remax-cli/src/build/webpack/plugins/RuntimeOptions.ts

@@ -1,6 +1,5 @@
 import { Compiler, compilation } from 'webpack';
 import * as path from 'path';
-import { appEvents, pageEvents } from '@remax/macro';
 import { slash } from '@remax/shared';
 import Store from '@remax/build-store';
 import getModules from '../../utils/modules';
@@ -70,7 +69,7 @@ export default class RuntimeOptionsPlugin {
  new Set(
  modules
  .reduce<string[]>((acc, cur) => {
- return [...acc, ...(pageEvents.get(slash(cur)) || []), ...(pageClassEvents.get(slash(cur)) || [])];
+ return [...acc, ...(Store.pageEvents.get(slash(cur)) || []), ...(pageClassEvents.get(slash(cur)) || [])];
  }, [])
  .sort()
  )
@@ -82,9 +81,9 @@ export default class RuntimeOptionsPlugin {
 
  getAppEvents() {
  let events: string[] = [];
- for (const key of appEvents.keys()) {
+ for (const key of Store.appEvents.keys()) {
  // 这里 get 不可能为空
- events = events.concat(Array.from(appEvents.get(key)!));
+ events = events.concat(Array.from(Store.appEvents.get(key)!));
  }
 
  for (const key of appClassEvents.keys()) {

packages/remax-macro/src/macro.ts

@@ -2,11 +2,12 @@ import * as React from 'react';
 import { NodePath } from '@babel/traverse';
 import { createMacro } from 'babel-plugin-macros';
 import { slash } from '@remax/shared';
+import Store from '@remax/build-store';
 import createHostComponentMacro from './createHostComponent';
 import requirePluginComponentMacro from './requirePluginComponent';
 import requirePluginMacro from './requirePlugin';
-import usePageEventMacro, { pageEvents } from './usePageEvent';
-import useAppEventMacro, { appEvents } from './useAppEvent';
+import usePageEventMacro from './usePageEvent';
+import useAppEventMacro from './useAppEvent';
 
 type PageEventName =
  | 'onLoad'
@@ -47,8 +48,8 @@ function remax({ references, state }: { references: { [name: string]: NodePath[]
 
  const importer = slash(state.file.opts.filename);
 
- appEvents.delete(importer);
- pageEvents.delete(importer);
+ Store.appEvents.delete(importer);
+ Store.pageEvents.delete(importer);
 
  references.useAppEvent?.forEach(path => useAppEventMacro(path, state));
 
@@ -68,6 +69,4 @@ export declare function usePageEvent(eventName: PageEventName, callback: (...par
 
 export declare function useAppEvent(eventName: AppEventName, callback: (...params: any[]) => any): void;
 
-export { pageEvents, appEvents };
-
 export default createMacro(remax);

packages/remax-macro/src/useAppEvent.ts

@@ -1,21 +1,18 @@
 import * as t from '@babel/types';
 import { slash } from '@remax/shared';
 import { NodePath } from '@babel/traverse';
+import Store from '@remax/build-store';
 import insertImportDeclaration from './utils/insertImportDeclaration';
 
 const PACKAGE_NAME = '@remax/runtime';
 const FUNCTION_NAME = 'useAppEvent';
 
-type Events = Set<string>;
-
-export const appEvents = new Map<string, Events>();
-
 function getArguments(callExpression: NodePath<t.CallExpression>, importer: string) {
  const args = callExpression.node.arguments;
  const eventName = args[0] as t.StringLiteral;
  const callback = args[1];
 
- appEvents.set(importer, appEvents.get(importer)?.add(eventName.value) ?? new Set([eventName.value]));
+ Store.appEvents.set(importer, Store.appEvents.get(importer)?.add(eventName.value) ?? new Set([eventName.value]));
 
  return [eventName, callback];
 }

packages/remax-macro/src/usePageEvent.ts

@@ -1,21 +1,18 @@
 import * as t from '@babel/types';
 import { NodePath } from '@babel/traverse';
 import { slash } from '@remax/shared';
+import Store from '@remax/build-store';
 import insertImportDeclaration from './utils/insertImportDeclaration';
 
 const PACKAGE_NAME = '@remax/runtime';
 const FUNCTION_NAME = 'usePageEvent';
 
-type Events = Set<string>;
-
-export const pageEvents = new Map<string, Events>();
-
 function getArguments(callExpression: NodePath<t.CallExpression>, importer: string) {
  const args = callExpression.node.arguments;
  const eventName = args[0] as t.StringLiteral;
  const callback = args[1];
 
- pageEvents.set(importer, pageEvents.get(importer)?.add(eventName.value) ?? new Set([eventName.value]));
+ Store.pageEvents.set(importer, Store.pageEvents.get(importer)?.add(eventName.value) ?? new Set([eventName.value]));
 
  return [eventName, callback];
 }