canrd-outside / order-erp-front · Commits

Commit aaae66835a9f1bdfa316e187c01557e5b54959ab

Authored by vben
1 parent 562e2af9

perf: update style

Inline Side-by-side
Showing 9 changed files with 281 additions and 207 deletions
CHANGELOG.zh_CN.md
  View file @aaae668
  1 +## Wip
  2 +
  3 +### 🐛 Bug Fixes
  4 +
  5 +- 修复菜单在 hmr 时数据被置空
  6 +
1 ## 2.0.0-rc.18 (2021-02-05) 7 ## 2.0.0-rc.18 (2021-02-05)
2 8
3 ### ✨ Features 9 ### ✨ Features
package.json
  View file @aaae668
@@ -96,11 +96,11 @@ @@ -96,11 +96,11 @@
96 "vite": "2.0.0-beta.64", 96 "vite": "2.0.0-beta.64",
97 "vite-plugin-html": "^2.0.0", 97 "vite-plugin-html": "^2.0.0",
98 "vite-plugin-imagemin": "^0.2.2", 98 "vite-plugin-imagemin": "^0.2.2",
99 - "vite-plugin-mock": "^2.0.1", 99 + "vite-plugin-mock": "2.0.5",
100 "vite-plugin-purge-icons": "^0.6.0", 100 "vite-plugin-purge-icons": "^0.6.0",
101 - "vite-plugin-pwa": "^0.4.2",  
102 - "vite-plugin-style-import": "^0.5.5",  
103 - "vite-plugin-theme": "0.3.3", 101 + "vite-plugin-pwa": "^0.4.3",
  102 + "vite-plugin-style-import": "^0.6.6",
  103 + "vite-plugin-theme": "0.3.8",
104 "vue-eslint-parser": "^7.4.1", 104 "vue-eslint-parser": "^7.4.1",
105 "yargs": "^16.2.0" 105 "yargs": "^16.2.0"
106 }, 106 },
src/components/Form/src/components/FormItem.tsx
  View file @aaae668
@@ -321,7 +321,7 @@ export default defineComponent({ @@ -321,7 +321,7 @@ export default defineComponent({
321 321
322 return ( 322 return (
323 isIfShow && ( 323 isIfShow && (
324 - <Col {...realColProps} class={{ hidden: !isShow }}> 324 + <Col {...realColProps} v-show={isShow}>
325 {getContent()} 325 {getContent()}
326 </Col> 326 </Col>
327 ) 327 )
src/components/Menu/src/BasicMenu.vue
  View file @aaae668
@@ -122,6 +122,9 @@ @@ -122,6 +122,9 @@
122 watch( 122 watch(
123 () => props.items, 123 () => props.items,
124 () => { 124 () => {
  125 + if (import.meta.hot && props.items.length === 0) {
  126 + return;
  127 + }
125 handleMenuChange(); 128 handleMenuChange();
126 } 129 }
127 ); 130 );
src/design/global.less
  View file @aaae668
1 @import './helper/distance.less'; 1 @import './helper/distance.less';
2 .distance(); 2 .distance();
3 3
4 -.hidden {  
5 - display: none !important;  
6 -}  
7 -  
8 .flex { 4 .flex {
9 display: flex; 5 display: flex;
10 } 6 }
src/design/index.less
  View file @aaae668
@@ -13,6 +13,11 @@ @@ -13,6 +13,11 @@
13 box-sizing: border-box; 13 box-sizing: border-box;
14 } 14 }
15 15
  16 +:root {
  17 + -moz-tab-size: 4;
  18 + tab-size: 4;
  19 +}
  20 +
16 input:-webkit-autofill { 21 input:-webkit-autofill {
17 -webkit-box-shadow: 0 0 0 1000px white inset !important; 22 -webkit-box-shadow: 0 0 0 1000px white inset !important;
18 } 23 }
@@ -33,6 +38,8 @@ html, @@ -33,6 +38,8 @@ html,
33 38
34 html { 39 html {
35 overflow: hidden; 40 overflow: hidden;
  41 + line-height: 1.15;
  42 + -webkit-text-size-adjust: 100%;
36 } 43 }
37 44
38 html, 45 html,
@@ -53,34 +60,9 @@ body { @@ -53,34 +60,9 @@ body {
53 } 60 }
54 61
55 body { 62 body {
56 - font-family: 'BlinkMacSystemFont,segoe ui,Microsoft YaHei,Arial,sans-serif,Helvetica Neue,Helvetica,Pingfang SC,Hiragino Sans GB,Roboto,helvetica neue,Arial,noto sans,sans-serif,apple color emoji,segoe ui emoji,segoe ui symbol,noto color emoji';  
57 - font-style: normal;  
58 - font-weight: normal;  
59 - line-height: 1.428571429; // 20/14  
60 - letter-spacing: normal;  
61 - word-spacing: normal;  
62 - text-align: left; // Fallback for where `start` is not supported  
63 - text-align: start;  
64 - text-decoration: none;  
65 - text-size-adjust: 100%;  
66 - text-shadow: none;  
67 - text-transform: none;  
68 - word-break: normal;  
69 - word-wrap: normal;  
70 - white-space: normal;  
71 - line-break: auto;  
72 -}  
73 -  
74 -h1,  
75 -h2,  
76 -h3,  
77 -h4,  
78 -h5,  
79 -h6 {  
80 - margin-top: 0;  
81 - margin-bottom: 0.5em;  
82 - font-weight: 500;  
83 - color: @heading-color; 63 + font-family: system-ui, -apple-system, 'Segoe UI', Microsoft YaHei, Arial, sans-serif,
  64 + Helvetica Neue, Helvetica, Pingfang SC, Hiragino Sans GB, Roboto, helvetica neue, noto sans,
  65 + apple color emoji, segoe ui emoji, segoe ui symbol, noto color emoji;
84 } 66 }
85 67
86 ul, 68 ul,
@@ -92,68 +74,121 @@ li { @@ -92,68 +74,121 @@ li {
92 list-style-type: none; 74 list-style-type: none;
93 } 75 }
94 76
95 -img {  
96 - vertical-align: top;  
97 - border: 0; 77 +a:focus,
  78 +a:active {
  79 + outline: none;
  80 +}
  81 +
  82 +hr {
  83 + height: 0;
  84 + color: inherit;
  85 +}
  86 +
  87 +abbr[title] {
  88 + text-decoration: underline dotted;
  89 +}
  90 +
  91 +b,
  92 +strong {
  93 + font-weight: bolder;
  94 +}
  95 +
  96 +code,
  97 +kbd,
  98 +samp,
  99 +pre {
  100 + font-family: ui-monospace, SFMono-Regular, Consolas, 'Liberation Mono', Menlo, monospace;
  101 + font-size: 1em;
  102 +}
  103 +
  104 +small {
  105 + font-size: 80%;
  106 +}
  107 +
  108 +sub,
  109 +sup {
  110 + position: relative;
  111 + font-size: 75%;
  112 + line-height: 0;
  113 + vertical-align: baseline;
  114 +}
  115 +
  116 +sub {
  117 + bottom: -0.25em;
  118 +}
  119 +
  120 +sup {
  121 + top: -0.5em;
98 } 122 }
99 123
100 table { 124 table {
101 - border-collapse: collapse;  
102 - border-spacing: 0; 125 + text-indent: 0;
  126 + border-color: inherit;
103 } 127 }
104 128
105 -a:focus,  
106 -a:active {  
107 - outline: none; 129 +button,
  130 +input,
  131 +optgroup,
  132 +select,
  133 +textarea {
  134 + margin: 0;
  135 + font-family: inherit;
  136 + font-size: 100%;
  137 + line-height: 1.15;
108 } 138 }
109 139
110 -i,  
111 -em {  
112 - font-style: normal; 140 +button,
  141 +select {
  142 + text-transform: none;
113 } 143 }
114 144
115 button, 145 button,
116 -div:focus {  
117 - outline: none !important; 146 +[type='button'],
  147 +[type='reset'],
  148 +[type='submit'] {
  149 + -webkit-appearance: button;
118 } 150 }
119 151
120 -a {  
121 - color: @link-color;  
122 - text-decoration: none;  
123 - cursor: pointer;  
124 - background-color: transparent; // remove the gray background on active links in IE 10.  
125 - outline: none;  
126 - transition: color 0.3s;  
127 - -webkit-text-decoration-skip: objects; // remove gaps in links underline in iOS 8+ and Safari 8+. 152 +::-moz-focus-inner {
  153 + padding: 0;
  154 + border-style: none;
  155 +}
128 156
129 - &:hover {  
130 - color: @link-hover-color;  
131 - } 157 +:-moz-focusring {
  158 + outline: 1px dotted ButtonText;
  159 +}
132 160
133 - &:active {  
134 - color: @link-active-color;  
135 - } 161 +:-moz-ui-invalid {
  162 + box-shadow: none;
  163 +}
136 164
137 - &:active,  
138 - &:hover {  
139 - text-decoration: none;  
140 - outline: 0;  
141 - } 165 +legend {
  166 + padding: 0;
  167 +}
142 168
143 - &[disabled] {  
144 - color: @disabled-color;  
145 - pointer-events: none;  
146 - cursor: not-allowed;  
147 - } 169 +progress {
  170 + vertical-align: baseline;
  171 +}
  172 +
  173 +::-webkit-inner-spin-button,
  174 +::-webkit-outer-spin-button {
  175 + height: auto;
  176 +}
  177 +
  178 +[type='search'] {
  179 + outline-offset: -2px;
  180 + -webkit-appearance: textfield;
  181 +}
  182 +
  183 +::-webkit-search-decoration {
  184 + -webkit-appearance: none;
  185 +}
  186 +
  187 +::-webkit-file-upload-button {
  188 + font: inherit;
  189 + -webkit-appearance: button;
148 } 190 }
149 191
150 -img,  
151 -svg,  
152 -video,  
153 -canvas,  
154 -audio,  
155 -iframe,  
156 -embed,  
157 -object {  
158 - vertical-align: baseline !important; 192 +summary {
  193 + display: list-item;
159 } 194 }
src/layouts/default/sider/LayoutSider.vue
  View file @aaae668
@@ -2,9 +2,10 @@ @@ -2,9 +2,10 @@
2 <div 2 <div
3 v-if="getMenuFixed && !getIsMobile" 3 v-if="getMenuFixed && !getIsMobile"
4 :style="getHiddenDomStyle" 4 :style="getHiddenDomStyle"
5 - :class="{ hidden: !showClassSideBarRef }" 5 + v-show="showClassSideBarRef"
6 ></div> 6 ></div>
7 <Sider 7 <Sider
  8 + v-show="showClassSideBarRef"
8 ref="sideRef" 9 ref="sideRef"
9 breakpoint="lg" 10 breakpoint="lg"
10 collapsible 11 collapsible
@@ -84,7 +85,6 @@ @@ -84,7 +85,6 @@
84 prefixCls, 85 prefixCls,
85 { 86 {
86 [`${prefixCls}--fixed`]: unref(getMenuFixed), 87 [`${prefixCls}--fixed`]: unref(getMenuFixed),
87 - hidden: !unref(showClassSideBarRef),  
88 [`${prefixCls}--mix`]: unref(getIsMixMode) && !unref(getIsMobile), 88 [`${prefixCls}--mix`]: unref(getIsMixMode) && !unref(getIsMobile),
89 }, 89 },
90 ]; 90 ];
tsconfig.json
  View file @aaae668
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
12 "allowJs": true, 12 "allowJs": true,
13 "sourceMap": true, 13 "sourceMap": true,
14 "esModuleInterop": true, 14 "esModuleInterop": true,
  15 + "resolveJsonModule": true,
15 "noUnusedLocals": true, 16 "noUnusedLocals": true,
16 "noUnusedParameters": true, 17 "noUnusedParameters": true,
17 "experimentalDecorators": true, 18 "experimentalDecorators": true,
yarn.lock
  View file @aaae668
@@ -6002,6 +6002,11 @@ lodash.map@^4.5.1: @@ -6002,6 +6002,11 @@ lodash.map@^4.5.1:
6002 resolved "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" 6002 resolved "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
6003 integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM= 6003 integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=
6004 6004
  6005 +lodash.sortby@^4.7.0:
  6006 + version "4.7.0"
  6007 + resolved "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
  6008 + integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
  6009 +
6005 lodash.template@^4.0.2: 6010 lodash.template@^4.0.2:
6006 version "4.5.0" 6011 version "4.5.0"
6007 resolved "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" 6012 resolved "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
@@ -8141,6 +8146,13 @@ source-map@^0.7.3, source-map@~0.7.2: @@ -8141,6 +8146,13 @@ source-map@^0.7.3, source-map@~0.7.2:
8141 resolved "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" 8146 resolved "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
8142 integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== 8147 integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
8143 8148
  8149 +source-map@^0.8.0-beta.0:
  8150 + version "0.8.0-beta.0"
  8151 + resolved "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz#d4c1bb42c3f7ee925f005927ba10709e0d1d1f11"
  8152 + integrity sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==
  8153 + dependencies:
  8154 + whatwg-url "^7.0.0"
  8155 +
8144 sourcemap-codec@^1.4.4: 8156 sourcemap-codec@^1.4.4:
8145 version "1.4.8" 8157 version "1.4.8"
8146 resolved "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" 8158 resolved "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
@@ -8809,6 +8821,13 @@ toidentifier@1.0.0: @@ -8809,6 +8821,13 @@ toidentifier@1.0.0:
8809 resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" 8821 resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
8810 integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== 8822 integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
8811 8823
  8824 +tr46@^1.0.1:
  8825 + version "1.0.1"
  8826 + resolved "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
  8827 + integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
  8828 + dependencies:
  8829 + punycode "^2.1.0"
  8830 +
8812 trim-newlines@^1.0.0: 8831 trim-newlines@^1.0.0:
8813 version "1.0.0" 8832 version "1.0.0"
8814 resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" 8833 resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
@@ -9195,10 +9214,10 @@ vite-plugin-imagemin@^0.2.2: @@ -9195,10 +9214,10 @@ vite-plugin-imagemin@^0.2.2:
9195 imagemin-svgo "^8.0.0" 9214 imagemin-svgo "^8.0.0"
9196 imagemin-webp "^6.0.0" 9215 imagemin-webp "^6.0.0"
9197 9216
9198 -vite-plugin-mock@^2.0.1:  
9199 - version "2.0.1"  
9200 - resolved "https://registry.npmjs.org/vite-plugin-mock/-/vite-plugin-mock-2.0.1.tgz#46b69ebeea3c13072a764b11974a4fb65bd06925"  
9201 - integrity sha512-1avHTs2B21uiMxa6zWI99G5X2MtUJ2vnGuBN2TS8jGGYCgUXZ/arMTcSeAo4RPpr6CPZmXYr/Q8ej5tJmGvhhA== 9217 +vite-plugin-mock@2.0.5:
  9218 + version "2.0.5"
  9219 + resolved "https://registry.npmjs.org/vite-plugin-mock/-/vite-plugin-mock-2.0.5.tgz#163953ac4b8e1567898a3ea21a503371bd64c82b"
  9220 + integrity sha512-gDPgKe/Ab/cy5D879xcwMzPK7q8T07qH408pHJ6uJDFiyndOa9RsZo0gC/AbS/+q13kUPGb0eSFHVnvmPog8MQ==
9202 dependencies: 9221 dependencies:
9203 "@rollup/plugin-node-resolve" "^11.1.1" 9222 "@rollup/plugin-node-resolve" "^11.1.1"
9204 "@types/mockjs" "^1.0.3" 9223 "@types/mockjs" "^1.0.3"
@@ -9222,30 +9241,30 @@ vite-plugin-purge-icons@^0.6.0: @@ -9222,30 +9241,30 @@ vite-plugin-purge-icons@^0.6.0:
9222 "@purge-icons/generated" "^0.6.0" 9241 "@purge-icons/generated" "^0.6.0"
9223 rollup-plugin-purge-icons "^0.6.0" 9242 rollup-plugin-purge-icons "^0.6.0"
9224 9243
9225 -vite-plugin-pwa@^0.4.2:  
9226 - version "0.4.2"  
9227 - resolved "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.4.2.tgz#b2e988147beb7bd2f42e88a98cb280a7d3739918"  
9228 - integrity sha512-zlKK45jBa7hxrVQlEIbdiIU3Eds2NEd6XT8noYPZha8GFRdB6Y6Izpnp7JYRHc+H6I4JHI3bmlwifOtjSFRrbA== 9244 +vite-plugin-pwa@^0.4.3:
  9245 + version "0.4.3"
  9246 + resolved "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.4.3.tgz#58262cb1eb889dc4fd41ab070ca77668d7a3c0a1"
  9247 + integrity sha512-VwC/bgAAziH1WiQG0QdjuNIxwlvA/rTFCMQuWQ5VCUHXdxoYb8n0pA/u1/dDP7D7yR1myxUvYZe97wAbJxfscw==
9229 dependencies: 9248 dependencies:
9230 debug "^4.3.2" 9249 debug "^4.3.2"
9231 fast-glob "^3.2.5" 9250 fast-glob "^3.2.5"
9232 pretty-bytes "^5.5.0" 9251 pretty-bytes "^5.5.0"
9233 - workbox-build "^6.0.2" 9252 + workbox-build "^6.1.0"
9234 9253
9235 -vite-plugin-style-import@^0.5.5:  
9236 - version "0.5.5"  
9237 - resolved "https://registry.npmjs.org/vite-plugin-style-import/-/vite-plugin-style-import-0.5.5.tgz#a73847d4fb9079f404d39c5a7d463f2d8943f5a6"  
9238 - integrity sha512-C8ISIpUhwlMt8aYj76+QhnIQnJc5SSnYVvpyFKJxUQUDM8jZIeawlsrPdydk4Ff/sBLg8Ahq1f4TEA2AItJmbA== 9254 +vite-plugin-style-import@^0.6.6:
  9255 + version "0.6.6"
  9256 + resolved "https://registry.npmjs.org/vite-plugin-style-import/-/vite-plugin-style-import-0.6.6.tgz#ce5a8e10fcb52b6c0bdac6b2c14220d42c0e029e"
  9257 + integrity sha512-Kc8KKRAcKtxst+nxB0aPpo+SKzLozggS2RXnSqqoAXTogU5bJut9pgvSkP+qcalToDRBWe+DUt/YC3Oya/x06Q==
9239 dependencies: 9258 dependencies:
9240 "@rollup/pluginutils" "^4.1.0" 9259 "@rollup/pluginutils" "^4.1.0"
9241 change-case "^4.1.2" 9260 change-case "^4.1.2"
9242 es-module-lexer "^0.3.26" 9261 es-module-lexer "^0.3.26"
9243 magic-string "^0.25.7" 9262 magic-string "^0.25.7"
9244 9263
9245 -vite-plugin-theme@0.3.3:  
9246 - version "0.3.3"  
9247 - resolved "https://registry.npmjs.org/vite-plugin-theme/-/vite-plugin-theme-0.3.3.tgz#2f0bd6ae6cc7d018c70e02a6ac277f9d15b64d4a"  
9248 - integrity sha512-tsA4fdnRw+6gBQ3Y17JvGRh/LFOKm9V7cYiV8+E5s06+U1g6XCS9GznEF3Hij+u2Dq3v9HudhwqwXKRO9ep4dw== 9264 +vite-plugin-theme@0.3.8:
  9265 + version "0.3.8"
  9266 + resolved "https://registry.npmjs.org/vite-plugin-theme/-/vite-plugin-theme-0.3.8.tgz#621eebd977cce8bd60fc9cdf516f23bf33a64328"
  9267 + integrity sha512-skxGc8zawhgTNt3QeivDOfRtNXg74dP6UnBexcefhOPskQN0s3Y1EjHEsD6/AAeLL/rd5QPnTm4OdrPJUfVD7g==
9249 dependencies: 9268 dependencies:
9250 "@types/tinycolor2" "^1.4.2" 9269 "@types/tinycolor2" "^1.4.2"
9251 clean-css "^4.2.3" 9270 clean-css "^4.2.3"
@@ -9350,6 +9369,20 @@ warning@^4.0.0: @@ -9350,6 +9369,20 @@ warning@^4.0.0:
9350 dependencies: 9369 dependencies:
9351 loose-envify "^1.0.0" 9370 loose-envify "^1.0.0"
9352 9371
  9372 +webidl-conversions@^4.0.2:
  9373 + version "4.0.2"
  9374 + resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
  9375 + integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
  9376 +
  9377 +whatwg-url@^7.0.0:
  9378 + version "7.1.0"
  9379 + resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06"
  9380 + integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==
  9381 + dependencies:
  9382 + lodash.sortby "^4.7.0"
  9383 + tr46 "^1.0.1"
  9384 + webidl-conversions "^4.0.2"
  9385 +
9353 which-module@^2.0.0: 9386 which-module@^2.0.0:
9354 version "2.0.0" 9387 version "2.0.0"
9355 resolved "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" 9388 resolved "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
@@ -9394,24 +9427,24 @@ wordwrap@^1.0.0: @@ -9394,24 +9427,24 @@ wordwrap@^1.0.0:
9394 resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" 9427 resolved "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
9395 integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= 9428 integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
9396 9429
9397 -workbox-background-sync@^6.0.2:  
9398 - version "6.0.2"  
9399 - resolved "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.0.2.tgz#9205f5ef7fbf68203b925bdc85bdaa31a34fbbe6"  
9400 - integrity sha512-KQU2ntvbvFoBvCRm+EDpWAaykt4u/oaF5j3C6io0dZVWhFc/ZwgYDii8fb34LTenug3VPWQELdw9dNBCoP4b0w== 9430 +workbox-background-sync@^6.1.0:
  9431 + version "6.1.0"
  9432 + resolved "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.1.0.tgz#817de1ac1546fb6035759f151b0b4c5f0d3d9506"
  9433 + integrity sha512-A7YWWmAqzLkWYqqxzxoX4mciVjdSHpfX+JMADXoJ9SoLb6l/QReNJE+CNPew+gGPH6JLKNjZeecDmUpXFhzFPA==
9401 dependencies: 9434 dependencies:
9402 - workbox-core "^6.0.2" 9435 + workbox-core "^6.1.0"
9403 9436
9404 -workbox-broadcast-update@^6.0.2:  
9405 - version "6.0.2"  
9406 - resolved "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.0.2.tgz#fc034277e631e4193dcee9f6b0a77e415b4ddefb"  
9407 - integrity sha512-yCXYEln7nU8FkMDysYQPirpgFXtsdBtxruHbvZzRsxMHvAELf3j/o6Ufae1zjl8XanLF696sqSNxehpCGSD6tw== 9437 +workbox-broadcast-update@^6.1.0:
  9438 + version "6.1.0"
  9439 + resolved "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.1.0.tgz#63c1dc2d519aa6a7b9ce1db2f8da3e1db45b3422"
  9440 + integrity sha512-70G821I1Lb4Ex+rcjfKCbuFJ4WL4RSQsqvcByt/bLpPTTLoE6+VvLX3+1QtSK8P2+NmOsKkAqx9qiQkUdGbaYw==
9408 dependencies: 9441 dependencies:
9409 - workbox-core "^6.0.2" 9442 + workbox-core "^6.1.0"
9410 9443
9411 -workbox-build@^6.0.2:  
9412 - version "6.0.2"  
9413 - resolved "https://registry.npmjs.org/workbox-build/-/workbox-build-6.0.2.tgz#a23eebd6556cf473fedda77c08421b2d093efc32"  
9414 - integrity sha512-Dukbt+p62Yzb12SXAmycTYvHngJ8aRtXy3hymsC8B6gxTCZmCZ0u5JuKhu7lNLbDwDkYE78lhFvT9SF+MXFz5A== 9444 +workbox-build@^6.1.0:
  9445 + version "6.1.0"
  9446 + resolved "https://registry.npmjs.org/workbox-build/-/workbox-build-6.1.0.tgz#e0ba4a0004da1079e934c7452c72c92ef7b52cba"
  9447 + integrity sha512-xJPqTEf+Pg9KAoTrNeVWpMjqi4cJIRn14i02bZjjbHsLNN38qrqc8xwAW48TwoPCYLjp104ST164/3RDgrc7yw==
9415 dependencies: 9448 dependencies:
9416 "@babel/core" "^7.11.1" 9449 "@babel/core" "^7.11.1"
9417 "@babel/preset-env" "^7.11.0" 9450 "@babel/preset-env" "^7.11.0"
@@ -9429,125 +9462,125 @@ workbox-build@^6.0.2: @@ -9429,125 +9462,125 @@ workbox-build@^6.0.2:
9429 pretty-bytes "^5.3.0" 9462 pretty-bytes "^5.3.0"
9430 rollup "^2.25.0" 9463 rollup "^2.25.0"
9431 rollup-plugin-terser "^7.0.0" 9464 rollup-plugin-terser "^7.0.0"
9432 - source-map "^0.7.3" 9465 + source-map "^0.8.0-beta.0"
9433 source-map-url "^0.4.0" 9466 source-map-url "^0.4.0"
9434 stringify-object "^3.3.0" 9467 stringify-object "^3.3.0"
9435 strip-comments "^2.0.1" 9468 strip-comments "^2.0.1"
9436 tempy "^0.6.0" 9469 tempy "^0.6.0"
9437 upath "^1.2.0" 9470 upath "^1.2.0"
9438 - workbox-background-sync "^6.0.2"  
9439 - workbox-broadcast-update "^6.0.2"  
9440 - workbox-cacheable-response "^6.0.2"  
9441 - workbox-core "^6.0.2"  
9442 - workbox-expiration "^6.0.2"  
9443 - workbox-google-analytics "^6.0.2"  
9444 - workbox-navigation-preload "^6.0.2"  
9445 - workbox-precaching "^6.0.2"  
9446 - workbox-range-requests "^6.0.2"  
9447 - workbox-recipes "^6.0.2"  
9448 - workbox-routing "^6.0.2"  
9449 - workbox-strategies "^6.0.2"  
9450 - workbox-streams "^6.0.2"  
9451 - workbox-sw "^6.0.2"  
9452 - workbox-window "^6.0.2"  
9453 -  
9454 -workbox-cacheable-response@^6.0.2:  
9455 - version "6.0.2"  
9456 - resolved "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.0.2.tgz#00b1133c4c846a2874f32ae14206c0636bacfd87"  
9457 - integrity sha512-OrgFiYWkmFXDIbNRYSu+fchcfoZqyJ4yZbdc8WKUjr9v/MghKHfR9u7UI077xBkjno5J3YNpbwx73/no3HkrzA== 9471 + workbox-background-sync "^6.1.0"
  9472 + workbox-broadcast-update "^6.1.0"
  9473 + workbox-cacheable-response "^6.1.0"
  9474 + workbox-core "^6.1.0"
  9475 + workbox-expiration "^6.1.0"
  9476 + workbox-google-analytics "^6.1.0"
  9477 + workbox-navigation-preload "^6.1.0"
  9478 + workbox-precaching "^6.1.0"
  9479 + workbox-range-requests "^6.1.0"
  9480 + workbox-recipes "^6.1.0"
  9481 + workbox-routing "^6.1.0"
  9482 + workbox-strategies "^6.1.0"
  9483 + workbox-streams "^6.1.0"
  9484 + workbox-sw "^6.1.0"
  9485 + workbox-window "^6.1.0"
  9486 +
  9487 +workbox-cacheable-response@^6.1.0:
  9488 + version "6.1.0"
  9489 + resolved "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.1.0.tgz#a99fdfe1507848486579df7b204c30e4cd0a74f2"
  9490 + integrity sha512-oDAi0vXHGaE5p9NOo4N180UTcEKm6t2JMgmlrq0PkEW2PZEu9YR/atSnCwzMW7xpDqpKWaQr/LGP4+eixS8gcA==
9458 dependencies: 9491 dependencies:
9459 - workbox-core "^6.0.2" 9492 + workbox-core "^6.1.0"
9460 9493
9461 -workbox-core@^6.0.2:  
9462 - version "6.0.2"  
9463 - resolved "https://registry.npmjs.org/workbox-core/-/workbox-core-6.0.2.tgz#2f865cfe633890b4210fd6d6fdb049a6daed0914"  
9464 - integrity sha512-Ksl6qeikGb+BOCILoCUJGxwlEQOeeqdpOnpOr9UDt3NtacPYbfYBmpYpKArw5DFWK+5geBsFqgUUlXThlCYfKQ== 9494 +workbox-core@^6.1.0:
  9495 + version "6.1.0"
  9496 + resolved "https://registry.npmjs.org/workbox-core/-/workbox-core-6.1.0.tgz#2671b64f76550e83a4c2202676b67ce372e10881"
  9497 + integrity sha512-s3KqTJfBreO4xCZpR2LB5p/EknAx8eg0QumKiIgxM4hRO0RtwS2pJvTieNEM23X3RqxRhqweriLD8To19KUvjg==
9465 9498
9466 -workbox-expiration@^6.0.2:  
9467 - version "6.0.2"  
9468 - resolved "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.0.2.tgz#ac01e8d17f48daa31dc0872c09ee6f4d2cf28ccb"  
9469 - integrity sha512-6+nbR18cklAdI3BPT675ytftXPwnVbXGR8mPWNWTJtl5y2urRYv56ZOJLD7FBFVkZ8EjWiRhNP/A0fkxgdKtWQ== 9499 +workbox-expiration@^6.1.0:
  9500 + version "6.1.0"
  9501 + resolved "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.1.0.tgz#cf6bb384e49d0c92b79233c46671d9c6d82478a2"
  9502 + integrity sha512-jp2xGk+LC4AhCoOxO/bC06GQkq/oVp0ZIf1zXLQh6OD2fWZPkXNjLLSuDnjXoGGPibYrq7gEE/xjAdYGjNWl1A==
9470 dependencies: 9503 dependencies:
9471 - workbox-core "^6.0.2" 9504 + workbox-core "^6.1.0"
9472 9505
9473 -workbox-google-analytics@^6.0.2:  
9474 - version "6.0.2"  
9475 - resolved "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.0.2.tgz#7e3641adb30a3acb25006b244035631cf6f65019"  
9476 - integrity sha512-xmYJurR1M6Pzc2SBM/E7AgwmBszhu/YYDzBnU+HJPZFLbTG97ASIJyTXV1vcczA/dNaS0miIf0cFqneozVlDRw== 9506 +workbox-google-analytics@^6.1.0:
  9507 + version "6.1.0"
  9508 + resolved "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.1.0.tgz#cd34100536250abc54070bcc23603213eb8e47e4"
  9509 + integrity sha512-BuUAJ747bMPC6IOKaQBXfotGybOfeHDRIC8ElF65ouB4O9kUJ3zh4EFxXmmJLgzTnji6265gXqNWcfuGiidk6A==
9477 dependencies: 9510 dependencies:
9478 - workbox-background-sync "^6.0.2"  
9479 - workbox-core "^6.0.2"  
9480 - workbox-routing "^6.0.2"  
9481 - workbox-strategies "^6.0.2" 9511 + workbox-background-sync "^6.1.0"
  9512 + workbox-core "^6.1.0"
  9513 + workbox-routing "^6.1.0"
  9514 + workbox-strategies "^6.1.0"
9482 9515
9483 -workbox-navigation-preload@^6.0.2:  
9484 - version "6.0.2"  
9485 - resolved "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.0.2.tgz#bfd9c61096be921b830153a3004b7212220748dc"  
9486 - integrity sha512-7+ojLrjXmTFZBfGmUQIcBWB+xrFgXLMJGNQAtxT7Ta9A23rEWo8jqAgeuwAylebcORUlM+ztgYTV7eGp+AD+Yg== 9516 +workbox-navigation-preload@^6.1.0:
  9517 + version "6.1.0"
  9518 + resolved "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.1.0.tgz#e36d19f0d49ab5277e6c4e13b92f40da8955d62f"
  9519 + integrity sha512-N0c5Kmzu7lPKvirukbeZ3lN8KEAZU9xA4b1wmpV0VXUfRXVEk2ayXXqwHwMGFVi6FNCHiDLOcC8a2zW5kFLAeg==
9487 dependencies: 9520 dependencies:
9488 - workbox-core "^6.0.2" 9521 + workbox-core "^6.1.0"
9489 9522
9490 -workbox-precaching@^6.0.2:  
9491 - version "6.0.2"  
9492 - resolved "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.0.2.tgz#cb45f290b0604bef1d9fc96bf42df82385d54e54"  
9493 - integrity sha512-sqKWL2emzmGnfJpna+9RjUkUiqQO++AKfwljCbgkHg8wBbVLy/rnui3eelKgAI7D8R31LJFfiZkY/kXmwkjtlQ== 9523 +workbox-precaching@^6.1.0:
  9524 + version "6.1.0"
  9525 + resolved "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.1.0.tgz#9ee3d28f27cd78daa62f5bd6a0d33f5682ac97a7"
  9526 + integrity sha512-zjye8MVzieBVJ3sS0hFcbKLp7pTHMfJM17YqxCxB0KykXWnxLOpYnStQ9M+bjWJsKJOQvbkPqvq5u9+mtA923g==
9494 dependencies: 9527 dependencies:
9495 - workbox-core "^6.0.2"  
9496 - workbox-routing "^6.0.2"  
9497 - workbox-strategies "^6.0.2" 9528 + workbox-core "^6.1.0"
  9529 + workbox-routing "^6.1.0"
  9530 + workbox-strategies "^6.1.0"
9498 9531
9499 -workbox-range-requests@^6.0.2:  
9500 - version "6.0.2"  
9501 - resolved "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.0.2.tgz#3b50cbe8ddaaed7e3bfaa2dfdcd6a22e02fe7770"  
9502 - integrity sha512-qCrDbH9AzDbCErde71Nys2iNZO9I9M9Jgl/9/Q67dGQVwFsEq73SuIzS2DGIBKqtIdC5QUigC3d7XJONajclUQ== 9532 +workbox-range-requests@^6.1.0:
  9533 + version "6.1.0"
  9534 + resolved "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.1.0.tgz#5fbe9edfbcdb97153ed5260575a54e53b0f85a2d"
  9535 + integrity sha512-BO025BdAvc6vTBXJfkfibcikMFLmLRECt0FrVrTiiQafdO3jWH9qX9zTdrjYf6GkiIjvejvvmSYegwU1mL6N3Q==
9503 dependencies: 9536 dependencies:
9504 - workbox-core "^6.0.2" 9537 + workbox-core "^6.1.0"
9505 9538
9506 -workbox-recipes@^6.0.2:  
9507 - version "6.0.2"  
9508 - resolved "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.0.2.tgz#ad4b3f26a71a7396004c4f617af318f3fd072208"  
9509 - integrity sha512-ewZIHO4jYE6bnEeUIYS6joQy3l+MydpOsVr2F6EpE8ps++z1ScbSdLtJU+yu6WuO3lH44HFZLeFxYQqYm50QAA== 9539 +workbox-recipes@^6.1.0:
  9540 + version "6.1.0"
  9541 + resolved "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.1.0.tgz#b925f2727ace05ce8762a1b6da6c0d749fd687ee"
  9542 + integrity sha512-r8YLtMtQnvfkK1htnfrrX1CxKHglZJiVlqnct9rYIU17n2LCalHdI0zQrPqzYdLLHZxTX25UpBsdib0cAATy0A==
9510 dependencies: 9543 dependencies:
9511 - workbox-cacheable-response "^6.0.2"  
9512 - workbox-core "^6.0.2"  
9513 - workbox-expiration "^6.0.2"  
9514 - workbox-precaching "^6.0.2"  
9515 - workbox-routing "^6.0.2"  
9516 - workbox-strategies "^6.0.2" 9544 + workbox-cacheable-response "^6.1.0"
  9545 + workbox-core "^6.1.0"
  9546 + workbox-expiration "^6.1.0"
  9547 + workbox-precaching "^6.1.0"
  9548 + workbox-routing "^6.1.0"
  9549 + workbox-strategies "^6.1.0"
9517 9550
9518 -workbox-routing@^6.0.2:  
9519 - version "6.0.2"  
9520 - resolved "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.0.2.tgz#8380bc322a2b1c44978df8ff6ae4e4d723f4e3f8"  
9521 - integrity sha512-iQ9ch3fL1YpztDLfHNURaHQ0ispgPCdzWmZZhtSHUyy/+YkTlIiDVTbOQCIpHIrWlKQiim6X3K2ItIy1FW9+wA== 9551 +workbox-routing@^6.1.0:
  9552 + version "6.1.0"
  9553 + resolved "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.1.0.tgz#f885cb7801e2c9c5678f197656cf27a2b649c1d5"
  9554 + integrity sha512-FXQ5cwb6Mk90fC0rfQLX0pN+r/N4eBafwkh/QanJUq0e6jMPdDFLrlsikZL/0LcXEx+yAkWLytoiS+d2HOEBOw==
9522 dependencies: 9555 dependencies:
9523 - workbox-core "^6.0.2" 9556 + workbox-core "^6.1.0"
9524 9557
9525 -workbox-strategies@^6.0.2:  
9526 - version "6.0.2"  
9527 - resolved "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.0.2.tgz#f4383e2e5d46c1546e6e08048c9f5c9a7beb5137"  
9528 - integrity sha512-HjLnYCVS60U7OKhl5NIq8NAQXrotJQRDakmIONnRlQIlP2If/kAiQSUP3QCHMq4EeXGiF+/CdlR1/bhYBHZzZg== 9558 +workbox-strategies@^6.1.0:
  9559 + version "6.1.0"
  9560 + resolved "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.1.0.tgz#9ddcee44408d2fb403f22a7989803b5c58560590"
  9561 + integrity sha512-HvUknzJdZWeV3x7Eq33a7TGAv9/r1TEiQK6kQ1QNzN+IKiqhIjnhKFHmMxb5hK1Gw9/aDSJTLNPDaLPfIJRQFQ==
9529 dependencies: 9562 dependencies:
9530 - workbox-core "^6.0.2" 9563 + workbox-core "^6.1.0"
9531 9564
9532 -workbox-streams@^6.0.2:  
9533 - version "6.0.2"  
9534 - resolved "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.0.2.tgz#07c19025af309ad3475e737018a05ed538bffacd"  
9535 - integrity sha512-bckftu/iMlg5LFXPZ6NX/FUc/w4illgxSuwtsZkQAO6Uen1EeegjfLyenO01/dwoyc3D/AlZepMdhv87XhE7HQ== 9565 +workbox-streams@^6.1.0:
  9566 + version "6.1.0"
  9567 + resolved "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.1.0.tgz#2dbc78ddc863b47aa4fe399d9385d3ed8567e881"
  9568 + integrity sha512-V80OIfoIXaDkjWIGFSae5sBJuaG2r4bXk6HKpntBYaVQ72LD1CgkXRmZKmLJQ9ltHCx9Vmq/7+q1OF5mTKb8Qw==
9536 dependencies: 9569 dependencies:
9537 - workbox-core "^6.0.2"  
9538 - workbox-routing "^6.0.2" 9570 + workbox-core "^6.1.0"
  9571 + workbox-routing "^6.1.0"
9539 9572
9540 -workbox-sw@^6.0.2:  
9541 - version "6.0.2"  
9542 - resolved "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.0.2.tgz#cd1b8b02ceaaf1abe5804936158a87ec605d271e"  
9543 - integrity sha512-EoOjbyy5bpoBoSqt2PIeDOZ/JJ41f+WJjb979PkfIUWw4F+F/w2uKJJrMA5fk+nWnVge83Fwy8nF3dWNsqOrdg== 9573 +workbox-sw@^6.1.0:
  9574 + version "6.1.0"
  9575 + resolved "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.1.0.tgz#dfaca1029264af71f13a90fdfb16cf8d64ed0537"
  9576 + integrity sha512-e2jnIWSmNrpO9Psy4D6euDdRUW8FTXAdMxOj5O02gxa01fri1kfTSM9irDnTGKUiSGc+hlycsvzGdr8bnvzDiA==
9544 9577
9545 -workbox-window@^6.0.2:  
9546 - version "6.0.2"  
9547 - resolved "https://registry.npmjs.org/workbox-window/-/workbox-window-6.0.2.tgz#9b47fdb7c088aa4e8b7d0c6cfda17c8bfca6bf7f"  
9548 - integrity sha512-I/X+qUh1AwN9x/MxFbXsPn7DA27BMtzkXo55w1tBD8V54fv8nUCeC5E4RpXt/mlgdSwBztnURCQTWsdhTrSUjg== 9578 +workbox-window@^6.1.0:
  9579 + version "6.1.0"
  9580 + resolved "https://registry.npmjs.org/workbox-window/-/workbox-window-6.1.0.tgz#5856127f183bcccfd93655b0e3cba5f2432b9156"
  9581 + integrity sha512-sjnE+nTSnrBvYx5KmpESvsTC82P3yy8h5l4Ae4Q8uLqdH29UQ3bMd8puGVVhX1JZFCmV40cvrbZ1fUj+3/TQ9g==
9549 dependencies: 9582 dependencies:
9550 - workbox-core "^6.0.2" 9583 + workbox-core "^6.1.0"
9551 9584
9552 wrap-ansi@^5.1.0: 9585 wrap-ansi@^5.1.0:
9553 version "5.1.0" 9586 version "5.1.0"