From ec7414a019a5dac224373c969b00026734c8e6e4 Mon Sep 17 00:00:00 2001 From: fxy060608 Date: Fri, 8 Jul 2022 17:47:31 +0800 Subject: [PATCH] chore: bump vite from 2.9.13 to 2.9.14 --- package.json | 2 +- packages/playground/ssr/package.json | 2 +- .../android/src/io/dcloud/uniplugin/log.uts | 2 +- .../android/src/io/dcloud/uniplugin/log.kt | 2 +- packages/uni-app-plus/dist/uni.runtime.esm.js | 25 ++++++++----- packages/uni-app-vite/package.json | 2 +- packages/uni-h5/dist/uni-h5.es.js | 22 +++++++----- packages/vite-plugin-uni/package.json | 4 +-- pnpm-lock.yaml | 36 +++++++++---------- 9 files changed, 55 insertions(+), 42 deletions(-) diff --git a/package.json b/package.json index 24675f9f4..9ee1bd0b4 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "semver": "^7.3.5", "ts-jest": "^27.0.3", "typescript": "4.6.4", - "vite": "2.9.13", + "vite": "2.9.14", "vue": "3.2.37", "vue-router": "^4.1.1", "yorkie": "^2.0.0" diff --git a/packages/playground/ssr/package.json b/packages/playground/ssr/package.json index 64cd2cb55..08f0f1b95 100644 --- a/packages/playground/ssr/package.json +++ b/packages/playground/ssr/package.json @@ -21,6 +21,6 @@ "compression": "^1.7.4", "cypress": "^7.3.0", "serve-static": "^1.14.1", - "vite": "2.9.13" + "vite": "2.9.14" } } diff --git a/packages/playground/uts/nativeplugins/test-uniplugin/android/src/io/dcloud/uniplugin/log.uts b/packages/playground/uts/nativeplugins/test-uniplugin/android/src/io/dcloud/uniplugin/log.uts index 0d11f49b8..f6886d51d 100644 --- a/packages/playground/uts/nativeplugins/test-uniplugin/android/src/io/dcloud/uniplugin/log.uts +++ b/packages/playground/uts/nativeplugins/test-uniplugin/android/src/io/dcloud/uniplugin/log.uts @@ -1,4 +1,4 @@ import Log from "android.util.Log"; export default function log(tag: string, msg: string) { - Log!.e(tag, msg); + Log.e(tag, msg); } diff --git a/packages/playground/uts/unpackage/nativeplugins/test-uniplugin-android/android/src/io/dcloud/uniplugin/log.kt b/packages/playground/uts/unpackage/nativeplugins/test-uniplugin-android/android/src/io/dcloud/uniplugin/log.kt index b4565d92f..874213fbd 100644 --- a/packages/playground/uts/unpackage/nativeplugins/test-uniplugin-android/android/src/io/dcloud/uniplugin/log.kt +++ b/packages/playground/uts/unpackage/nativeplugins/test-uniplugin-android/android/src/io/dcloud/uniplugin/log.kt @@ -1,5 +1,5 @@ package io.dcloud.uniplugin.log; import android.util.Log; fun log(tag: String, msg: String) { - Log!!.e(tag, msg); + Log.e(tag, msg); } diff --git a/packages/uni-app-plus/dist/uni.runtime.esm.js b/packages/uni-app-plus/dist/uni.runtime.esm.js index a15fa4b4c..6c3412cd8 100644 --- a/packages/uni-app-plus/dist/uni.runtime.esm.js +++ b/packages/uni-app-plus/dist/uni.runtime.esm.js @@ -11613,6 +11613,18 @@ const GetLocationProtocol = { const API_OPEN_LOCATION = 'openLocation'; const OpenLocationOptions = { formatArgs: { + latitude(value, params) { + if (value !== 0 && !value) { + return 'latitude should not be empty.'; + } + params.latitude = value; + }, + longitude(value, params) { + if (value !== 0 && !value) { + return 'longitude should not be empty.'; + } + params.longitude = value; + }, scale(value, params) { value = Math.floor(value); params.scale = value >= 5 && value <= 18 ? value : 18; @@ -11620,14 +11632,8 @@ const OpenLocationOptions = { }, }; const OpenLocationProtocol = { - latitude: { - type: Number, - required: true, - }, - longitude: { - type: Number, - required: true, - }, + latitude: Number, + longitude: Number, scale: Number, name: String, address: String, @@ -17708,10 +17714,11 @@ function onWebviewPopGesture(webview) { setStatusBarStyle(popStartStatusBarStyle); } else if (e.type === 'end' && e.result) { + const len = getCurrentPages().length; const page = getCurrentPage(); removeCurrentPage(); setStatusBarStyle(); - if (page && isDirectPage(page)) { + if (page && len === 1 && isDirectPage(page)) { reLaunchEntryPage(); } else { diff --git a/packages/uni-app-vite/package.json b/packages/uni-app-vite/package.json index 501b77351..7b1baa9eb 100644 --- a/packages/uni-app-vite/package.json +++ b/packages/uni-app-vite/package.json @@ -40,7 +40,7 @@ "@vue/compiler-core": "3.2.37", "esbuild": "^0.14.27", "postcss": "^8.4.13", - "vite": "2.9.13", + "vite": "2.9.14", "vue": "3.2.37" } } diff --git a/packages/uni-h5/dist/uni-h5.es.js b/packages/uni-h5/dist/uni-h5.es.js index 5e3ef3288..a346587ab 100644 --- a/packages/uni-h5/dist/uni-h5.es.js +++ b/packages/uni-h5/dist/uni-h5.es.js @@ -4837,6 +4837,18 @@ const GetLocationProtocol = { const API_OPEN_LOCATION = "openLocation"; const OpenLocationOptions = { formatArgs: { + latitude(value, params) { + if (value !== 0 && !value) { + return "latitude should not be empty."; + } + params.latitude = value; + }, + longitude(value, params) { + if (value !== 0 && !value) { + return "longitude should not be empty."; + } + params.longitude = value; + }, scale(value, params) { value = Math.floor(value); params.scale = value >= 5 && value <= 18 ? value : 18; @@ -4844,14 +4856,8 @@ const OpenLocationOptions = { } }; const OpenLocationProtocol = { - latitude: { - type: Number, - required: true - }, - longitude: { - type: Number, - required: true - }, + latitude: Number, + longitude: Number, scale: Number, name: String, address: String diff --git a/packages/vite-plugin-uni/package.json b/packages/vite-plugin-uni/package.json index 802c1fb4a..a2cfeea79 100644 --- a/packages/vite-plugin-uni/package.json +++ b/packages/vite-plugin-uni/package.json @@ -53,11 +53,11 @@ "@types/sass": "^1.16.0", "@vue/babel-plugin-jsx": "^1.1.1", "chokidar": "^3.5.3", - "vite": "2.9.13", + "vite": "2.9.14", "vue": "3.2.37" }, "peerDependencies": { - "vite": "2.9.13" + "vite": "2.9.14" }, "uni-app": { "compilerVersion": "3.5.1" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e32eff935..9e7c04e38 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -50,7 +50,7 @@ importers: semver: ^7.3.5 ts-jest: ^27.0.3 typescript: 4.6.4 - vite: 2.9.13 + vite: 2.9.14 vue: 3.2.37 vue-router: ^4.1.1 yorkie: ^2.0.0 @@ -72,7 +72,7 @@ importers: '@types/jest': 27.5.2 '@types/node': 17.0.45 '@typescript-eslint/parser': 5.28.0_e4zyhrvfnqudwdx5bevnvkluy4 - '@vitejs/plugin-vue': 2.3.3_vite@2.9.13+vue@3.2.37 + '@vitejs/plugin-vue': 2.3.3_vite@2.9.14+vue@3.2.37 '@vitejs/plugin-vue-jsx': 1.3.10 '@vue/compiler-sfc': 3.2.37 '@vue/reactivity': 3.2.37 @@ -101,7 +101,7 @@ importers: semver: 7.3.7 ts-jest: 27.1.5_s6xtcnfklq2lhz65wqxmjm4pia typescript: 4.6.4 - vite: 2.9.13 + vite: 2.9.14 vue: 3.2.37 vue-router: 4.1.1_vue@3.2.37 yorkie: 2.0.0 @@ -115,7 +115,7 @@ importers: compression: ^1.7.4 cypress: ^7.3.0 serve-static: ^1.14.1 - vite: 2.9.13 + vite: 2.9.14 vue: 3.2.37 vue-router: ^4.1.1 vuex: ^4.0.2 @@ -131,7 +131,7 @@ importers: compression: 1.7.4 cypress: 7.7.0 serve-static: 1.15.0 - vite: 2.9.13 + vite: 2.9.14 packages/size-check: specifiers: @@ -232,7 +232,7 @@ importers: picocolors: ^1.0.0 postcss: ^8.4.13 rollup: ^2.59.0 - vite: 2.9.13 + vite: 2.9.14 vue: 3.2.37 dependencies: '@dcloudio/uni-cli-shared': link:../uni-cli-shared @@ -241,7 +241,7 @@ importers: '@dcloudio/uni-shared': link:../uni-shared '@dcloudio/uts': link:../uts '@rollup/pluginutils': 4.2.1 - '@vitejs/plugin-vue': 2.3.3_vite@2.9.13+vue@3.2.37 + '@vitejs/plugin-vue': 2.3.3_vite@2.9.14+vue@3.2.37 '@vue/compiler-dom': 3.2.37 '@vue/compiler-sfc': 3.2.37 debug: 4.3.4 @@ -254,7 +254,7 @@ importers: '@vue/compiler-core': 3.2.37 esbuild: 0.14.45 postcss: 8.4.14 - vite: 2.9.13 + vite: 2.9.14 vue: 3.2.37 packages/uni-app-vue: @@ -869,7 +869,7 @@ importers: hash-sum: ^2.0.0 jsonc-parser: ^3.0.0 picocolors: ^1.0.0 - vite: 2.9.13 + vite: 2.9.14 vue: 3.2.37 dependencies: '@babel/core': 7.18.5 @@ -878,8 +878,8 @@ importers: '@dcloudio/uni-cli-shared': link:../uni-cli-shared '@dcloudio/uni-shared': link:../uni-shared '@rollup/pluginutils': 4.2.1 - '@vitejs/plugin-legacy': 1.8.2_vite@2.9.13 - '@vitejs/plugin-vue': 2.3.3_vite@2.9.13+vue@3.2.37 + '@vitejs/plugin-legacy': 1.8.2_vite@2.9.14 + '@vitejs/plugin-vue': 2.3.3_vite@2.9.14+vue@3.2.37 '@vitejs/plugin-vue-jsx': 1.3.10 '@vue/compiler-core': 3.2.37 '@vue/compiler-dom': 3.2.37 @@ -902,7 +902,7 @@ importers: '@types/sass': 1.43.1 '@vue/babel-plugin-jsx': 1.1.1_@babel+core@7.18.5 chokidar: 3.5.3 - vite: 2.9.13 + vite: 2.9.14 vue: 3.2.37 packages: @@ -2996,7 +2996,7 @@ packages: eslint-visitor-keys: 3.3.0 dev: true - /@vitejs/plugin-legacy/1.8.2_vite@2.9.13: + /@vitejs/plugin-legacy/1.8.2_vite@2.9.14: resolution: {integrity: sha512-NCOKU+pU+cxLMR9P9RTolEuOK+h+zYBXlknj+zGcKSj/NXBZYgA1GAH1FnO4zijoWRiTaiOm2ha9LQrELE7XHg==} engines: {node: '>=12.0.0'} peerDependencies: @@ -3007,7 +3007,7 @@ packages: magic-string: 0.26.2 regenerator-runtime: 0.13.9 systemjs: 6.12.1 - vite: 2.9.13 + vite: 2.9.14 dev: false /@vitejs/plugin-vue-jsx/1.3.10: @@ -3023,14 +3023,14 @@ packages: transitivePeerDependencies: - supports-color - /@vitejs/plugin-vue/2.3.3_vite@2.9.13+vue@3.2.37: + /@vitejs/plugin-vue/2.3.3_vite@2.9.14+vue@3.2.37: resolution: {integrity: sha512-SmQLDyhz+6lGJhPELsBdzXGc+AcaT8stgkbiTFGpXPe8Tl1tJaBw1A6pxDqDuRsVkD8uscrkx3hA7QDOoKYtyw==} engines: {node: '>=12.0.0'} peerDependencies: vite: ^2.5.10 vue: ^3.2.25 dependencies: - vite: 2.9.13 + vite: 2.9.14 vue: 3.2.37 /@vue/babel-helper-vue-transform-on/1.0.2: @@ -8199,8 +8199,8 @@ packages: extsprintf: 1.3.0 dev: true - /vite/2.9.13: - resolution: {integrity: sha512-AsOBAaT0AD7Mhe8DuK+/kE4aWYFMx/i0ZNi98hJclxb4e0OhQcZYUrvLjIaQ8e59Ui7txcvKMiJC1yftqpQoDw==} + /vite/2.9.14: + resolution: {integrity: sha512-P/UCjSpSMcE54r4mPak55hWAZPlyfS369svib/gpmz8/01L822lMPOJ/RYW6tLCe1RPvMvOsJ17erf55bKp4Hw==} engines: {node: '>=12.2.0'} hasBin: true peerDependencies: -- GitLab