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

chore: bump vue from 3.2.45 to 3.2.47

上级 8c773ea2
......@@ -12,7 +12,7 @@
"@dcloudio/uni-app": "../../uni-app",
"@dcloudio/uni-components": "../../uni-components",
"@dcloudio/uni-h5": "../../uni-h5",
"vue": "3.2.45",
"vue": "3.2.47",
"vue-router": "^4.1.6",
"vuex": "^4.1.0"
},
......@@ -21,6 +21,6 @@
"compression": "^1.7.4",
"cypress": "^10.7.0",
"serve-static": "^1.15.0",
"vite": "4.0.4"
"vite": "^4.1.0"
}
}
......@@ -5,7 +5,7 @@
"dependencies": {
"@dcloudio/uni-app": "3.0.0-alpha-3070020230202001",
"@dcloudio/uni-h5": "3.0.0-alpha-3070020230202001",
"vue": "3.2.45",
"vue": "3.2.47",
"vue-i18n": "9.1.9",
"vuex": "^4.1.0"
},
......
......@@ -15,7 +15,7 @@
"url": "https://github.com/dcloudio/uni-app/issues"
},
"dependencies": {
"@vue/shared": "3.2.45"
"@vue/shared": "3.2.47"
},
"devDependencies": {
"@dcloudio/uni-shared": "3.0.0-alpha-3070020230202001"
......
......@@ -42,10 +42,10 @@
"@dcloudio/uni-i18n": "3.0.0-alpha-3070020230202001",
"@dcloudio/uni-shared": "3.0.0-alpha-3070020230202001",
"@types/pako": "1.0.2",
"@vue/compiler-sfc": "3.2.45",
"@vue/compiler-sfc": "3.2.47",
"autoprefixer": "^10.4.13",
"pako": "^1.0.11",
"postcss": "^8.4.16",
"vue": "3.2.45"
"postcss": "^8.4.21",
"vue": "3.2.47"
}
}
......@@ -26,8 +26,8 @@
"@dcloudio/uni-shared": "3.0.0-alpha-3070020230202001",
"@rollup/pluginutils": "^4.2.0",
"@vitejs/plugin-vue": "^4.0.0",
"@vue/compiler-dom": "3.2.45",
"@vue/compiler-sfc": "3.2.45",
"@vue/compiler-dom": "3.2.47",
"@vue/compiler-sfc": "3.2.47",
"debug": "^4.3.3",
"fs-extra": "^10.0.0",
"picocolors": "^1.0.0"
......@@ -35,11 +35,11 @@
"devDependencies": {
"@types/debug": "^4.1.7",
"@types/fs-extra": "^9.0.13",
"@vue/compiler-core": "3.2.45",
"@vue/compiler-core": "3.2.47",
"esbuild": "^0.16.3",
"postcss": "^8.4.16",
"postcss": "^8.4.21",
"rollup": "^3.7.0",
"vite": "4.0.4",
"vue": "3.2.45"
"vite": "^4.1.0",
"vue": "3.2.47"
}
}
import { isString, isFunction, isPromise, isArray, getGlobalThis, NOOP, EMPTY_OBJ, remove, toHandlerKey, camelize, capitalize, isObject, extend, normalizeClass, normalizeStyle, isOn, hasChanged, hasOwn, hyphenate, toNumber, isSet, isMap, isPlainObject, invokeArrayFns, EMPTY_ARR, NO, isModelListener, isBuiltInDirective, isReservedProp, makeMap, parseStringStyle, def, toRawType, isGloballyWhitelisted } from '@vue/shared';
import { isString, isFunction, isPromise, isArray, getGlobalThis, NOOP, EMPTY_OBJ, remove, toHandlerKey, camelize, capitalize, isObject, extend, normalizeClass, normalizeStyle, isOn, hasChanged, hasOwn, hyphenate, toNumber, isSet, isMap, isPlainObject, invokeArrayFns, isRegExp, EMPTY_ARR, NO, isModelListener, isBuiltInDirective, isReservedProp, makeMap, parseStringStyle, looseToNumber, def, toRawType, isGloballyWhitelisted } from '@vue/shared';
export { camelize, capitalize, hyphenate, normalizeClass, normalizeProps, normalizeStyle, toDisplayString, toHandlerKey } from '@vue/shared';
import { pauseTracking, resetTracking, isRef, toRaw, isShallow as isShallow$1, isReactive, ReactiveEffect, ref, isProxy, computed as computed$1, shallowReadonly, proxyRefs, markRaw, isReadonly, track, EffectScope, reactive, shallowReactive, trigger } from '@vue/reactivity';
import { pauseTracking, resetTracking, isRef, toRaw, getCurrentScope, isShallow as isShallow$1, isReactive, ReactiveEffect, ref, isProxy, computed as computed$1, shallowReadonly, proxyRefs, markRaw, isReadonly, track, EffectScope, reactive, shallowReactive, trigger } from '@vue/reactivity';
export { EffectScope, ReactiveEffect, customRef, effect, effectScope, getCurrentScope, isProxy, isReactive, isReadonly, isRef, isShallow, markRaw, onScopeDispose, proxyRefs, reactive, readonly, ref, shallowReactive, shallowReadonly, shallowRef, stop, toRaw, toRef, toRefs, triggerRef, unref } from '@vue/reactivity';
import { isRootHook, isRootImmediateHook, ON_LOAD } from '@dcloudio/uni-shared';
var stack = [];
......@@ -111,6 +111,18 @@ function formatProp(key, value, raw) {
return raw ? value : ["".concat(key, "="), value];
}
}
/**
* @internal
*/
function assertNumber(val, type) {
if (val === undefined) {
return;
} else if (typeof val !== 'number') {
warn("".concat(type, " is not a valid number - ") + "got ".concat(JSON.stringify(val), "."));
} else if (isNaN(val)) {
warn("".concat(type, " is NaN - ") + 'the duration expression might be incorrect.');
}
}
var ErrorTypeStrings = {
["sp" /* LifecycleHooks.SERVER_PREFETCH */]: 'serverPrefetch hook',
["bc" /* LifecycleHooks.BEFORE_CREATE */]: 'beforeCreate hook',
......@@ -526,7 +538,7 @@ function tryWrap(fn) {
var devtools;
var buffer = [];
var devtoolsNotInstalled = false;
function emit(event) {
function emit$1(event) {
for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
args[_key2 - 1] = arguments[_key2];
}
......@@ -581,7 +593,7 @@ function setDevtoolsHook(hook, target) {
}
}
function devtoolsInitApp(app, version) {
emit("app:init" /* DevtoolsHooks.APP_INIT */, app, version, {
emit$1("app:init" /* DevtoolsHooks.APP_INIT */, app, version, {
Fragment,
Text,
Comment,
......@@ -589,7 +601,7 @@ function devtoolsInitApp(app, version) {
});
}
function devtoolsUnmountApp(app) {
emit("app:unmount" /* DevtoolsHooks.APP_UNMOUNT */, app);
emit$1("app:unmount" /* DevtoolsHooks.APP_UNMOUNT */, app);
}
var devtoolsComponentAdded = /*#__PURE__*/createDevtoolsComponentHook("component:added" /* DevtoolsHooks.COMPONENT_ADDED */);
var devtoolsComponentUpdated = /*#__PURE__*/createDevtoolsComponentHook("component:updated" /* DevtoolsHooks.COMPONENT_UPDATED */);
......@@ -603,20 +615,20 @@ var devtoolsComponentRemoved = component => {
};
function createDevtoolsComponentHook(hook) {
return component => {
emit(hook, component.appContext.app, component.uid, component.parent ? component.parent.uid : undefined, component);
emit$1(hook, component.appContext.app, component.uid, component.parent ? component.parent.uid : undefined, component);
};
}
var devtoolsPerfStart = /*#__PURE__*/createDevtoolsPerformanceHook("perf:start" /* DevtoolsHooks.PERFORMANCE_START */);
var devtoolsPerfEnd = /*#__PURE__*/createDevtoolsPerformanceHook("perf:end" /* DevtoolsHooks.PERFORMANCE_END */);
function createDevtoolsPerformanceHook(hook) {
return (component, type, time) => {
emit(hook, component.appContext.app, component.uid, component, type, time);
emit$1(hook, component.appContext.app, component.uid, component, type, time);
};
}
function devtoolsComponentEmit(component, event, params) {
emit("component:emit" /* DevtoolsHooks.COMPONENT_EMIT */, component.appContext.app, component, event, params);
emit$1("component:emit" /* DevtoolsHooks.COMPONENT_EMIT */, component.appContext.app, component, event, params);
}
function emit$1(instance, event) {
function emit(instance, event) {
if (instance.isUnmounted) return;
var props = instance.vnode.props || EMPTY_OBJ;
for (var _len3 = arguments.length, rawArgs = new Array(_len3 > 2 ? _len3 - 2 : 0), _key3 = 2; _key3 < _len3; _key3++) {
......@@ -657,7 +669,7 @@ function emit$1(instance, event) {
args = rawArgs.map(a => isString(a) ? a.trim() : a);
}
if (number) {
args = rawArgs.map(toNumber);
args = rawArgs.map(looseToNumber);
}
}
{
......@@ -1322,7 +1334,10 @@ function createSuspenseBoundary(vnode, parent, parentComponent, container, hidde
remove
}
} = rendererInternals;
var timeout = toNumber(vnode.props && vnode.props.timeout);
var timeout = vnode.props ? toNumber(vnode.props.timeout) : undefined;
{
assertNumber(timeout, "Suspense timeout");
}
var suspense = {
vnode,
parent,
......@@ -1691,7 +1706,8 @@ function doWatch(source, cb) {
var warnInvalidSource = s => {
warn("Invalid watch source: ", s, "A watch source can only be a getter/effect function, a ref, " + "a reactive object, or an array of these types.");
};
var instance = currentInstance;
var instance = getCurrentScope() === (currentInstance === null || currentInstance === void 0 ? void 0 : currentInstance.scope) ? currentInstance : null;
// const instance = currentInstance
var getter;
var forceTrigger = false;
var isMultiSource = false;
......@@ -1899,28 +1915,29 @@ function useTransitionState() {
return state;
}
var TransitionHookValidator = [Function, Array];
var BaseTransitionPropsValidators = {
mode: String,
appear: Boolean,
persisted: Boolean,
// enter
onBeforeEnter: TransitionHookValidator,
onEnter: TransitionHookValidator,
onAfterEnter: TransitionHookValidator,
onEnterCancelled: TransitionHookValidator,
// leave
onBeforeLeave: TransitionHookValidator,
onLeave: TransitionHookValidator,
onAfterLeave: TransitionHookValidator,
onLeaveCancelled: TransitionHookValidator,
// appear
onBeforeAppear: TransitionHookValidator,
onAppear: TransitionHookValidator,
onAfterAppear: TransitionHookValidator,
onAppearCancelled: TransitionHookValidator
};
var BaseTransitionImpl = {
name: "BaseTransition",
props: {
mode: String,
appear: Boolean,
persisted: Boolean,
// enter
onBeforeEnter: TransitionHookValidator,
onEnter: TransitionHookValidator,
onAfterEnter: TransitionHookValidator,
onEnterCancelled: TransitionHookValidator,
// leave
onBeforeLeave: TransitionHookValidator,
onLeave: TransitionHookValidator,
onAfterLeave: TransitionHookValidator,
onLeaveCancelled: TransitionHookValidator,
// appear
onBeforeAppear: TransitionHookValidator,
onAppear: TransitionHookValidator,
onAfterAppear: TransitionHookValidator,
onAppearCancelled: TransitionHookValidator
},
props: BaseTransitionPropsValidators,
setup(props, _ref6) {
var {
slots
......@@ -2472,7 +2489,7 @@ var KeepAliveImpl = {
}
function pruneCacheEntry(key) {
var cached = cache.get(key);
if (!current || cached.type !== current.type) {
if (!current || !isSameVNodeType(cached, current)) {
unmount(cached);
} else if (current) {
// current active instance should no longer be kept-alive.
......@@ -2510,7 +2527,7 @@ var KeepAliveImpl = {
suspense
} = instance;
var vnode = getInnerChild(subTree);
if (cached.type === vnode.type) {
if (cached.type === vnode.type && cached.key === vnode.key) {
// current instance will be unmounted as part of keep-alive's unmount
resetShapeFlag(vnode);
// but invoke its deactivated hook here
......@@ -2602,7 +2619,7 @@ function matches(pattern, name) {
return pattern.some(p => matches(p, name));
} else if (isString(pattern)) {
return pattern.split(',').includes(name);
} else if (pattern.test) {
} else if (isRegExp(pattern)) {
return pattern.test(name);
}
/* istanbul ignore next */
......@@ -3990,8 +4007,8 @@ function validatePropName(key) {
// use function string name to check type constructors
// so that it works across vms / iframes.
function getType(ctor) {
var match = ctor && ctor.toString().match(/^\s*function (\w+)/);
return match ? match[1] : ctor === null ? 'null' : '';
var match = ctor && ctor.toString().match(/^\s*(function|class) (\w+)/);
return match ? match[2] : ctor === null ? 'null' : '';
}
function isSameType(a, b) {
return getType(a) === getType(b);
......@@ -4270,7 +4287,7 @@ function createAppContext() {
emitsCache: new WeakMap()
};
}
var uid = 0;
var uid$1 = 0;
function createAppAPI(render, hydrate) {
return function createApp(rootComponent) {
var rootProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
......@@ -4285,7 +4302,7 @@ function createAppAPI(render, hydrate) {
var installedPlugins = new Set();
var isMounted = false;
var app = context.app = {
_uid: uid++,
_uid: uid$1++,
_component: rootComponent,
_props: rootProps,
_container: null,
......@@ -5080,6 +5097,8 @@ function baseCreateRenderer(options, createHydrationFns) {
if (dirs) {
invokeDirectiveHook(vnode, null, parentComponent, 'created');
}
// scopeId
setScopeId(el, vnode, vnode.scopeId, slotScopeIds, parentComponent);
// props
if (props) {
for (var key in props) {
......@@ -5108,8 +5127,6 @@ function baseCreateRenderer(options, createHydrationFns) {
invokeVNodeHook(vnodeHook, parentComponent, vnode);
}
}
// scopeId
setScopeId(el, vnode, vnode.scopeId, slotScopeIds, parentComponent);
{
Object.defineProperty(el, '__vnode', {
value: vnode,
......@@ -6821,7 +6838,8 @@ function cloneVNode(vnode, extraProps) {
ssFallback: vnode.ssFallback && cloneVNode(vnode.ssFallback),
el: vnode.el,
anchor: vnode.anchor,
ctx: vnode.ctx
ctx: vnode.ctx,
ce: vnode.ce
};
return cloned;
}
......@@ -6969,13 +6987,13 @@ function invokeVNodeHook(hook, instance, vnode) {
callWithAsyncErrorHandling(hook, instance, 7 /* ErrorCodes.VNODE_HOOK */, [vnode, prevVNode]);
}
var emptyAppContext = createAppContext();
var uid$1 = 0;
var uid = 0;
function createComponentInstance(vnode, parent, suspense) {
var type = vnode.type;
// inherit parent app context - or - if root, adopt from root vnode
var appContext = (parent ? parent.appContext : vnode.appContext) || emptyAppContext;
var instance = {
uid: uid$1++,
uid: uid++,
vnode,
type,
parent,
......@@ -7045,7 +7063,7 @@ function createComponentInstance(vnode, parent, suspense) {
instance.ctx = createDevRenderContext(instance);
}
instance.root = parent ? parent.root : instance;
instance.emit = emit$1.bind(null, instance);
instance.emit = emit.bind(null, instance);
// apply custom element special handling
if (vnode.ce) {
vnode.ce(instance);
......@@ -7276,8 +7294,23 @@ function createAttrsProxy(instance) {
}
function createSetupContext(instance) {
var expose = exposed => {
if (instance.exposed) {
warn("expose() should be called only once per setup().");
{
if (instance.exposed) {
warn("expose() should be called only once per setup().");
}
if (exposed != null) {
var exposedType = typeof exposed;
if (exposedType === 'object') {
if (isArray(exposed)) {
exposedType = 'array';
} else if (isRef(exposed)) {
exposedType = 'ref';
}
}
if (exposedType !== 'object') {
warn("expose() should be passed a plain object, received ".concat(exposedType, "."));
}
}
}
instance.exposed = exposed || {};
};
......@@ -7717,7 +7750,7 @@ function isMemoSame(cached, memo) {
}
// Core API ------------------------------------------------------------------
var version = "3.2.45";
var version = "3.2.47";
/**
* @internal only exposed in compat builds
*/
......@@ -8252,4 +8285,4 @@ var createApp = function () {
};
return app;
};
export { BaseTransition, Comment, Fragment, KeepAlive, Static, Suspense, Teleport, Text, callWithAsyncErrorHandling, callWithErrorHandling, cloneVNode, compatUtils, computed, createApp, createBlock, createCommentVNode, createElementBlock, createBaseVNode as createElementVNode, createHydrationRenderer, createPropsRestProxy, createRenderer, createSlots, createStaticVNode, createTextVNode, createVNode, defineAsyncComponent, defineComponent, defineEmits, defineExpose, defineProps, devtools, getCurrentInstance, getTransitionRawChildren, guardReactiveProps, h, handleError, initCustomFormatter, inject, injectHook, isInSSRComponentSetup, isMemoSame, isRuntimeOnly, isVNode, mergeDefaults, mergeProps, nextTick, onActivated, onBeforeMount, onBeforeUnmount, onBeforeUpdate, onDeactivated, onErrorCaptured, onMounted, onRenderTracked, onRenderTriggered, onServerPrefetch, onUnmounted, onUpdated, openBlock, parseClassList, parseClassStyles, popScopeId, provide, pushScopeId, queuePostFlushCb, registerRuntimeCompiler, render, renderList, renderSlot, resolveComponent, resolveDirective, resolveDynamicComponent, resolveFilter, resolveTransitionHooks, setBlockTracking, setDevtoolsHook, setTransitionHooks, ssrContextKey, toHandlers, transformVNodeArgs, useAttrs, useCssModule, useCssStyles, useCssVars, useSSRContext, useSlots, useTransitionState, version, warn, watch, watchEffect, watchPostEffect, watchSyncEffect, withAsyncContext, withCtx, withDefaults, withDirectives, withKeys, withMemo, withModifiers, withScopeId };
export { BaseTransition, BaseTransitionPropsValidators, Comment, Fragment, KeepAlive, Static, Suspense, Teleport, Text, assertNumber, callWithAsyncErrorHandling, callWithErrorHandling, cloneVNode, compatUtils, computed, createApp, createBlock, createCommentVNode, createElementBlock, createBaseVNode as createElementVNode, createHydrationRenderer, createPropsRestProxy, createRenderer, createSlots, createStaticVNode, createTextVNode, createVNode, defineAsyncComponent, defineComponent, defineEmits, defineExpose, defineProps, devtools, getCurrentInstance, getTransitionRawChildren, guardReactiveProps, h, handleError, initCustomFormatter, inject, injectHook, isInSSRComponentSetup, isMemoSame, isRuntimeOnly, isVNode, mergeDefaults, mergeProps, nextTick, onActivated, onBeforeMount, onBeforeUnmount, onBeforeUpdate, onDeactivated, onErrorCaptured, onMounted, onRenderTracked, onRenderTriggered, onServerPrefetch, onUnmounted, onUpdated, openBlock, parseClassList, parseClassStyles, popScopeId, provide, pushScopeId, queuePostFlushCb, registerRuntimeCompiler, render, renderList, renderSlot, resolveComponent, resolveDirective, resolveDynamicComponent, resolveFilter, resolveTransitionHooks, setBlockTracking, setDevtoolsHook, setTransitionHooks, ssrContextKey, toHandlers, transformVNodeArgs, useAttrs, useCssModule, useCssStyles, useCssVars, useSSRContext, useSlots, useTransitionState, version, warn, watch, watchEffect, watchPostEffect, watchSyncEffect, withAsyncContext, withCtx, withDefaults, withDirectives, withKeys, withMemo, withModifiers, withScopeId };
import { isFunction, isPromise, isArray, NOOP, EMPTY_OBJ, remove, isString, camelize, capitalize, isObject, toHandlerKey, getGlobalThis, normalizeClass, extend, normalizeStyle, isOn, hasChanged, hasOwn, hyphenate, toNumber, isSet, isMap, isPlainObject, invokeArrayFns, EMPTY_ARR, isModelListener, isReservedProp, parseStringStyle, def, NO, isGloballyWhitelisted } from '@vue/shared';
import { isFunction, isPromise, isArray, NOOP, EMPTY_OBJ, remove, isString, camelize, capitalize, isObject, toHandlerKey, getGlobalThis, normalizeClass, extend, normalizeStyle, isOn, hasChanged, hasOwn, hyphenate, toNumber, isSet, isMap, isPlainObject, invokeArrayFns, isRegExp, EMPTY_ARR, isModelListener, isReservedProp, parseStringStyle, looseToNumber, def, NO, isGloballyWhitelisted } from '@vue/shared';
export { camelize, capitalize, hyphenate, normalizeClass, normalizeProps, normalizeStyle, toDisplayString, toHandlerKey } from '@vue/shared';
import { isRef, isShallow, isReactive, ReactiveEffect, ref, pauseTracking, resetTracking, isProxy, computed as computed$1, toRaw, proxyRefs, markRaw, EffectScope, track, reactive, shallowReactive, trigger } from '@vue/reactivity';
import { getCurrentScope, isRef, isShallow, isReactive, ReactiveEffect, ref, pauseTracking, resetTracking, isProxy, computed as computed$1, toRaw, proxyRefs, markRaw, EffectScope, track, reactive, shallowReactive, trigger } from '@vue/reactivity';
export { EffectScope, ReactiveEffect, customRef, effect, effectScope, getCurrentScope, isProxy, isReactive, isReadonly, isRef, isShallow, markRaw, onScopeDispose, proxyRefs, reactive, readonly, ref, shallowReactive, shallowReadonly, shallowRef, stop, toRaw, toRef, toRefs, triggerRef, unref } from '@vue/reactivity';
import { isRootHook, isRootImmediateHook, ON_LOAD } from '@dcloudio/uni-shared';
function warn(msg) {
return;
}
/**
* @internal
*/
function assertNumber(val, type) {
return;
}
function callWithErrorHandling(fn, instance, type, args) {
var res;
try {
......@@ -254,7 +260,7 @@ function setDevtoolsHook(hook, target) {
buffer = [];
}
}
function emit$1(instance, event) {
function emit(instance, event) {
if (instance.isUnmounted) return;
var props = instance.vnode.props || EMPTY_OBJ;
for (var _len = arguments.length, rawArgs = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
......@@ -274,7 +280,7 @@ function emit$1(instance, event) {
args = rawArgs.map(a => isString(a) ? a.trim() : a);
}
if (number) {
args = rawArgs.map(toNumber);
args = rawArgs.map(looseToNumber);
}
}
var handlerName;
......@@ -833,7 +839,7 @@ function createSuspenseBoundary(vnode, parent, parentComponent, container, hidde
remove
}
} = rendererInternals;
var timeout = toNumber(vnode.props && vnode.props.timeout);
var timeout = vnode.props ? toNumber(vnode.props.timeout) : undefined;
var suspense = {
vnode,
parent,
......@@ -1163,7 +1169,8 @@ function doWatch(source, cb) {
onTrack,
onTrigger
} = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : EMPTY_OBJ;
var instance = currentInstance;
var instance = getCurrentScope() === (currentInstance === null || currentInstance === void 0 ? void 0 : currentInstance.scope) ? currentInstance : null;
// const instance = currentInstance
var getter;
var forceTrigger = false;
var isMultiSource = false;
......@@ -1364,28 +1371,29 @@ function useTransitionState() {
return state;
}
var TransitionHookValidator = [Function, Array];
var BaseTransitionPropsValidators = {
mode: String,
appear: Boolean,
persisted: Boolean,
// enter
onBeforeEnter: TransitionHookValidator,
onEnter: TransitionHookValidator,
onAfterEnter: TransitionHookValidator,
onEnterCancelled: TransitionHookValidator,
// leave
onBeforeLeave: TransitionHookValidator,
onLeave: TransitionHookValidator,
onAfterLeave: TransitionHookValidator,
onLeaveCancelled: TransitionHookValidator,
// appear
onBeforeAppear: TransitionHookValidator,
onAppear: TransitionHookValidator,
onAfterAppear: TransitionHookValidator,
onAppearCancelled: TransitionHookValidator
};
var BaseTransitionImpl = {
name: "BaseTransition",
props: {
mode: String,
appear: Boolean,
persisted: Boolean,
// enter
onBeforeEnter: TransitionHookValidator,
onEnter: TransitionHookValidator,
onAfterEnter: TransitionHookValidator,
onEnterCancelled: TransitionHookValidator,
// leave
onBeforeLeave: TransitionHookValidator,
onLeave: TransitionHookValidator,
onAfterLeave: TransitionHookValidator,
onLeaveCancelled: TransitionHookValidator,
// appear
onBeforeAppear: TransitionHookValidator,
onAppear: TransitionHookValidator,
onAfterAppear: TransitionHookValidator,
onAppearCancelled: TransitionHookValidator
},
props: BaseTransitionPropsValidators,
setup(props, _ref4) {
var {
slots
......@@ -1910,7 +1918,7 @@ var KeepAliveImpl = {
}
function pruneCacheEntry(key) {
var cached = cache.get(key);
if (!current || cached.type !== current.type) {
if (!current || !isSameVNodeType(cached, current)) {
unmount(cached);
} else if (current) {
// current active instance should no longer be kept-alive.
......@@ -1948,7 +1956,7 @@ var KeepAliveImpl = {
suspense
} = instance;
var vnode = getInnerChild(subTree);
if (cached.type === vnode.type) {
if (cached.type === vnode.type && cached.key === vnode.key) {
// current instance will be unmounted as part of keep-alive's unmount
resetShapeFlag(vnode);
// but invoke its deactivated hook here
......@@ -2037,7 +2045,7 @@ function matches(pattern, name) {
return pattern.some(p => matches(p, name));
} else if (isString(pattern)) {
return pattern.split(',').includes(name);
} else if (pattern.test) {
} else if (isRegExp(pattern)) {
return pattern.test(name);
}
/* istanbul ignore next */
......@@ -3191,8 +3199,8 @@ function validatePropName(key) {
// use function string name to check type constructors
// so that it works across vms / iframes.
function getType(ctor) {
var match = ctor && ctor.toString().match(/^\s*function (\w+)/);
return match ? match[1] : ctor === null ? 'null' : '';
var match = ctor && ctor.toString().match(/^\s*(function|class) (\w+)/);
return match ? match[2] : ctor === null ? 'null' : '';
}
function isSameType(a, b) {
return getType(a) === getType(b);
......@@ -3329,7 +3337,7 @@ function createAppContext() {
emitsCache: new WeakMap()
};
}
var uid = 0;
var uid$1 = 0;
function createAppAPI(render, hydrate) {
return function createApp(rootComponent) {
var rootProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
......@@ -3343,7 +3351,7 @@ function createAppAPI(render, hydrate) {
var installedPlugins = new Set();
var isMounted = false;
var app = context.app = {
_uid: uid++,
_uid: uid$1++,
_component: rootComponent,
_props: rootProps,
_container: null,
......@@ -3990,6 +3998,8 @@ function baseCreateRenderer(options, createHydrationFns) {
if (dirs) {
invokeDirectiveHook(vnode, null, parentComponent, 'created');
}
// scopeId
setScopeId(el, vnode, vnode.scopeId, slotScopeIds, parentComponent);
// props
if (props) {
for (var key in props) {
......@@ -4018,8 +4028,6 @@ function baseCreateRenderer(options, createHydrationFns) {
invokeVNodeHook(vnodeHook, parentComponent, vnode);
}
}
// scopeId
setScopeId(el, vnode, vnode.scopeId, slotScopeIds, parentComponent);
if (dirs) {
invokeDirectiveHook(vnode, null, parentComponent, 'beforeMount');
}
......@@ -5553,7 +5561,8 @@ function cloneVNode(vnode, extraProps) {
ssFallback: vnode.ssFallback && cloneVNode(vnode.ssFallback),
el: vnode.el,
anchor: vnode.anchor,
ctx: vnode.ctx
ctx: vnode.ctx,
ce: vnode.ce
};
return cloned;
}
......@@ -5690,13 +5699,13 @@ function invokeVNodeHook(hook, instance, vnode) {
callWithAsyncErrorHandling(hook, instance, 7 /* ErrorCodes.VNODE_HOOK */, [vnode, prevVNode]);
}
var emptyAppContext = createAppContext();
var uid$1 = 0;
var uid = 0;
function createComponentInstance(vnode, parent, suspense) {
var type = vnode.type;
// inherit parent app context - or - if root, adopt from root vnode
var appContext = (parent ? parent.appContext : vnode.appContext) || emptyAppContext;
var instance = {
uid: uid$1++,
uid: uid++,
vnode,
type,
parent,
......@@ -5768,7 +5777,7 @@ function createComponentInstance(vnode, parent, suspense) {
};
}
instance.root = parent ? parent.root : instance;
instance.emit = emit$1.bind(null, instance);
instance.emit = emit.bind(null, instance);
// apply custom element special handling
if (vnode.ce) {
vnode.ce(instance);
......@@ -6161,7 +6170,7 @@ function isMemoSame(cached, memo) {
}
// Core API ------------------------------------------------------------------
var version = "3.2.45";
var version = "3.2.47";
/**
* @internal only exposed in compat builds
*/
......@@ -6692,4 +6701,4 @@ var createApp = function () {
};
return app;
};
export { BaseTransition, Comment, Fragment, KeepAlive, Static, Suspense, Teleport, Text, callWithAsyncErrorHandling, callWithErrorHandling, cloneVNode, compatUtils, computed, createApp, createBlock, createCommentVNode, createElementBlock, createBaseVNode as createElementVNode, createHydrationRenderer, createPropsRestProxy, createRenderer, createSlots, createStaticVNode, createTextVNode, createVNode, defineAsyncComponent, defineComponent, defineEmits, defineExpose, defineProps, devtools, getCurrentInstance, getTransitionRawChildren, guardReactiveProps, h, handleError, initCustomFormatter, inject, injectHook, isInSSRComponentSetup, isMemoSame, isRuntimeOnly, isVNode, mergeDefaults, mergeProps, nextTick, onActivated, onBeforeMount, onBeforeUnmount, onBeforeUpdate, onDeactivated, onErrorCaptured, onMounted, onRenderTracked, onRenderTriggered, onServerPrefetch, onUnmounted, onUpdated, openBlock, parseClassList, parseClassStyles, popScopeId, provide, pushScopeId, queuePostFlushCb, registerRuntimeCompiler, render, renderList, renderSlot, resolveComponent, resolveDirective, resolveDynamicComponent, resolveFilter, resolveTransitionHooks, setBlockTracking, setDevtoolsHook, setTransitionHooks, ssrContextKey, toHandlers, transformVNodeArgs, useAttrs, useCssModule, useCssStyles, useCssVars, useSSRContext, useSlots, useTransitionState, version, warn, watch, watchEffect, watchPostEffect, watchSyncEffect, withAsyncContext, withCtx, withDefaults, withDirectives, withKeys, withMemo, withModifiers, withScopeId };
export { BaseTransition, BaseTransitionPropsValidators, Comment, Fragment, KeepAlive, Static, Suspense, Teleport, Text, assertNumber, callWithAsyncErrorHandling, callWithErrorHandling, cloneVNode, compatUtils, computed, createApp, createBlock, createCommentVNode, createElementBlock, createBaseVNode as createElementVNode, createHydrationRenderer, createPropsRestProxy, createRenderer, createSlots, createStaticVNode, createTextVNode, createVNode, defineAsyncComponent, defineComponent, defineEmits, defineExpose, defineProps, devtools, getCurrentInstance, getTransitionRawChildren, guardReactiveProps, h, handleError, initCustomFormatter, inject, injectHook, isInSSRComponentSetup, isMemoSame, isRuntimeOnly, isVNode, mergeDefaults, mergeProps, nextTick, onActivated, onBeforeMount, onBeforeUnmount, onBeforeUpdate, onDeactivated, onErrorCaptured, onMounted, onRenderTracked, onRenderTriggered, onServerPrefetch, onUnmounted, onUpdated, openBlock, parseClassList, parseClassStyles, popScopeId, provide, pushScopeId, queuePostFlushCb, registerRuntimeCompiler, render, renderList, renderSlot, resolveComponent, resolveDirective, resolveDynamicComponent, resolveFilter, resolveTransitionHooks, setBlockTracking, setDevtoolsHook, setTransitionHooks, ssrContextKey, toHandlers, transformVNodeArgs, useAttrs, useCssModule, useCssStyles, useCssVars, useSSRContext, useSlots, useTransitionState, version, warn, watch, watchEffect, watchPostEffect, watchSyncEffect, withAsyncContext, withCtx, withDefaults, withDirectives, withKeys, withMemo, withModifiers, withScopeId };
import { isFunction, isPromise, isArray, NOOP, EMPTY_OBJ, remove, isString, camelize, capitalize, isObject, toHandlerKey, getGlobalThis, normalizeClass, extend, normalizeStyle, isOn, hasChanged, toNumber, hyphenate, isSet, isMap, isPlainObject, invokeArrayFns, EMPTY_ARR, isModelListener, isReservedProp, hasOwn, def, NO, isGloballyWhitelisted } from '@vue/shared';
import { isFunction, isPromise, isArray, NOOP, EMPTY_OBJ, remove, isString, camelize, capitalize, isObject, toHandlerKey, getGlobalThis, normalizeClass, extend, normalizeStyle, isOn, hasChanged, toNumber, hyphenate, isSet, isMap, isPlainObject, invokeArrayFns, isRegExp, EMPTY_ARR, isModelListener, isReservedProp, looseToNumber, hasOwn, def, NO, isGloballyWhitelisted } from '@vue/shared';
export { camelize, capitalize, normalizeClass, normalizeProps, normalizeStyle, toDisplayString, toHandlerKey } from '@vue/shared';
import { isRef, isShallow, isReactive, ReactiveEffect, ref, pauseTracking, resetTracking, isProxy, computed as computed$1, toRaw, proxyRefs, markRaw, EffectScope, track, reactive, shallowReactive, trigger } from '@vue/reactivity';
import { getCurrentScope, isRef, isShallow, isReactive, ReactiveEffect, ref, pauseTracking, resetTracking, isProxy, computed as computed$1, toRaw, proxyRefs, markRaw, EffectScope, track, reactive, shallowReactive, trigger } from '@vue/reactivity';
export { EffectScope, ReactiveEffect, customRef, effect, effectScope, getCurrentScope, isProxy, isReactive, isReadonly, isRef, isShallow, markRaw, onScopeDispose, proxyRefs, reactive, readonly, ref, shallowReactive, shallowReadonly, shallowRef, stop, toRaw, toRef, toRefs, triggerRef, unref } from '@vue/reactivity';
import { isRootHook, isRootImmediateHook, ON_LOAD, UniInputElement, UniTextAreaElement, UniElement, UniTextNode, UniCommentNode, forcePatchProp, JSON_PROTOCOL, resolveOwnerEl, ATTR_V_OWNER_ID, ATTR_V_RENDERJS } from '@dcloudio/uni-shared';
function warn(msg) {
return;
}
/**
* @internal
*/
function assertNumber(val, type) {
return;
}
function callWithErrorHandling(fn, instance, type, args) {
var res;
try {
......@@ -263,7 +269,7 @@ function setDevtoolsHook(hook, target) {
buffer = [];
}
}
function emit$1(instance, event) {
function emit(instance, event) {
if (instance.isUnmounted) return;
var props = instance.vnode.props || EMPTY_OBJ;
for (var _len = arguments.length, rawArgs = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
......@@ -283,7 +289,7 @@ function emit$1(instance, event) {
args = rawArgs.map(a => isString(a) ? a.trim() : a);
}
if (number) {
args = rawArgs.map(toNumber);
args = rawArgs.map(looseToNumber);
}
}
var handlerName;
......@@ -842,7 +848,7 @@ function createSuspenseBoundary(vnode, parent, parentComponent, container, hidde
remove
}
} = rendererInternals;
var timeout = toNumber(vnode.props && vnode.props.timeout);
var timeout = vnode.props ? toNumber(vnode.props.timeout) : undefined;
var suspense = {
vnode,
parent,
......@@ -1172,7 +1178,8 @@ function doWatch(source, cb) {
onTrack,
onTrigger
} = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : EMPTY_OBJ;
var instance = currentInstance;
var instance = getCurrentScope() === (currentInstance === null || currentInstance === void 0 ? void 0 : currentInstance.scope) ? currentInstance : null;
// const instance = currentInstance
var getter;
var forceTrigger = false;
var isMultiSource = false;
......@@ -1373,28 +1380,29 @@ function useTransitionState() {
return state;
}
var TransitionHookValidator = [Function, Array];
var BaseTransitionPropsValidators = {
mode: String,
appear: Boolean,
persisted: Boolean,
// enter
onBeforeEnter: TransitionHookValidator,
onEnter: TransitionHookValidator,
onAfterEnter: TransitionHookValidator,
onEnterCancelled: TransitionHookValidator,
// leave
onBeforeLeave: TransitionHookValidator,
onLeave: TransitionHookValidator,
onAfterLeave: TransitionHookValidator,
onLeaveCancelled: TransitionHookValidator,
// appear
onBeforeAppear: TransitionHookValidator,
onAppear: TransitionHookValidator,
onAfterAppear: TransitionHookValidator,
onAppearCancelled: TransitionHookValidator
};
var BaseTransitionImpl = {
name: "BaseTransition",
props: {
mode: String,
appear: Boolean,
persisted: Boolean,
// enter
onBeforeEnter: TransitionHookValidator,
onEnter: TransitionHookValidator,
onAfterEnter: TransitionHookValidator,
onEnterCancelled: TransitionHookValidator,
// leave
onBeforeLeave: TransitionHookValidator,
onLeave: TransitionHookValidator,
onAfterLeave: TransitionHookValidator,
onLeaveCancelled: TransitionHookValidator,
// appear
onBeforeAppear: TransitionHookValidator,
onAppear: TransitionHookValidator,
onAfterAppear: TransitionHookValidator,
onAppearCancelled: TransitionHookValidator
},
props: BaseTransitionPropsValidators,
setup(props, _ref4) {
var {
slots
......@@ -1919,7 +1927,7 @@ var KeepAliveImpl = {
}
function pruneCacheEntry(key) {
var cached = cache.get(key);
if (!current || cached.type !== current.type) {
if (!current || !isSameVNodeType(cached, current)) {
unmount(cached);
} else if (current) {
// current active instance should no longer be kept-alive.
......@@ -1957,7 +1965,7 @@ var KeepAliveImpl = {
suspense
} = instance;
var vnode = getInnerChild(subTree);
if (cached.type === vnode.type) {
if (cached.type === vnode.type && cached.key === vnode.key) {
// current instance will be unmounted as part of keep-alive's unmount
resetShapeFlag(vnode);
// but invoke its deactivated hook here
......@@ -2046,7 +2054,7 @@ function matches(pattern, name) {
return pattern.some(p => matches(p, name));
} else if (isString(pattern)) {
return pattern.split(',').includes(name);
} else if (pattern.test) {
} else if (isRegExp(pattern)) {
return pattern.test(name);
}
/* istanbul ignore next */
......@@ -2598,7 +2606,7 @@ function applyOptions(instance) {
// call beforeCreate first before accessing other options since
// the hook may mutate resolved options (#2791)
if (options.beforeCreate) {
callHook(options.beforeCreate, instance, "bc" /* LifecycleHooks.BEFORE_CREATE */);
callHook$1(options.beforeCreate, instance, "bc" /* LifecycleHooks.BEFORE_CREATE */);
}
var {
......@@ -2698,7 +2706,7 @@ function applyOptions(instance) {
});
}
if (created) {
callHook(created, instance, "c" /* LifecycleHooks.CREATED */);
callHook$1(created, instance, "c" /* LifecycleHooks.CREATED */);
}
function registerLifecycleHook(register, hook) {
......@@ -2788,7 +2796,7 @@ function resolveInjections(injectOptions, ctx) {
_loop3();
}
}
function callHook(hook, instance, type) {
function callHook$1(hook, instance, type) {
callWithAsyncErrorHandling(isArray(hook) ? hook.map(h => h.bind(instance.proxy)) : hook.bind(instance.proxy), instance, type);
}
function createWatcher(raw, ctx, publicThis, key) {
......@@ -3207,8 +3215,8 @@ function validatePropName(key) {
// use function string name to check type constructors
// so that it works across vms / iframes.
function getType(ctor) {
var match = ctor && ctor.toString().match(/^\s*function (\w+)/);
return match ? match[1] : ctor === null ? 'null' : '';
var match = ctor && ctor.toString().match(/^\s*(function|class) (\w+)/);
return match ? match[2] : ctor === null ? 'null' : '';
}
function isSameType(a, b) {
return getType(a) === getType(b);
......@@ -3345,7 +3353,7 @@ function createAppContext() {
emitsCache: new WeakMap()
};
}
var uid = 0;
var uid$1 = 0;
function createAppAPI(render, hydrate) {
return function createApp(rootComponent) {
var rootProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
......@@ -3359,7 +3367,7 @@ function createAppAPI(render, hydrate) {
var installedPlugins = new Set();
var isMounted = false;
var app = context.app = {
_uid: uid++,
_uid: uid$1++,
_component: rootComponent,
_props: rootProps,
_container: null,
......@@ -4014,6 +4022,8 @@ function baseCreateRenderer(options, createHydrationFns) {
if (dirs) {
invokeDirectiveHook(vnode, null, parentComponent, 'created');
}
// scopeId
setScopeId(el, vnode, vnode.scopeId, slotScopeIds, parentComponent);
// props
if (props) {
for (var key in props) {
......@@ -4037,8 +4047,6 @@ function baseCreateRenderer(options, createHydrationFns) {
invokeVNodeHook(vnodeHook, parentComponent, vnode);
}
}
// scopeId
setScopeId(el, vnode, vnode.scopeId, slotScopeIds, parentComponent);
// fixed by xxxxxx (框架始终都要能访问到__vueParentComponent,主要是renderjs)
Object.defineProperty(el, '__vueParentComponent', {
value: parentComponent,
......@@ -5569,7 +5577,8 @@ function cloneVNode(vnode, extraProps) {
ssFallback: vnode.ssFallback && cloneVNode(vnode.ssFallback),
el: vnode.el,
anchor: vnode.anchor,
ctx: vnode.ctx
ctx: vnode.ctx,
ce: vnode.ce
};
return cloned;
}
......@@ -5706,13 +5715,13 @@ function invokeVNodeHook(hook, instance, vnode) {
callWithAsyncErrorHandling(hook, instance, 7 /* ErrorCodes.VNODE_HOOK */, [vnode, prevVNode]);
}
var emptyAppContext = createAppContext();
var uid$1 = 0;
var uid = 0;
function createComponentInstance(vnode, parent, suspense) {
var type = vnode.type;
// inherit parent app context - or - if root, adopt from root vnode
var appContext = (parent ? parent.appContext : vnode.appContext) || emptyAppContext;
var instance = {
uid: uid$1++,
uid: uid++,
vnode,
type,
parent,
......@@ -5784,7 +5793,7 @@ function createComponentInstance(vnode, parent, suspense) {
};
}
instance.root = parent ? parent.root : instance;
instance.emit = emit$1.bind(null, instance);
instance.emit = emit.bind(null, instance);
// apply custom element special handling
if (vnode.ce) {
vnode.ce(instance);
......@@ -6177,7 +6186,7 @@ function isMemoSame(cached, memo) {
}
// Core API ------------------------------------------------------------------
var version = "3.2.45";
var version = "3.2.47";
var _ssrUtils = {
createComponentInstance,
setupComponent,
......@@ -6550,7 +6559,7 @@ var TransitionPropsValidators = Transition.props = /*#__PURE__*/extend({}, BaseT
* #3227 Incoming hooks may be merged into arrays when wrapping Transition
* with custom HOCs.
*/
var callHook$1 = function (hook) {
var callHook = function (hook) {
var args = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
if (isArray(hook)) {
hook.forEach(h => h(...args));
......@@ -6616,7 +6625,7 @@ function resolveTransitionProps(rawProps) {
return (el, done) => {
var hook = isAppear ? onAppear : onEnter;
var resolve = () => finishEnter(el, isAppear, done);
callHook$1(hook, [el, resolve]);
callHook(hook, [el, resolve]);
nextFrame(() => {
removeTransitionClass(el, isAppear ? appearFromClass : enterFromClass);
addTransitionClass(el, isAppear ? appearToClass : enterToClass);
......@@ -6628,12 +6637,12 @@ function resolveTransitionProps(rawProps) {
};
return extend(baseProps, {
onBeforeEnter(el) {
callHook$1(onBeforeEnter, [el]);
callHook(onBeforeEnter, [el]);
addTransitionClass(el, enterFromClass);
addTransitionClass(el, enterActiveClass);
},
onBeforeAppear(el) {
callHook$1(onBeforeAppear, [el]);
callHook(onBeforeAppear, [el]);
addTransitionClass(el, appearFromClass);
addTransitionClass(el, appearActiveClass);
},
......@@ -6652,19 +6661,19 @@ function resolveTransitionProps(rawProps) {
whenTransitionEnds(el, type, leaveDuration, resolve);
}
});
callHook$1(onLeave, [el, resolve]);
callHook(onLeave, [el, resolve]);
},
onEnterCancelled(el) {
finishEnter(el, false);
callHook$1(onEnterCancelled, [el]);
callHook(onEnterCancelled, [el]);
},
onAppearCancelled(el) {
finishEnter(el, true);
callHook$1(onAppearCancelled, [el]);
callHook(onAppearCancelled, [el]);
},
onLeaveCancelled(el) {
finishLeave(el);
callHook$1(onLeaveCancelled, [el]);
callHook(onLeaveCancelled, [el]);
}
});
}
......@@ -6869,6 +6878,15 @@ var TransitionGroupImpl = {
};
}
};
/**
* TransitionGroup does not support "mode" so we need to remove it from the
* props declarations, but direct delete operation is considered a side effect
* and will make the entire transition feature non-tree-shakeable, so we do it
* in a function and mark the function's invocation as pure.
*/
var removeMode = props => delete props.mode;
/*#__PURE__*/
removeMode(TransitionGroupImpl.props);
var TransitionGroup = TransitionGroupImpl;
function callPendingCbs(c) {
var el = c.el;
......@@ -7081,4 +7099,4 @@ function wxsProp(prop) {
return prop;
}
var wp = prop => wxsProp(prop);
export { BaseTransition, Comment, Fragment, KeepAlive, Static, Suspense, Teleport, Text, Transition, TransitionGroup, callWithAsyncErrorHandling, callWithErrorHandling, cloneVNode, compatUtils, computed, createApp, createBlock, createComment, createCommentVNode, createElement, createElementBlock, createBaseVNode as createElementVNode, createHydrationRenderer, createPropsRestProxy, createRenderer, createSSRApp, createSlots, createStaticVNode, createTextNode, createTextVNode, createVNode, createApp as createVueApp, defineAsyncComponent, defineComponent, defineEmits, defineExpose, defineProps, devtools, getCurrentInstance, getTransitionRawChildren, guardReactiveProps, h, handleError, initCustomFormatter, inject, injectHook, isInSSRComponentSetup, isMemoSame, isRuntimeOnly, isVNode, mergeDefaults, mergeProps, nextTick, onActivated, onBeforeActivate, onBeforeDeactivate, onBeforeMount, onBeforeUnmount, onBeforeUpdate, onDeactivated, onErrorCaptured, onMounted, onRenderTracked, onRenderTriggered, onServerPrefetch, onUnmounted, onUpdated, openBlock, popScopeId, provide, pushScopeId, queuePostFlushCb, registerRuntimeCompiler, render, renderList, renderSlot, resolveComponent, resolveDirective, resolveDynamicComponent, resolveFilter, resolveTransitionHooks, setBlockTracking, setDevtoolsHook, setTransitionHooks, ssrContextKey, ssrUtils, toHandlers, transformVNodeArgs, useAttrs, useCssModule, useCssVars, useSSRContext, useSlots, useTransitionState, vModelDynamic, vModelText, vShow, version, warn, watch, watchEffect, watchPostEffect, watchSyncEffect, withAsyncContext, withCtx, withDefaults, withDirectives, withKeys, withMemo, withModifiers, withScopeId, wp };
export { BaseTransition, BaseTransitionPropsValidators, Comment, Fragment, KeepAlive, Static, Suspense, Teleport, Text, Transition, TransitionGroup, assertNumber, callWithAsyncErrorHandling, callWithErrorHandling, cloneVNode, compatUtils, computed, createApp, createBlock, createComment, createCommentVNode, createElement, createElementBlock, createBaseVNode as createElementVNode, createHydrationRenderer, createPropsRestProxy, createRenderer, createSSRApp, createSlots, createStaticVNode, createTextNode, createTextVNode, createVNode, createApp as createVueApp, defineAsyncComponent, defineComponent, defineEmits, defineExpose, defineProps, devtools, getCurrentInstance, getTransitionRawChildren, guardReactiveProps, h, handleError, initCustomFormatter, inject, injectHook, isInSSRComponentSetup, isMemoSame, isRuntimeOnly, isVNode, mergeDefaults, mergeProps, nextTick, onActivated, onBeforeActivate, onBeforeDeactivate, onBeforeMount, onBeforeUnmount, onBeforeUpdate, onDeactivated, onErrorCaptured, onMounted, onRenderTracked, onRenderTriggered, onServerPrefetch, onUnmounted, onUpdated, openBlock, popScopeId, provide, pushScopeId, queuePostFlushCb, registerRuntimeCompiler, render, renderList, renderSlot, resolveComponent, resolveDirective, resolveDynamicComponent, resolveFilter, resolveTransitionHooks, setBlockTracking, setDevtoolsHook, setTransitionHooks, ssrContextKey, ssrUtils, toHandlers, transformVNodeArgs, useAttrs, useCssModule, useCssVars, useSSRContext, useSlots, useTransitionState, vModelDynamic, vModelText, vShow, version, warn, watch, watchEffect, watchPostEffect, watchSyncEffect, withAsyncContext, withCtx, withDefaults, withDirectives, withKeys, withMemo, withModifiers, withScopeId, wp };
import { isString, isFunction, isPromise, isArray, NOOP, getGlobalThis, extend, EMPTY_OBJ, toHandlerKey, toNumber, hyphenate, camelize, isObject, isOn, hasOwn, isModelListener, hasChanged, remove, isSet, isMap, isPlainObject, invokeArrayFns, isBuiltInDirective, capitalize, isGloballyWhitelisted, def, isReservedProp, EMPTY_ARR, toRawType, makeMap, NO, normalizeClass, normalizeStyle, parseStringStyle } from '@vue/shared';
import { isString, isFunction, isPromise, isArray, NOOP, getGlobalThis, extend, EMPTY_OBJ, toHandlerKey, looseToNumber, hyphenate, camelize, isObject, isOn, hasOwn, isModelListener, toNumber, hasChanged, remove, isSet, isMap, isPlainObject, invokeArrayFns, isRegExp, isBuiltInDirective, capitalize, isGloballyWhitelisted, def, isReservedProp, EMPTY_ARR, toRawType, makeMap, NO, normalizeClass, normalizeStyle, parseStringStyle } from '@vue/shared';
export { camelize, capitalize, hyphenate, normalizeClass, normalizeProps, normalizeStyle, toDisplayString, toHandlerKey } from '@vue/shared';
import { pauseTracking, resetTracking, isRef, toRaw, isShallow as isShallow$1, isReactive, ReactiveEffect, ref, shallowReadonly, track, reactive, shallowReactive, trigger, isProxy, EffectScope, markRaw, proxyRefs, computed as computed$1, isReadonly } from '@vue/reactivity';
import { pauseTracking, resetTracking, isRef, toRaw, getCurrentScope, isShallow as isShallow$1, isReactive, ReactiveEffect, ref, shallowReadonly, track, reactive, shallowReactive, trigger, isProxy, proxyRefs, markRaw, EffectScope, computed as computed$1, isReadonly } from '@vue/reactivity';
export { EffectScope, ReactiveEffect, customRef, effect, effectScope, getCurrentScope, isProxy, isReactive, isReadonly, isRef, isShallow, markRaw, onScopeDispose, proxyRefs, reactive, readonly, ref, shallowReactive, shallowReadonly, shallowRef, stop, toRaw, toRef, toRefs, triggerRef, unref } from '@vue/reactivity';
import { isRootHook, isRootImmediateHook, ON_LOAD } from '@dcloudio/uni-shared';
......@@ -119,6 +119,22 @@ function formatProp(key, value, raw) {
return raw ? value : [`${key}=`, value];
}
}
/**
* @internal
*/
function assertNumber(val, type) {
if (!(process.env.NODE_ENV !== 'production'))
return;
if (val === undefined) {
return;
}
else if (typeof val !== 'number') {
warn(`${type} is not a valid number - ` + `got ${JSON.stringify(val)}.`);
}
else if (isNaN(val)) {
warn(`${type} is NaN - ` + 'the duration expression might be incorrect.');
}
}
const ErrorTypeStrings = {
["sp" /* LifecycleHooks.SERVER_PREFETCH */]: 'serverPrefetch hook',
......@@ -566,7 +582,7 @@ function tryWrap(fn) {
let devtools;
let buffer = [];
let devtoolsNotInstalled = false;
function emit(event, ...args) {
function emit$1(event, ...args) {
if (devtools) {
devtools.emit(event, ...args);
}
......@@ -613,7 +629,7 @@ function setDevtoolsHook(hook, target) {
}
}
function devtoolsInitApp(app, version) {
emit("app:init" /* DevtoolsHooks.APP_INIT */, app, version, {
emit$1("app:init" /* DevtoolsHooks.APP_INIT */, app, version, {
Fragment,
Text,
Comment,
......@@ -621,7 +637,7 @@ function devtoolsInitApp(app, version) {
});
}
function devtoolsUnmountApp(app) {
emit("app:unmount" /* DevtoolsHooks.APP_UNMOUNT */, app);
emit$1("app:unmount" /* DevtoolsHooks.APP_UNMOUNT */, app);
}
const devtoolsComponentAdded = /*#__PURE__*/ createDevtoolsComponentHook("component:added" /* DevtoolsHooks.COMPONENT_ADDED */);
const devtoolsComponentUpdated =
......@@ -637,21 +653,21 @@ const devtoolsComponentRemoved = (component) => {
};
function createDevtoolsComponentHook(hook) {
return (component) => {
emit(hook, component.appContext.app, component.uid, component.parent ? component.parent.uid : undefined, component);
emit$1(hook, component.appContext.app, component.uid, component.parent ? component.parent.uid : undefined, component);
};
}
const devtoolsPerfStart = /*#__PURE__*/ createDevtoolsPerformanceHook("perf:start" /* DevtoolsHooks.PERFORMANCE_START */);
const devtoolsPerfEnd = /*#__PURE__*/ createDevtoolsPerformanceHook("perf:end" /* DevtoolsHooks.PERFORMANCE_END */);
function createDevtoolsPerformanceHook(hook) {
return (component, type, time) => {
emit(hook, component.appContext.app, component.uid, component, type, time);
emit$1(hook, component.appContext.app, component.uid, component, type, time);
};
}
function devtoolsComponentEmit(component, event, params) {
emit("component:emit" /* DevtoolsHooks.COMPONENT_EMIT */, component.appContext.app, component, event, params);
emit$1("component:emit" /* DevtoolsHooks.COMPONENT_EMIT */, component.appContext.app, component, event, params);
}
function emit$1(instance, event, ...rawArgs) {
function emit(instance, event, ...rawArgs) {
if (instance.isUnmounted)
return;
const props = instance.vnode.props || EMPTY_OBJ;
......@@ -687,7 +703,7 @@ function emit$1(instance, event, ...rawArgs) {
args = rawArgs.map(a => (isString(a) ? a.trim() : a));
}
if (number) {
args = rawArgs.map(toNumber);
args = rawArgs.map(looseToNumber);
}
}
if ((process.env.NODE_ENV !== 'production') || __VUE_PROD_DEVTOOLS__) {
......@@ -1336,7 +1352,10 @@ function createSuspenseBoundary(vnode, parent, parentComponent, container, hidde
console[console.info ? 'info' : 'log'](`<Suspense> is an experimental feature and its API will likely change.`);
}
const { p: patch, m: move, um: unmount, n: next, o: { parentNode, remove } } = rendererInternals;
const timeout = toNumber(vnode.props && vnode.props.timeout);
const timeout = vnode.props ? toNumber(vnode.props.timeout) : undefined;
if ((process.env.NODE_ENV !== 'production')) {
assertNumber(timeout, `Suspense timeout`);
}
const suspense = {
vnode,
parent,
......@@ -1658,12 +1677,10 @@ function watchEffect(effect, options) {
return doWatch(effect, null, options);
}
function watchPostEffect(effect, options) {
return doWatch(effect, null, ((process.env.NODE_ENV !== 'production')
? Object.assign(Object.assign({}, options), { flush: 'post' }) : { flush: 'post' }));
return doWatch(effect, null, (process.env.NODE_ENV !== 'production') ? Object.assign(Object.assign({}, options), { flush: 'post' }) : { flush: 'post' });
}
function watchSyncEffect(effect, options) {
return doWatch(effect, null, ((process.env.NODE_ENV !== 'production')
? Object.assign(Object.assign({}, options), { flush: 'sync' }) : { flush: 'sync' }));
return doWatch(effect, null, (process.env.NODE_ENV !== 'production') ? Object.assign(Object.assign({}, options), { flush: 'sync' }) : { flush: 'sync' });
}
// initial value for watchers to trigger on undefined initial values
const INITIAL_WATCHER_VALUE = {};
......@@ -1691,7 +1708,8 @@ function doWatch(source, cb, { immediate, deep, flush, onTrack, onTrigger } = EM
warn(`Invalid watch source: `, s, `A watch source can only be a getter/effect function, a ref, ` +
`a reactive object, or an array of these types.`);
};
const instance = currentInstance;
const instance = getCurrentScope() === (currentInstance === null || currentInstance === void 0 ? void 0 : currentInstance.scope) ? currentInstance : null;
// const instance = currentInstance
let getter;
let forceTrigger = false;
let isMultiSource = false;
......@@ -1945,28 +1963,29 @@ function useTransitionState() {
return state;
}
const TransitionHookValidator = [Function, Array];
const BaseTransitionPropsValidators = {
mode: String,
appear: Boolean,
persisted: Boolean,
// enter
onBeforeEnter: TransitionHookValidator,
onEnter: TransitionHookValidator,
onAfterEnter: TransitionHookValidator,
onEnterCancelled: TransitionHookValidator,
// leave
onBeforeLeave: TransitionHookValidator,
onLeave: TransitionHookValidator,
onAfterLeave: TransitionHookValidator,
onLeaveCancelled: TransitionHookValidator,
// appear
onBeforeAppear: TransitionHookValidator,
onAppear: TransitionHookValidator,
onAfterAppear: TransitionHookValidator,
onAppearCancelled: TransitionHookValidator
};
const BaseTransitionImpl = {
name: `BaseTransition`,
props: {
mode: String,
appear: Boolean,
persisted: Boolean,
// enter
onBeforeEnter: TransitionHookValidator,
onEnter: TransitionHookValidator,
onAfterEnter: TransitionHookValidator,
onEnterCancelled: TransitionHookValidator,
// leave
onBeforeLeave: TransitionHookValidator,
onLeave: TransitionHookValidator,
onAfterLeave: TransitionHookValidator,
onLeaveCancelled: TransitionHookValidator,
// appear
onBeforeAppear: TransitionHookValidator,
onAppear: TransitionHookValidator,
onAfterAppear: TransitionHookValidator,
onAppearCancelled: TransitionHookValidator
},
props: BaseTransitionPropsValidators,
setup(props, { slots }) {
const instance = getCurrentInstance();
const state = useTransitionState();
......@@ -2508,7 +2527,7 @@ const KeepAliveImpl = {
}
function pruneCacheEntry(key) {
const cached = cache.get(key);
if (!current || cached.type !== current.type) {
if (!current || !isSameVNodeType(cached, current)) {
unmount(cached);
}
else if (current) {
......@@ -2540,7 +2559,7 @@ const KeepAliveImpl = {
cache.forEach(cached => {
const { subTree, suspense } = instance;
const vnode = getInnerChild(subTree);
if (cached.type === vnode.type) {
if (cached.type === vnode.type && cached.key === vnode.key) {
// current instance will be unmounted as part of keep-alive's unmount
resetShapeFlag(vnode);
// but invoke its deactivated hook here
......@@ -2637,7 +2656,7 @@ function matches(pattern, name) {
else if (isString(pattern)) {
return pattern.split(',').includes(name);
}
else if (pattern.test) {
else if (isRegExp(pattern)) {
return pattern.test(name);
}
/* istanbul ignore next */
......@@ -4074,8 +4093,8 @@ function validatePropName(key) {
// use function string name to check type constructors
// so that it works across vms / iframes.
function getType(ctor) {
const match = ctor && ctor.toString().match(/^\s*function (\w+)/);
return match ? match[1] : ctor === null ? 'null' : '';
const match = ctor && ctor.toString().match(/^\s*(function|class) (\w+)/);
return match ? match[2] : ctor === null ? 'null' : '';
}
function isSameType(a, b) {
return getType(a) === getType(b);
......@@ -4365,7 +4384,7 @@ function createAppContext() {
emitsCache: new WeakMap()
};
}
let uid = 0;
let uid$1 = 0;
function createAppAPI(render, hydrate) {
return function createApp(rootComponent, rootProps = null) {
if (!isFunction(rootComponent)) {
......@@ -4379,7 +4398,7 @@ function createAppAPI(render, hydrate) {
const installedPlugins = new Set();
let isMounted = false;
const app = (context.app = {
_uid: uid++,
_uid: uid$1++,
_component: rootComponent,
_props: rootProps,
_container: null,
......@@ -5221,6 +5240,8 @@ function baseCreateRenderer(options, createHydrationFns) {
if (dirs) {
invokeDirectiveHook(vnode, null, parentComponent, 'created');
}
// scopeId
setScopeId(el, vnode, vnode.scopeId, slotScopeIds, parentComponent);
// props
if (props) {
for (const key in props) {
......@@ -5249,8 +5270,6 @@ function baseCreateRenderer(options, createHydrationFns) {
invokeVNodeHook(vnodeHook, parentComponent, vnode);
}
}
// scopeId
setScopeId(el, vnode, vnode.scopeId, slotScopeIds, parentComponent);
if ((process.env.NODE_ENV !== 'production') || __VUE_PROD_DEVTOOLS__) {
Object.defineProperty(el, '__vnode', {
value: vnode,
......@@ -6970,7 +6989,8 @@ function cloneVNode(vnode, extraProps, mergeRef = false) {
ssFallback: vnode.ssFallback && cloneVNode(vnode.ssFallback),
el: vnode.el,
anchor: vnode.anchor,
ctx: vnode.ctx
ctx: vnode.ctx,
ce: vnode.ce
};
return cloned;
}
......@@ -7137,13 +7157,13 @@ function invokeVNodeHook(hook, instance, vnode, prevVNode = null) {
}
const emptyAppContext = createAppContext();
let uid$1 = 0;
let uid = 0;
function createComponentInstance(vnode, parent, suspense) {
const type = vnode.type;
// inherit parent app context - or - if root, adopt from root vnode
const appContext = (parent ? parent.appContext : vnode.appContext) || emptyAppContext;
const instance = {
uid: uid$1++,
uid: uid++,
vnode,
type,
parent,
......@@ -7216,7 +7236,7 @@ function createComponentInstance(vnode, parent, suspense) {
instance.ctx = { _: instance };
}
instance.root = parent ? parent.root : instance;
instance.emit = emit$1.bind(null, instance);
instance.emit = emit.bind(null, instance);
// apply custom element special handling
if (vnode.ce) {
vnode.ce(instance);
......@@ -7463,8 +7483,24 @@ function createAttrsProxy(instance) {
}
function createSetupContext(instance) {
const expose = exposed => {
if ((process.env.NODE_ENV !== 'production') && instance.exposed) {
warn(`expose() should be called only once per setup().`);
if ((process.env.NODE_ENV !== 'production')) {
if (instance.exposed) {
warn(`expose() should be called only once per setup().`);
}
if (exposed != null) {
let exposedType = typeof exposed;
if (exposedType === 'object') {
if (isArray(exposed)) {
exposedType = 'array';
}
else if (isRef(exposed)) {
exposedType = 'ref';
}
}
if (exposedType !== 'object') {
warn(`expose() should be passed a plain object, received ${exposedType}.`);
}
}
}
instance.exposed = exposed || {};
};
......@@ -7968,7 +8004,7 @@ function isMemoSame(cached, memo) {
}
// Core API ------------------------------------------------------------------
const version = "3.2.45";
const version = "3.2.47";
/**
* @internal only exposed in compat builds
*/
......@@ -8497,4 +8533,4 @@ const createApp = ((...args) => {
return app;
});
export { BaseTransition, Comment, Fragment, KeepAlive, Static, Suspense, Teleport, Text, callWithAsyncErrorHandling, callWithErrorHandling, cloneVNode, compatUtils, computed, createApp, createBlock, createCommentVNode, createElementBlock, createBaseVNode as createElementVNode, createHydrationRenderer, createPropsRestProxy, createRenderer, createSlots, createStaticVNode, createTextVNode, createVNode, defineAsyncComponent, defineComponent, defineEmits, defineExpose, defineProps, devtools, getCurrentInstance, getTransitionRawChildren, guardReactiveProps, h, handleError, initCustomFormatter, inject, injectHook, isInSSRComponentSetup, isMemoSame, isRuntimeOnly, isVNode, mergeDefaults, mergeProps, nextTick, onActivated, onBeforeMount, onBeforeUnmount, onBeforeUpdate, onDeactivated, onErrorCaptured, onMounted, onRenderTracked, onRenderTriggered, onServerPrefetch, onUnmounted, onUpdated, openBlock, parseClassList, parseClassStyles, popScopeId, provide, pushScopeId, queuePostFlushCb, registerRuntimeCompiler, render, renderList, renderSlot, resolveComponent, resolveDirective, resolveDynamicComponent, resolveFilter, resolveTransitionHooks, setBlockTracking, setDevtoolsHook, setTransitionHooks, ssrContextKey, toHandlers, transformVNodeArgs, useAttrs, useCssModule, useCssStyles, useCssVars, useSSRContext, useSlots, useTransitionState, version, warn, watch, watchEffect, watchPostEffect, watchSyncEffect, withAsyncContext, withCtx, withDefaults, withDirectives, withKeys, withMemo, withModifiers, withScopeId };
export { BaseTransition, BaseTransitionPropsValidators, Comment, Fragment, KeepAlive, Static, Suspense, Teleport, Text, assertNumber, callWithAsyncErrorHandling, callWithErrorHandling, cloneVNode, compatUtils, computed, createApp, createBlock, createCommentVNode, createElementBlock, createBaseVNode as createElementVNode, createHydrationRenderer, createPropsRestProxy, createRenderer, createSlots, createStaticVNode, createTextVNode, createVNode, defineAsyncComponent, defineComponent, defineEmits, defineExpose, defineProps, devtools, getCurrentInstance, getTransitionRawChildren, guardReactiveProps, h, handleError, initCustomFormatter, inject, injectHook, isInSSRComponentSetup, isMemoSame, isRuntimeOnly, isVNode, mergeDefaults, mergeProps, nextTick, onActivated, onBeforeMount, onBeforeUnmount, onBeforeUpdate, onDeactivated, onErrorCaptured, onMounted, onRenderTracked, onRenderTriggered, onServerPrefetch, onUnmounted, onUpdated, openBlock, parseClassList, parseClassStyles, popScopeId, provide, pushScopeId, queuePostFlushCb, registerRuntimeCompiler, render, renderList, renderSlot, resolveComponent, resolveDirective, resolveDynamicComponent, resolveFilter, resolveTransitionHooks, setBlockTracking, setDevtoolsHook, setTransitionHooks, ssrContextKey, toHandlers, transformVNodeArgs, useAttrs, useCssModule, useCssStyles, useCssVars, useSSRContext, useSlots, useTransitionState, version, warn, watch, watchEffect, watchPostEffect, watchSyncEffect, withAsyncContext, withCtx, withDefaults, withDirectives, withKeys, withMemo, withModifiers, withScopeId };
......@@ -30,7 +30,7 @@
"@dcloudio/uni-push": "3.0.0-alpha-3070020230202001",
"@dcloudio/uni-shared": "3.0.0-alpha-3070020230202001",
"@dcloudio/uni-stat": "3.0.0-alpha-3070020230202001",
"@vue/shared": "3.2.45"
"@vue/shared": "3.2.47"
},
"peerDependencies": {
"@dcloudio/types": "^3.2.11"
......
......@@ -31,11 +31,11 @@
"@intlify/shared": "9.1.9",
"@intlify/vue-devtools": "9.1.9",
"@rollup/pluginutils": "^4.2.0",
"@vue/compiler-core": "3.2.45",
"@vue/compiler-dom": "3.2.45",
"@vue/compiler-sfc": "3.2.45",
"@vue/server-renderer": "3.2.45",
"@vue/shared": "3.2.45",
"@vue/compiler-core": "3.2.47",
"@vue/compiler-dom": "3.2.47",
"@vue/compiler-sfc": "3.2.47",
"@vue/server-renderer": "3.2.47",
"@vue/shared": "3.2.47",
"autoprefixer": "^10.4.13",
"base64url": "^3.0.1",
"chokidar": "^3.5.3",
......@@ -76,7 +76,7 @@
"@types/resolve": "^1.20.2",
"@types/sass": "^1.43.1",
"@types/stylus": "^0.48.36",
"postcss": "^8.4.16",
"vue": "3.2.45"
"postcss": "^8.4.21",
"vue": "3.2.47"
}
}
......@@ -23,7 +23,7 @@
"@dcloudio/uni-cli-shared": "3.0.0-alpha-3070020230202001",
"@dcloudio/uni-i18n": "3.0.0-alpha-3070020230202001",
"@dcloudio/uni-shared": "3.0.0-alpha-3070020230202001",
"@vue/shared": "3.2.45",
"@vue/shared": "3.2.47",
"fast-glob": "^3.2.11"
}
}
......@@ -98,6 +98,7 @@ function createNavigatorOnClick(props2) {
case "redirect":
uni.redirectTo({
url: props2.url,
// @ts-ignore
exists: props2.exists
});
break;
......@@ -2628,6 +2629,8 @@ const mode = {
MULTISELECTOR: "multiSelector",
TIME: "time",
DATE: "date"
// 暂不支持城市选择
// REGION: 'region'
};
const fields = {
YEAR: "year",
......@@ -4098,6 +4101,7 @@ function useSwiperState(props2) {
itemColor: props2.indicatorColor,
itemSelectedColor: props2.indicatorActiveColor,
itemSize: 8,
// 动态创建 indicator 在安卓上有问题,改成透明度控制显示和隐藏
opacity: props2.indicatorDots ? 1 : 0
}));
const state = reactive({
......@@ -4324,6 +4328,7 @@ function HTMLParser(html, handler) {
name,
value,
escaped: value.replace(/(^|[^\\])"/g, '$1\\"')
// "
});
});
if (handler.start) {
......
......@@ -22,10 +22,10 @@
"@dcloudio/uni-cli-shared": "3.0.0-alpha-3070020230202001",
"@dcloudio/uni-shared": "3.0.0-alpha-3070020230202001",
"@rollup/pluginutils": "^4.2.0",
"@vue/compiler-dom": "3.2.45",
"@vue/compiler-sfc": "3.2.45",
"@vue/server-renderer": "3.2.45",
"@vue/shared": "3.2.45",
"@vue/compiler-dom": "3.2.47",
"@vue/compiler-sfc": "3.2.47",
"@vue/server-renderer": "3.2.47",
"@vue/shared": "3.2.47",
"debug": "^4.3.3",
"fs-extra": "^10.0.0",
"mime": "^3.0.0",
......@@ -37,8 +37,8 @@
"@types/mime": "^2.0.3",
"@types/module-alias": "^2.0.1",
"@types/resolve": "^1.20.2",
"@vue/compiler-core": "3.2.45",
"@vue/compiler-core": "3.2.47",
"esbuild": "^0.16.3",
"vue": "3.2.45"
"vue": "3.2.47"
}
}
......@@ -519,6 +519,7 @@ const invokeViewMethodKeepAlive = (name, args, callback, pageId) => {
const ServiceJSBridge = /* @__PURE__ */ shared.extend(
/* @__PURE__ */ initBridge(
"view"
/* view 指的是 service 层订阅的是 view 层事件 */
),
{
invokeOnCallback,
......@@ -684,6 +685,7 @@ const defineSystemComponent = (options) => {
options.__reserved = true;
options.compatConfig = {
MODE: 3
// 标记为vue3
};
return vue.defineComponent(options);
};
......@@ -2090,7 +2092,9 @@ function useMethods(props2, canvasRef, actionsWaiting) {
if (image) {
c2d.drawImage.apply(
c2d,
// @ts-ignore
[image].concat(
// @ts-ignore
[...otherData.slice(4, 8)],
[...otherData.slice(0, 4)]
)
......@@ -2641,6 +2645,7 @@ function HTMLParser(html, handler) {
name,
value,
escaped: value.replace(/(^|[^\\])"/g, '$1\\"')
// "
});
});
if (handler.start) {
......@@ -2859,9 +2864,12 @@ const index$u = /* @__PURE__ */ defineBuiltInComponent({
"ref": rootRef
}, [vue.createVNode("div", {
"style": state.modeStyle
}, null, 4), FIX_MODES[props2.mode] ? vue.createVNode(ResizeSensor, {
"onResize": fixSize
}, null, 8, ["onResize"]) : vue.createVNode("span", null, null)], 512);
}, null, 4), FIX_MODES[props2.mode] ? (
// @ts-ignore
vue.createVNode(ResizeSensor, {
"onResize": fixSize
}, null, 8, ["onResize"])
) : vue.createVNode("span", null, null)], 512);
};
}
});
......@@ -3034,6 +3042,9 @@ function throttle(fn, wait) {
}
function useUserAction() {
const state = vue.reactive({
/**
* 是否用户激活
*/
userAction: false
});
return {
......@@ -3052,6 +3063,7 @@ function useFormField(nameKey, value) {
const uniForm = vue.inject(
uniFormKey,
false
// remove warning
);
if (!uniForm) {
return;
......@@ -3129,6 +3141,9 @@ const props$k = /* @__PURE__ */ shared.extend(
type: [Boolean, String],
default: false
},
/**
* 已废弃属性,用于历史兼容
*/
autoFocus: {
type: [Boolean, String],
default: false
......@@ -4615,10 +4630,12 @@ function useMovableViewInit(props2, rootRef, trigger, _scale, _oldScale, _isScal
}
}
return {
// scale
_updateOldScale,
_endScale,
_setScale,
scaleValueSync,
// layout
_updateBoundary,
_updateOffset,
_updateWH,
......@@ -4627,6 +4644,7 @@ function useMovableViewInit(props2, rootRef, trigger, _scale, _oldScale, _isScal
minY,
maxX,
maxY,
// transform
FAandSFACancel,
_getLimitXY,
_animationTo,
......@@ -4662,10 +4680,12 @@ function useMovableViewState(props2, trigger, rootRef) {
__handleTouchStart();
});
const {
// scale
_updateOldScale,
_endScale,
_setScale,
scaleValueSync,
// layout
_updateBoundary,
_updateOffset,
_updateWH,
......@@ -4674,6 +4694,7 @@ function useMovableViewState(props2, trigger, rootRef) {
minY,
maxX,
maxY,
// transform
FAandSFACancel,
_getLimitXY,
_setTransform,
......@@ -4815,6 +4836,7 @@ function createNavigatorOnClick(props2) {
case "redirect":
uni.redirectTo({
url: props2.url,
// @ts-ignore
exists: props2.exists
});
break;
......@@ -5191,9 +5213,12 @@ const index$q = /* @__PURE__ */ defineBuiltInComponent({
}, [vue.createVNode("div", {
"style": innerBarStyle,
"class": "uni-progress-inner-bar"
}, null, 4)], 4), showInfo ? vue.createVNode("p", {
"class": "uni-progress-info"
}, [currentPercent + "%"]) : ""]);
}, null, 4)], 4), showInfo ? (
// {currentPercent}% 的写法会影响 SSR Hydration (tsx插件的问题)
vue.createVNode("p", {
"class": "uni-progress-info"
}, [currentPercent + "%"])
) : ""]);
};
}
});
......@@ -5245,6 +5270,7 @@ const props$i = {
const index$p = /* @__PURE__ */ defineBuiltInComponent({
name: "RadioGroup",
props: props$i,
// emits: ['change'],
setup(props2, {
emit: emit2,
slots
......@@ -7689,6 +7715,7 @@ const loadingVNode = /* @__PURE__ */ vue.createVNode(
{ class: "uni-loading" },
null,
-1
/* HOISTED */
);
const AsyncLoadingComponent = /* @__PURE__ */ defineSystemComponent({
name: "AsyncLoading",
......@@ -7773,6 +7800,7 @@ function setupPage(comp) {
}
return setupComponent(comp, {
clone: true,
// 页面组件可能会被其他地方手动引用,比如 windows 等,需要 clone 一份新的作为页面组件
init: initPage,
setup(instance) {
instance.$pageInstance = instance;
......@@ -8870,6 +8898,7 @@ const MapMarker = /* @__PURE__ */ defineSystemComponent({
position,
map,
top,
// handle AMap callout offset
offsetY: -option.height / 2,
content: calloutOpt.content,
color: calloutOpt.color,
......@@ -8883,6 +8912,7 @@ const MapMarker = /* @__PURE__ */ defineSystemComponent({
position,
map,
top,
// handle AMap callout offset
offsetY: -option.height / 2,
content: title,
boxShadow
......@@ -9380,26 +9410,32 @@ const MapLocation = /* @__PURE__ */ defineSystemComponent({
}
});
const props$3 = {
// 边框虚线,腾讯地图支持,google 高德 地图不支持,默认值为[0, 0] 为实线,非 [0, 0] 为虚线,H5 端无法像微信小程序一样控制虚线的间隔像素大小
dashArray: {
type: Array,
default: () => [0, 0]
},
// 经纬度数组,[{latitude: 0, longitude: 0}]
points: {
type: Array,
required: true
},
// 描边的宽度
strokeWidth: {
type: Number,
default: 1
},
// 描边的颜色,十六进制
strokeColor: {
type: String,
default: "#000000"
},
// 填充颜色,十六进制
fillColor: {
type: String,
default: "#00000000"
},
// 设置多边形 Z 轴数值
zIndex: {
type: Number,
default: 0
......@@ -9441,16 +9477,28 @@ const MapPolygon = /* @__PURE__ */ defineSystemComponent({
a: scA
} = hexToRgba(strokeColor);
const polygonOptions = {
//多边形是否可点击。
clickable: true,
//鼠标在多边形内的光标样式。
cursor: "crosshair",
//多边形是否可编辑。
editable: false,
// 地图实例,即要显示多边形的地图
// @ts-ignore
map,
// 区域填充色
fillColor: "",
//多边形的路径,以经纬度坐标数组构成。
path,
// 区域边框
strokeColor: "",
//多边形的边框样式。实线是solid,虚线是dash。
strokeDashStyle: dashArray.some((item) => item > 0) ? "dash" : "solid",
//多边形的边框线宽。
strokeWeight: strokeWidth,
//多边形是否可见。
visible: true,
//多边形的zIndex值。
zIndex
};
if (maps.Color) {
......@@ -9990,6 +10038,8 @@ const mode = {
MULTISELECTOR: "multiSelector",
TIME: "time",
DATE: "date"
// 暂不支持城市选择
// REGION: 'region'
};
const fields = {
YEAR: "year",
......@@ -11139,21 +11189,21 @@ require("localstorage-polyfill");
global.XMLHttpRequest = require("xmlhttprequest").XMLHttpRequest;
const api = /* @__PURE__ */ Object.defineProperty({
__proto__: null,
setNavigationBarTitle,
request,
setStorageSync,
setStorage,
getStorageSync,
getStorage,
removeStorageSync,
removeStorage,
clearStorageSync,
clearStorage,
getStorageInfoSync,
getStorageInfo,
getDeviceInfo,
clearStorageSync,
getAppBaseInfo,
getSystemInfoSync
getDeviceInfo,
getStorage,
getStorageInfo,
getStorageInfoSync,
getStorageSync,
getSystemInfoSync,
removeStorage,
removeStorageSync,
request,
setNavigationBarTitle,
setStorage,
setStorageSync
}, Symbol.toStringTag, { value: "Module" });
const uni$1 = api;
const UniServiceJSBridge$1 = /* @__PURE__ */ shared.extend(ServiceJSBridge, {
......@@ -11699,6 +11749,7 @@ function createRouterViewVNode({
key: routeKey.value
}))], 1032, ["cache"]))]),
_: 1
/* STABLE */
});
}
function useTopWindow(layoutState) {
......@@ -12013,6 +12064,7 @@ function onPageHeadBackButton() {
from: "backbutton",
success() {
}
// 传入空方法,避免返回Promise,因为onBackPress可能导致fail
});
}
}
......@@ -12097,6 +12149,7 @@ function usePageHeadButton(pageId, index2, btn, isTransparent) {
}
return {
btnClass: {
// 类似这样的大量重复的字符串,会在gzip时压缩大小,无需在代码层考虑优化相同字符串
"uni-page-head-btn": true,
"uni-page-head-btn-red-dot": !!(btn.redDot || btn.badgeText),
"uni-page-head-btn-select": !!btn.select
......
此差异已折叠。
......@@ -33,8 +33,8 @@
"@dcloudio/uni-h5-vue": "3.0.0-alpha-3070020230202001",
"@dcloudio/uni-i18n": "3.0.0-alpha-3070020230202001",
"@dcloudio/uni-shared": "3.0.0-alpha-3070020230202001",
"@vue/server-renderer": "3.2.45",
"@vue/shared": "3.2.45",
"@vue/server-renderer": "3.2.47",
"@vue/shared": "3.2.47",
"debug": "^4.3.3",
"localstorage-polyfill": "^1.0.1",
"safe-area-insets": "^1.4.1",
......@@ -51,6 +51,6 @@
"acorn-loose": "^8.2.1",
"acorn-walk": "^8.2.0",
"estree-walker": "^2.0.2",
"vue": "3.2.45"
"vue": "3.2.47"
}
}
......@@ -30,7 +30,7 @@
"@dcloudio/uni-mp-vite": "3.0.0-alpha-3070020230202001",
"@dcloudio/uni-mp-vue": "3.0.0-alpha-3070020230202001",
"@dcloudio/uni-shared": "3.0.0-alpha-3070020230202001",
"@vue/compiler-core": "3.2.45",
"@vue/shared": "3.2.45"
"@vue/compiler-core": "3.2.47",
"@vue/shared": "3.2.47"
}
}
......@@ -32,8 +32,8 @@
"@dcloudio/uni-mp-vue": "3.0.0-alpha-3070020230202001",
"@dcloudio/uni-mp-weixin": "3.0.0-alpha-3070020230202001",
"@dcloudio/uni-shared": "3.0.0-alpha-3070020230202001",
"@vue/compiler-core": "3.2.45",
"@vue/shared": "3.2.45",
"@vue/compiler-core": "3.2.47",
"@vue/shared": "3.2.47",
"jimp": "^0.10.1",
"licia": "^1.29.0",
"qrcode-reader": "^1.0.4",
......
......@@ -24,14 +24,14 @@
"@babel/types": "^7.20.7",
"@dcloudio/uni-cli-shared": "3.0.0-alpha-3070020230202001",
"@dcloudio/uni-shared": "3.0.0-alpha-3070020230202001",
"@vue/compiler-core": "3.2.45",
"@vue/compiler-dom": "3.2.45",
"@vue/shared": "3.2.45",
"@vue/compiler-core": "3.2.47",
"@vue/compiler-dom": "3.2.47",
"@vue/shared": "3.2.47",
"estree-walker": "^2.0.2"
},
"devDependencies": {
"@types/babel__generator": "^7.6.4",
"@vue/compiler-sfc": "3.2.45",
"@vue/compiler-sfc": "3.2.47",
"source-map": "^0.6.1"
}
}
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册