fix(runtime-mini): replace @morjs/api with @morjs/runtime-base to avo…

…id cycle references
eleme · Mar 10, 2023 · 84b4a0c · 84b4a0c
1 parent 5d22b11
commit 84b4a0c
Show file tree

Hide file tree

Showing 15 changed files with 37 additions and 26 deletions.
diff --git a/packages/runtime-mini/package.json b/packages/runtime-mini/package.json
@@ -41,8 +41,7 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@morjs/api": "1.0.0",
-    "@morjs/core": "1.0.4",
+    "@morjs/runtime-base": "1.0.0",
     "clone-deep": "^4.0.1",
     "lodash.get": "^4.4.2",
     "lodash.has": "^4.5.2",

diff --git a/packages/runtime-mini/src/alipay/apisToAlipay.ts b/packages/runtime-mini/src/alipay/apisToAlipay.ts
@@ -3,7 +3,7 @@ import {
   IAPITransformConfig,
   logger,
   transformApis
-} from '@morjs/api'
+} from '@morjs/runtime-base'
 import { needPromisfiedApis } from './needPromisfiedApis'
 
 /**

diff --git a/packages/runtime-mini/src/alipay/apisToOther.ts b/packages/runtime-mini/src/alipay/apisToOther.ts
@@ -5,7 +5,7 @@ import {
   IAPITransformConfig,
   logger,
   transformApis
-} from '@morjs/api'
+} from '@morjs/runtime-base'
 import { needPromisfiedApis } from './needPromisfiedApis'
 
 /**

diff --git a/packages/runtime-mini/src/alipay/behaviorToAlipay.ts b/packages/runtime-mini/src/alipay/behaviorToAlipay.ts
@@ -1,4 +1,4 @@
-import { logger } from '@morjs/api'
+import { logger } from '@morjs/runtime-base'
 import type { BehaviorOptions, DefinitionFilter } from './utilsToAlipay'
 
 /**

diff --git a/packages/runtime-mini/src/alipay/componentToAlipay.ts b/packages/runtime-mini/src/alipay/componentToAlipay.ts
@@ -1,4 +1,4 @@
-import { compose, getGlobalObject, logger } from '@morjs/api'
+import { compose, getGlobalObject, logger } from '@morjs/runtime-base'
 import get from 'lodash.get'
 import has from 'lodash.has'
 import {

diff --git a/packages/runtime-mini/src/alipay/componentToOther.ts b/packages/runtime-mini/src/alipay/componentToOther.ts
@@ -4,7 +4,7 @@ import {
   generateId,
   getSharedProperty,
   logger
-} from '@morjs/api'
+} from '@morjs/runtime-base'
 import clone from 'clone-deep'
 import { addEventProxy, injectInstanceMethodsSupport } from './utilsToOther'
 

diff --git a/packages/runtime-mini/src/alipay/pageToAlipay.ts b/packages/runtime-mini/src/alipay/pageToAlipay.ts
@@ -1,4 +1,4 @@
-import { compose } from '@morjs/api'
+import { compose } from '@morjs/runtime-base'
 import {
   injectComponentSelectorMethodsSupport,
   injectCreateIntersectionObserverSupport,

diff --git a/packages/runtime-mini/src/alipay/utilsToAlipay.ts b/packages/runtime-mini/src/alipay/utilsToAlipay.ts
@@ -1,4 +1,4 @@
-import { getGlobalObject, markAsUnsupport } from '@morjs/api'
+import { getGlobalObject, markAsUnsupport } from '@morjs/runtime-base'
 
 /**
  * 标记不支持的实例方法

diff --git a/packages/runtime-mini/src/alipay/utilsToOther.ts b/packages/runtime-mini/src/alipay/utilsToOther.ts
@@ -1,4 +1,4 @@
-import { getSharedProperty, logger } from '@morjs/api'
+import { getSharedProperty, logger } from '@morjs/runtime-base'
 
 interface IEventDetail {
   name?: string

diff --git a/packages/runtime-mini/src/baidu/apis.ts b/packages/runtime-mini/src/baidu/apis.ts
@@ -1,4 +1,4 @@
-import { getGlobalObject, transformApis } from '@morjs/api'
+import { getGlobalObject, transformApis } from '@morjs/runtime-base'
 import { needPromisfiedApis as needPromisfiedApisForWechat } from '../wechat/apis'
 
 /**

diff --git a/packages/runtime-mini/src/bytedance/apis.ts b/packages/runtime-mini/src/bytedance/apis.ts
@@ -1,4 +1,4 @@
-import { getGlobalObject, transformApis } from '@morjs/api'
+import { getGlobalObject, transformApis } from '@morjs/runtime-base'
 import { needPromisfiedApis as needPromisfiedApisForWechat } from '../wechat/apis'
 
 /**

diff --git a/packages/runtime-mini/src/index.ts b/packages/runtime-mini/src/index.ts
@@ -1,10 +1,3 @@
-import { createApi, MorAPIAdapter } from '@morjs/api'
-import {
-  MorComponentAdapter,
-  MorPageAdapter,
-  registerComponentAdapters,
-  registerPageAdapters
-} from '@morjs/core'
 import * as apisToAlipay from './alipay/apisToAlipay'
 import * as apisToOther from './alipay/apisToOther'
 import * as componentToAlipay from './alipay/componentToAlipay'
@@ -17,20 +10,39 @@ import * as apisToKuaishou from './kuaishou/apis'
 import * as apisToQQ from './qq/apis'
 import * as apisToWechat from './wechat/apis'
 
+interface InitAdapterOptions {
+  sourceType: 'alipay' | 'wechat'
+  target: string
+  createApi: (
+    api?: any,
+    options?: any
+  ) => { override: () => any } & Record<string, any>
+  registerComponentAdapters: (adapters?: any[]) => void
+  registerPageAdapters: (adapters?: any[]) => void
+}
+
 /**
  * 初始化转端适配逻辑
  * @param sourceType - 源码类型
  * @param target - 目标平台
  */
-export function initAdapters(sourceType: 'alipay' | 'wechat', target: string) {
+export function initAdapters(options: InitAdapterOptions) {
+  const {
+    sourceType,
+    target,
+    createApi,
+    registerComponentAdapters,
+    registerPageAdapters
+  } = options || {}
+
   // 源码和目标平台一致时不转换
   if (sourceType === target) return
 
   // target 的 adapter 需要放在 source adapter 之前
   // 和编译时自动注入逻辑保持一致
-  const componentAdapters: MorComponentAdapter[] = []
-  const pageAdapters: MorPageAdapter[] = []
-  const apiAdapters: MorAPIAdapter[] = []
+  const componentAdapters: Record<string, any>[] = []
+  const pageAdapters: Record<string, any>[] = []
+  const apiAdapters: Record<string, any>[] = []
 
   // 支付宝转其他端
   if (sourceType === 'alipay') {

diff --git a/packages/runtime-mini/src/kuaishou/apis.ts b/packages/runtime-mini/src/kuaishou/apis.ts
@@ -1,4 +1,4 @@
-import { getGlobalObject, transformApis } from '@morjs/api'
+import { getGlobalObject, transformApis } from '@morjs/runtime-base'
 import { needPromisfiedApis as needPromisfiedApisForWechat } from '../wechat/apis'
 
 /**

diff --git a/packages/runtime-mini/src/qq/apis.ts b/packages/runtime-mini/src/qq/apis.ts
@@ -1,4 +1,4 @@
-import { getGlobalObject, transformApis } from '@morjs/api'
+import { getGlobalObject, transformApis } from '@morjs/runtime-base'
 import { needPromisfiedApis as needPromisfiedApisForWechat } from '../wechat/apis'
 
 /**

diff --git a/packages/runtime-mini/src/wechat/apis.ts b/packages/runtime-mini/src/wechat/apis.ts
@@ -1,4 +1,4 @@
-import { getGlobalObject, transformApis } from '@morjs/api'
+import { getGlobalObject, transformApis } from '@morjs/runtime-base'
 
 /**
  * 微信需要被 promisified 的接口