Merge branch 'dev' into alpha

build/postcssSplitMediaPlugin.js

@@ -15,10 +15,10 @@ module.exports = {
       const fs = require('fs')
       const path = require('path')
       const postcss = require('postcss')
-      var uglifycss = require('uglifycss')
+      const uglifycss = require('uglifycss')
 
       const mediaRoot = postcss.root()
-      mediaRoot.append(mediaQuerys)
+      mediaRoot.append(mediaQuerys.sort((a, b) => a.source.input.file > b.source.input.file ? 1 : -1))
 
       fs.writeFileSync(
         path.resolve(outputDir, filename),

packages/uni-cli-shared/components/ad-interactive.vue

@@ -67,21 +67,13 @@
         this._uniAdPlugin.show()
       },
       getAdData() {
-        if (!this.adpid) {
-          this.$emit(events.error, {
-            code: -5002,
-            message: 'invalid adpid'
-          })
-          return
-        }
-
         this.loading = true
 
         uni.request({
           url: AD_URL,
           method: 'POST',
           data: {
-            adpid: this.adpid
+            adpid: this.adpid || ''
           },
           timeout: 5000,
           dataType: 'json',

packages/uni-h5/dist/index.dark.css

-@media(prefers-color-scheme:dark){html{--UI-BG-CLOLOR-ACTIVE:#373737;--UI-BORDER-CLOLOR-1:#373737;--UI-BG:#000;--UI-BG-0:#191919;--UI-BG-1:#1f1f1f;--UI-BG-2:#232323;--UI-BG-3:#2f2f2f;--UI-BG-4:#606060;--UI-BG-5:#2c2c2c;--UI-FG:#fff;--UI-FG-0:hsla(0,0%,100%,0.8);--UI-FG-HALF:hsla(0,0%,100%,0.6);--UI-FG-1:hsla(0,0%,100%,0.5);--UI-FG-2:hsla(0,0%,100%,0.3);--UI-FG-3:hsla(0,0%,100%,0.05)}}@media(prefers-color-scheme:dark){uni-page-body{background-color:#191919;color:hsla(0,0%,100%,0.8)}}@media(prefers-color-scheme:dark){uni-toast .uni-toast{background-color:#606060;color:var(--UI-FG-0)}uni-toast .uni-icon_toast.uni-icon-error:before,uni-toast .uni-icon_toast.uni-icon-success-no-circle:before{color:rgba(255,255,255,0.9)}}@media(prefers-color-scheme:dark){uni-actionsheet .uni-actionsheet__title{background-color:var(--UI-BG-1);border-bottom-color:var(--UI-BORDER-CLOLOR-1)}uni-actionsheet .uni-actionsheet__action,uni-actionsheet .uni-actionsheet__menu{background-color:var(--UI-BG-2)}uni-actionsheet .uni-actionsheet__cell:active{background-color:var(--UI-BG-CLOLOR-ACTIVE)}uni-actionsheet .uni-actionsheet__cell:before{border-top-color:var(--UI-BORDER-CLOLOR-1);color:var(--UI-BORDER-CLOLOR-1)}}@media(prefers-color-scheme:dark){uni-modal .uni-modal{color:var(--UI-FG-0);background-color:var(--UI-BG-2)}uni-modal .uni-modal__bd{color:var(--UI-FG-1)}uni-modal .uni-modal__btn:active{color:#aaa;background-color:var(--UI-BG-CLOLOR-ACTIVE)}uni-modal .uni-modal__ft:after,uni-modal .uni-modal__btn:after{color:var(--UI-BORDER-CLOLOR-1);border-color:var(--UI-BORDER-CLOLOR-1)}}
\ No newline at end of file
+@media(prefers-color-scheme:dark){html{--UI-BG-CLOLOR-ACTIVE:#373737;--UI-BORDER-CLOLOR-1:#373737;--UI-BG:#000;--UI-BG-0:#191919;--UI-BG-1:#1f1f1f;--UI-BG-2:#232323;--UI-BG-3:#2f2f2f;--UI-BG-4:#606060;--UI-BG-5:#2c2c2c;--UI-FG:#fff;--UI-FG-0:hsla(0,0%,100%,0.8);--UI-FG-HALF:hsla(0,0%,100%,0.6);--UI-FG-1:hsla(0,0%,100%,0.5);--UI-FG-2:hsla(0,0%,100%,0.3);--UI-FG-3:hsla(0,0%,100%,0.05)}}@media(prefers-color-scheme:dark){uni-actionsheet .uni-actionsheet__title{background-color:var(--UI-BG-1);border-bottom-color:var(--UI-BORDER-CLOLOR-1)}uni-actionsheet .uni-actionsheet__action,uni-actionsheet .uni-actionsheet__menu{background-color:var(--UI-BG-2)}uni-actionsheet .uni-actionsheet__cell:active{background-color:var(--UI-BG-CLOLOR-ACTIVE)}uni-actionsheet .uni-actionsheet__cell:before{border-top-color:var(--UI-BORDER-CLOLOR-1);color:var(--UI-BORDER-CLOLOR-1)}}@media(prefers-color-scheme:dark){uni-modal .uni-modal{color:var(--UI-FG-0);background-color:var(--UI-BG-2)}uni-modal .uni-modal__bd{color:var(--UI-FG-1)}uni-modal .uni-modal__btn:active{color:#aaa;background-color:var(--UI-BG-CLOLOR-ACTIVE)}uni-modal .uni-modal__ft:after,uni-modal .uni-modal__btn:after{color:var(--UI-BORDER-CLOLOR-1);border-color:var(--UI-BORDER-CLOLOR-1)}}@media(prefers-color-scheme:dark){uni-toast .uni-toast{background-color:#606060;color:var(--UI-FG-0)}uni-toast .uni-icon_toast.uni-icon-error:before,uni-toast .uni-icon_toast.uni-icon-success-no-circle:before{color:rgba(255,255,255,0.9)}}@media(prefers-color-scheme:dark){uni-page-body{background-color:#191919;color:hsla(0,0%,100%,0.8)}}
\ No newline at end of file

src/platforms/app-plus/service/framework/plugins/data.js

@@ -155,6 +155,11 @@ function setData (id, name, value) {
       break
     case V_FOR:
       return setForData.call(this, id, value)
+    case 'is': {
+      if (typeof value === 'function') {
+        value = value.options
+      }
+    }
   }
 
   return ((this._$newData[id] || (this._$newData[id] = {}))[name] = value)

src/platforms/app-plus/view/framework/plugins/data.js

@@ -114,7 +114,18 @@ function vdSync ({
 
 function getData (id, name) {
   try {
-    return this.$r[id][name]
+    const data = this.$r[id][name]
+    if (name === 'is' && typeof data === 'object') {
+      const components = this.$options.components || {}
+      for (const key in components) {
+        const value = components[key]
+        const options = typeof value === 'function' ? value.options : value
+        if (options.__file === data.__file) {
+          return options
+        }
+      }
+    }
+    return data
   } catch (e) {
     // console.error(this.$options.__file + `:[${this._$id}]$r[${id}][${name}] is undefined`)
   }