diff --git a/packages/shims-uni-app.d.ts b/packages/shims-uni-app.d.ts index ecffcba7e4f1338c1ce1a8ebb3385f219d03c9ed..97e53650c99d31397b1a4bfadcfef1dff61f2296 100644 --- a/packages/shims-uni-app.d.ts +++ b/packages/shims-uni-app.d.ts @@ -22,6 +22,13 @@ declare namespace UniApp { interface PageNavigationBar { type: 'default' | 'transparent' | 'float' | 'none' titleText: string + textStyle: 'black' | 'white' + timingFunc: string + duration: string + backgroundColor: string + titlePenetrate: 'YES' | 'NO' + shadowColorType: 'grey' | 'blue' | 'green' | 'orange' | 'red' | 'yellow' + backButton: boolean } interface PageRefreshOptions { support: boolean diff --git a/packages/uni-h5/dist/uni-h5.esm.js b/packages/uni-h5/dist/uni-h5.esm.js index e893a1826b6f5ce1298d708675bc2de8e94cddc8..d746fb6d7208f0848f4ab7f54210fdb4380a4d47 100644 --- a/packages/uni-h5/dist/uni-h5.esm.js +++ b/packages/uni-h5/dist/uni-h5.esm.js @@ -1,6 +1,6 @@ import {isFunction, extend, isPlainObject, hasOwn as hasOwn$1, hyphenate, isArray, isObject as isObject$1, capitalize, toRawType, makeMap as makeMap$1, isPromise} from "@vue/shared"; -import {injectHook, defineComponent, nextTick, computed, openBlock, createBlock, Fragment, withDirectives, createVNode, vShow, createCommentVNode, withCtx, KeepAlive, resolveDynamicComponent, resolveComponent, mergeProps, onMounted, ref, toDisplayString, toHandlers, renderSlot, withModifiers, vModelDynamic, renderList, vModelText, inject, provide, reactive} from "vue"; -import {COMPONENT_NAME_PREFIX, isCustomElement, plusReady, debounce, NAVBAR_HEIGHT} from "@dcloudio/uni-shared"; +import {injectHook, defineComponent, inject, provide, reactive, nextTick, computed, openBlock, createBlock, Fragment, withDirectives, createVNode, vShow, createCommentVNode, withCtx, KeepAlive, resolveDynamicComponent, resolveComponent, mergeProps, onMounted, ref, toDisplayString, toHandlers, renderSlot, withModifiers, vModelDynamic, renderList, vModelText, createTextVNode} from "vue"; +import {NAVBAR_HEIGHT, COMPONENT_NAME_PREFIX, isCustomElement, plusReady, debounce} from "@dcloudio/uni-shared"; import {createRouter, createWebHistory, createWebHashHistory, useRoute, RouterView} from "vue-router"; function applyOptions(options, instance2, publicThis) { Object.keys(options).forEach((name) => { @@ -756,9 +756,65 @@ const afterEach = (to, from, failure) => { var TabBar = defineComponent({ name: "TabBar" }); +const pageMetaKey = PolySymbol(process.env.NODE_ENV !== "production" ? "pageMeta" : "pm"); +function usePageMeta() { + return inject(pageMetaKey); +} +function providePageMeta() { + provide(pageMetaKey, initPageMeta()); +} +function initPageMeta() { + if (__UNI_FEATURE_PAGES__) { + return reactive(normalizePageMeta(JSON.parse(JSON.stringify(mergePageMeta(useRoute().meta))))); + } + return reactive(normalizePageMeta(JSON.parse(JSON.stringify(mergePageMeta(__uniRoutes[1].meta))))); +} +const PAGE_META_KEYS = [ + "navigationBar", + "refreshOptions" +]; +function mergePageMeta(pageMeta) { + const res = Object.assign({}, __uniConfig.globalStyle, pageMeta); + PAGE_META_KEYS.forEach((name) => { + res[name] = Object.assign({}, __uniConfig.globalStyle[name] || {}, pageMeta[name] || {}); + }); + return res; +} +function normalizePageMeta(pageMeta) { + const {enablePullDownRefresh, navigationBar} = pageMeta; + if (enablePullDownRefresh) { + const refreshOptions = Object.assign({ + support: true, + color: "#2BD009", + style: "circle", + height: 70, + range: 150, + offset: 0 + }, pageMeta.refreshOptions || {}); + let offset = rpx2px(refreshOptions.offset); + const {type} = navigationBar; + if (type !== "transparent" && type !== "none") { + offset += NAVBAR_HEIGHT + out.top; + } + refreshOptions.height = rpx2px(refreshOptions.height); + refreshOptions.range = rpx2px(refreshOptions.range); + pageMeta.refreshOptions = refreshOptions; + } + return pageMeta; +} +const documentElement = document.documentElement; +let styleObj; +function updateCssVar(name, value) { + if (!styleObj) { + styleObj = documentElement.style; + } + styleObj.setProperty(name, value); +} +PolySymbol(process.env.NODE_ENV !== "production" ? "layout" : "l"); const SEP = "$$"; +const currentPages = []; function getCurrentPages$1() { - return []; + return currentPages; } let id = history.state && history.state.__id__ || 1; function createPageState(type) { @@ -780,10 +836,12 @@ function initPublicPage(route) { path: route.path, route: route.meta.pagePath, fullPath: route.meta.isEntry ? route.meta.pagePath : route.fullPath, - options: {} + options: {}, + meta: usePageMeta() }; } function initPage(vm) { + currentPages.push(vm); const route = vm.$route; vm.__page__ = initPublicPage(route); } @@ -917,14 +975,6 @@ function createLeftWindowVNode(leftWindow) { } function createRightWindowVNode(leftWindow) { } -const documentElement = document.documentElement; -let styleObj; -function updateCssVar(name, value) { - if (!styleObj) { - styleObj = documentElement.style; - } - styleObj.setProperty(name, value); -} const CSS_VARS = [ "--status-bar-height", "--top-window-height", @@ -8031,61 +8081,70 @@ const UniServiceJSBridge$1 = extend(ServiceJSBridge, { window.UniViewJSBridge.subscribeHandler(event2, args, pageId); } }); -const pageMetaKey = PolySymbol(process.env.NODE_ENV !== "production" ? "pageMeta" : "pm"); -function usePageMeta() { - return inject(pageMetaKey); -} -function providePageMeta() { - provide(pageMetaKey, initPageMeta()); -} -function initPageMeta() { - if (__UNI_FEATURE_PAGES__) { - return reactive(normalizePageMeta(JSON.parse(JSON.stringify(mergePageMeta(useRoute().meta))))); - } - return reactive(normalizePageMeta(JSON.parse(JSON.stringify(mergePageMeta(__uniRoutes[1].meta))))); -} -const PAGE_META_KEYS = [ - "navigationBar", - "refreshOptions" -]; -function mergePageMeta(pageMeta) { - const res = Object.assign({}, __uniConfig.globalStyle, pageMeta); - PAGE_META_KEYS.forEach((name) => { - res[name] = Object.assign({}, __uniConfig.globalStyle[name] || {}, pageMeta[name] || {}); - }); - return res; -} -function normalizePageMeta(pageMeta) { - const {enablePullDownRefresh, navigationBar} = pageMeta; - if (enablePullDownRefresh) { - const refreshOptions = Object.assign({ - support: true, - color: "#2BD009", - style: "circle", - height: 70, - range: 150, - offset: 0 - }, pageMeta.refreshOptions || {}); - let offset = rpx2px(refreshOptions.offset); - const {type} = navigationBar; - if (type !== "transparent" && type !== "none") { - offset += NAVBAR_HEIGHT + out.top; - } - refreshOptions.height = rpx2px(refreshOptions.height); - refreshOptions.range = rpx2px(refreshOptions.range); - pageMeta.refreshOptions = refreshOptions; - } - return pageMeta; -} -PolySymbol(process.env.NODE_ENV !== "production" ? "layout" : "l"); var PageHead = defineComponent({ name: "PageHead", setup() { const pageMeta = usePageMeta(); - UniServiceJSBridge.emit("onNavigationBarChange", pageMeta.navigationBar.titleText); - return () => (openBlock(), createBlock("uni-page-head", null, pageMeta.navigationBar.titleText)); + const navigationBar = pageMeta.navigationBar; + UniServiceJSBridge.emit("onNavigationBarChange", navigationBar.titleText); + const { + clazz, + style + } = usePageHead(navigationBar); + const backButtonJsx = createBackButtonJsx(navigationBar); + return () => createVNode("uni-page-head", { + "uni-page-head-type": navigationBar.type + }, { + default: () => [createVNode("div", { + class: clazz.value, + style: style.value + }, [createVNode("div", { + class: "uni-page-head-hd" + }, [backButtonJsx])], 6)] + }, 8, ["uni-page-head-type"]); } }); +function createBackButtonJsx(navigationBar) { + if (navigationBar.backButton) { + return createVNode("div", { + class: "uni-page-head-btn" + }, [createVNode("i", { + style: "{color:color,fontSize:'27px'}", + class: "uni-btn-icon" + }, [createTextVNode("\uE601")])]); + } +} +function usePageHead(navigationBar) { + const clazz = computed(() => { + const { + type, + titlePenetrate, + shadowColorType + } = navigationBar; + const clazz2 = { + "uni-page-head": true, + "uni-page-head-transparent": type === "transparent", + "uni-page-head-titlePenetrate": titlePenetrate === "YES", + "uni-page-head-shadow": !!shadowColorType + }; + if (shadowColorType) { + clazz2[`uni-page-head-shadow-${shadowColorType}`] = true; + } + return clazz2; + }); + const style = computed(() => { + return { + transitionDuration: navigationBar.duration, + transitionTimingFunction: navigationBar.timingFunc, + backgroundColor: navigationBar.backgroundColor, + color: navigationBar.textStyle === "black" ? "#000" : "#fff" + }; + }); + return { + clazz, + style + }; +} var _sfc_main$2 = { name: "PageRefresh", setup() { diff --git a/packages/uni-h5/src/framework/components/page/page-refresh/index.ts b/packages/uni-h5/src/framework/components/page/page-refresh/index.ts index 58029df4f982373c1dfe30d70e0d943db9070bd5..4060550adfb02bba8495e81e5e4bf18151182703 100644 --- a/packages/uni-h5/src/framework/components/page/page-refresh/index.ts +++ b/packages/uni-h5/src/framework/components/page/page-refresh/index.ts @@ -93,7 +93,6 @@ export function usePageRefresh(refreshRef: Ref) { function removeClass() { toggleClass('remove') } - function pulling(deltaY: number) { if (!refreshControllerElem) { return diff --git a/packages/uni-h5/src/framework/components/page/pageHead.ts b/packages/uni-h5/src/framework/components/page/pageHead.ts deleted file mode 100644 index 26842c57a621c55542e7201e09a87555be2eb05e..0000000000000000000000000000000000000000 --- a/packages/uni-h5/src/framework/components/page/pageHead.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { - createBlock, - // createCommentVNode, - // createVNode, - defineComponent, - openBlock, - // renderSlot, - // SetupContext, - // withCtx, -} from 'vue' - -import { usePageMeta } from '../../plugin/provide' - -export default defineComponent({ - name: 'PageHead', - setup() { - const pageMeta = usePageMeta() - UniServiceJSBridge.emit( - 'onNavigationBarChange', - pageMeta.navigationBar.titleText - ) - return () => ( - openBlock(), - createBlock('uni-page-head', null, pageMeta.navigationBar.titleText) - ) - }, -}) diff --git a/packages/uni-h5/src/framework/components/page/pageHead.tsx b/packages/uni-h5/src/framework/components/page/pageHead.tsx new file mode 100644 index 0000000000000000000000000000000000000000..432901a217ed8d67e34a40badc139361d8117d57 --- /dev/null +++ b/packages/uni-h5/src/framework/components/page/pageHead.tsx @@ -0,0 +1,71 @@ +import { + computed, + createBlock, + // createCommentVNode, + // createVNode, + defineComponent, + openBlock, + // renderSlot, + // SetupContext, + // withCtx, +} from 'vue' + +import { usePageMeta } from '../../plugin/provide' + +export default defineComponent({ + name: 'PageHead', + setup() { + const pageMeta = usePageMeta() + const navigationBar = pageMeta.navigationBar + UniServiceJSBridge.emit('onNavigationBarChange', navigationBar.titleText) + const { clazz, style } = usePageHead(navigationBar) + const backButtonJsx = createBackButtonJsx(navigationBar) + return () => ( + +
+
{backButtonJsx}
+
+ + ) + }, +}) + +function createBackButtonJsx(navigationBar: UniApp.PageNavigationBar) { + if (navigationBar.backButton) { + return ( +
+ +  + +
+ ) + } +} + +function usePageHead(navigationBar: UniApp.PageNavigationBar) { + const clazz = computed(() => { + const { type, titlePenetrate, shadowColorType } = navigationBar + const clazz: Record = { + 'uni-page-head': true, + 'uni-page-head-transparent': type === 'transparent', + 'uni-page-head-titlePenetrate': titlePenetrate === 'YES', + 'uni-page-head-shadow': !!shadowColorType, + } + if (shadowColorType) { + clazz[`uni-page-head-shadow-${shadowColorType}`] = true + } + return clazz + }) + const style = computed(() => { + return { + transitionDuration: navigationBar.duration, + transitionTimingFunction: navigationBar.timingFunc, + backgroundColor: navigationBar.backgroundColor, + color: navigationBar.textStyle === 'black' ? '#000' : '#fff', + } + }) + return { + clazz, + style, + } +} diff --git a/packages/uni-h5/src/framework/plugin/page.ts b/packages/uni-h5/src/framework/plugin/page.ts index 1d49ffd9a8d3aac01f335f54777d6e28c7275dae..0d9f0053460b94c4ab3639773b4a1df026e28fc2 100644 --- a/packages/uni-h5/src/framework/plugin/page.ts +++ b/packages/uni-h5/src/framework/plugin/page.ts @@ -1,10 +1,13 @@ import { computed, nextTick, VNode, ComponentPublicInstance } from 'vue' import { useRoute, RouteLocationNormalizedLoaded } from 'vue-router' +import { usePageMeta } from './provide' const SEP = '$$' +const currentPages: Page.PageInstance[] = [] + export function getCurrentPages() { - return [] + return currentPages } let id = (history.state && history.state.__id__) || 1 @@ -34,10 +37,12 @@ function initPublicPage(route: RouteLocationNormalizedLoaded) { route: route.meta.pagePath, fullPath: route.meta.isEntry ? route.meta.pagePath : route.fullPath, options: {}, // $route.query + meta: usePageMeta(), } } export function initPage(vm: ComponentPublicInstance) { + currentPages.push(vm as Page.PageInstance) const route = vm.$route ;(vm as any).__page__ = initPublicPage(route) } diff --git a/packages/uni-h5/style/base.css b/packages/uni-h5/style/base.css index 25416c486e27e44ce82df768c1ac8e7e5c02a1b8..de08869f34ce6b18d48295c7aa32de4212904b35 100644 --- a/packages/uni-h5/style/base.css +++ b/packages/uni-h5/style/base.css @@ -3,22 +3,6 @@ -webkit-tap-highlight-color: transparent; } -@font-face { - font-weight: normal; - font-style: normal; - font-family: 'uni'; - src: url('data:application/octet-stream;base64,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') - format('truetype'); -} - -@font-face { - font-weight: normal; - font-style: normal; - font-family: 'unibtn'; - src: url('data:application/octet-stream;base64,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') - format('truetype'); -} - html, body { -webkit-user-select: none; @@ -27,158 +11,12 @@ body { height: 100%; } -/* html { - height: 100% -} */ - body { overflow-x: hidden; } -[class^='uni-icon-'], -[class*=' uni-icon-'] { - display: inline-block; - vertical-align: middle; - font: normal normal normal 14px/1 'uni'; - font-size: inherit; - text-rendering: auto; - -webkit-font-smoothing: antialiased; -} - -[class^='uni-btn-icon'], -[class*=' uni-btn-icon'] { - display: inline-block; - font: normal normal normal 14px/1 'unibtn'; - font-size: inherit; - text-rendering: auto; - -webkit-font-smoothing: antialiased; -} - -[class^='uni-btn-icon']:before, -[class*=' uni-btn-icon']:before { - margin: 0; - box-sizing: border-box; -} - -.uni-icon-success-no-circle:before { - content: '\EA08'; -} - -.uni-loading, -uni-button[loading]:before { - background: transparent - url('data:image/svg+xml;base64, PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=') - no-repeat; -} - -.uni-loading { - width: 20px; - height: 20px; - display: inline-block; - vertical-align: middle; - animation: uni-loading 1s steps(12, end) infinite; - background-size: 100%; -} - -@keyframes uni-loading { - 0% { - transform: rotate3d(0, 0, 1, 0deg); - } - - 100% { - transform: rotate3d(0, 0, 1, 360deg); - } -} - -/* -html, -body, uni-app, uni-page { - height: 100%; -} */ - -.uni-mask { - position: fixed; - z-index: 999; - top: 0; - right: 0; - left: 0; - bottom: 0; - background: rgba(0, 0, 0, 0.5); -} - -.uni-fade-enter-active, -.uni-fade-leave-active { - transition-duration: 0.25s; - transition-property: opacity; - transition-timing-function: ease; -} - -.uni-fade-enter, -.uni-fade-leave-active { - opacity: 0; -} - -[nvue] uni-view, -[nvue] uni-label, -[nvue] uni-swiper-item, -[nvue] uni-scroll-view { - display: flex; - flex-shrink: 0; - flex-grow: 0; - flex-basis: auto; - align-items: stretch; - align-content: flex-start; -} - -[nvue] uni-button { - margin: 0; -} - -[nvue-dir-row] uni-view, -[nvue-dir-row] uni-label, -[nvue-dir-row] uni-swiper-item { - flex-direction: row; -} - -[nvue-dir-column] uni-view, -[nvue-dir-column] uni-label, -[nvue-dir-column] uni-swiper-item { - flex-direction: column; -} - -[nvue-dir-row-reverse] uni-view, -[nvue-dir-row-reverse] uni-label, -[nvue-dir-row-reverse] uni-swiper-item { - flex-direction: row-reverse; -} - -[nvue-dir-column-reverse] uni-view, -[nvue-dir-column-reverse] uni-label, -[nvue-dir-column-reverse] uni-swiper-item { - flex-direction: column-reverse; -} - -[nvue] uni-view, -[nvue] uni-image, -[nvue] uni-input, -[nvue] uni-scroll-view, -[nvue] uni-swiper, -[nvue] uni-swiper-item, -[nvue] uni-text, -[nvue] uni-textarea, -[nvue] uni-video { - position: relative; - border: 0px solid #000000; - box-sizing: border-box; -} - -[nvue] uni-swiper-item { - position: absolute; -} - -uni-app { display: block; box-sizing: border-box; width: 100%; diff --git a/packages/uni-h5/style/layout.css b/packages/uni-h5/style/layout.css new file mode 100644 index 0000000000000000000000000000000000000000..0b31f26e924a4061a2cda7fd95535357b29d5168 --- /dev/null +++ b/packages/uni-h5/style/layout.css @@ -0,0 +1,56 @@ +uni-content { + display: flex; + flex: 1 0 auto; + height: 100%; +} + +uni-main { + flex: 1; + width: 100%; +} + +uni-top-window + uni-content { + height: calc(100vh - var(--top-window-height)); +} + +uni-left-window { + position: relative; + width: var(--window-left); + order: -1; + overflow-x: hidden; +} + +uni-right-window { + position: relative; + width: var(--window-right); + overflow-x: hidden; +} + +uni-left-window[data-show], +uni-right-window[data-show] { + position: absolute; +} + +uni-right-window[data-show] { + right: 0; +} + +uni-content .uni-mask, +.uni-left-window, +.uni-right-window { + z-index: 997; +} + +.uni-mask + .uni-left-window, +.uni-mask + .uni-right-window { + position: fixed; +} + +.uni-top-window { + position: fixed; + left: var(--window-margin); + right: var(--window-margin); + top: 0; + z-index: 998; + overflow: hidden; +} diff --git a/packages/uni-h5/style/nvue.css b/packages/uni-h5/style/nvue.css new file mode 100644 index 0000000000000000000000000000000000000000..38d12499756a5ff3b8685dd7ae173a76eb3bb4d5 --- /dev/null +++ b/packages/uni-h5/style/nvue.css @@ -0,0 +1,57 @@ +[nvue] uni-view, +[nvue] uni-label, +[nvue] uni-swiper-item, +[nvue] uni-scroll-view { + display: flex; + flex-shrink: 0; + flex-grow: 0; + flex-basis: auto; + align-items: stretch; + align-content: flex-start; +} + +[nvue] uni-button { + margin: 0; +} + +[nvue-dir-row] uni-view, +[nvue-dir-row] uni-label, +[nvue-dir-row] uni-swiper-item { + flex-direction: row; +} + +[nvue-dir-column] uni-view, +[nvue-dir-column] uni-label, +[nvue-dir-column] uni-swiper-item { + flex-direction: column; +} + +[nvue-dir-row-reverse] uni-view, +[nvue-dir-row-reverse] uni-label, +[nvue-dir-row-reverse] uni-swiper-item { + flex-direction: row-reverse; +} + +[nvue-dir-column-reverse] uni-view, +[nvue-dir-column-reverse] uni-label, +[nvue-dir-column-reverse] uni-swiper-item { + flex-direction: column-reverse; +} + +[nvue] uni-view, +[nvue] uni-image, +[nvue] uni-input, +[nvue] uni-scroll-view, +[nvue] uni-swiper, +[nvue] uni-swiper-item, +[nvue] uni-text, +[nvue] uni-textarea, +[nvue] uni-video { + position: relative; + border: 0px solid #000000; + box-sizing: border-box; +} + +[nvue] uni-swiper-item { + position: absolute; +} diff --git a/packages/uni-h5/style/pageHead.css b/packages/uni-h5/style/pageHead.css new file mode 100644 index 0000000000000000000000000000000000000000..1f4033d70ae1f188e6719b4b5365e2854fc969c0 --- /dev/null +++ b/packages/uni-h5/style/pageHead.css @@ -0,0 +1,238 @@ +uni-page-head { + display: block; + box-sizing: border-box; +} + +.uni-page-head { + position: fixed; + left: var(--window-left); + right: var(--window-right); + height: 44px; + height: calc(44px + constant(safe-area-inset-top)); + height: calc(44px + env(safe-area-inset-top)); + padding: 7px 3px; + padding-top: calc(7px + constant(safe-area-inset-top)); + padding-top: calc(7px + env(safe-area-inset-top)); + display: flex; + overflow: hidden; + justify-content: space-between; + box-sizing: border-box; + z-index: 998; + color: #fff; + background-color: #000; + transition-property: all; +} + +.uni-page-head * { + box-sizing: border-box; +} + +.uni-page-head .uni-btn-icon { + overflow: hidden; + min-width: 1em; +} + +.uni-page-head-titlePenetrate, +.uni-page-head-titlePenetrate .uni-page-head-bd, +.uni-page-head-titlePenetrate .uni-page-head-bd * { + pointer-events: none; +} + +.uni-page-head-titlePenetrate * { + pointer-events: auto; +} + +.uni-page-head.uni-page-head-transparent .uni-page-head-ft > div { + justify-content: center; +} + +.uni-page-head ~ .uni-placeholder { + width: 100%; + height: 44px; + height: calc(44px + constant(safe-area-inset-top)); + height: calc(44px + env(safe-area-inset-top)); +} + +.uni-placeholder-titlePenetrate { + pointer-events: none; +} + +.uni-page-head-hd { + display: flex; + align-items: center; + font-size: 16px; +} + +.uni-page-head-bd { + position: absolute; + left: 70px; + right: 70px; + min-width: 0; + user-select: auto; +} + +.uni-page-head-btn { + position: relative; + width: auto; + margin: 0 2px; + word-break: keep-all; + white-space: pre; + cursor: pointer; +} + +.uni-page-head-transparent .uni-page-head-btn { + display: flex; + align-items: center; + width: 32px; + height: 32px; + border-radius: 50%; + background-color: rgba(0, 0, 0, 0.5); +} + +.uni-page-head-btn-red-dot::after { + content: attr(badge-text); + position: absolute; + right: 0; + top: 0; + background-color: red; + color: white; + width: 18px; + height: 18px; + line-height: 18px; + border-radius: 18px; + overflow: hidden; + transform: scale(0.5) translate(40%, -40%); + transform-origin: 100% 0; +} + +.uni-page-head-btn-red-dot[badge-text]::after { + font-size: 12px; + width: auto; + min-width: 18px; + max-width: 42px; + text-align: center; + padding: 0 3px; + transform: scale(0.7) translate(40%, -40%); +} + +.uni-page-head-btn-select > .uni-btn-icon::after { + display: inline-block; + font-family: 'unibtn'; + content: '\e601'; + margin-left: 2px; + transform: rotate(-90deg) scale(0.8); +} + +.uni-page-head-search { + position: relative; + display: flex; + flex: 1; + margin: 0 2px; + line-height: 30px; + font-size: 15px; +} + +.uni-page-head-search-input { + width: 100%; + height: 100%; + padding-left: 34px; + text-align: left; +} + +.uni-page-head-search-placeholder { + position: absolute; + max-width: 100%; + height: 100%; + padding-left: 34px; + overflow: hidden; + word-break: keep-all; + white-space: pre; +} + +.uni-page-head-search-placeholder-right { + right: 0; +} + +.uni-page-head-search-placeholder-center { + left: 50%; + transform: translateX(-50%); +} + +.uni-page-head-search-placeholder::before { + position: absolute; + top: 0; + left: 2px; + width: 30px; + content: '\ea0e'; + display: block; + font-size: 20px; + font-family: 'uni'; + text-align: center; +} + +.uni-page-head-ft { + display: flex; + align-items: center; + flex-direction: row-reverse; + font-size: 13px; +} + +.uni-page-head__title { + font-weight: bold; + font-size: 16px; + line-height: 30px; + text-align: center; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} + +.uni-page-head__title .uni-loading { + width: 16px; + height: 16px; + margin-top: -3px; +} + +.uni-page-head__title .uni-page-head__title_image { + width: auto; + height: 26px; + vertical-align: middle; +} + +.uni-page-head-shadow { + overflow: visible; +} + +.uni-page-head-shadow::after { + content: ''; + position: absolute; + left: 0; + right: 0; + top: 100%; + height: 5px; + background-size: 100% 100%; +} + +.uni-page-head-shadow-grey::after { + background-image: url('https://cdn.dcloud.net.cn/img/shadow-grey.png'); +} + +.uni-page-head-shadow-blue::after { + background-image: url('https://cdn.dcloud.net.cn/img/shadow-blue.png'); +} + +.uni-page-head-shadow-green::after { + background-image: url('https://cdn.dcloud.net.cn/img/shadow-green.png'); +} + +.uni-page-head-shadow-orange::after { + background-image: url('https://cdn.dcloud.net.cn/img/shadow-orange.png'); +} + +.uni-page-head-shadow-red::after { + background-image: url('https://cdn.dcloud.net.cn/img/shadow-red.png'); +} + +.uni-page-head-shadow-yellow::after { + background-image: url('https://cdn.dcloud.net.cn/img/shadow-yellow.png'); +} diff --git a/packages/uni-h5/vite.config.ts b/packages/uni-h5/vite.config.ts index fbf543c41f05b6e8fcfc53246689ee6d50302683..7c04cdd1600de184a8bc203bbfa22560dec4d17c 100644 --- a/packages/uni-h5/vite.config.ts +++ b/packages/uni-h5/vite.config.ts @@ -54,7 +54,18 @@ export default defineConfig({ assetsDir: '.', rollupOptions: { input: path.resolve(__dirname, 'src/index.ts'), - external: ['vue', 'vue-router', '@vue/shared', '@dcloudio/uni-shared'], + external(source) { + if ( + ['vue', 'vue-router', '@vue/shared', '@dcloudio/uni-shared'].includes( + source + ) + ) { + return true + } + if (source.startsWith('@dcloudio/uni-h5/style')) { + return true + } + }, preserveEntrySignatures: 'strict', plugins: [ replace({ diff --git a/packages/vite-plugin-uni/src/config/index.ts b/packages/vite-plugin-uni/src/config/index.ts index 5e108d5d0be5f92901a1c72738f20af99ca49713..98f89d0495ea38727957950e124dbe42cdb3fe39 100644 --- a/packages/vite-plugin-uni/src/config/index.ts +++ b/packages/vite-plugin-uni/src/config/index.ts @@ -16,6 +16,7 @@ export function createConfig( if (config.root) { options.root = config.root } + options.command = env.command return { base: options.base, define: createDefine(options, env), diff --git a/packages/vite-plugin-uni/src/config/server.ts b/packages/vite-plugin-uni/src/config/server.ts index 17371f7dab133d02fe9eb3d8dc19dc66f653ca1d..1db9b78f810cb1c6fc33307dc645dbb9f373a375 100644 --- a/packages/vite-plugin-uni/src/config/server.ts +++ b/packages/vite-plugin-uni/src/config/server.ts @@ -6,7 +6,7 @@ export function createServer( ): UserConfig['server'] { return { watch: { - ignored: ['**/node_modules/**', '**/.git/**', '**/uniCloud**'], + ignored: ['**/uniCloud**'], }, } } diff --git a/packages/vite-plugin-uni/src/configResolved/plugins/pagesJson.ts b/packages/vite-plugin-uni/src/configResolved/plugins/pagesJson.ts index 77d8d0510130a9993466f8ec140e9326f9f1175c..0db5c216d11ff6a304d44347bfb53985729f69a2 100644 --- a/packages/vite-plugin-uni/src/configResolved/plugins/pagesJson.ts +++ b/packages/vite-plugin-uni/src/configResolved/plugins/pagesJson.ts @@ -26,7 +26,7 @@ export function uniPagesJsonPlugin( if (id.endsWith(PAGES_JSON_JS)) { return { code: - (options.devServer ? registerGlobalCode : '') + + (options.command === 'serve' ? registerGlobalCode : '') + parsePagesJson(code, options), map: { mappings: '' }, } @@ -65,9 +65,16 @@ import { appid, debug, networkTimeout, router, async, sdkConfigs, qqMapKey, nvue ${uniConfigCode} ${definePagesCode} ${uniRoutesCode} +${options.command === 'serve' ? hmrCode : ''} ` } +const hmrCode = `if(import.meta.hot){ + import.meta.hot.on('invalidate', (data) => { + import.meta.hot.invalidate() + }) +}` + const registerGlobalCode = `import {uni,getCurrentPages,getApp,UniServiceJSBridge,UniViewJSBridge} from '@dcloudio/uni-h5' window.getApp = getApp window.getCurrentPages = getCurrentPages @@ -103,24 +110,34 @@ const navigationBarMaps = { navigationBarBackgroundColor: 'backgroundColor', navigationBarTextStyle: 'textStyle', navigationBarTitleText: 'titleText', - navigationBarShadow: 'shadow', navigationStyle: 'style', titleImage: 'titleImage', titlePenetrate: 'titlePenetrate', } -function normalizeNavigationBar(pageStyle: Record) { - const navigationBar = Object.create(null) +function normalizeNavigationBar( + pageStyle: Record +): UniApp.PageNavigationBar { + const navigationBar = Object.create(null) as UniApp.PageNavigationBar Object.keys(navigationBarMaps).forEach((name) => { if (hasOwn(pageStyle, name)) { + // @ts-ignore navigationBar[navigationBarMaps[name]] = pageStyle[name] delete pageStyle[name] } }) + if ( + pageStyle.navigationBarShadow && + pageStyle.navigationBarShadow.colorType + ) { + navigationBar.shadowColorType = pageStyle.navigationBarShadow.colorType + delete pageStyle.navigationBarShadow + } const { titleNView } = pageStyle if (isPlainObject(titleNView)) { Object.assign(navigationBar, titleNView) } + return navigationBar } @@ -267,7 +284,7 @@ function generateConfig( delete pagesJson.subpackages pagesJson.compilerVersion = pkg['uni-app'].compilerVersion return ( - (options.devServer + (options.command === 'serve' ? '' : `window['____'+appid+'____']=true delete window['____'+appid+'____'] diff --git a/packages/vite-plugin-uni/src/handleHotUpdate/index.ts b/packages/vite-plugin-uni/src/handleHotUpdate/index.ts new file mode 100644 index 0000000000000000000000000000000000000000..53dd6c863a29364050880b1d098bf40c1cc4bb11 --- /dev/null +++ b/packages/vite-plugin-uni/src/handleHotUpdate/index.ts @@ -0,0 +1,22 @@ +import debug from 'debug' +import { Plugin } from 'vite' +import { VitePluginUniResolvedOptions } from '..' + +const debugHmr = debug('uni:hmr') + +export function createHandleHotUpdate( + _options: VitePluginUniResolvedOptions +): Plugin['handleHotUpdate'] { + return function ({ file, server }) { + // TODO 目前简单处理，当pages.json,manifest.json发生变化，就直接刷新，理想情况下，应该区分变化的内容，仅必要时做整页面刷新 + if (file.endsWith('pages.json') || file.endsWith('manifest.json')) { + debugHmr(file) + server.ws.send({ + type: 'custom', + event: 'invalidate', + data: {}, + }) + return [] + } + } +} diff --git a/packages/vite-plugin-uni/src/index.ts b/packages/vite-plugin-uni/src/index.ts index d1c5ed214ea153a014b9b91919b8d1a960f2395e..bcb8d4d12c6ca6a18f3ae7fa772bc11f1f3748fc 100644 --- a/packages/vite-plugin-uni/src/index.ts +++ b/packages/vite-plugin-uni/src/index.ts @@ -2,19 +2,21 @@ import fs from 'fs' import path from 'path' import { parse } from 'jsonc-parser' -import { Plugin, ViteDevServer } from 'vite' +import { Plugin, ResolvedConfig, ViteDevServer } from 'vite' import { initEnv } from './env' import { createConfig } from './config' import { createResolveId } from './resolveId' import { createConfigResolved } from './configResolved' import { createConfigureServer } from './configureServer' +import { createHandleHotUpdate } from './handleHotUpdate' export interface VitePluginUniOptions { inputDir?: string } export interface VitePluginUniResolvedOptions extends VitePluginUniOptions { root: string base: string + command: ResolvedConfig['command'] inputDir: string assetsDir: string devServer?: ViteDevServer @@ -39,6 +41,7 @@ export default function uniPlugin( base: resolveBase(inputDir), assetsDir: 'assets', inputDir, + command: 'serve', } initEnv(options) return { @@ -47,5 +50,6 @@ export default function uniPlugin( configResolved: createConfigResolved(options), configureServer: createConfigureServer(options), resolveId: createResolveId(options), + handleHotUpdate: createHandleHotUpdate(options), } } diff --git a/packages/vite-plugin-uni/src/resolveId.ts b/packages/vite-plugin-uni/src/resolveId/index.ts similarity index 79% rename from packages/vite-plugin-uni/src/resolveId.ts rename to packages/vite-plugin-uni/src/resolveId/index.ts index a99ed16c62bfea58871f4c9ec3b24d6979f9133d..c2ca037cd1c42d39271fe3bfd930f6a834fc56bb 100644 --- a/packages/vite-plugin-uni/src/resolveId.ts +++ b/packages/vite-plugin-uni/src/resolveId/index.ts @@ -1,13 +1,13 @@ import debug from 'debug' import { Plugin } from 'vite' -import { VitePluginUniResolvedOptions } from '.' +import { VitePluginUniResolvedOptions } from '..' const debugResolve = debug('uni:resolve') const VUES = ['vue', 'vue.js', './vue.js', 'dist/vue.runtime.esm-bundler.js'] export function createResolveId( - options: VitePluginUniResolvedOptions + _options: VitePluginUniResolvedOptions ): Plugin['resolveId'] { return function (id) { if (VUES.includes(id)) { diff --git a/yarn.lock b/yarn.lock index 83cec5b37e49fe6377b103f3488b2c07a8e0b0d5..7c8234212ba4c2a4c72997150a1085c11bf3d6cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17,9 +17,9 @@ "@babel/highlight" "^7.12.13" "@babel/compat-data@^7.13.8": - version "7.13.11" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.11.tgz#9c8fe523c206979c9a81b1e12fe50c1254f1aa35" - integrity sha512-BwKEkO+2a67DcFeS3RLl0Z3Gs2OvdXewuWjc1Hfokhb5eQWP9YRYH1/+VrVZvql2CfjOiNGqSAFOYt4lsqTHzg== + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.12.tgz#a8a5ccac19c200f9dd49624cac6e19d7be1236a1" + integrity sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ== "@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.7.5": version "7.13.10" @@ -89,34 +89,33 @@ dependencies: "@babel/types" "^7.12.13" -"@babel/helper-member-expression-to-functions@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz#6aa4bb678e0f8c22f58cdb79451d30494461b091" - integrity sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ== +"@babel/helper-member-expression-to-functions@^7.13.0", "@babel/helper-member-expression-to-functions@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72" + integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw== dependencies: - "@babel/types" "^7.13.0" + "@babel/types" "^7.13.12" -"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz#ec67e4404f41750463e455cc3203f6a32e93fcb0" - integrity sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g== +"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977" + integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA== dependencies: - "@babel/types" "^7.12.13" + "@babel/types" "^7.13.12" "@babel/helper-module-transforms@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz#42eb4bd8eea68bab46751212c357bfed8b40f6f1" - integrity sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw== + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.12.tgz#600e58350490828d82282631a1422268e982ba96" + integrity sha512-7zVQqMO3V+K4JOOj40kxiCrMf6xlQAkewBB0eu2b03OO/Q21ZutOzjpfD79A5gtE/2OWi1nv625MrDlGlkbknQ== dependencies: - "@babel/helper-module-imports" "^7.12.13" - "@babel/helper-replace-supers" "^7.13.0" - "@babel/helper-simple-access" "^7.12.13" + "@babel/helper-module-imports" "^7.13.12" + "@babel/helper-replace-supers" "^7.13.12" + "@babel/helper-simple-access" "^7.13.12" "@babel/helper-split-export-declaration" "^7.12.13" "@babel/helper-validator-identifier" "^7.12.11" "@babel/template" "^7.12.13" "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" - lodash "^4.17.19" + "@babel/types" "^7.13.12" "@babel/helper-optimise-call-expression@^7.12.13": version "7.12.13" @@ -130,22 +129,22 @@ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af" integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ== -"@babel/helper-replace-supers@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz#6034b7b51943094cb41627848cb219cb02be1d24" - integrity sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw== +"@babel/helper-replace-supers@^7.13.0", "@babel/helper-replace-supers@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804" + integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw== dependencies: - "@babel/helper-member-expression-to-functions" "^7.13.0" + "@babel/helper-member-expression-to-functions" "^7.13.12" "@babel/helper-optimise-call-expression" "^7.12.13" "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" + "@babel/types" "^7.13.12" -"@babel/helper-simple-access@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz#8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4" - integrity sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA== +"@babel/helper-simple-access@^7.13.12": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6" + integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA== dependencies: - "@babel/types" "^7.12.13" + "@babel/types" "^7.13.12" "@babel/helper-split-export-declaration@^7.12.13": version "7.12.13" @@ -183,9 +182,9 @@ js-tokens "^4.0.0" "@babel/parser@^7.1.0", "@babel/parser@^7.12.0", "@babel/parser@^7.12.13", "@babel/parser@^7.13.0", "@babel/parser@^7.13.10": - version "7.13.11" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.11.tgz#f93ebfc99d21c1772afbbaa153f47e7ce2f50b88" - integrity sha512-PhuoqeHoO9fc4ffMEVk4qb/w/s2iOSWohvbHxLtxui0eBg3Lg5gN1U8wp1V1u61hOWkPQJJyJzGH6Y+grwkq8Q== + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.12.tgz#ba320059420774394d3b0c0233ba40e4250b81d1" + integrity sha512-4T7Pb244rxH24yR116LAuJ+adxXXnHhZaLJjegJVKSdoNCe4x1eDBaud5YIcQFcqzsaD5BHvJw5BQ0AZapdCRw== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -318,10 +317,10 @@ globals "^11.1.0" lodash "^4.17.19" -"@babel/types@^7.0.0", "@babel/types@^7.12.0", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.0.tgz#74424d2816f0171b4100f0ab34e9a374efdf7f80" - integrity sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA== +"@babel/types@^7.0.0", "@babel/types@^7.12.0", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.3.0", "@babel/types@^7.3.3": + version "7.13.12" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.12.tgz#edbf99208ef48852acdff1c8a681a1e4ade580cd" + integrity sha512-K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA== dependencies: "@babel/helper-validator-identifier" "^7.12.11" lodash "^4.17.19" @@ -902,47 +901,47 @@ "@types/node" "*" "@typescript-eslint/parser@^4.12.0": - version "4.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.18.0.tgz#a211edb14a69fc5177054bec04c95b185b4dde21" - integrity sha512-W3z5S0ZbecwX3PhJEAnq4mnjK5JJXvXUDBYIYGoweCyWyuvAKfGHvzmpUzgB5L4cRBb+cTu9U/ro66dx7dIimA== + version "4.19.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.19.0.tgz#4ae77513b39f164f1751f21f348d2e6cb2d11128" + integrity sha512-/uabZjo2ZZhm66rdAu21HA8nQebl3lAIDcybUoOxoI7VbZBYavLIwtOOmykKCJy+Xq6Vw6ugkiwn8Js7D6wieA== dependencies: - "@typescript-eslint/scope-manager" "4.18.0" - "@typescript-eslint/types" "4.18.0" - "@typescript-eslint/typescript-estree" "4.18.0" + "@typescript-eslint/scope-manager" "4.19.0" + "@typescript-eslint/types" "4.19.0" + "@typescript-eslint/typescript-estree" "4.19.0" debug "^4.1.1" -"@typescript-eslint/scope-manager@4.18.0": - version "4.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.18.0.tgz#d75b55234c35d2ff6ac945758d6d9e53be84a427" - integrity sha512-olX4yN6rvHR2eyFOcb6E4vmhDPsfdMyfQ3qR+oQNkAv8emKKlfxTWUXU5Mqxs2Fwe3Pf1BoPvrwZtwngxDzYzQ== +"@typescript-eslint/scope-manager@4.19.0": + version "4.19.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.19.0.tgz#5e0b49eca4df7684205d957c9856f4e720717a4f" + integrity sha512-GGy4Ba/hLXwJXygkXqMzduqOMc+Na6LrJTZXJWVhRrSuZeXmu8TAnniQVKgj8uTRKe4igO2ysYzH+Np879G75g== dependencies: - "@typescript-eslint/types" "4.18.0" - "@typescript-eslint/visitor-keys" "4.18.0" + "@typescript-eslint/types" "4.19.0" + "@typescript-eslint/visitor-keys" "4.19.0" -"@typescript-eslint/types@4.18.0": - version "4.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.18.0.tgz#bebe323f81f2a7e2e320fac9415e60856267584a" - integrity sha512-/BRociARpj5E+9yQ7cwCF/SNOWwXJ3qhjurMuK2hIFUbr9vTuDeu476Zpu+ptxY2kSxUHDGLLKy+qGq2sOg37A== +"@typescript-eslint/types@4.19.0": + version "4.19.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.19.0.tgz#5181d5d2afd02e5b8f149ebb37ffc8bd7b07a568" + integrity sha512-A4iAlexVvd4IBsSTNxdvdepW0D4uR/fwxDrKUa+iEY9UWvGREu2ZyB8ylTENM1SH8F7bVC9ac9+si3LWNxcBuA== -"@typescript-eslint/typescript-estree@4.18.0": - version "4.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.18.0.tgz#756d3e61da8c16ab99185532c44872f4cd5538cb" - integrity sha512-wt4xvF6vvJI7epz+rEqxmoNQ4ZADArGQO9gDU+cM0U5fdVv7N+IAuVoVAoZSOZxzGHBfvE3XQMLdy+scsqFfeg== +"@typescript-eslint/typescript-estree@4.19.0": + version "4.19.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.19.0.tgz#8a709ffa400284ab72df33376df085e2e2f61147" + integrity sha512-3xqArJ/A62smaQYRv2ZFyTA+XxGGWmlDYrsfZG68zJeNbeqRScnhf81rUVa6QG4UgzHnXw5VnMT5cg75dQGDkA== dependencies: - "@typescript-eslint/types" "4.18.0" - "@typescript-eslint/visitor-keys" "4.18.0" + "@typescript-eslint/types" "4.19.0" + "@typescript-eslint/visitor-keys" "4.19.0" debug "^4.1.1" globby "^11.0.1" is-glob "^4.0.1" semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/visitor-keys@4.18.0": - version "4.18.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.18.0.tgz#4e6fe2a175ee33418318a029610845a81e2ff7b6" - integrity sha512-Q9t90JCvfYaN0OfFUgaLqByOfz8yPeTAdotn/XYNm5q9eHax90gzdb+RJ6E9T5s97Kv/UHWKERTmqA0jTKAEHw== +"@typescript-eslint/visitor-keys@4.19.0": + version "4.19.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.19.0.tgz#cbea35109cbd9b26e597644556be4546465d8f7f" + integrity sha512-aGPS6kz//j7XLSlgpzU2SeTqHPsmRYxFztj2vPuMMFJXZudpRSehE3WCV+BaxwZFvfAqMoSd86TEuM0PQ59E/A== dependencies: - "@typescript-eslint/types" "4.18.0" + "@typescript-eslint/types" "4.19.0" eslint-visitor-keys "^2.0.0" "@vitejs/plugin-vue-jsx@^1.1.2": @@ -1143,11 +1142,11 @@ ansi-colors@^4.1.1: integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== ansi-escapes@^4.2.1, ansi-escapes@^4.3.0: - version "4.3.1" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" - integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA== + version "4.3.2" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" + integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== dependencies: - type-fest "^0.11.0" + type-fest "^0.21.3" ansi-regex@^5.0.0: version "5.0.0" @@ -2148,9 +2147,9 @@ ecc-jsbn@~0.1.1: safer-buffer "^2.1.0" electron-to-chromium@^1.3.649: - version "1.3.693" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.693.tgz#5089c506a925c31f93fcb173a003a22e341115dd" - integrity sha512-vUdsE8yyeu30RecppQtI+XTz2++LWLVEIYmzeCaCRLSdtKZ2eXqdJcrs85KwLiPOPVc6PELgWyXBsfqIvzGZag== + version "1.3.699" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.699.tgz#854eea9db8bc8109c409a4807bfdb200dd75a2c7" + integrity sha512-fjt43CPXdPYwD9ybmKbNeLwZBmCVdLY2J5fGZub7/eMPuiqQznOGNXv/wurnpXIlE7ScHnvG9Zi+H4/i6uMKmw== elliptic@^6.5.3: version "6.5.4" @@ -2209,9 +2208,9 @@ error-ex@^1.3.1: is-arrayish "^0.2.1" esbuild@^0.9.3: - version "0.9.6" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.9.6.tgz#2cae519e7ce2328ecf57ae738090d07ce7245850" - integrity sha512-F6vASxU0wT/Davt9aj2qtDwDNSkQxh9VbyO56M7PDWD+D/Vgq/rmUDGDQo7te76W5auauVojjnQr/wTu3vpaUA== + version "0.9.7" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.9.7.tgz#ea0d639cbe4b88ec25fbed4d6ff00c8d788ef70b" + integrity sha512-VtUf6aQ89VTmMLKrWHYG50uByMF4JQlVysb8dmg6cOgW8JnFCipmz7p+HNBl+RR3LLCuBxFGVauAe2wfnF9bLg== escalade@^3.1.1: version "3.1.1" @@ -2390,9 +2389,9 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: safe-buffer "^5.1.1" exec-sh@^0.3.2: - version "0.3.4" - resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5" - integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A== + version "0.3.6" + resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc" + integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w== execa@^0.8.0: version "0.8.0" @@ -2817,9 +2816,9 @@ globals@^13.6.0: type-fest "^0.20.2" globby@^11.0.1, globby@^11.0.2: - version "11.0.2" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.2.tgz#1af538b766a3b540ebfb58a32b2e2d5897321d83" - integrity sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og== + version "11.0.3" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb" + integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg== dependencies: array-union "^2.1.0" dir-glob "^3.0.1" @@ -4079,12 +4078,7 @@ lodash.isequal@^4.0.0: resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= -lodash.sortby@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" - integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= - -lodash@4.x, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@~4.17.15: +lodash@4.x, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0, lodash@~4.17.15: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -4903,14 +4897,14 @@ randomfill@^1.0.3: safe-buffer "^5.1.0" react-is@^17.0.1: - version "17.0.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" - integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" + integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== react@^17.0.1: - version "17.0.1" - resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127" - integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w== + version "17.0.2" + resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" + integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -5198,9 +5192,9 @@ rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.8.2: estree-walker "^0.6.1" rollup@^2.35.1, rollup@^2.38.5: - version "2.42.2" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.42.2.tgz#4ea90d60539f47c5739df6ccce60bf47e2011992" - integrity sha512-o34Ar4rf01ky4EV1RFlTPd+tXICDz13a2o1PARLPFBxighJoPsxvliJTrULqjmIVpZP+JPm499ZPkvnPzRxUYA== + version "2.42.4" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.42.4.tgz#97c910a48bd0db6aaa4271dd48745870cbbbf970" + integrity sha512-Zqv3EvNfcllBHyyEUM754npqsZw82VIjK34cDQMwrQ1d6aqxzeYu5yFb7smGkPU4C1Bj7HupIMeT6WU7uIdnMw== optionalDependencies: fsevents "~2.3.1" @@ -5282,13 +5276,20 @@ semver-compare@^1.0.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@7.3.4, semver@7.x, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@~7.3.0: +semver@7.3.4: version "7.3.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== dependencies: lru-cache "^6.0.0" +semver@7.x, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@~7.3.0: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + semver@^6.0.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" @@ -5890,16 +5891,16 @@ type-detect@4.0.8: resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== -type-fest@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" - integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== - type-fest@^0.20.2: version "0.20.2" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== +type-fest@^0.21.3: + version "0.21.3" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" + integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== + type-fest@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" @@ -6123,11 +6124,11 @@ whatwg-mimetype@^2.3.0: integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== whatwg-url@^8.0.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837" - integrity sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw== + version "8.5.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.5.0.tgz#7752b8464fc0903fec89aa9846fc9efe07351fd3" + integrity sha512-fy+R77xWv0AiqfLl4nuGUlQ3/6b5uNfQ4WAbGQVMYshCTCCPK9psC1nWh3XHuxGVCtlcDDQPQW1csmmIQo+fwg== dependencies: - lodash.sortby "^4.7.0" + lodash "^4.7.0" tr46 "^2.0.2" webidl-conversions "^6.1.0"