Merge branch 'dev' of github.com:dcloudio/uni-app into dev

ylw657284133 · May 16, 2019 · fd1ca3e · fd1ca3e
2 parents 7843334 + 5bef921
commit fd1ca3e
Show file tree

Hide file tree

Showing 36 changed files with 2,701 additions and 2,059 deletions.
diff --git a/build/rollup.config.js b/build/rollup.config.js
@@ -36,7 +36,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-platform': path.resolve(__dirname, '../src/platforms/' + process.env.UNI_PLATFORM),
+      'uni-wrapper': path.resolve(__dirname, '../src/core/runtime/wrapper')
     }),
     replace({
       __GLOBAL__: platform.prefix,