Skip to content

Commit 862fed4

Browse files
committed
fix lodash bug
1 parent d265f4a commit 862fed4

File tree

3 files changed

+14
-26
lines changed

3 files changed

+14
-26
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"css-loader": "^1.0.1",
4949
"html-webpack-plugin": "^3.2.0",
5050
"mini-css-extract-plugin": "^0.4.4",
51-
"node-sass": "^4.10.0",
51+
"node-sass": "^4.12.0",
5252
"optimize-css-assets-webpack-plugin": "^5.0.1",
5353
"postcss-loader": "^3.0.0",
5454
"react-hot-loader": "^4.3.12",

src/routes/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ const Routes = (authorized: boolean) => <Suspense fallback={<Loading/>}>
177177
routes.map(r => {
178178
const {path, exact, component} = r
179179
const LazyCom = component
180-
return <Route key={path + ''} exact={exact} path={path} render={(props: any) => (authorized ? <LazyCom {...props}/> : <Redirect to="/login"/>)}/>
180+
return <Route key={path + ''} exact={!!exact} path={path} render={(props: any) => (authorized ? <LazyCom {...props}/> : <Redirect to="/login"/>)}/>
181181
})
182182
}
183183
</Switch>

yarn.lock

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4479,16 +4479,6 @@ lodash._reinterpolate@~3.0.0:
44794479
resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
44804480
integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
44814481

4482-
lodash.assign@^4.2.0:
4483-
version "4.2.0"
4484-
resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
4485-
integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
4486-
4487-
lodash.clonedeep@^4.3.2:
4488-
version "4.5.0"
4489-
resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
4490-
integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
4491-
44924482
lodash.debounce@^4.0.0, lodash.debounce@^4.0.8:
44934483
version "4.0.8"
44944484
resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
@@ -4523,11 +4513,6 @@ lodash.memoize@^4.1.2:
45234513
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
45244514
integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
45254515

4526-
lodash.mergewith@^4.6.0:
4527-
version "4.6.1"
4528-
resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
4529-
integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==
4530-
45314516
lodash.tail@^4.1.1:
45324517
version "4.1.1"
45334518
resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
@@ -4929,7 +4914,12 @@ mutationobserver-shim@^0.3.2:
49294914
resolved "https://registry.yarnpkg.com/mutationobserver-shim/-/mutationobserver-shim-0.3.2.tgz#f4d5dae7a4971a2207914fb5a90ebd514b65acca"
49304915
integrity sha1-9NXa56SXGiIHkU+1qQ69UUtlrMo=
49314916

4932-
nan@^2.10.0, nan@^2.9.2:
4917+
nan@^2.13.2:
4918+
version "2.14.0"
4919+
resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
4920+
integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
4921+
4922+
nan@^2.9.2:
49334923
version "2.11.1"
49344924
resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.1.tgz#90e22bccb8ca57ea4cd37cc83d3819b52eea6766"
49354925
integrity sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==
@@ -5072,10 +5062,10 @@ node-releases@^1.0.5:
50725062
dependencies:
50735063
semver "^5.3.0"
50745064

5075-
node-sass@^4.10.0:
5076-
version "4.10.0"
5077-
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.10.0.tgz#dcc2b364c0913630945ccbf7a2bbf1f926effca4"
5078-
integrity sha512-fDQJfXszw6vek63Fe/ldkYXmRYK/QS6NbvM3i5oEo9ntPDy4XX7BcKZyTKv+/kSSxRtXXc7l+MSwEmYc0CSy6Q==
5065+
node-sass@^4.12.0:
5066+
version "4.12.0"
5067+
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz#0914f531932380114a30cc5fa4fa63233a25f017"
5068+
integrity sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==
50795069
dependencies:
50805070
async-foreach "^0.1.3"
50815071
chalk "^1.1.1"
@@ -5084,12 +5074,10 @@ node-sass@^4.10.0:
50845074
get-stdin "^4.0.1"
50855075
glob "^7.0.3"
50865076
in-publish "^2.0.0"
5087-
lodash.assign "^4.2.0"
5088-
lodash.clonedeep "^4.3.2"
5089-
lodash.mergewith "^4.6.0"
5077+
lodash "^4.17.11"
50905078
meow "^3.7.0"
50915079
mkdirp "^0.5.1"
5092-
nan "^2.10.0"
5080+
nan "^2.13.2"
50935081
node-gyp "^3.8.0"
50945082
npmlog "^4.0.0"
50955083
request "^2.88.0"

0 commit comments

Comments
 (0)