Merge branch 'master' of github.com:backstage/backstage into blam/tubgoat

* 'master' of github.com:backstage/backstage:
  forgot to push yarn.lock
  changeset
  upgrade git-url-parse to 11.4.4
  chore(deps-dev): bump @storybook/react from 6.1.14 to 6.1.15
  Add changeset for alb aws provider fix
  fix aws alb auth provider key caching
  Update .changeset/stale-tools-confess.md
  add fields to config type for aws-alb provider
  Fix test, add changeset for ALB provider bug fix
  fix: change issuer to iss to conform to JWT spec. Make issuer verification optional
This commit is contained in:
blam
2021-01-27 22:19:25 +01:00
15 changed files with 153 additions and 123 deletions
+12
View File
@@ -0,0 +1,12 @@
---
'@backstage/backend-common': patch
'@backstage/integration': patch
'@backstage/techdocs-common': patch
'@backstage/plugin-catalog': patch
'@backstage/plugin-catalog-backend': patch
'@backstage/plugin-catalog-import': patch
'@backstage/plugin-scaffolder': patch
'@backstage/plugin-scaffolder-backend': patch
---
Upgrade [git-url-parse](https://www.npmjs.com/package/git-url-parse) to [v11.4.4](https://github.com/IonicaBizau/git-url-parse/pull/125) which fixes parsing an Azure DevOps branch ref.
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/plugin-auth-backend': patch
---
Fixed serialization issue with caching of public keys in AWS ALB auth provider
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/plugin-auth-backend': patch
---
Fix AWS ALB issuer check
+1 -1
View File
@@ -43,7 +43,7 @@
"express": "^4.17.1",
"express-promise-router": "^3.0.3",
"fs-extra": "^9.0.1",
"git-url-parse": "^11.4.3",
"git-url-parse": "^11.4.4",
"helmet": "^4.0.0",
"isomorphic-git": "^1.8.0",
"knex": "^0.21.6",
+1 -1
View File
@@ -31,7 +31,7 @@
"dependencies": {
"@backstage/config": "^0.1.2",
"cross-fetch": "^3.0.6",
"git-url-parse": "^11.4.3",
"git-url-parse": "^11.4.4",
"@octokit/rest": "^18.0.12",
"@octokit/auth-app": "^2.10.5",
"luxon": "^1.25.0"
+1 -1
View File
@@ -48,7 +48,7 @@
"dockerode": "^3.2.1",
"express": "^4.17.1",
"fs-extra": "^9.0.1",
"git-url-parse": "^11.4.3",
"git-url-parse": "^11.4.4",
"js-yaml": "^4.0.0",
"json5": "^2.1.3",
"mime-types": "^2.1.27",
+4
View File
@@ -72,6 +72,10 @@ export interface Config {
onelogin?: {
development: { [key: string]: string };
};
awsalb?: {
issuer?: string;
region: string;
};
};
};
}
@@ -80,7 +80,7 @@ describe('AwsALBAuthProvider', () => {
const mockResponseSend = jest.fn();
const mockRequest = ({
header: jest.fn(() => {
return 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6ImZvbyIsImlzc3VlciI6ImZvbyJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.zUkMYAuMwC1T0tyHMpxXrkbFDa4aGhB8d9um_tI2hsI';
return 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6ImZvbyIsImlzcyI6ImZvbyJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.T2BNS4G-6RoiFnXc8Q8TiwdWzTpNitY8jcsGM3N3-Yo';
}),
} as unknown) as express.Request;
const mockRequestWithoutJwt = ({
@@ -34,7 +34,7 @@ const ALB_JWT_HEADER = 'x-amzn-oidc-data';
*/
type AwsAlbAuthProviderOptions = {
region: string;
issuer: string;
issuer?: string;
identityResolutionCallback: ExperimentalIdentityResolver;
};
export const getJWTHeaders = (input: string) => {
@@ -70,10 +70,7 @@ export class AwsAlbAuthProvider implements AuthProviderRouteHandlers {
const key = await this.getKey(headers.kid);
const payload = JWT.verify(jwt, key);
if (
this.options.issuer !== '' &&
headers.issuer !== this.options.issuer
) {
if (this.options.issuer && headers.iss !== this.options.issuer) {
throw new Error('issuer mismatch on JWT');
}
@@ -98,13 +95,13 @@ export class AwsAlbAuthProvider implements AuthProviderRouteHandlers {
async getKey(keyId: string): Promise<KeyObject> {
const optionalCacheKey = this.keyCache.get<KeyObject>(keyId);
if (optionalCacheKey) {
return optionalCacheKey;
return crypto.createPublicKey(optionalCacheKey);
}
const keyText: string = await fetch(
`https://public-keys.auth.elb.${this.options.region}.amazonaws.com/${keyId}`,
).then(response => response.text());
const keyValue = crypto.createPublicKey(keyText);
this.keyCache.set(keyId, keyValue);
this.keyCache.set(keyId, keyValue.export({ format: 'pem', type: 'spki' }));
return keyValue;
}
}
@@ -116,7 +113,7 @@ export const createAwsAlbProvider = ({
identityResolver,
}: AuthProviderFactoryOptions) => {
const region = config.getString('region');
const issuer = config.getString('iss');
const issuer = config.getOptionalString('iss');
if (identityResolver !== undefined) {
return new AwsAlbAuthProvider(logger, catalogApi, {
region,
+1 -1
View File
@@ -43,7 +43,7 @@
"express": "^4.17.1",
"express-promise-router": "^3.0.3",
"fs-extra": "^9.0.0",
"git-url-parse": "^11.4.3",
"git-url-parse": "^11.4.4",
"knex": "^0.21.6",
"ldapjs": "^2.2.0",
"lodash": "^4.17.15",
+1 -1
View File
@@ -39,7 +39,7 @@
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.45",
"@octokit/rest": "^18.0.12",
"git-url-parse": "^11.4.3",
"git-url-parse": "^11.4.4",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-hook-form": "^6.6.0",
+1 -1
View File
@@ -40,7 +40,7 @@
"@material-ui/lab": "4.0.0-alpha.45",
"@types/react": "^16.9",
"classnames": "^2.2.6",
"git-url-parse": "^11.4.3",
"git-url-parse": "^11.4.4",
"moment": "^2.26.0",
"react": "^16.13.1",
"react-dom": "^16.13.1",
+1 -1
View File
@@ -48,7 +48,7 @@
"express": "^4.17.1",
"express-promise-router": "^3.0.3",
"fs-extra": "^9.0.0",
"git-url-parse": "^11.4.3",
"git-url-parse": "^11.4.4",
"globby": "^11.0.0",
"helmet": "^4.0.0",
"isomorphic-git": "^1.8.0",
+1 -1
View File
@@ -40,7 +40,7 @@
"@rjsf/core": "^2.4.0",
"@rjsf/material-ui": "^2.4.0",
"classnames": "^2.2.6",
"git-url-parse": "^11.4.3",
"git-url-parse": "^11.4.4",
"moment": "^2.26.0",
"react": "^16.13.1",
"react-dom": "^16.13.1",
+113 -106
View File
@@ -5301,17 +5301,17 @@
global "^4.3.2"
regenerator-runtime "^0.13.7"
"@storybook/addons@6.1.14", "@storybook/addons@^6.1.11":
version "6.1.14"
resolved "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.14.tgz#2b81304bbe696923df95cdcf85cfc592d10f4065"
integrity sha512-HlpmV7aejp/MeW8bo/WKME3i71gi0men9qcwoovjDjnSF6jXoNLT336a5udKXdHqYSZgzdyURlgLtilCWkWaJQ==
"@storybook/addons@6.1.15", "@storybook/addons@^6.1.11":
version "6.1.15"
resolved "https://registry.npmjs.org/@storybook/addons/-/addons-6.1.15.tgz#09eb8d962f58bd20b4ac2f83b515831c83226352"
integrity sha512-ENyHapLFOG93VaoQXPX8O3IWjLRyVBox9C9P20LMruKX/SfXAXx20qsoAWKKPGssopyOin17aoQX9pj+lFmCZQ==
dependencies:
"@storybook/api" "6.1.14"
"@storybook/channels" "6.1.14"
"@storybook/client-logger" "6.1.14"
"@storybook/core-events" "6.1.14"
"@storybook/router" "6.1.14"
"@storybook/theming" "6.1.14"
"@storybook/api" "6.1.15"
"@storybook/channels" "6.1.15"
"@storybook/client-logger" "6.1.15"
"@storybook/core-events" "6.1.15"
"@storybook/router" "6.1.15"
"@storybook/theming" "6.1.15"
core-js "^3.0.1"
global "^4.3.2"
regenerator-runtime "^0.13.7"
@@ -5341,20 +5341,20 @@
ts-dedent "^2.0.0"
util-deprecate "^1.0.2"
"@storybook/api@6.1.14":
version "6.1.14"
resolved "https://registry.npmjs.org/@storybook/api/-/api-6.1.14.tgz#20035dd336aba1c5a0f8c83c8c14a2edaf4db891"
integrity sha512-gWcC/xEW8HL5DsocLujHBUdoNsl4YW1Zx1Y4SBbLCyrhj8v4JudJpylwJpOUBDe/GESXq1zqvNKvUPtI8DQNyw==
"@storybook/api@6.1.15":
version "6.1.15"
resolved "https://registry.npmjs.org/@storybook/api/-/api-6.1.15.tgz#285ba42f7a8efcd3bd0e586a5e978487d826fbb4"
integrity sha512-C4D08e2ZbSe62nNKtmh9YBraoWb2j6Chw8VCkuj91kuKHh3YDNc1gjj5Fi+KYZwIcy0EllzW3RFQs+YR1/Vg1g==
dependencies:
"@reach/router" "^1.3.3"
"@storybook/channels" "6.1.14"
"@storybook/client-logger" "6.1.14"
"@storybook/core-events" "6.1.14"
"@storybook/channels" "6.1.15"
"@storybook/client-logger" "6.1.15"
"@storybook/core-events" "6.1.15"
"@storybook/csf" "0.0.1"
"@storybook/router" "6.1.14"
"@storybook/router" "6.1.15"
"@storybook/semver" "^7.3.2"
"@storybook/theming" "6.1.14"
"@types/reach__router" "^1.3.5"
"@storybook/theming" "6.1.15"
"@types/reach__router" "^1.3.7"
core-js "^3.0.1"
fast-deep-equal "^3.1.1"
global "^4.3.2"
@@ -5379,14 +5379,14 @@
qs "^6.6.0"
telejson "^5.0.2"
"@storybook/channel-postmessage@6.1.14":
version "6.1.14"
resolved "https://registry.npmjs.org/@storybook/channel-postmessage/-/channel-postmessage-6.1.14.tgz#41f3115895010dad9fb30f4ac381e4f904b1e50c"
integrity sha512-If83dXXW9mKIRuvuWhWa/zkEw/F0FDgikp33x8436J3rWCh3recp27kffFRrKG0YDMpFSk/Ci5G47E9zn9SCjw==
"@storybook/channel-postmessage@6.1.15":
version "6.1.15"
resolved "https://registry.npmjs.org/@storybook/channel-postmessage/-/channel-postmessage-6.1.15.tgz#80ea2346d18496f9710dd7f87fd2a9eca46ef36f"
integrity sha512-Es4B5zpLrW28KSbY8FhGVEDgUnKspJ7wPuJyKExUpZ5L9w52RkTD6lRnVPzLUfoQ4luPsExy5fiuo878/Wc9ag==
dependencies:
"@storybook/channels" "6.1.14"
"@storybook/client-logger" "6.1.14"
"@storybook/core-events" "6.1.14"
"@storybook/channels" "6.1.15"
"@storybook/client-logger" "6.1.15"
"@storybook/core-events" "6.1.15"
core-js "^3.0.1"
global "^4.3.2"
qs "^6.6.0"
@@ -5401,10 +5401,10 @@
ts-dedent "^2.0.0"
util-deprecate "^1.0.2"
"@storybook/channels@6.1.14":
version "6.1.14"
resolved "https://registry.npmjs.org/@storybook/channels/-/channels-6.1.14.tgz#c479190ebb853a603f3ed90fc470534a02eb46eb"
integrity sha512-vP19IB2FXj8SiFbQ9ETljEBienL+KRMLgMzz3Ta3nZj/OfjJJbIuj42ZfexQGV4mS0Bo+OW+qT7VMIY6fulnFw==
"@storybook/channels@6.1.15":
version "6.1.15"
resolved "https://registry.npmjs.org/@storybook/channels/-/channels-6.1.15.tgz#22bb06a671a5ae09d2537bcf63aaf90d7f6b9f6b"
integrity sha512-HIKHDeL/0BDk9a7xc2PLiFFoHjUMKUd2djhUGdeKgdKqoWejp4JJ60fI68+2QuSRbkB8k+rAwmuWJzV7EfB5fg==
dependencies:
core-js "^3.0.1"
ts-dedent "^2.0.0"
@@ -5434,16 +5434,16 @@
ts-dedent "^2.0.0"
util-deprecate "^1.0.2"
"@storybook/client-api@6.1.14":
version "6.1.14"
resolved "https://registry.npmjs.org/@storybook/client-api/-/client-api-6.1.14.tgz#6daf56743cc72e13f05fff3d2ac554897cc9f9fd"
integrity sha512-pIDSlS48bhJdtgNg7sXV1NmLJtB0ebRHJI9htIiqtL7EGQenb4+Bbwflhj1j51OEkuM+bQsAAZxq5deiUQEGVw==
"@storybook/client-api@6.1.15":
version "6.1.15"
resolved "https://registry.npmjs.org/@storybook/client-api/-/client-api-6.1.15.tgz#8f8ead111459b94621571bdb2276f8a0aace17b1"
integrity sha512-iwuDlgNdB6Y4OidlhWPob3tEIax9taymdKEe9by4rLJ3nfXu7viHcvCAjN24oI4NFW3NZsmtqJotgftRYk0r1Q==
dependencies:
"@storybook/addons" "6.1.14"
"@storybook/channel-postmessage" "6.1.14"
"@storybook/channels" "6.1.14"
"@storybook/client-logger" "6.1.14"
"@storybook/core-events" "6.1.14"
"@storybook/addons" "6.1.15"
"@storybook/channel-postmessage" "6.1.15"
"@storybook/channels" "6.1.15"
"@storybook/client-logger" "6.1.15"
"@storybook/core-events" "6.1.15"
"@storybook/csf" "0.0.1"
"@types/qs" "^6.9.0"
"@types/webpack-env" "^1.15.3"
@@ -5466,10 +5466,10 @@
core-js "^3.0.1"
global "^4.3.2"
"@storybook/client-logger@6.1.14":
version "6.1.14"
resolved "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.1.14.tgz#216b9c1332ffa3a3473dad837780a3b14f686bae"
integrity sha512-NSO8nVsp6o0eoQ1Drlu66KXpl6DPuq02Kj8AhttGzvqSYB50SV4CV+wceBcg77tIVu5QmQ+71hAEVXhx7sjRHA==
"@storybook/client-logger@6.1.15":
version "6.1.15"
resolved "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-6.1.15.tgz#b558d6ecbee82c038d684717d8c598eaa4a9324d"
integrity sha512-lUpatG8SxzrUapWMsIPWiR+5qRVT5ebn8tGHQeBeRHXbdmEqyq5DOlrotLUemkA5nNTCs1pMFNvKSpCHznG+fg==
dependencies:
core-js "^3.0.1"
global "^4.3.2"
@@ -5500,15 +5500,15 @@
react-textarea-autosize "^8.1.1"
ts-dedent "^2.0.0"
"@storybook/components@6.1.14":
version "6.1.14"
resolved "https://registry.npmjs.org/@storybook/components/-/components-6.1.14.tgz#4ea47edfa0a3e4a26882aa5a1eb90c1ec86e6f71"
integrity sha512-Nxsp/9o1tqfY8s6RBWNHyM03A5D9k56Kr/4VNa++CbDrz1+TIxpYlDgS4sllUlXyvICLfk3sUtg3KS5CPl2iZA==
"@storybook/components@6.1.15":
version "6.1.15"
resolved "https://registry.npmjs.org/@storybook/components/-/components-6.1.15.tgz#b4a2af23ee6b9cba4c255191eae3d3463e29bfb7"
integrity sha512-lPbA/zyBfctdlpDhRTcRFLWlZPJ3PB4+wI0FUvYs69iG3/bNbQPYu8vRmNhCZOsaGt+b+dik4Tfcth8Bu+eQug==
dependencies:
"@popperjs/core" "^2.5.4"
"@storybook/client-logger" "6.1.14"
"@storybook/client-logger" "6.1.15"
"@storybook/csf" "0.0.1"
"@storybook/theming" "6.1.14"
"@storybook/theming" "6.1.15"
"@types/overlayscrollbars" "^1.9.0"
"@types/react-color" "^3.0.1"
"@types/react-syntax-highlighter" "11.0.4"
@@ -5533,17 +5533,17 @@
dependencies:
core-js "^3.0.1"
"@storybook/core-events@6.1.14":
version "6.1.14"
resolved "https://registry.npmjs.org/@storybook/core-events/-/core-events-6.1.14.tgz#a3165e32cefd6be7326bbad4b8140653bdfa0426"
integrity sha512-tpM3VDvzqgRY7S17CRglgt1625rxNoyEwrLQiNcZkUPyO0rpaacPqVEbPCtcTmUeboI1bLdnSQIjT9B0/Y2Pww==
"@storybook/core-events@6.1.15":
version "6.1.15"
resolved "https://registry.npmjs.org/@storybook/core-events/-/core-events-6.1.15.tgz#f66e30cbed8afdb8df2254d2aa47fe139e641c60"
integrity sha512-2sz02hdGZshanoq83jaB+goAcapVEWrxe+RJZn/gu2OymlEioWNjPPtOVGgi5DNIiJFnYvc66adayNwX39+tDA==
dependencies:
core-js "^3.0.1"
"@storybook/core@6.1.14":
version "6.1.14"
resolved "https://registry.npmjs.org/@storybook/core/-/core-6.1.14.tgz#17e724a5b94d6e1bb557e213b8176660d2d14762"
integrity sha512-lHKZmfLAo2VGtF/yrZkkWMYgmFRNKbzIDxYJGp8USyUQyTfEpz2qqJlBdoD6rxr1hFPM2954tIKwh8iPhT2PFQ==
"@storybook/core@6.1.15":
version "6.1.15"
resolved "https://registry.npmjs.org/@storybook/core/-/core-6.1.15.tgz#7ff8c314d3857497bf2e26c69a1fa93ef37301aa"
integrity sha512-mQeKAXcowUwF+pOdWZEFwb5M6sz4yv5cOv1vTci3/1pMmB8QpYlH+P61p4lsRO17Vlak70h18TworPka/4+mhA==
dependencies:
"@babel/core" "^7.12.3"
"@babel/plugin-proposal-class-properties" "^7.12.1"
@@ -5567,20 +5567,20 @@
"@babel/preset-react" "^7.12.1"
"@babel/preset-typescript" "^7.12.1"
"@babel/register" "^7.12.1"
"@storybook/addons" "6.1.14"
"@storybook/api" "6.1.14"
"@storybook/channel-postmessage" "6.1.14"
"@storybook/channels" "6.1.14"
"@storybook/client-api" "6.1.14"
"@storybook/client-logger" "6.1.14"
"@storybook/components" "6.1.14"
"@storybook/core-events" "6.1.14"
"@storybook/addons" "6.1.15"
"@storybook/api" "6.1.15"
"@storybook/channel-postmessage" "6.1.15"
"@storybook/channels" "6.1.15"
"@storybook/client-api" "6.1.15"
"@storybook/client-logger" "6.1.15"
"@storybook/components" "6.1.15"
"@storybook/core-events" "6.1.15"
"@storybook/csf" "0.0.1"
"@storybook/node-logger" "6.1.14"
"@storybook/router" "6.1.14"
"@storybook/node-logger" "6.1.15"
"@storybook/router" "6.1.15"
"@storybook/semver" "^7.3.2"
"@storybook/theming" "6.1.14"
"@storybook/ui" "6.1.14"
"@storybook/theming" "6.1.15"
"@storybook/ui" "6.1.15"
"@types/glob-base" "^0.3.0"
"@types/micromatch" "^4.0.1"
"@types/node-fetch" "^2.5.4"
@@ -5654,10 +5654,10 @@
dependencies:
lodash "^4.17.15"
"@storybook/node-logger@6.1.14":
version "6.1.14"
resolved "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-6.1.14.tgz#e5294f986e3ec5c67b2738895b9d16c9a2b667fa"
integrity sha512-3jrw7coAwFXZu4qK1vm54bCPhNRvxjG+7jISbhhocDoNIv0nLWL3+tJyrC5/k/XHQiUlLkhEzpMaASADmkttNw==
"@storybook/node-logger@6.1.15":
version "6.1.15"
resolved "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-6.1.15.tgz#fcf786d3a323feb6821e40e26f98a513a60d1a79"
integrity sha512-lrO0ei3W7BRci2iUkWTr/rXgHkzxwZTrlkx0iBzbQQRy7K1AJ9bjzhurCH9B8C9XGLmn60LXT81RWD3iCLZjcw==
dependencies:
"@types/npmlog" "^4.1.2"
chalk "^4.0.0"
@@ -5666,16 +5666,16 @@
pretty-hrtime "^1.0.3"
"@storybook/react@^6.1.11":
version "6.1.14"
resolved "https://registry.npmjs.org/@storybook/react/-/react-6.1.14.tgz#436e9b90096b1d7c83f7f073b5baf47212b2e425"
integrity sha512-M99wHjc/5z+Wz1FdFaScVs6dyAi/6PdcIx5Fyip6Qd8aKwm1XyYoOMql5Vu3Cf560feDYCKS4phzyEZ7EJy+EQ==
version "6.1.15"
resolved "https://registry.npmjs.org/@storybook/react/-/react-6.1.15.tgz#e17d00b05b8980ad381ba701805309ed46d1fdcd"
integrity sha512-7WoYLOZuAlzgQsL9oy4JCr9NcB4NBCuxslPSncN5l/7ewGXgfVXTAOMOfw+EVNrtUeVJU2fC8gFiHVl0SJpTZw==
dependencies:
"@babel/preset-flow" "^7.12.1"
"@babel/preset-react" "^7.12.1"
"@pmmmwh/react-refresh-webpack-plugin" "^0.4.2"
"@storybook/addons" "6.1.14"
"@storybook/core" "6.1.14"
"@storybook/node-logger" "6.1.14"
"@storybook/addons" "6.1.15"
"@storybook/core" "6.1.15"
"@storybook/node-logger" "6.1.15"
"@storybook/semver" "^7.3.2"
"@types/webpack-env" "^1.15.3"
babel-plugin-add-react-displayname "^0.0.5"
@@ -5704,13 +5704,13 @@
memoizerific "^1.11.3"
qs "^6.6.0"
"@storybook/router@6.1.14":
version "6.1.14"
resolved "https://registry.npmjs.org/@storybook/router/-/router-6.1.14.tgz#f6aef8c9dabf19bf06dddd80907e66369261fdde"
integrity sha512-rMaUCYzgfVLwFWo3A1Q/weSv8FBqCLmHY+3+t6ao7OV6NYjR0XgLKRzHrXq1uYdbMxWeIKhN2tIt/LR43bmDjQ==
"@storybook/router@6.1.15":
version "6.1.15"
resolved "https://registry.npmjs.org/@storybook/router/-/router-6.1.15.tgz#e0cd7440a2ddc9b265e506b1cb590d3eeab56476"
integrity sha512-HlxDkGpiTSxXCJuqRoZ9Viq6Y/h/7efI8LPhhopr50qWRBTh/PEQzDqWBXG3sj8ISmi9GyUaTSAuqRwdA3lJQQ==
dependencies:
"@reach/router" "^1.3.3"
"@types/reach__router" "^1.3.5"
"@types/reach__router" "^1.3.7"
core-js "^3.0.1"
global "^4.3.2"
memoizerific "^1.11.3"
@@ -5759,15 +5759,15 @@
resolve-from "^5.0.0"
ts-dedent "^2.0.0"
"@storybook/theming@6.1.14":
version "6.1.14"
resolved "https://registry.npmjs.org/@storybook/theming/-/theming-6.1.14.tgz#fecb66cab22d3b3218b4a98a9c210eb8a7be91e8"
integrity sha512-S+t30y4FqBTXWoVr+dtxVJ/ywiQGHBclBd9aUunbdCV4mMFra5InNo2CWn+RJlNEauLZ93gRIEzSFchIbzLk1A==
"@storybook/theming@6.1.15":
version "6.1.15"
resolved "https://registry.npmjs.org/@storybook/theming/-/theming-6.1.15.tgz#01083ab89904dd959429b0b3fd1c76bd0ecc59ef"
integrity sha512-88IdYaPzp4NMKf/GKBrPggxD6/d/lkdQ4SNowXxN9g9eONd9M7HtTbjuJGRCbGMJ52xGcbpj2exEnAqKQ2iodA==
dependencies:
"@emotion/core" "^10.1.1"
"@emotion/is-prop-valid" "^0.8.6"
"@emotion/styled" "^10.0.23"
"@storybook/client-logger" "6.1.14"
"@storybook/client-logger" "6.1.15"
core-js "^3.0.1"
deep-object-diff "^1.1.0"
emotion-theming "^10.0.19"
@@ -5777,21 +5777,21 @@
resolve-from "^5.0.0"
ts-dedent "^2.0.0"
"@storybook/ui@6.1.14":
version "6.1.14"
resolved "https://registry.npmjs.org/@storybook/ui/-/ui-6.1.14.tgz#766d696480ee6f6a5a0454ccb2f101c38a0eb9d2"
integrity sha512-DTW2TM05jTMKxh8LzUGk3g5a528PgJxrtgODFU6zzwSg2+LwdmSDtd1HAxopt2vpfTyQyX+6WN2H+lMNwfQTAQ==
"@storybook/ui@6.1.15":
version "6.1.15"
resolved "https://registry.npmjs.org/@storybook/ui/-/ui-6.1.15.tgz#a0f6c49fcf81cf172cd2de4c8dba2be1296891f6"
integrity sha512-quyhJWlOxhk95he7s5/TSYM3eEsaz3s4+98kUZE6r3ssME8u6zDvqa/qa6EWs5/nvZ2V3+12efIzCNbiiT3v3g==
dependencies:
"@emotion/core" "^10.1.1"
"@storybook/addons" "6.1.14"
"@storybook/api" "6.1.14"
"@storybook/channels" "6.1.14"
"@storybook/client-logger" "6.1.14"
"@storybook/components" "6.1.14"
"@storybook/core-events" "6.1.14"
"@storybook/router" "6.1.14"
"@storybook/addons" "6.1.15"
"@storybook/api" "6.1.15"
"@storybook/channels" "6.1.15"
"@storybook/client-logger" "6.1.15"
"@storybook/components" "6.1.15"
"@storybook/core-events" "6.1.15"
"@storybook/router" "6.1.15"
"@storybook/semver" "^7.3.2"
"@storybook/theming" "6.1.14"
"@storybook/theming" "6.1.15"
"@types/markdown-to-jsx" "^6.11.0"
copy-to-clipboard "^3.0.8"
core-js "^3.0.1"
@@ -7093,6 +7093,13 @@
"@types/history" "*"
"@types/react" "*"
"@types/reach__router@^1.3.7":
version "1.3.7"
resolved "https://registry.npmjs.org/@types/reach__router/-/reach__router-1.3.7.tgz#de8ab374259ae7f7499fc1373b9697a5f3cd6428"
integrity sha512-cyBEb8Ef3SJNH5NYEIDGPoMMmYUxROatuxbICusVRQIqZUB85UCt6R2Ok60tKS/TABJsJYaHyNTW3kqbpxlMjg==
dependencies:
"@types/react" "*"
"@types/react-color@^3.0.1":
version "3.0.4"
resolved "https://registry.npmjs.org/@types/react-color/-/react-color-3.0.4.tgz#c63daf012ad067ac0127bdd86725f079d02082bd"
@@ -14173,10 +14180,10 @@ git-url-parse@^11.1.2:
dependencies:
git-up "^4.0.0"
git-url-parse@^11.4.3:
version "11.4.3"
resolved "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.4.3.tgz#1610284edf1f14964180f5b3399ec68b692cfd87"
integrity sha512-LZTTk0nqJnKN48YRtOpR8H5SEfp1oM2tls90NuZmBxN95PnCvmuXGzqQ4QmVirBgKx2KPYfPGteX3/raWjKenQ==
git-url-parse@^11.4.4:
version "11.4.4"
resolved "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.4.4.tgz#5d747debc2469c17bc385719f7d0427802d83d77"
integrity sha512-Y4o9o7vQngQDIU9IjyCmRJBin5iYjI5u9ZITnddRZpD7dcCFQj2sL2XuMNbLRE4b4B/4ENPsp2Q8P44fjAZ0Pw==
dependencies:
git-up "^4.0.0"