提交 ec7414a0 编写于 作者: fxy060608's avatar fxy060608

chore: bump vite from 2.9.13 to 2.9.14

上级 26c32028
......@@ -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"
......
......@@ -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"
}
}
import Log from "android.util.Log";
export default function log(tag: string, msg: string) {
Log!.e(tag, msg);
Log.e(tag, msg);
}
package io.dcloud.uniplugin.log;
import android.util.Log;
fun log(tag: String, msg: String) {
Log!!.e(tag, msg);
Log.e(tag, msg);
}
......@@ -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 {
......
......@@ -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"
}
}
......@@ -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
......
......@@ -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"
......
......@@ -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:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册