Merge branch 'alpha'

# Conflicts: # lerna.json # packages/uni-app-plus-nvue/package.json # packages/uni-app-plus/package.json # packages/uni-automator/package.json # packages/uni-cli-i18n/package.json # packages/uni-cli-shared/package.json # packages/uni-h5-ui/package.json # packages/uni-h5/package.json # packages/uni-i18n/package.json # packages/uni-migration/package.json # packages/uni-mp-alipay/package.json # packages/uni-mp-baidu/package.json # packages/uni-mp-jd/package.json # packages/uni-mp-kuaishou/package.json # packages/uni-mp-lark/package.json # packages/uni-mp-qq/package.json # packages/uni-mp-toutiao/package.json # packages/uni-mp-vue/package.json # packages/uni-mp-weixin/package.json # packages/uni-mp-xhs/package.json # packages/uni-quickapp-native/package.json # packages/uni-quickapp-webview/package.json # packages/uni-stat/package.json # packages/uni-template-compiler/package.json # packages/vue-cli-plugin-hbuilderx/package.json # packages/vue-cli-plugin-uni-optimize/package.json # packages/vue-cli-plugin-uni/package.json # packages/webpack-uni-mp-loader/package.json # packages/webpack-uni-pages-loader/package.json
sunxiaotianmg · Jun 29, 2022 · bb4a120 · bb4a120
2 parents 6577bf3 + 61a67ad
commit bb4a120
Show file tree

Hide file tree

Showing 215 changed files with 15,301 additions and 6,706 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -20,6 +20,7 @@ packages/*/packages/mpvue-page-factory
 packages/*/packages/mpvue-template-compiler
 packages/*/packages/postcss-normalize-whitespace
 packages/*/packages/uni-app
+packages/*/packages/uni-push
 packages/*/packages/uni-stat
 packages/*/packages/uni-cloud
 packages/*/packages/vue-loader
@@ -35,3 +36,7 @@ node_modules
 automator.js
 uni.automator.js
 uni-polyfill.js
+packages/uni-cli-shared/components/ad-fullscreen-video.vue
+packages/uni-cli-shared/components/ad-interactive.vue
+packages/uni-cli-shared/components/ad-interstitial.vue
+packages/uni-cli-shared/components/ad-rewarded-video.vue
diff --git a/README.md b/README.md
@@ -61,8 +61,8 @@
 
 ## 常见疑问
 
-- 问：不同端有不同的需求、不同的特色，登陆支付也不一样，如何统一？
-- 答：差异部分使用条件编译。uni-app提供了灵活强大的[条件编译](https://uniapp.dcloud.io/platform)。可以完美处理复用部分和差异部分。真正一套工程源码。当业务升级时，不再需要多端维护。如果多端维护，经常会因为某些端的流量不大，就一直拖延无法让那些用户享受到最新服务。另外登陆支付在客户端部分，已经被uni-app统一成一样的api了。
+- 问：不同端有不同的需求、不同的特色，登录支付也不一样，如何统一？
+- 答：差异部分使用条件编译。uni-app提供了灵活强大的[条件编译](https://uniapp.dcloud.io/platform)。可以完美处理复用部分和差异部分。真正一套工程源码。当业务升级时，不再需要多端维护。如果多端维护，经常会因为某些端的流量不大，就一直拖延无法让那些用户享受到最新服务。另外登录支付在客户端部分，已经被uni-app统一成一样的api了。
 
 
 - 问：多端是不是一种妥协，是否会造成性能下降？

diff --git a/build/rollup.config.mp.js b/build/rollup.config.mp.js
@@ -71,6 +71,12 @@ module.exports = {
       entries: [{
         find: '@dcloudio',
         replacement: path.resolve(__dirname, '../packages')
+      }, {
+        find: 'uni-core',
+        replacement: path.resolve(__dirname, '../src/core')
+      }, {
+        find: 'uni-api-protocol',
+        replacement: path.resolve(__dirname, '../src/core/helpers/protocol')
       }, {
         find: 'uni-shared/query',
         replacement: path.resolve(__dirname, '../src/shared/query.js')

diff --git a/build/rollup.config.web-view.js b/build/rollup.config.web-view.js
@@ -6,7 +6,7 @@ module.exports = {
   input: 'src/core/runtime/web-view/index.js',
   output: {
     name: 'uni',
-    file: 'dist/uni.webview.1.5.3.js',
+    file: 'dist/uni.webview.1.5.4.js',
     format: 'umd'
   },
   plugins: [

diff --git a/dist/uni.webview.1.5.4.js b/dist/uni.webview.1.5.4.js
diff --git a/jsconfig.json b/jsconfig.json
@@ -2,6 +2,15 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
+      "uni-shared": [
+        "./src/shared/index.js"
+      ],
+      "uni-helpers/*": [
+        "./src/core/helpers/*"
+      ],
+      "uni-mixins/*": [
+        "./src/core/view/mixins/*"
+      ],
       "uni-core/*": [
         "./src/core/*"
       ],

diff --git a/lerna.json b/lerna.json
@@ -12,5 +12,5 @@
       "message": "chore(release): publish %s"
     }
   },
-  "version": "2.0.1-34720220422002"
+  "version": "2.0.1-alpha-34920220614002"
 }
diff --git a/lib/apis.js b/lib/apis.js
@@ -74,6 +74,9 @@ const media = [
 const device = [
   'getSystemInfo',
   'getSystemInfoSync',
+  'getWindowInfo',
+  'getDeviceInfo',
+  'getAppBaseInfo',
   'canIUse',
   'onMemoryWarning',
   'getNetworkType',
@@ -240,15 +243,17 @@ const third = [
   'requireGlobal',
   'getSubNVueById',
   'getCurrentSubNVue',
-  'setPageMeta',
+  'setPageMeta',
   'onHostEventReceive',
   'onNativeEventReceive',
   'sendNativeEvent',
   'preloadPage',
   'unPreloadPage',
   'loadSubPackage',
   'sendHostEvent',
-  'navigateToMiniProgram'
+  'navigateToMiniProgram',
+  'getLaunchOptionsSync',
+  'getEnterOptionsSync'
 ]
 
 const ad = [
@@ -258,6 +263,13 @@ const ad = [
   'createInteractiveAd'
 ]
 
+const plugin = [
+  'invokePushCallback',
+  'getPushCid',
+  'onPushMessage',
+  'offPushMessage',
+]
+
 const apis = [
   ...base,
   ...network,
@@ -272,7 +284,8 @@ const apis = [
   ...file,
   ...canvas,
   ...third,
-  ...ad
+  ...ad,
+  ...plugin
 ]
 
 module.exports = apis
diff --git a/packages/uni-app-plus-nvue/package.json b/packages/uni-app-plus-nvue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-app-plus-nvue",
-  "version": "2.0.1-34720220422002",
+  "version": "2.0.1-alpha-34920220614002",
   "description": "uni-app app-plus-nvue",
   "main": "dist/index.js",
   "repository": {