Merge branches 'dev' and 'dev' of https://github.com/dcloudio/uni-app into dev

build/rollup.config.stat.js

@@ -4,6 +4,6 @@ module.exports = {
     file: 'packages/uni-stat/dist/index.js',
     format: 'es'
   },
-  external: ['vue', '@dcloudio/uni-stat/package.json'],
+  external: ['vue', '../package.json'],
   plugins: []
 }

packages/uni-cli-shared/lib/index.js

@@ -35,7 +35,8 @@ const {
 
 const {
   getFlexDirection,
-  getPlatformProject,
+  getPlatformProject,
+  isSupportFilters,
   isSupportSubPackages,
   getPlatforms,
   getPlatformGlobal,
@@ -82,7 +83,8 @@ module.exports = {
   getNetworkTimeout,
   runByHBuilderX,
   isInHBuilderX,
-  isInHBuilderXAlpha,
+  isInHBuilderXAlpha,
+  isSupportFilters,
   isSupportSubPackages,
   getPlatforms,
   getFlexDirection,

packages/uni-cli-shared/lib/platform.js

@@ -80,6 +80,7 @@ const PLATFORMS = {
     vue: '@dcloudio/vue-cli-plugin-uni/packages/h5-vue',
     compiler: false,
     megalo: false,
+    filters: true,
     subPackages: false,
     cssVars: {
       '--status-bar-height': '0px'
@@ -107,11 +108,13 @@ const PLATFORMS = {
     global: 'wx',
     exts: {
       style: '.wxss',
-      template: '.wxml'
+      template: '.wxml',
+      filter: '.wxs'
     },
     vue: mpvueRuntime,
     compiler: mpvueCompiler,
     megalo: false,
+    filters: true,
     subPackages: false,
     cssVars: {
       '--window-top': '0px',
@@ -134,11 +137,13 @@ const PLATFORMS = {
     global: 'wx',
     exts: {
       style: '.qss',
-      template: '.qml'
+      template: '.qml',
+      filter: '.wxs'
     },
     vue: mpvueRuntime,
     compiler: mpvueCompiler,
     megalo: false,
+    filters: true,
     subPackages: true,
     cssVars: {
       '--status-bar-height': '25px',
@@ -159,11 +164,13 @@ const PLATFORMS = {
     global: 'wx',
     exts: {
       style: '.wxss',
-      template: '.wxml'
+      template: '.wxml',
+      filter: '.wxs'
     },
     vue: mpvueRuntime,
     compiler: mpvueCompiler,
     megalo: false,
+    filters: true,
     subPackages: true,
     cssVars: {
       '--status-bar-height': '25px',
@@ -194,11 +201,13 @@ const PLATFORMS = {
     global: 'swan',
     exts: {
       style: '.css',
-      template: '.swan'
+      template: '.swan',
+      filter: '.filter.js'
     },
     vue: megaloRuntime,
     compiler: megaloCompiler,
     megalo: 'swan',
+    filters: true,
     subPackages: true,
     cssVars: {
       '--status-bar-height': '25px',
@@ -219,11 +228,13 @@ const PLATFORMS = {
     global: 'my',
     exts: {
       style: '.acss',
-      template: '.axml'
+      template: '.axml',
+      filter: '.sjs'
     },
     vue: megaloRuntime,
     compiler: megaloCompiler,
     megalo: 'alipay',
+    filters: true,
     subPackages: false,
     cssVars: {
       '--status-bar-height': '25px',
@@ -429,6 +440,9 @@ module.exports = {
     type: 'html',
     context: nvuePreprocessContext
   },
+  isSupportFilters () {
+    return platform.filters
+  },
   isSupportSubPackages () {
     return platform.subPackages
   },

packages/uni-stat/dist/index.js

-import { version } from '@dcloudio/uni-stat/package.json';
+import { version } from '../package.json';
 
 const STAT_VERSION = version; 
 const STAT_URL = 'https://tongji.dcloud.net.cn/uni/stat'; 
@@ -18,7 +18,6 @@ function getUuid() {
     } catch (e) {
       uuid = '';
     }
-    uni.setStorageSync(UUID_KEY, uuid);
     return uuid
   }
 
@@ -505,7 +504,7 @@ class Util {
     key = '',
     value = ""
   } = {}) {
-    const route = getPageRoute(this);
+    const route = this._lastPageRoute;
     let options = {
       ak: this.statData.ak,
       uuid: this.statData.uuid,

packages/uni-stat/package.json

 {
   "name": "@dcloudio/uni-stat",
-  "version": "0.0.105",
+  "version": "0.0.108",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

packages/uni-stat/src/config.js

 import {
   version
-} from '@dcloudio/uni-stat/package.json'
+} from '../package.json'
 export const STAT_VERSION = version 
 export const STAT_URL = 'https://tongji.dcloud.net.cn/uni/stat' 
 export const STAT_H5_URL = 'https://tongji.dcloud.net.cn/uni/stat.gif' 

packages/uni-stat/src/parameter.js

@@ -14,7 +14,6 @@ export function getUuid() {
     } catch (e) {
       uuid = '';
     }
-    uni.setStorageSync(UUID_KEY, uuid);
     return uuid
   }
 

packages/uni-stat/src/stat.js

@@ -239,7 +239,7 @@ class Util {
     key = '',
     value = ""
   } = {}) {
-    const route = getPageRoute(this);
+    const route = this._lastPageRoute;
     let options = {
       ak: this.statData.ak,
       uuid: this.statData.uuid,