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

build(deps): bump vite from 2.9.5 to 2.9.6

上级 8172bf6e
......@@ -84,7 +84,7 @@
"semver": "^7.3.5",
"ts-jest": "^27.0.3",
"typescript": "4.6.3",
"vite": "^2.9.5",
"vite": "^2.9.6",
"vue": "3.2.33",
"vue-router": "^4.0.14",
"yorkie": "^2.0.0"
......
......@@ -21,6 +21,6 @@
"compression": "^1.7.4",
"cypress": "^7.3.0",
"serve-static": "^1.14.1",
"vite": "^2.9.5"
"vite": "^2.9.6"
}
}
......@@ -9938,6 +9938,10 @@ class CanvasContext {
beginPath() {
this.path = [];
this.subpath = [];
this.path.push({
method: 'beginPath',
data: [],
});
}
moveTo(x, y) {
this.path.push({
......
......@@ -207,9 +207,21 @@ export function getMac() {
if (!item.family || (item.mac && item.mac === '00:00:00:00:00:00')) {
continue
}
if (item.family === 'IPv4' || item.family === 'IPv6') {
if (
// Node < v18
typeof item.family === 'string' &&
(item.family === 'IPv4' || item.family === 'IPv6')
) {
mac = item.mac
break
} else if (
// Node >= v18
typeof item.family === 'number' &&
(item.family === 4 || item.family === 6)
) {
mac = (item as any).mac
break
}
}
}
......
......@@ -891,6 +891,7 @@ var MovableArea = defineComponent({
styles: [{
"uni-movable-area": {
"": {
overflow: "hidden",
width: "10px",
height: "10px"
}
......@@ -946,6 +947,7 @@ var MovableArea = defineComponent({
},
onPanend(e2) {
touchMovableView && touchMovableView.touchend(e2);
touchMovableView = null;
}
};
const addMovableViewContext = (movableViewContext) => {
......@@ -970,7 +972,7 @@ var MovableArea = defineComponent({
return () => {
const defaultSlots = slots.default && slots.default();
const movableViewItems = flatVNode(defaultSlots);
return createVNode("div", mergeProps({
return createVNode("view", mergeProps({
"ref": rootRef,
"class": "uni-movable-area"
}, listeners), [movableViewItems]);
......
......@@ -3546,6 +3546,10 @@ class CanvasContext {
beginPath() {
this.path = [];
this.subpath = [];
this.path.push({
method: "beginPath",
data: []
});
}
moveTo(x, y) {
this.path.push({
......
......@@ -861,7 +861,7 @@ function addSafeAreaInsets(fromRes, toRes) {
top: safeArea.top,
left: safeArea.left,
right: fromRes.windowWidth - safeArea.right,
bottom: fromRes.windowHeight - safeArea.bottom,
bottom: Math.abs(fromRes.screenHeight - safeArea.bottom),
};
}
}
......
......@@ -861,7 +861,7 @@ function addSafeAreaInsets(fromRes, toRes) {
top: safeArea.top,
left: safeArea.left,
right: fromRes.windowWidth - safeArea.right,
bottom: fromRes.windowHeight - safeArea.bottom,
bottom: Math.abs(fromRes.screenHeight - safeArea.bottom),
};
}
}
......
......@@ -861,7 +861,7 @@ function addSafeAreaInsets(fromRes, toRes) {
top: safeArea.top,
left: safeArea.left,
right: fromRes.windowWidth - safeArea.right,
bottom: fromRes.windowHeight - safeArea.bottom,
bottom: Math.abs(fromRes.screenHeight - safeArea.bottom),
};
}
}
......
......@@ -861,7 +861,7 @@ function addSafeAreaInsets(fromRes, toRes) {
top: safeArea.top,
left: safeArea.left,
right: fromRes.windowWidth - safeArea.right,
bottom: fromRes.windowHeight - safeArea.bottom,
bottom: Math.abs(fromRes.screenHeight - safeArea.bottom),
};
}
}
......
......@@ -825,7 +825,7 @@ function addSafeAreaInsets(fromRes, toRes) {
top: safeArea.top,
left: safeArea.left,
right: fromRes.windowWidth - safeArea.right,
bottom: fromRes.windowHeight - safeArea.bottom,
bottom: Math.abs(fromRes.screenHeight - safeArea.bottom),
};
}
}
......
......@@ -861,7 +861,7 @@ function addSafeAreaInsets(fromRes, toRes) {
top: safeArea.top,
left: safeArea.left,
right: fromRes.windowWidth - safeArea.right,
bottom: fromRes.windowHeight - safeArea.bottom,
bottom: Math.abs(fromRes.screenHeight - safeArea.bottom),
};
}
}
......
......@@ -53,7 +53,7 @@
"chokidar": "^3.5.3"
},
"peerDependencies": {
"vite": "^2.9.5"
"vite": "^2.9.6"
},
"uni-app": {
"compilerVersion": "3.4.8"
......
......@@ -178,7 +178,11 @@ function resolveHostname() {
continue
}
for (const info of interfaceInfos) {
if (info.family === 'IPv4' && !info.address.includes('127.0.0.1')) {
if (
(info.family === 'IPv4' ||
/* Node >= v18 */ (info as any).family === 4) &&
!info.address.includes('127.0.0.1')
) {
return info.address
}
}
......
此差异已折叠。
......@@ -25,7 +25,7 @@ const pkgs = {
next: '9.1.9',
},
vite: {
latest: '2.9.5',
latest: '2.9.6',
},
'@vitejs/plugin-vue': {
latest: '2.3.1',
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册