Merge branch 'dev'

.editorconfig

@@ -6,7 +6,7 @@ root = true
 [*]
 charset = utf-8
 indent_style = space
-indent_size = 4
+indent_size = 2
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true

.eslintignore

@@ -1 +1,4 @@
-src/core/helpers/html-parser.js
+src/core/helpers/html-parser.js
+src/platforms/app-plus-nvue/runtime
+build/rollup-plugin-require-context
+packages/*/packages

.gitignore

@@ -1,4 +1,5 @@
 node_modules/
 .project
 unpackage/
-.vscode/
+.vscode/
+.DS_Store

babel.config.js

@@ -1,10 +1,17 @@
-module.exports = {
-	ignore: [
-		"./packages",
-	],
-	presets: [
-		["@vue/app", {
-			useBuiltIns: "entry"
-		}]
-	]
+const config = {
+  ignore: [
+    "./packages",
+  ],
+  presets: [
+    ["@vue/app", {
+      useBuiltIns: "entry"
+    }]
+  ],
+  plugins: [require('./lib/babel-plugin-uni-api/index.js')]
+}
+
+if (process.env.NODE_ENV === 'test') {
+  delete config.ignore
 }
+
+module.exports = config

build/build.js

@@ -9,16 +9,27 @@ const copy = require('copy')
 const path = require('path')
 const jsonfile = require('jsonfile')
 
+const {
+  generateApiManifest
+} = require('./manifest')
+
 const service = new Service(process.env.VUE_CLI_CONTEXT || process.cwd(), {
   inlineOptions: require('./vue.config.js')
 })
+// 删除 cache 目录
+del.sync(['node_modules/.cache'])
 
 service.run('build', {
   name: 'index',
   watch: process.env.UNI_WATCH === 'true',
   target: 'lib',
   formats: process.env.UNI_WATCH === 'true' ? 'umd' : 'umd-min',
   entry: './lib/' + process.env.UNI_PLATFORM + '/main.js'
+}).then(function () {
+  generateApiManifest(
+    JSON.parse(JSON.stringify(process.UNI_SERVICE_API_MANIFEST)),
+    JSON.parse(JSON.stringify(process.UNI_SERVICE_API_PROTOCOL))
+  )
 }).catch(err => {
   error(err)
   process.exit(1)
@@ -44,9 +55,11 @@ if (process.env.UNI_WATCH === 'false') {
         })
     })
     .then(obj => {
-      return jsonfile.writeFile(packageJsonPath, obj, { spaces: 2 })
+      return jsonfile.writeFile(packageJsonPath, obj, {
+        spaces: 2
+      })
     })
     .catch(err => {
       throw err
     })
-}
+}

build/manifest.js

@@ -0,0 +1,141 @@
+const fs = require('fs')
+const path = require('path')
+
+const apis = require('../lib/apis')
+
+const AUTO_LOADS = [
+  'upx2px',
+  'canIUse',
+
+  'getSystemInfo',
+  'getSystemInfoSync',
+
+  'navigateTo',
+  'redirectTo',
+  'switchTab',
+  'reLaunch',
+  'navigateBack'
+]
+
+const TOAST_DEPS = [
+  ['/platforms/h5/components/app/popup/toast.vue', 'Toast'],
+  ['/platforms/h5/components/app/popup/mixins/toast.js', 'ToastMixin']
+]
+
+// TODO 暂不考虑 head,tabBar 的动态拆分
+const DEPS = {
+  'chooseLocation': [
+    ['/platforms/h5/components/system-routes/choose-location/index.vue', 'ChooseLocation']
+  ],
+  'openLocation': [
+    ['/platforms/h5/components/system-routes/open-location/index.vue', 'OpenLocation']
+  ],
+  'previewImage': [
+    ['/platforms/h5/components/system-routes/preview-image/index.vue', 'PreviewImage']
+  ],
+  'showToast': TOAST_DEPS,
+  'hideToast': TOAST_DEPS,
+  'showLoading': TOAST_DEPS,
+  'hideLoading': TOAST_DEPS,
+  'showModal': [
+    ['/platforms/h5/components/app/popup/modal.vue', 'Modal'],
+    ['/platforms/h5/components/app/popup/mixins/modal.js', 'ModalMixin']
+  ],
+  'showActionSheet': [
+    ['/platforms/h5/components/app/popup/actionSheet.vue', 'ActionSheet'],
+    ['/platforms/h5/components/app/popup/mixins/action-sheet.js', 'ActionSheetMixin']
+  ],
+  'createSelectorQuery': [
+    ['/core/view/bridge/subscribe/api/request-component-info.js', 'requestComponentInfo']
+  ],
+  'createIntersectionObserver': [
+    ['/core/view/bridge/subscribe/api/request-component-observer.js', 'requestComponentObserver'],
+    ['/core/view/bridge/subscribe/api/request-component-observer.js', 'destroyComponentObserver']
+  ]
+}
+
+// 检查依赖文件是否存在
+Object.keys(DEPS).reduce(function (depFiles, name) {
+  DEPS[name].forEach(function (dep) {
+    depFiles.add(dep[0])
+  })
+  return depFiles
+}, new Set()).forEach(file => {
+  if (!fs.existsSync(path.join(__dirname, '../src', file))) {
+    console.error(file + ' 不存在')
+    process.exit(0)
+  }
+})
+
+function parseApiManifestDeps (manifest, protocol) {
+  // 解析 platform 依赖
+  Object.keys(manifest).forEach(name => {
+    const deps = manifest[name][1]
+    if (deps.length) {
+      deps.forEach(dep => {
+        if (manifest[dep[1]]) {
+          dep[0] = manifest[dep[1]][0]
+        } else {
+          console.error(`依赖模块[${dep[1]}]不存在,删除 ${name} 接口\n`)
+          delete manifest[name]
+        }
+      })
+    }
+  })
+  // 解析 protocol 依赖
+  Object.keys(manifest).forEach(name => {
+    const deps = manifest[name][1]
+    if (protocol[name]) {
+      deps.push([protocol[name], name])
+    } else {
+      console.warn(`${name} 缺少 protocol`)
+    }
+  })
+  // 追加默认依赖
+  Object.keys(DEPS).forEach(name => {
+    if (manifest[name]) {
+      manifest[name][1].push(...DEPS[name])
+    } else {
+      console.error(`缺少 ${name}`)
+    }
+  })
+  // 设置自动加载标记
+  AUTO_LOADS.forEach(name => {
+    if (manifest[name]) {
+      manifest[name][2] = true
+    } else {
+      console.error(`缺少 ${name}`)
+    }
+  })
+}
+
+module.exports = {
+  generateApiManifest (manifest, protocol) {
+    if (!Object.keys(manifest).length) {
+      throw new Error('api manifest.json 生成失败')
+    }
+    parseApiManifestDeps(manifest, protocol)
+
+    const manifestJson = Object.create(null)
+    const todoApis = []
+    apis.forEach(name => {
+      if (manifest[name]) {
+        manifestJson[name] = manifest[name]
+      } else {
+        todoApis.push(name)
+      }
+    })
+
+    if (todoApis.length) {
+      console.log('\n')
+      console.warn(`${process.env.UNI_PLATFORM} 平台缺少以下 API  实现(共 ${todoApis.length} 个)`)
+      todoApis.forEach(name => {
+        console.warn(name)
+      })
+    }
+
+    fs.writeFileSync(path.resolve(__dirname, '../packages/uni-' + process.env.UNI_PLATFORM + '/manifest.json'),
+      JSON.stringify(manifestJson, null, 4)
+    )
+  }
+}

build/rollup.config.app.js

@@ -0,0 +1,71 @@
+const path = require('path')
+const alias = require('rollup-plugin-alias')
+const replace = require('rollup-plugin-replace')
+const nodeResolve = require('rollup-plugin-node-resolve')
+const commonjs = require('rollup-plugin-commonjs')
+const requireContext = require('../lib/rollup-plugin-require-context')
+
+let input = 'src/platforms/app-plus/service/framework/create-instance-context.js'
+
+const output = {
+  file: 'packages/uni-app-plus-nvue/dist/index.js',
+  format: 'es'
+}
+
+const external = []
+
+if (process.env.UNI_SERVICE === 'legacy') {
+  input = 'src/platforms/app-plus-nvue/services/index.legacy.js'
+  output.file = 'packages/uni-app-plus-nvue/dist/index.legacy.js'
+} else {
+  input = 'src/platforms/app-plus/service/index.js'
+  output.file = 'packages/uni-app-plus-nvue/dist/index.js'
+  output.format = 'iife'
+  output.name = 'serviceContext'
+  output.banner =
+    `export function createServiceContext(Vue, weex, plus, __uniConfig, __uniRoutes, UniServiceJSBridge,instanceContext){
+var localStorage = plus.storage
+var setTimeout = instanceContext.setTimeout
+var clearTimeout = instanceContext.clearTimeout
+var setInterval = instanceContext.setInterval
+var clearInterval = instanceContext.clearInterval
+`
+  output.footer =
+    `
+var uni = serviceContext.uni
+var getApp = serviceContext.getApp
+var getCurrentPages = serviceContext.getCurrentPages
+
+var __registerPage = serviceContext.__registerPage
+
+return serviceContext \n}
+`
+}
+
+const resolve = dir => path.resolve(__dirname, '../', dir)
+
+module.exports = {
+  input,
+  output,
+  plugins: [
+    nodeResolve(),
+    commonjs(),
+    requireContext(),
+    alias({
+      'uni-core': resolve('src/core'),
+      'uni-platform': resolve('src/platforms/' + process.env.UNI_PLATFORM),
+      'uni-platforms': resolve('src/platforms'),
+      'uni-shared': resolve('src/shared/index.js'),
+      'uni-helpers': resolve('src/core/helpers'),
+      'uni-invoke-api': resolve('src/platforms/app-plus/service/api'),
+      'uni-service-api': resolve('src/core/service/platform-api'),
+      'uni-api-protocol': resolve('src/core/helpers/protocol')
+    }),
+    replace({
+      __GLOBAL__: 'getGlobalUni()',
+      __PLATFORM__: JSON.stringify('app-plus'),
+      __PLATFORM_TITLE__: 'app-plus-nvue'
+    })
+  ],
+  external
+}

build/rollup.config.js → build/rollup.config.mp.js

@@ -6,10 +6,10 @@ const PLATFORMS = {
   'mp-weixin': {
     prefix: 'wx',
     title: '微信小程序'
-  },
-  'mp-qq': {
-    prefix: 'wx',
-    title: 'QQ小程序'
+  },
+  'mp-qq': {
+    prefix: 'wx',
+    title: 'QQ小程序'
   },
   'mp-alipay': {
     prefix: 'my',
@@ -40,8 +40,8 @@ module.exports = {
   plugins: [
     alias({
       'uni-shared': path.resolve(__dirname, '../src/shared/util.js'),
-      'uni-platform': path.resolve(__dirname, '../src/platforms/' + process.env.UNI_PLATFORM),
-      'uni-wrapper': path.resolve(__dirname, '../src/core/runtime/wrapper'),
+      'uni-platform': path.resolve(__dirname, '../src/platforms/' + process.env.UNI_PLATFORM),
+      'uni-wrapper': path.resolve(__dirname, '../src/core/runtime/wrapper'),
       'uni-helpers': path.resolve(__dirname, '../src/core/helpers')
     }),
     replace({

build/rollup.config.stat.js

@@ -0,0 +1,9 @@
+module.exports = {
+  input: 'packages/uni-stat/src/index.js',
+  output: {
+    file: 'packages/uni-stat/dist/index.js',
+    format: 'es'
+  },
+  external: ['vue', '../package.json'],
+  plugins: []
+}

build/webpack.config.js

@@ -29,7 +29,16 @@ module.exports = {
       'uni-mixins': resolve('src/core/view/mixins'),
       'uni-helpers': resolve('src/core/helpers'),
       'uni-platform': resolve('src/platforms/' + process.env.UNI_PLATFORM),
-      'uni-components': resolve('src/core/view/components')
+      // tree shaking
+      'uni-components': resolve('src/core/view/components'),
+      'uni-invoke-api': resolve('src/platforms/' + process.env.UNI_PLATFORM + '/service/api'),
+      'uni-service-api': resolve('src/core/service/platform-api'),
+      'uni-api-protocol': resolve('src/core/helpers/protocol'),
+      'uni-api-subscribe': resolve('src/core/view/bridge/subscribe/api/index'),
+      // h5 components
+      'uni-h5-app-components': resolve('src/platforms/h5/components/app/popup/index'),
+      'uni-h5-app-mixins': resolve('src/platforms/h5/components/app/popup/mixins/index'),
+      'uni-h5-system-routes': resolve('src/platforms/h5/components/system-routes/index')
     }
   },
   module: {
@@ -42,8 +51,8 @@ module.exports = {
     }),
     new webpack.ProvidePlugin({
       'console': [resolve('src/core/helpers/console'), 'default'],
-      'UniViewJSBridge': [resolve('src/core/view/bridge')],
-      'UniServiceJSBridge': [resolve('src/core/service/bridge')]
+      'UniViewJSBridge': [resolve('src/core/view/bridge/index')],
+      'UniServiceJSBridge': [resolve('src/core/service/bridge/index')]
     })
   ]
 }