Skip to content

Commit fbd7137

Browse files
Thomas Judd-CooperThomas Judd-Cooper
authored andcommitted
Uplift dependences and fix storybook build
1 parent b766f5a commit fbd7137

File tree

3 files changed

+34
-64
lines changed

3 files changed

+34
-64
lines changed

.storybook/storybook.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
@import '../node_modules/nhsuk-frontend/dist/nhsuk-3.0.2.min.css';
1+
@import '../node_modules/nhsuk-frontend/dist/nhsuk.css';

package.json

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
},
99
"license": "MIT",
1010
"devDependencies": {
11-
"@babel/cli": "^7.7.4",
12-
"@babel/core": "^7.8.3",
13-
"@babel/plugin-proposal-numeric-separator": "^7.7.4",
14-
"@babel/preset-react": "^7.8.3",
15-
"@babel/preset-typescript": "^7.7.4",
16-
"@storybook/addon-centered": "^5.3.9",
17-
"@storybook/addon-info": "^5.2.1",
18-
"@storybook/addon-storysource": "^5.3.3",
19-
"@storybook/react": "^5.2.1",
20-
"@storybook/storybook-deployer": "^2.8.1",
11+
"@babel/cli": "^7.10.1",
12+
"@babel/core": "^7.10.1",
13+
"@babel/plugin-proposal-numeric-separator": "^7.10.1",
14+
"@babel/preset-react": "^7.10.1",
15+
"@babel/preset-typescript": "^7.10.1",
16+
"@storybook/addon-centered": "^5.3.19",
17+
"@storybook/addon-info": "^5.3.19",
18+
"@storybook/addon-storysource": "^5.3.19",
19+
"@storybook/react": "^5.3.19",
20+
"@storybook/storybook-deployer": "^2.8.6",
2121
"@types/classnames": "^2.2.9",
2222
"@types/enzyme": "^3.10.3",
2323
"@types/enzyme-adapter-react-16": "^1.0.5",
@@ -26,8 +26,6 @@
2626
"@types/node": "^12.12.12",
2727
"@types/react": "^16.9.3",
2828
"@types/react-dom": "^16.9.3",
29-
"@types/storybook__react": "^4.0.2",
30-
"@types/styled-components": "^4.1.19",
3129
"@typescript-eslint/eslint-plugin": "^2.3.1",
3230
"@typescript-eslint/parser": "^2.3.1",
3331
"awesome-typescript-loader": "^5.2.1",
@@ -48,7 +46,7 @@
4846
"jest": "^24.9.0",
4947
"jest-axe": "^3.4.0",
5048
"nhsuk-frontend": "^3.1.0",
51-
"node-sass": "^4.12.0",
49+
"node-sass": "^4.14.1",
5250
"prettier": "^1.18.2",
5351
"react": "^16.9.3",
5452
"react-docgen-typescript-loader": "^3.2.1",
@@ -57,11 +55,11 @@
5755
"rollup-plugin-sass": "^1.2.2",
5856
"rollup-plugin-scss": "^1.0.2",
5957
"rollup-plugin-typescript2": "^0.24.2",
60-
"sass-loader": "^8.0.0",
58+
"sass-loader": "^8.0.2",
6159
"ts-jest": "^24.2.0",
6260
"ts-node": "^8.4.1",
63-
"tslib": "^1.10.0",
64-
"typescript": "^3.6.3"
61+
"tslib": "^2.0.0",
62+
"typescript": "^3.9.5"
6563
},
6664
"peerDependencies": {
6765
"nhsuk-frontend": "^3.0.0",

yarn.lock

Lines changed: 19 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# yarn lockfile v1
33

44

5-
"@babel/cli@^7.7.4":
5+
"@babel/cli@^7.10.1":
66
version "7.10.1"
77
resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.10.1.tgz#b6e5cd43a17b8f639442ab027976408ebe6d79a0"
88
integrity sha512-cVB+dXeGhMOqViIaZs3A9OUAe4pKw4SBNdMw6yHJMYR7s4TB+Cei7ThquV/84O19PdIFWuwe03vxxES0BHUm5g==
@@ -41,7 +41,7 @@
4141
invariant "^2.2.4"
4242
semver "^5.5.0"
4343

44-
"@babel/core@^7.1.0", "@babel/core@^7.4.5", "@babel/core@^7.7.5", "@babel/core@^7.8.3":
44+
"@babel/core@^7.1.0", "@babel/core@^7.10.1", "@babel/core@^7.4.5", "@babel/core@^7.7.5":
4545
version "7.10.2"
4646
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.2.tgz#bd6786046668a925ac2bd2fd95b579b92a23b36a"
4747
integrity sha512-KQmV9yguEjQsXqyOUGKjS4+3K8/DlOCE2pZcq4augdQmtTy5iv5EHtmMSJ7V4c1BIPjuwtZYqYLCq9Ga+hGBRQ==
@@ -338,7 +338,7 @@
338338
"@babel/helper-plugin-utils" "^7.10.1"
339339
"@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
340340

341-
"@babel/plugin-proposal-numeric-separator@^7.10.1", "@babel/plugin-proposal-numeric-separator@^7.7.4":
341+
"@babel/plugin-proposal-numeric-separator@^7.10.1":
342342
version "7.10.1"
343343
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.1.tgz#a9a38bc34f78bdfd981e791c27c6fdcec478c123"
344344
integrity sha512-jjfym4N9HtCiNfyyLAVD8WqPYeHUrw4ihxuAynWj6zzp2gf9Ey2f7ImhFm6ikB3CLf5Z/zmcJDri6B4+9j9RsA==
@@ -892,7 +892,7 @@
892892
"@babel/types" "^7.4.4"
893893
esutils "^2.0.2"
894894

895-
"@babel/preset-react@^7.0.0", "@babel/preset-react@^7.8.3":
895+
"@babel/preset-react@^7.0.0", "@babel/preset-react@^7.10.1":
896896
version "7.10.1"
897897
resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.10.1.tgz#e2ab8ae9a363ec307b936589f07ed753192de041"
898898
integrity sha512-Rw0SxQ7VKhObmFjD/cUcKhPTtzpeviEFX1E6PgP+cYOhQ98icNqtINNFANlsdbQHrmeWnqdxA4Tmnl1jy5tp3Q==
@@ -905,7 +905,7 @@
905905
"@babel/plugin-transform-react-jsx-source" "^7.10.1"
906906
"@babel/plugin-transform-react-pure-annotations" "^7.10.1"
907907

908-
"@babel/preset-typescript@^7.7.4":
908+
"@babel/preset-typescript@^7.10.1":
909909
version "7.10.1"
910910
resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.10.1.tgz#a8d8d9035f55b7d99a2461a0bdc506582914d07e"
911911
integrity sha512-m6GV3y1ShiqxnyQj10600ZVOFrSSAa8HQ3qIUk2r+gcGtHTIRw0dJnFLt1WNXpKjtVw7yw1DAPU/6ma2ZvgJuA==
@@ -1262,7 +1262,7 @@
12621262
prop-types "^15.6.1"
12631263
react-lifecycles-compat "^3.0.4"
12641264

1265-
"@storybook/addon-centered@^5.3.9":
1265+
"@storybook/addon-centered@^5.3.19":
12661266
version "5.3.19"
12671267
resolved "https://registry.yarnpkg.com/@storybook/addon-centered/-/addon-centered-5.3.19.tgz#2f9a162ec668128e887be418be95b068d1aeba6b"
12681268
integrity sha512-uOgGF0WGM8a15ap266zplG20F79DyPvGpqzYhLXvbrOlUn+13yit3kCZpL3V5to4iQKQjpVL5wj1RJI8ar+JZw==
@@ -1272,7 +1272,7 @@
12721272
global "^4.3.2"
12731273
util-deprecate "^1.0.2"
12741274

1275-
"@storybook/addon-info@^5.2.1":
1275+
"@storybook/addon-info@^5.3.19":
12761276
version "5.3.19"
12771277
resolved "https://registry.yarnpkg.com/@storybook/addon-info/-/addon-info-5.3.19.tgz#175af53ba54ddb8fe24b3c979206ffbbf42bc4f4"
12781278
integrity sha512-MiFLcyoOmwawquagQHkqiPHnvBOKrVaS/wnO1XyBvIHwkK+KN7CZ9l7HakA4SO76kugrY9OJYyi5YvEEdN6vww==
@@ -1293,7 +1293,7 @@
12931293
react-lifecycles-compat "^3.0.4"
12941294
util-deprecate "^1.0.2"
12951295

1296-
"@storybook/addon-storysource@^5.3.3":
1296+
"@storybook/addon-storysource@^5.3.19":
12971297
version "5.3.19"
12981298
resolved "https://registry.yarnpkg.com/@storybook/addon-storysource/-/addon-storysource-5.3.19.tgz#ae693e88db5d220cb256a9ef4a2366c300e8d88c"
12991299
integrity sha512-W7mIAHuxYT+b1huaHCHLkBAh2MbeWmF8CxeBCFiOgZaYYQUTDEh018HJF8u2AqiWSouRhcfzhTnGxOo0hNRBgw==
@@ -1531,7 +1531,7 @@
15311531
pretty-hrtime "^1.0.3"
15321532
regenerator-runtime "^0.13.3"
15331533

1534-
"@storybook/react@^5.2.1":
1534+
"@storybook/react@^5.3.19":
15351535
version "5.3.19"
15361536
resolved "https://registry.yarnpkg.com/@storybook/react/-/react-5.3.19.tgz#ad7e7a5538399e2794cdb5a1b844a2b77c10bd09"
15371537
integrity sha512-OBRUqol3YLQi/qE55x2pWkv4YpaAmmfj6/Km+7agx+og+oNQl0nnlXy7r27X/4j3ERczzURa5pJHtSjwiNaJNw==
@@ -1589,7 +1589,7 @@
15891589
prop-types "^15.7.2"
15901590
regenerator-runtime "^0.13.3"
15911591

1592-
"@storybook/storybook-deployer@^2.8.1":
1592+
"@storybook/storybook-deployer@^2.8.6":
15931593
version "2.8.6"
15941594
resolved "https://registry.yarnpkg.com/@storybook/storybook-deployer/-/storybook-deployer-2.8.6.tgz#00c2e84f27dfaa88cb0785361453f23b1ebb4ea3"
15951595
integrity sha512-Bpe7ZtsR5NUuohK3VsQa+nxEHtVxMZZo3DRlRUZW5IZOmzmvSID3i+jkizloG9xO7sw5zUvlD31YMHm7OtdrMA==
@@ -1846,14 +1846,6 @@
18461846
resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.6.tgz#ed8fc802c45b8e8f54419c2d054e55c9ea344356"
18471847
integrity sha512-GRTZLeLJ8ia00ZH8mxMO8t0aC9M1N9bN461Z2eaRurJo6Fpa+utgCwLzI4jQHcrdzuzp5WPN9jRwpsCQ1VhJ5w==
18481848

1849-
"@types/hoist-non-react-statics@*":
1850-
version "3.3.1"
1851-
resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f"
1852-
integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==
1853-
dependencies:
1854-
"@types/react" "*"
1855-
hoist-non-react-statics "^3.3.0"
1856-
18571849
"@types/html-minifier-terser@^5.0.0":
18581850
version "5.1.0"
18591851
resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.0.tgz#551a4589b6ee2cc9c1dff08056128aec29b94880"
@@ -1957,13 +1949,6 @@
19571949
dependencies:
19581950
"@types/react" "*"
19591951

1960-
"@types/react-native@*":
1961-
version "0.62.13"
1962-
resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.62.13.tgz#c688c5ae03e426f927f7e1fa1a59cd067f35d1c2"
1963-
integrity sha512-hs4/tSABhcJx+J8pZhVoXHrOQD89WFmbs8QiDLNSA9zNrD46pityAuBWuwk1aMjPk9I3vC5ewkJroVRHgRIfdg==
1964-
dependencies:
1965-
"@types/react" "*"
1966-
19671952
19681953
version "11.0.4"
19691954
resolved "https://registry.yarnpkg.com/@types/react-syntax-highlighter/-/react-syntax-highlighter-11.0.4.tgz#d86d17697db62f98046874f62fdb3e53a0bbc4cd"
@@ -1996,24 +1981,6 @@
19961981
resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
19971982
integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
19981983

1999-
"@types/storybook__react@^4.0.2":
2000-
version "4.0.2"
2001-
resolved "https://registry.yarnpkg.com/@types/storybook__react/-/storybook__react-4.0.2.tgz#f36fb399574c662e79c1a0cf6e429b6ff730da40"
2002-
integrity sha512-U/+J5qccRdKFryvHkk1a0IeZaSIZLCmTwAQhTSDGeC3SPNIYPus+EtunBqP49r870l8czbfxtjeC3IL9P66ngQ==
2003-
dependencies:
2004-
"@types/react" "*"
2005-
"@types/webpack-env" "*"
2006-
2007-
"@types/styled-components@^4.1.19":
2008-
version "4.4.3"
2009-
resolved "https://registry.yarnpkg.com/@types/styled-components/-/styled-components-4.4.3.tgz#74dd00ad760845a98890a8539361d8afc32059de"
2010-
integrity sha512-U0udeNOZBfUkJycmGJwmzun0FBt11rZy08weVQmE2xfUNAbX8AGOEWxWna2d+qAUKxKgMlcG+TZT0+K2FfDcnQ==
2011-
dependencies:
2012-
"@types/hoist-non-react-statics" "*"
2013-
"@types/react" "*"
2014-
"@types/react-native" "*"
2015-
csstype "^2.2.0"
2016-
20171984
"@types/tapable@*", "@types/tapable@^1.0.5":
20181985
version "1.0.5"
20191986
resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.5.tgz#9adbc12950582aa65ead76bffdf39fe0c27a3c02"
@@ -2026,7 +1993,7 @@
20261993
dependencies:
20271994
source-map "^0.6.1"
20281995

2029-
"@types/webpack-env@*", "@types/webpack-env@^1.15.0":
1996+
"@types/webpack-env@^1.15.0":
20301997
version "1.15.2"
20311998
resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.15.2.tgz#927997342bb9f4a5185a86e6579a0a18afc33b0a"
20321999
integrity sha512-67ZgZpAlhIICIdfQrB5fnDvaKFcDxpKibxznfYRVAT4mQE41Dido/3Ty+E3xGBmTogc5+0Qb8tWhna+5B8z1iQ==
@@ -8149,7 +8116,7 @@ node-releases@^1.1.29, node-releases@^1.1.53:
81498116
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.58.tgz#8ee20eef30fa60e52755fcc0942def5a734fe935"
81508117
integrity sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==
81518118

8152-
node-sass@4, node-sass@^4.12.0:
8119+
node-sass@4, node-sass@^4.14.1:
81538120
version "4.14.1"
81548121
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.14.1.tgz#99c87ec2efb7047ed638fb4c9db7f3a42e2217b5"
81558122
integrity sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==
@@ -10025,7 +9992,7 @@ [email protected]:
100259992
scss-tokenizer "^0.2.3"
100269993
yargs "^13.3.2"
100279994

10028-
sass-loader@^8.0.0:
9995+
sass-loader@^8.0.2:
100299996
version "8.0.2"
100309997
resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.2.tgz#debecd8c3ce243c76454f2e8290482150380090d"
100319998
integrity sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==
@@ -11095,6 +11062,11 @@ tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
1109511062
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
1109611063
integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
1109711064

11065+
tslib@^2.0.0:
11066+
version "2.0.0"
11067+
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.0.tgz#18d13fc2dce04051e20f074cc8387fd8089ce4f3"
11068+
integrity sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==
11069+
1109811070
tsutils@^3.17.1:
1109911071
version "3.17.1"
1110011072
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"
@@ -11164,7 +11136,7 @@ typedarray@^0.0.6:
1116411136
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
1116511137
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
1116611138

11167-
typescript@^3.6.3:
11139+
typescript@^3.9.5:
1116811140
version "3.9.5"
1116911141
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36"
1117011142
integrity sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==

0 commit comments

Comments
 (0)