move apis.js

DevenLu · Jul 29, 2019 · 68e3ff9 · 68e3ff9
1 parent c3d71c9
commit 68e3ff9
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/build/manifest.js b/build/manifest.js
@@ -1,7 +1,7 @@
 const fs = require('fs')
 const path = require('path')
 
-const apis = require('../src/core/helpers/apis')
+const apis = require('../lib/apis')
 
 const AUTO_LOADS = [
   'upx2px',
@@ -49,11 +49,8 @@ const DEPS = {
     ['/core/view/bridge/subscribe/api/request-component-info.js', 'requestComponentInfo']
   ],
   'createIntersectionObserver': [
-    [
-      '/core/view/bridge/subscribe/api/request-component-observer.js',
-      'requestComponentObserver',
-      'destroyComponentObserver'
-    ]
+    ['/core/view/bridge/subscribe/api/request-component-observer.js', 'requestComponentObserver'],
+    ['/core/view/bridge/subscribe/api/request-component-observer.js', 'destroyComponentObserver']
   ]
 }
 
@@ -113,6 +110,9 @@ function parseApiManifestDeps (manifest, protocol) {
 
 module.exports = {
   generateApiManifest (manifest, protocol) {
+    if (!Object.keys(manifest).length) {
+      throw new Error('api manifest.json 生成失败')
+    }
     parseApiManifestDeps(manifest, protocol)
 
     const manifestJson = Object.create(null)

diff --git a/src/core/helpers/apis.js → lib/apis.js b/src/core/helpers/apis.js → lib/apis.js
diff --git a/lib/babel-plugin-uni-api/index.js b/lib/babel-plugin-uni-api/index.js
@@ -13,7 +13,7 @@ const protocolPath = resolve('../../src/core/helpers/protocol')
 const coreApiPath = resolve('../../src/core/service/api')
 const platformApiPath = resolve('../../src/platforms/' + process.env.UNI_PLATFORM + '/service/api')
 
-const apis = require('../../src/core/helpers/apis')
+const apis = require('../apis')
 
 process.UNI_SERVICE_API_MANIFEST = Object.create(null)
 process.UNI_SERVICE_API_PROTOCOL = Object.create(null)

diff --git a/packages/uni-h5/dist/index.umd.min.js b/packages/uni-h5/dist/index.umd.min.js
diff --git a/packages/uni-h5/manifest.json b/packages/uni-h5/manifest.json
@@ -645,7 +645,10 @@
         [
             [
                 "/core/view/bridge/subscribe/api/request-component-observer.js",
-                "requestComponentObserver",
+                "requestComponentObserver"
+            ],
+            [
+                "/core/view/bridge/subscribe/api/request-component-observer.js",
                 "destroyComponentObserver"
             ]
         ]

diff --git a/src/core/service/uni.js b/src/core/service/uni.js
@@ -1,4 +1,4 @@
-import apis from 'uni-helpers/apis'
+import apis from '../../../lib/apis'
 import {
   wrapper,
   wrapperUnimplemented