🌐 AI搜索 & 代理 主页
Skip to content

Commit bfa65fc

Browse files
authored
Merge branch 'dev' into fix-b-table-sort-handling-for-numeric-string-values
2 parents ea22414 + 2700ebd commit bfa65fc

File tree

2 files changed

+27
-26
lines changed

2 files changed

+27
-26
lines changed

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@
9999
"@babel/standalone": "^7.12.9",
100100
"@nuxt/content": "^1.11.1",
101101
"@nuxtjs/google-analytics": "^2.4.0",
102-
"@nuxtjs/pwa": "^3.2.2",
102+
"@nuxtjs/pwa": "^3.3.1",
103103
"@nuxtjs/robots": "^2.4.2",
104104
"@nuxtjs/sitemap": "^2.4.0",
105105
"@testing-library/jest-dom": "^5.11.6",
106106
"@vue/test-utils": "^1.1.1",
107-
"autoprefixer": "^10.0.3",
107+
"autoprefixer": "^10.0.4",
108108
"babel-core": "^7.0.0-bridge.0",
109109
"babel-eslint": "^10.1.0",
110110
"babel-jest": "^26.6.3",
@@ -143,14 +143,14 @@
143143
"postcss-cli": "^8.3.0",
144144
"prettier": "1.14.3",
145145
"require-context": "^1.1.0",
146-
"rollup": "^2.33.3",
146+
"rollup": "^2.34.0",
147147
"rollup-plugin-babel": "^4.4.0",
148148
"rollup-plugin-commonjs": "^10.1.0",
149149
"rollup-plugin-node-resolve": "^5.2.0",
150150
"sass": "^1.29.0",
151151
"sass-loader": "^10.1.0",
152152
"standard-version": "^9.0.0",
153-
"terser": "^5.5.0",
153+
"terser": "^5.5.1",
154154
"vue": "^2.6.12",
155155
"vue-jest": "^3.0.7",
156156
"vue-router": "^3.4.9",

yarn.lock

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1553,18 +1553,19 @@
15531553
dependencies:
15541554
vue-analytics "^5.22.1"
15551555

1556-
"@nuxtjs/pwa@^3.2.2":
1557-
version "3.2.2"
1558-
resolved "https://registry.yarnpkg.com/@nuxtjs/pwa/-/pwa-3.2.2.tgz#e03c632e30f3df287a842d67323d945f36b97440"
1559-
integrity sha512-B+2VKwmaw40Wyds0hOKuN9R8ODHg7de8B7uQbzaZpLNuCinfKioQOk8jjaLDKRf4sndNG4AYI90Et4M+MRQetQ==
1556+
"@nuxtjs/pwa@^3.3.1":
1557+
version "3.3.1"
1558+
resolved "https://registry.yarnpkg.com/@nuxtjs/pwa/-/pwa-3.3.1.tgz#1056d9b2c52201094ff0683e2ee652a15cc701ab"
1559+
integrity sha512-XQGRooqZl9kEQLNC+FtsJyG5ZbeeTGrtme4Yr12XpJPvPfrwN2a4BkCS+ucNGbkDV9yxRtGtj04rIXLqsuMAkQ==
15601560
dependencies:
1561-
defu "^3.1.0"
1562-
execa "^4.0.3"
1561+
defu "^3.2.2"
1562+
execa "^4.1.0"
15631563
fs-extra "^9.0.1"
15641564
hasha "^5.2.2"
15651565
jimp-compact "^0.16.1"
15661566
lodash.template "^4.5.0"
1567-
workbox-cdn "^5.1.3"
1567+
serve-static "^1.14.1"
1568+
workbox-cdn "^5.1.4"
15681569

15691570
"@nuxtjs/robots@^2.4.2":
15701571
version "2.4.2"
@@ -2744,10 +2745,10 @@ atob@^2.1.2:
27442745
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
27452746
integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
27462747

2747-
autoprefixer@^10.0.3:
2748-
version "10.0.3"
2749-
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.0.3.tgz#43c8fb60ab095f4b6ff7bc5d24cd05925112f2ce"
2750-
integrity sha512-SIUDNQlGARsfL69nsmi7OKnDtz1HVwPAiYPGn1Nv9eLMpBywXK5DNwAnvTq6aTjuPx3XKPl2boCQRYcThjJa2A==
2748+
autoprefixer@^10.0.4:
2749+
version "10.0.4"
2750+
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.0.4.tgz#f87ac6105d7861e31af794b8ebb1c6d4390d3d55"
2751+
integrity sha512-hmjYejN/WTyPP9cdNmiwtwqM8/ACVJPD5ExtwoOceQohNbgnFNiwpL2+U4bXS8aXozBL00WvH6WhqbuHf0Fgfg==
27512752
dependencies:
27522753
browserslist "^4.14.7"
27532754
caniuse-lite "^1.0.30001161"
@@ -4967,7 +4968,7 @@ defu@^2.0.4:
49674968
resolved "https://registry.yarnpkg.com/defu/-/defu-2.0.4.tgz#09659a6e87a8fd7178be13bd43e9357ebf6d1c46"
49684969
integrity sha512-G9pEH1UUMxShy6syWk01VQSRVs3CDWtlxtZu7A+NyqjxaCA4gSlWAKDBx6QiUEKezqS8+DUlXLI14Fp05Hmpwg==
49694970

4970-
defu@^3.1.0, defu@^3.2.2:
4971+
defu@^3.2.2:
49714972
version "3.2.2"
49724973
resolved "https://registry.yarnpkg.com/defu/-/defu-3.2.2.tgz#be20f4cc49b9805d54ee6b610658d53894942e97"
49734974
integrity sha512-8UWj5lNv7HD+kB0e9w77Z7TdQlbUYDVWqITLHNqFIn6khrNHv5WQo38Dcm1f6HeNyZf0U7UbPf6WeZDSdCzGDQ==
@@ -5791,7 +5792,7 @@ execa@^3.4.0:
57915792
signal-exit "^3.0.2"
57925793
strip-final-newline "^2.0.0"
57935794

5794-
execa@^4.0.0, execa@^4.0.3, execa@^4.1.0:
5795+
execa@^4.0.0, execa@^4.1.0:
57955796
version "4.1.0"
57965797
resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
57975798
integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
@@ -12222,10 +12223,10 @@ rollup-pluginutils@^2.8.1:
1222212223
dependencies:
1222312224
estree-walker "^0.6.1"
1222412225

12225-
rollup@^2.33.3:
12226-
version "2.33.3"
12227-
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.33.3.tgz#ae72ce31f992b09a580072951bfea76e9df17342"
12228-
integrity sha512-RpayhPTe4Gu/uFGCmk7Gp5Z9Qic2VsqZ040G+KZZvsZYdcuWaJg678JeDJJvJeEQXminu24a2au+y92CUWVd+w==
12226+
rollup@^2.34.0:
12227+
version "2.34.0"
12228+
resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.34.0.tgz#ecc7f1d4ce2cb88bb51bec2f56b984f3c35b8271"
12229+
integrity sha512-dW5iLvttZzdVehjEuNJ1bWvuMEJjOWGmnuFS82WeKHTGXDkRHQeq/ExdifkSyJv9dLcR86ysKRmrIDyR6O0X8g==
1222912230
optionalDependencies:
1223012231
fsevents "~2.1.2"
1223112232

@@ -13329,10 +13330,10 @@ terser@^4.1.2, terser@^4.3.9, terser@^4.6.12, terser@^4.6.3:
1332913330
source-map "~0.6.1"
1333013331
source-map-support "~0.5.12"
1333113332

13332-
terser@^5.5.0:
13333-
version "5.5.0"
13334-
resolved "https://registry.yarnpkg.com/terser/-/terser-5.5.0.tgz#1406fcb4d4bc517add3b22a9694284c040e33448"
13335-
integrity sha512-eopt1Gf7/AQyPhpygdKePTzaet31TvQxXvrf7xYUvD/d8qkCJm4SKPDzu+GHK5ZaYTn8rvttfqaZc3swK21e5g==
13333+
terser@^5.5.1:
13334+
version "5.5.1"
13335+
resolved "https://registry.yarnpkg.com/terser/-/terser-5.5.1.tgz#540caa25139d6f496fdea056e414284886fb2289"
13336+
integrity sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ==
1333613337
dependencies:
1333713338
commander "^2.20.0"
1333813339
source-map "~0.7.2"
@@ -14528,7 +14529,7 @@ wordwrap@^1.0.0:
1452814529
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
1452914530
integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
1453014531

14531-
workbox-cdn@^5.1.3:
14532+
workbox-cdn@^5.1.4:
1453214533
version "5.1.4"
1453314534
resolved "https://registry.yarnpkg.com/workbox-cdn/-/workbox-cdn-5.1.4.tgz#dbd8acee70b1978be70106207590bbb76af935cf"
1453414535
integrity sha512-04gM3mi8QGutokkSaA9xunVfjURnLbo9TTWyi8+pSDCEW5cD8u5GbJiliLK1vB9CShk/9OY1UDfW+XcmD+d6KQ==

0 commit comments

Comments
 (0)