Merge branch 'master' of https://github.com/didi/mpx

didi · Dec 10, 2024 · cff64ba · cff64ba
2 parents 0e3a2b9 + 7f44aa0
commit cff64ba
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
     "tsc:build": "npm --workspace=./packages/webpack-plugin run build"
   },
   "devDependencies": {
-    "@babel/core": "^7.8.7",
+    "@babel/core": "^7.25.2",
     "@babel/eslint-parser": "^7.18.9",
     "@babel/preset-env": "^7.25.3",
     "@docsearch/css": "^3.0.0",

diff --git a/packages/core/src/platform/patch/getDefaultOptions.ali.js b/packages/core/src/platform/patch/getDefaultOptions.ali.js
@@ -1,6 +1,6 @@
-import MpxProxy from '../../../core/proxy'
-import builtInKeysMap from '../builtInKeysMap'
-import mergeOptions from '../../../core/mergeOptions'
+import MpxProxy from '../../core/proxy'
+import builtInKeysMap from './builtInKeysMap'
+import mergeOptions from '../../core/mergeOptions'
 import { error, diffAndCloneA, hasOwn, noop, wrapMethodsWithErrorHandling } from '@mpxjs/utils'
 
 function transformApiForProxy (context, currentInject) {

diff --git a/packages/core/src/platform/patch/getDefaultOptions.ios.js b/packages/core/src/platform/patch/getDefaultOptions.ios.js
@@ -1,13 +1,13 @@
 import { useEffect, useLayoutEffect, useSyncExternalStore, useRef, useMemo, useState, useCallback, createElement, memo, forwardRef, useImperativeHandle, useContext, Fragment, cloneElement } from 'react'
 import * as ReactNative from 'react-native'
-import { ReactiveEffect } from '../../../observer/effect'
-import { watch } from '../../../observer/watch'
-import { reactive, set, del } from '../../../observer/reactive'
+import { ReactiveEffect } from '../../observer/effect'
+import { watch } from '../../observer/watch'
+import { reactive, set, del } from '../../observer/reactive'
 import { hasOwn, isFunction, noop, isObject, isArray, getByPath, collectDataset, hump2dash, wrapMethodsWithErrorHandling } from '@mpxjs/utils'
-import MpxProxy from '../../../core/proxy'
-import { BEFOREUPDATE, ONLOAD, UPDATED, ONSHOW, ONHIDE, ONRESIZE, REACTHOOKSEXEC } from '../../../core/innerLifecycle'
-import mergeOptions from '../../../core/mergeOptions'
-import { queueJob, hasPendingJob } from '../../../observer/scheduler'
+import MpxProxy from '../../core/proxy'
+import { BEFOREUPDATE, ONLOAD, UPDATED, ONSHOW, ONHIDE, ONRESIZE, REACTHOOKSEXEC } from '../../core/innerLifecycle'
+import mergeOptions from '../../core/mergeOptions'
+import { queueJob, hasPendingJob } from '../../observer/scheduler'
 import { createSelectorQuery, createIntersectionObserver } from '@mpxjs/api-proxy'
 import { IntersectionObserverContext, RouteContext, KeyboardAvoidContext } from '@mpxjs/webpack-plugin/lib/runtime/components/react/dist/context'
 

diff --git a/packages/core/src/platform/patch/getDefaultOptions.js b/packages/core/src/platform/patch/getDefaultOptions.js
@@ -1,7 +1,7 @@
 import { hasOwn, noop, isFunction, wrapMethodsWithErrorHandling } from '@mpxjs/utils'
-import MpxProxy from '../../../core/proxy'
-import builtInKeysMap from '../builtInKeysMap'
-import mergeOptions from '../../../core/mergeOptions'
+import MpxProxy from '../../core/proxy'
+import builtInKeysMap from './builtInKeysMap'
+import mergeOptions from '../../core/mergeOptions'
 
 function transformProperties (properties) {
   if (!properties) {

diff --git a/packages/core/src/platform/patch/getDefaultOptions.web.js b/packages/core/src/platform/patch/getDefaultOptions.web.js
@@ -1,16 +1,16 @@
-import builtInKeysMap from '../builtInKeysMap'
-import mergeOptions from '../../../core/mergeOptions'
+import builtInKeysMap from './builtInKeysMap'
+import mergeOptions from '../../core/mergeOptions'
 import { diffAndCloneA, hasOwn, wrapMethodsWithErrorHandling } from '@mpxjs/utils'
-import { getCurrentInstance as getCurrentVueInstance } from '../../export/index'
-import MpxProxy, { setCurrentInstance, unsetCurrentInstance } from '../../../core/proxy'
+import { getCurrentInstance as getCurrentVueInstance } from '../export/index'
+import MpxProxy, { setCurrentInstance, unsetCurrentInstance } from '../../core/proxy'
 import {
   BEFORECREATE,
   BEFOREUPDATE,
   UPDATED,
   BEFOREUNMOUNT,
   UNMOUNTED,
   SERVERPREFETCH
-} from '../../../core/innerLifecycle'
+} from '../../core/innerLifecycle'
 
 function filterOptions (options) {
   const newOptions = {}

diff --git a/packages/core/src/platform/patch/lifecycle/index.web.js b/packages/core/src/platform/patch/lifecycle/index.web.js
@@ -51,3 +51,5 @@ export const LIFECYCLE = {
 }
 
 export const pageMode = ''
+
+export const lifecycleProxyMap = {}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -51,3 +51,5 @@ export const LIFECYCLE = {
		}

		export const pageMode = ''

		export const lifecycleProxyMap = {}