From 9a07e8788f66656c31d88a8d61c5b400127fee5e Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 2 Nov 2022 13:50:45 +0100 Subject: [PATCH 01/42] prebundle the preview --- code/.eslintignore | 1 - .../src/frameworks/angular/loader.ts | 34 +- .../src/frameworks/html/loader.ts | 34 +- .../src/frameworks/preact/loader.ts | 34 +- .../src/frameworks/rax/loader.ts | 34 +- .../src/frameworks/react-native/loader.ts | 10 +- .../src/frameworks/react/loader.ts | 34 +- .../src/frameworks/riot/loader.ts | 34 +- .../src/frameworks/svelte/loader.ts | 35 +- .../src/frameworks/vue/loader.ts | 35 +- .../src/frameworks/vue3/loader.ts | 34 +- .../src/frameworks/web-components/loader.ts | 34 +- code/frameworks/angular/package.json | 1 + .../angular/src/client/public-api.ts | 2 +- .../ember/src/client/preview/index.ts | 3 +- code/lib/api/package.json | 8 +- code/lib/api/shortcut.d.ts | 8 - code/lib/api/shortcut.js | 1 - code/lib/api/src/index.tsx | 3 + code/lib/builder-webpack5/package.json | 4 + code/lib/builder-webpack5/src/index.ts | 29 +- .../src/presets/preview-preset.ts | 3 + .../src/preview/iframe-webpack.config.ts | 50 +- .../templates/preview.ejs | 6 +- code/lib/core-common/src/utils/template.ts | 4 - .../src/core-presets.disabled-test.ts | 304 ------------- code/lib/core-server/src/index.ts | 6 +- .../core-server/src/presets/common-preset.ts | 9 +- .../src/utils/stories-json.test.ts | 6 +- code/lib/preview/README.md | 94 ++++ code/lib/preview/package.json | 150 ++++++ code/lib/preview/src/addons.ts | 2 + code/lib/preview/src/channel-postmessage.ts | 2 + code/lib/preview/src/channel-websocket.ts | 2 + code/lib/preview/src/channels.ts | 2 + code/lib/preview/src/client-api.ts | 2 + code/lib/preview/src/client-logger.ts | 2 + code/lib/preview/src/core-client.ts | 2 + code/lib/preview/src/core-events.ts | 2 + code/lib/preview/src/global/addons.ts | 46 ++ .../preview/src/global/channel-postmessage.ts | 7 + .../preview/src/global/channel-websocket.ts | 7 + code/lib/preview/src/global/channels.ts | 6 + code/lib/preview/src/global/client-api.ts | 32 ++ code/lib/preview/src/global/client-logger.ts | 7 + code/lib/preview/src/global/core-client.ts | 7 + code/lib/preview/src/global/core-events.ts | 86 ++++ code/lib/preview/src/global/preview-web.ts | 20 + code/lib/preview/src/global/store.ts | 84 ++++ code/lib/preview/src/index.ts | 39 ++ code/lib/preview/src/preview-web.ts | 2 + code/lib/preview/src/store.ts | 2 + code/lib/preview/tsconfig.json | 11 + code/renderers/html/src/public-api.ts | 2 +- code/renderers/preact/src/public-api.ts | 2 +- .../react/src/__test__/Button.stories.tsx | 2 +- .../react/src/__test__/Button.test.tsx | 2 +- .../react/src/__test__/internals.test.tsx | 2 +- code/renderers/react/src/public-api.tsx | 2 +- code/renderers/react/src/testing-api.ts | 2 +- code/renderers/server/src/public-api.ts | 2 +- code/renderers/svelte/src/public-api.ts | 3 +- code/renderers/vue/src/public-api.ts | 2 +- code/renderers/vue3/src/public-api.ts | 2 +- .../web-components/src/public-api.ts | 2 +- .../ui/manager/src/components/panel/panel.tsx | 2 +- code/ui/manager/src/containers/menu.tsx | 2 +- code/ui/manager/src/globals/exports.ts | 3 + code/ui/manager/src/settings/shortcuts.tsx | 6 +- code/workspace.json | 5 + code/yarn.lock | 429 +++++++++--------- scripts/.eslintrc.js | 25 + scripts/prepare/bundle.ts | 8 +- scripts/tasks/compile.ts | 2 +- scripts/tsconfig.json | 6 +- 75 files changed, 1239 insertions(+), 690 deletions(-) delete mode 100644 code/lib/api/shortcut.d.ts delete mode 100644 code/lib/api/shortcut.js rename code/lib/{core-common => builder-webpack5}/templates/preview.ejs (88%) delete mode 100644 code/lib/core-server/src/core-presets.disabled-test.ts create mode 100644 code/lib/preview/README.md create mode 100644 code/lib/preview/package.json create mode 100644 code/lib/preview/src/addons.ts create mode 100644 code/lib/preview/src/channel-postmessage.ts create mode 100644 code/lib/preview/src/channel-websocket.ts create mode 100644 code/lib/preview/src/channels.ts create mode 100644 code/lib/preview/src/client-api.ts create mode 100644 code/lib/preview/src/client-logger.ts create mode 100644 code/lib/preview/src/core-client.ts create mode 100644 code/lib/preview/src/core-events.ts create mode 100644 code/lib/preview/src/global/addons.ts create mode 100644 code/lib/preview/src/global/channel-postmessage.ts create mode 100644 code/lib/preview/src/global/channel-websocket.ts create mode 100644 code/lib/preview/src/global/channels.ts create mode 100644 code/lib/preview/src/global/client-api.ts create mode 100644 code/lib/preview/src/global/client-logger.ts create mode 100644 code/lib/preview/src/global/core-client.ts create mode 100644 code/lib/preview/src/global/core-events.ts create mode 100644 code/lib/preview/src/global/preview-web.ts create mode 100644 code/lib/preview/src/global/store.ts create mode 100644 code/lib/preview/src/index.ts create mode 100644 code/lib/preview/src/preview-web.ts create mode 100644 code/lib/preview/src/store.ts create mode 100644 code/lib/preview/tsconfig.json diff --git a/code/.eslintignore b/code/.eslintignore index 6f8539b9b7b6..3a410b6472bc 100644 --- a/code/.eslintignore +++ b/code/.eslintignore @@ -1,5 +1,4 @@ dist -lib/**/dll build coverage node_modules diff --git a/code/addons/storyshots/storyshots-core/src/frameworks/angular/loader.ts b/code/addons/storyshots/storyshots-core/src/frameworks/angular/loader.ts index 401b25764122..40a7def7ffa7 100644 --- a/code/addons/storyshots/storyshots-core/src/frameworks/angular/loader.ts +++ b/code/addons/storyshots/storyshots-core/src/frameworks/angular/loader.ts @@ -33,17 +33,35 @@ function test(options: StoryshotsOptions): boolean { function load(options: StoryshotsOptions) { setupAngularJestPreset(); - const storybook = jest.requireActual('@storybook/angular'); - const clientAPI = jest.requireActual('@storybook/client-api'); + let mockStartedAPI: any; - const api = { - ...clientAPI, - ...storybook, - }; + jest.mock('@storybook/core-client', () => { + const coreClientAPI = jest.requireActual('@storybook/core-client'); + + return { + ...coreClientAPI, + start: (...args: any[]) => { + mockStartedAPI = coreClientAPI.start(...args); + return mockStartedAPI; + }, + }; + }); + + jest.mock('@storybook/angular', () => { + const renderAPI = jest.requireActual('@storybook/angular'); + + renderAPI.addDecorator = mockStartedAPI.clientApi.addDecorator; + renderAPI.addParameters = mockStartedAPI.clientApi.addParameters; + + return renderAPI; + }); + + // eslint-disable-next-line global-require + const storybook = require('@storybook/angular'); configure({ ...options, - storybook: api, + storybook, }); return { @@ -52,7 +70,7 @@ function load(options: StoryshotsOptions) { renderShallowTree: () => { throw new Error('Shallow renderer is not supported for angular'); }, - storybook: api, + storybook, }; } diff --git a/code/addons/storyshots/storyshots-core/src/frameworks/html/loader.ts b/code/addons/storyshots/storyshots-core/src/frameworks/html/loader.ts index 6cc2b9d3e943..55a8dfdd6b12 100644 --- a/code/addons/storyshots/storyshots-core/src/frameworks/html/loader.ts +++ b/code/addons/storyshots/storyshots-core/src/frameworks/html/loader.ts @@ -10,17 +10,35 @@ function test(options: StoryshotsOptions): boolean { function load(options: StoryshotsOptions) { global.STORYBOOK_ENV = 'html'; - const storybook = jest.requireActual('@storybook/html'); - const clientAPI = jest.requireActual('@storybook/client-api'); + let mockStartedAPI: any; + + jest.mock('@storybook/core-client', () => { + const coreClientAPI = jest.requireActual('@storybook/core-client'); + + return { + ...coreClientAPI, + start: (...args: any[]) => { + mockStartedAPI = coreClientAPI.start(...args); + return mockStartedAPI; + }, + }; + }); - const api = { - ...clientAPI, - ...storybook, - }; + jest.mock('@storybook/html', () => { + const renderAPI = jest.requireActual('@storybook/html'); + + renderAPI.addDecorator = mockStartedAPI.clientApi.addDecorator; + renderAPI.addParameters = mockStartedAPI.clientApi.addParameters; + + return renderAPI; + }); + + // eslint-disable-next-line global-require + const storybook = require('@storybook/html'); configure({ ...options, - storybook: api, + storybook, }); return { @@ -29,7 +47,7 @@ function load(options: StoryshotsOptions) { renderShallowTree: () => { throw new Error('Shallow renderer is not supported for HTML'); }, - storybook: api, + storybook, }; } diff --git a/code/addons/storyshots/storyshots-core/src/frameworks/preact/loader.ts b/code/addons/storyshots/storyshots-core/src/frameworks/preact/loader.ts index c45f7c9b8efc..986dcf5f911f 100644 --- a/code/addons/storyshots/storyshots-core/src/frameworks/preact/loader.ts +++ b/code/addons/storyshots/storyshots-core/src/frameworks/preact/loader.ts @@ -16,17 +16,35 @@ function test(options: StoryshotsOptions): boolean { function load(options: StoryshotsOptions) { global.STORYBOOK_ENV = 'preact'; - const storybook = jest.requireActual('@storybook/preact'); - const clientAPI = jest.requireActual('@storybook/client-api'); + let mockStartedAPI: any; - const api = { - ...clientAPI, - ...storybook, - }; + jest.mock('@storybook/core-client', () => { + const coreClientAPI = jest.requireActual('@storybook/core-client'); + + return { + ...coreClientAPI, + start: (...args: any[]) => { + mockStartedAPI = coreClientAPI.start(...args); + return mockStartedAPI; + }, + }; + }); + + jest.mock('@storybook/preact', () => { + const renderAPI = jest.requireActual('@storybook/preact'); + + renderAPI.addDecorator = mockStartedAPI.clientApi.addDecorator; + renderAPI.addParameters = mockStartedAPI.clientApi.addParameters; + + return renderAPI; + }); + + // eslint-disable-next-line global-require + const storybook = require('@storybook/preact'); configure({ ...options, - storybook: api, + storybook, }); return { @@ -35,7 +53,7 @@ function load(options: StoryshotsOptions) { renderShallowTree: () => { throw new Error('Shallow renderer is not supported for preact'); }, - storybook: api, + storybook, }; } diff --git a/code/addons/storyshots/storyshots-core/src/frameworks/rax/loader.ts b/code/addons/storyshots/storyshots-core/src/frameworks/rax/loader.ts index 86284861d29b..2d14593fd096 100644 --- a/code/addons/storyshots/storyshots-core/src/frameworks/rax/loader.ts +++ b/code/addons/storyshots/storyshots-core/src/frameworks/rax/loader.ts @@ -11,17 +11,35 @@ function test(options: StoryshotsOptions): boolean { function load(options: StoryshotsOptions) { global.STORYBOOK_ENV = 'rax'; - const storybook = jest.requireActual('@storybook/rax'); - const clientAPI = jest.requireActual('@storybook/client-api'); + let mockStartedAPI: any; + + jest.mock('@storybook/core-client', () => { + const coreClientAPI = jest.requireActual('@storybook/core-client'); + + return { + ...coreClientAPI, + start: (...args: any[]) => { + mockStartedAPI = coreClientAPI.start(...args); + return mockStartedAPI; + }, + }; + }); - const api = { - ...clientAPI, - ...storybook, - }; + jest.mock('@storybook/rax', () => { + const renderAPI = jest.requireActual('@storybook/rax'); + + renderAPI.addDecorator = mockStartedAPI.clientApi.addDecorator; + renderAPI.addParameters = mockStartedAPI.clientApi.addParameters; + + return renderAPI; + }); + + // eslint-disable-next-line global-require + const storybook = require('@storybook/rax'); configure({ ...options, - storybook: api, + storybook, }); return { @@ -30,7 +48,7 @@ function load(options: StoryshotsOptions) { renderShallowTree: () => { throw new Error('Shallow renderer is not supported for rax'); }, - storybook: api, + storybook, }; } diff --git a/code/addons/storyshots/storyshots-core/src/frameworks/react-native/loader.ts b/code/addons/storyshots/storyshots-core/src/frameworks/react-native/loader.ts index a31758cdc2b9..7c0e51d23f0f 100644 --- a/code/addons/storyshots/storyshots-core/src/frameworks/react-native/loader.ts +++ b/code/addons/storyshots/storyshots-core/src/frameworks/react-native/loader.ts @@ -25,20 +25,14 @@ function configure(options: StoryshotsOptions, storybook: any) { function load(options: StoryshotsOptions) { const storybook = jest.requireActual('@storybook/react-native'); - const clientAPI = jest.requireActual('@storybook/client-api'); - const api = { - ...clientAPI, - ...storybook, - }; - - configure(options, api); + configure(options, storybook); return { renderTree: require('../react/renderTree').default, renderShallowTree: require('../react/renderShallowTree').default, framework: 'react-native' as const, - storybook: api, + storybook, }; } diff --git a/code/addons/storyshots/storyshots-core/src/frameworks/react/loader.ts b/code/addons/storyshots/storyshots-core/src/frameworks/react/loader.ts index 1ba371b1d622..bc6f9153f10f 100644 --- a/code/addons/storyshots/storyshots-core/src/frameworks/react/loader.ts +++ b/code/addons/storyshots/storyshots-core/src/frameworks/react/loader.ts @@ -8,24 +8,42 @@ function test(options: StoryshotsOptions): boolean { } function load(options: StoryshotsOptions) { - const storybook = jest.requireActual('@storybook/react'); - const clientAPI = jest.requireActual('@storybook/client-api'); + let mockStartedAPI: any; - const api = { - ...clientAPI, - ...storybook, - }; + jest.mock('@storybook/core-client', () => { + const coreClientAPI = jest.requireActual('@storybook/core-client'); + + return { + ...coreClientAPI, + start: (...args: any[]) => { + mockStartedAPI = coreClientAPI.start(...args); + return mockStartedAPI; + }, + }; + }); + + jest.mock('@storybook/react', () => { + const renderAPI = jest.requireActual('@storybook/react'); + + renderAPI.addDecorator = mockStartedAPI.clientApi.addDecorator; + renderAPI.addParameters = mockStartedAPI.clientApi.addParameters; + + return renderAPI; + }); + + // eslint-disable-next-line global-require + const storybook = require('@storybook/react'); configure({ ...options, - storybook: api, + storybook, }); return { framework: 'react' as const, renderTree: jest.requireActual('./renderTree').default, renderShallowTree: jest.requireActual('./renderShallowTree').default, - storybook: api, + storybook, }; } diff --git a/code/addons/storyshots/storyshots-core/src/frameworks/riot/loader.ts b/code/addons/storyshots/storyshots-core/src/frameworks/riot/loader.ts index 1e352031dfba..bd131ba1f80f 100644 --- a/code/addons/storyshots/storyshots-core/src/frameworks/riot/loader.ts +++ b/code/addons/storyshots/storyshots-core/src/frameworks/riot/loader.ts @@ -16,17 +16,35 @@ function load(options: StoryshotsOptions) { global.STORYBOOK_ENV = 'riot'; mockRiotToIncludeCompiler(); - const storybook = jest.requireActual('@storybook/riot'); - const clientAPI = jest.requireActual('@storybook/client-api'); + let mockStartedAPI: any; - const api = { - ...clientAPI, - ...storybook, - }; + jest.mock('@storybook/core-client', () => { + const coreClientAPI = jest.requireActual('@storybook/core-client'); + + return { + ...coreClientAPI, + start: (...args: any[]) => { + mockStartedAPI = coreClientAPI.start(...args); + return mockStartedAPI; + }, + }; + }); + + jest.mock('@storybook/riot', () => { + const renderAPI = jest.requireActual('@storybook/riot'); + + renderAPI.addDecorator = mockStartedAPI.clientApi.addDecorator; + renderAPI.addParameters = mockStartedAPI.clientApi.addParameters; + + return renderAPI; + }); + + // eslint-disable-next-line global-require + const storybook = require('@storybook/riot'); configure({ ...options, - storybook: api, + storybook, }); return { @@ -35,7 +53,7 @@ function load(options: StoryshotsOptions) { renderShallowTree: () => { throw new Error('Shallow renderer is not supported for riot'); }, - storybook: api, + storybook, }; } diff --git a/code/addons/storyshots/storyshots-core/src/frameworks/svelte/loader.ts b/code/addons/storyshots/storyshots-core/src/frameworks/svelte/loader.ts index 8f874c7468bd..d7a45bc58466 100644 --- a/code/addons/storyshots/storyshots-core/src/frameworks/svelte/loader.ts +++ b/code/addons/storyshots/storyshots-core/src/frameworks/svelte/loader.ts @@ -13,26 +13,43 @@ function test(options: StoryshotsOptions): boolean { function load(options: StoryshotsOptions) { global.STORYBOOK_ENV = 'svelte'; - const storybook = jest.requireActual('@storybook/svelte'); - const clientAPI = jest.requireActual('@storybook/client-api'); + let mockStartedAPI: any; + + jest.mock('@storybook/core-client', () => { + const coreClientAPI = jest.requireActual('@storybook/core-client'); + + return { + ...coreClientAPI, + start: (...args: any[]) => { + mockStartedAPI = coreClientAPI.start(...args); + return mockStartedAPI; + }, + }; + }); - const api = { - ...clientAPI, - ...storybook, - }; + jest.mock('@storybook/svelte', () => { + const renderAPI = jest.requireActual('@storybook/svelte'); + + renderAPI.addDecorator = mockStartedAPI.clientApi.addDecorator; + renderAPI.addParameters = mockStartedAPI.clientApi.addParameters; + + return renderAPI; + }); + + // eslint-disable-next-line global-require + const storybook = require('@storybook/svelte'); configure({ ...options, - storybook: api, + storybook, }); - return { framework: 'svelte' as const, renderTree: jest.requireActual('./renderTree').default, renderShallowTree: () => { throw new Error('Shallow renderer is not supported for svelte'); }, - storybook: api, + storybook, }; } diff --git a/code/addons/storyshots/storyshots-core/src/frameworks/vue/loader.ts b/code/addons/storyshots/storyshots-core/src/frameworks/vue/loader.ts index 3748e7713633..bb97cd1560b5 100644 --- a/code/addons/storyshots/storyshots-core/src/frameworks/vue/loader.ts +++ b/code/addons/storyshots/storyshots-core/src/frameworks/vue/loader.ts @@ -16,26 +16,43 @@ function load(options: StoryshotsOptions) { global.STORYBOOK_ENV = 'vue'; mockVueToIncludeCompiler(); - const storybook = jest.requireActual('@storybook/vue'); - const clientAPI = jest.requireActual('@storybook/client-api'); + let mockStartedAPI: any; - const api = { - ...clientAPI, - ...storybook, - }; + jest.mock('@storybook/core-client', () => { + const coreClientAPI = jest.requireActual('@storybook/core-client'); + + return { + ...coreClientAPI, + start: (...args: any[]) => { + mockStartedAPI = coreClientAPI.start(...args); + return mockStartedAPI; + }, + }; + }); + + jest.mock('@storybook/vue', () => { + const renderAPI = jest.requireActual('@storybook/vue'); + + renderAPI.addDecorator = mockStartedAPI.clientApi.addDecorator; + renderAPI.addParameters = mockStartedAPI.clientApi.addParameters; + + return renderAPI; + }); + + // eslint-disable-next-line global-require + const storybook = require('@storybook/vue'); configure({ ...options, - storybook: api, + storybook, }); - return { framework: 'vue' as const, renderTree: jest.requireActual('./renderTree').default, renderShallowTree: () => { throw new Error('Shallow renderer is not supported for vue'); }, - storybook: api, + storybook, }; } diff --git a/code/addons/storyshots/storyshots-core/src/frameworks/vue3/loader.ts b/code/addons/storyshots/storyshots-core/src/frameworks/vue3/loader.ts index 980b26e14c98..01de29fa01cc 100644 --- a/code/addons/storyshots/storyshots-core/src/frameworks/vue3/loader.ts +++ b/code/addons/storyshots/storyshots-core/src/frameworks/vue3/loader.ts @@ -11,17 +11,35 @@ function test(options: StoryshotsOptions): boolean { function load(options: StoryshotsOptions) { global.STORYBOOK_ENV = 'vue3'; - const storybook = jest.requireActual('@storybook/vue'); - const clientAPI = jest.requireActual('@storybook/client-api'); + let mockStartedAPI: any; + + jest.mock('@storybook/core-client', () => { + const coreClientAPI = jest.requireActual('@storybook/core-client'); + + return { + ...coreClientAPI, + start: (...args: any[]) => { + mockStartedAPI = coreClientAPI.start(...args); + return mockStartedAPI; + }, + }; + }); - const api = { - ...clientAPI, - ...storybook, - }; + jest.mock('@storybook/vue3', () => { + const renderAPI = jest.requireActual('@storybook/vue3'); + + renderAPI.addDecorator = mockStartedAPI.clientApi.addDecorator; + renderAPI.addParameters = mockStartedAPI.clientApi.addParameters; + + return renderAPI; + }); + + // eslint-disable-next-line global-require + const storybook = require('@storybook/vue3'); configure({ ...options, - storybook: api, + storybook, }); return { @@ -30,7 +48,7 @@ function load(options: StoryshotsOptions) { renderShallowTree: () => { throw new Error('Shallow renderer is not supported for Vue 3'); }, - storybook: api, + storybook, }; } diff --git a/code/addons/storyshots/storyshots-core/src/frameworks/web-components/loader.ts b/code/addons/storyshots/storyshots-core/src/frameworks/web-components/loader.ts index 35f8020718f3..b17cd8f4474f 100644 --- a/code/addons/storyshots/storyshots-core/src/frameworks/web-components/loader.ts +++ b/code/addons/storyshots/storyshots-core/src/frameworks/web-components/loader.ts @@ -10,17 +10,35 @@ function test(options: StoryshotsOptions): boolean { function load(options: StoryshotsOptions) { global.STORYBOOK_ENV = 'web-components'; - const storybook = jest.requireActual('@storybook/html'); - const clientAPI = jest.requireActual('@storybook/client-api'); + let mockStartedAPI: any; + + jest.mock('@storybook/core-client', () => { + const coreClientAPI = jest.requireActual('@storybook/core-client'); + + return { + ...coreClientAPI, + start: (...args: any[]) => { + mockStartedAPI = coreClientAPI.start(...args); + return mockStartedAPI; + }, + }; + }); - const api = { - ...clientAPI, - ...storybook, - }; + jest.mock('@storybook/html', () => { + const renderAPI = jest.requireActual('@storybook/html'); + + renderAPI.addDecorator = mockStartedAPI.clientApi.addDecorator; + renderAPI.addParameters = mockStartedAPI.clientApi.addParameters; + + return renderAPI; + }); + + // eslint-disable-next-line global-require + const storybook = require('@storybook/html'); configure({ ...options, - storybook: api, + storybook, }); return { @@ -29,7 +47,7 @@ function load(options: StoryshotsOptions) { renderShallowTree: () => { throw new Error('Shallow renderer is not supported for web-components'); }, - storybook: api, + storybook, }; } diff --git a/code/frameworks/angular/package.json b/code/frameworks/angular/package.json index 31974b668643..756aa89192dd 100644 --- a/code/frameworks/angular/package.json +++ b/code/frameworks/angular/package.json @@ -51,6 +51,7 @@ "@types/react": "^16.14.23", "@types/react-dom": "^16.9.14", "@types/semver": "^7.3.4", + "@types/webpack-env": "^1.18.0", "core-js": "^3.8.2", "find-up": "^5.0.0", "global": "^4.4.0", diff --git a/code/frameworks/angular/src/client/public-api.ts b/code/frameworks/angular/src/client/public-api.ts index 42c179689090..1710041317df 100644 --- a/code/frameworks/angular/src/client/public-api.ts +++ b/code/frameworks/angular/src/client/public-api.ts @@ -16,7 +16,7 @@ interface ClientApi extends Addon_ClientStoryApi void; } -const api = start(renderToDOM, { decorateStory, render }); +const api = start(renderToDOM, { decorateStory, render }); export const storiesOf: ClientApi['storiesOf'] = (kind, m) => { return (api.clientApi.storiesOf(kind, m) as ReturnType).addParameters({ diff --git a/code/frameworks/ember/src/client/preview/index.ts b/code/frameworks/ember/src/client/preview/index.ts index 9327fbfe7556..0c23ff323e55 100644 --- a/code/frameworks/ember/src/client/preview/index.ts +++ b/code/frameworks/ember/src/client/preview/index.ts @@ -2,8 +2,9 @@ import { start } from '@storybook/core-client'; import './globals'; import { renderToDOM } from './render'; +import type { EmberFramework } from './types'; -const { configure: coreConfigure, clientApi, forceReRender } = start(renderToDOM); +const { configure: coreConfigure, clientApi, forceReRender } = start(renderToDOM); export const { raw } = clientApi; diff --git a/code/lib/api/package.json b/code/lib/api/package.json index 87f4bfb8dd7c..22278741fbd5 100644 --- a/code/lib/api/package.json +++ b/code/lib/api/package.json @@ -24,11 +24,6 @@ "import": "./dist/index.mjs", "types": "./dist/index.d.ts" }, - "./shortcut": { - "require": "./dist/shortcut.js", - "import": "./dist/shortcut.mjs", - "types": "./dist/shortcut.d.ts" - }, "./package.json": "./package.json" }, "main": "dist/index.js", @@ -80,8 +75,7 @@ }, "bundler": { "entries": [ - "./src/index.tsx", - "./src/shortcut.ts" + "./src/index.tsx" ] }, "gitHead": "1c706a4a778831e012343c905f86225fa71491a7" diff --git a/code/lib/api/shortcut.d.ts b/code/lib/api/shortcut.d.ts deleted file mode 100644 index 26c2671b9af5..000000000000 --- a/code/lib/api/shortcut.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -export type KeyCollection = string[]; - -export function shortcutToHumanString(shortcut: KeyCollection): string; -export function eventToShortcut(e: KeyboardEvent): KeyCollection | null; -export function shortcutMatchesShortcut( - inputShortcut: KeyCollection, - shortcut: KeyCollection -): boolean; diff --git a/code/lib/api/shortcut.js b/code/lib/api/shortcut.js deleted file mode 100644 index 9fb9988699cd..000000000000 --- a/code/lib/api/shortcut.js +++ /dev/null @@ -1 +0,0 @@ -export * from './dist/shortcut'; diff --git a/code/lib/api/src/index.tsx b/code/lib/api/src/index.tsx index ff0e9cee8388..380bd9085972 100644 --- a/code/lib/api/src/index.tsx +++ b/code/lib/api/src/index.tsx @@ -64,6 +64,7 @@ import * as url from './modules/url'; import * as version from './modules/versions'; // eslint-disable-next-line import/no-cycle import * as globals from './modules/globals'; +import { eventToShortcut, shortcutMatchesShortcut, shortcutToHumanString } from './lib/shortcut'; const { ActiveTabs } = layout; @@ -480,3 +481,5 @@ export function useArgTypes(): API_ArgTypes { const current = useCurrentStory(); return (current?.type === 'story' && current.argTypes) || {}; } + +export { eventToShortcut, shortcutToHumanString, shortcutMatchesShortcut }; diff --git a/code/lib/builder-webpack5/package.json b/code/lib/builder-webpack5/package.json index 269253ceac03..de4574034f20 100644 --- a/code/lib/builder-webpack5/package.json +++ b/code/lib/builder-webpack5/package.json @@ -36,6 +36,7 @@ "types": "./presets/preview-preset.d.ts" }, "./templates/virtualModuleModernEntry.js.handlebars": "./templates/virtualModuleModernEntry.js.handlebars", + "./templates/preview.ejs": "./templates/preview.ejs", "./package.json": "./package.json" }, "main": "dist/index.js", @@ -65,6 +66,7 @@ "@storybook/core-events": "7.0.0-alpha.47", "@storybook/core-webpack": "7.0.0-alpha.47", "@storybook/node-logger": "7.0.0-alpha.47", + "@storybook/preview": "7.0.0-alpha.47", "@storybook/preview-web": "7.0.0-alpha.47", "@storybook/router": "7.0.0-alpha.47", "@storybook/store": "7.0.0-alpha.47", @@ -76,7 +78,9 @@ "browser-assert": "^1.2.1", "case-sensitive-paths-webpack-plugin": "^2.4.0", "css-loader": "^6.7.1", + "express": "^4.17.1", "fork-ts-checker-webpack-plugin": "^7.2.8", + "fs-extra": "^9.0.1", "global": "^4.4.0", "html-webpack-plugin": "^5.5.0", "path-browserify": "^1.0.1", diff --git a/code/lib/builder-webpack5/src/index.ts b/code/lib/builder-webpack5/src/index.ts index d8ae375a5559..6bdb48644650 100644 --- a/code/lib/builder-webpack5/src/index.ts +++ b/code/lib/builder-webpack5/src/index.ts @@ -6,7 +6,9 @@ import { logger } from '@storybook/node-logger'; import { useProgressReporting } from '@storybook/core-common'; import type { Builder, Options } from '@storybook/types'; import { checkWebpackVersion } from '@storybook/core-webpack'; -import { join } from 'path'; +import { dirname, join, parse } from 'path'; +import express from 'express'; +import fs from 'fs-extra'; export * from './types'; @@ -131,6 +133,11 @@ const starter: StarterFunction = async function* starterGeneratorFn({ compilation = webpackDevMiddleware(compiler, middlewareOptions); + const previewResolvedDir = dirname(require.resolve('@storybook/preview/package.json')); + const previewDirOrigin = join(previewResolvedDir, 'dist'); + + router.use(`/sb-preview`, express.static(previewDirOrigin)); + router.use(compilation); router.use(webpackHotMiddleware(compiler as any)); @@ -181,7 +188,7 @@ const builder: BuilderFunction = async function* builderGeneratorFn({ startTime, } as any as Stats; } - return new Promise((succeed, fail) => { + const webpackCompilation = new Promise((succeed, fail) => { compiler.run((error, stats) => { if (error || !stats || stats.hasErrors()) { logger.error('=> Failed to build the preview'); @@ -238,6 +245,24 @@ const builder: BuilderFunction = async function* builderGeneratorFn({ startTime, }); }); }); + + const previewResolvedDir = dirname(require.resolve('@storybook/preview/package.json')); + const previewDirOrigin = join(previewResolvedDir, 'dist'); + const previewDirTarget = join(options.outputDir || '', `sb-preview`); + + const previewFiles = fs.copy(previewDirOrigin, previewDirTarget, { + filter: (src) => { + const { ext } = parse(src); + if (ext) { + return ext === '.mjs'; + } + return true; + }, + }); + + const [webpackCompilationOutput] = await Promise.all([webpackCompilation, previewFiles]); + + return webpackCompilationOutput; }; export const start = async (options: BuilderStartOptions) => { diff --git a/code/lib/builder-webpack5/src/presets/preview-preset.ts b/code/lib/builder-webpack5/src/presets/preview-preset.ts index 4d8daace20ad..9614abcb2d1f 100644 --- a/code/lib/builder-webpack5/src/presets/preview-preset.ts +++ b/code/lib/builder-webpack5/src/presets/preview-preset.ts @@ -30,3 +30,6 @@ export const babel = async (config: any, options: any) => ({ }); export const babelLoaderRef = () => require.resolve('babel-loader'); + +export const previewMainTemplate = () => + require.resolve('@storybook/builder-webpack5/templates/preview.ejs'); diff --git a/code/lib/builder-webpack5/src/preview/iframe-webpack.config.ts b/code/lib/builder-webpack5/src/preview/iframe-webpack.config.ts index ac29c5ad5d95..c984444da13c 100644 --- a/code/lib/builder-webpack5/src/preview/iframe-webpack.config.ts +++ b/code/lib/builder-webpack5/src/preview/iframe-webpack.config.ts @@ -1,4 +1,4 @@ -import path from 'path'; +import { dirname, join, resolve } from 'path'; import { DefinePlugin, HotModuleReplacementPlugin, ProgressPlugin, ProvidePlugin } from 'webpack'; import type { Configuration } from 'webpack'; import HtmlWebpackPlugin from 'html-webpack-plugin'; @@ -23,26 +23,38 @@ import type { BuilderOptions, TypescriptOptions } from '../types'; import { createBabelLoader } from './babel-loader-preview'; const storybookPaths: Record = { - global: path.dirname(require.resolve(`global/package.json`)), + global: dirname(require.resolve(`global/package.json`)), ...[ - 'addons', + // 'api', - 'store', + 'components', + 'router', + 'theming', + ].reduce( + (acc, sbPackage) => ({ + ...acc, + [`@storybook/${sbPackage}`]: dirname(require.resolve(`@storybook/${sbPackage}/package.json`)), + }), + {} + ), + ...[ + // 'channels', 'channel-postmessage', 'channel-websocket', - 'components', 'core-events', - 'router', - 'theming', + 'client-logger', + 'addons', + 'store', 'preview-web', 'client-api', - 'client-logger', + 'core-client', ].reduce( (acc, sbPackage) => ({ ...acc, - [`@storybook/${sbPackage}`]: path.dirname( - require.resolve(`@storybook/${sbPackage}/package.json`) + [`@storybook/${sbPackage}`]: join( + dirname(require.resolve(`@storybook/preview/package.json`)), + `dist/global/${sbPackage}.mjs` ), }), {} @@ -53,7 +65,7 @@ export default async ( options: Options & Record & { typescriptOptions: TypescriptOptions } ): Promise => { const { - outputDir = path.join('.', 'public'), + outputDir = join('.', 'public'), quiet, packageJson, configType, @@ -95,11 +107,11 @@ export default async ( const virtualModuleMapping: Record = {}; if (features?.storyStoreV7) { const storiesFilename = 'storybook-stories.js'; - const storiesPath = path.resolve(path.join(workingDir, storiesFilename)); + const storiesPath = resolve(join(workingDir, storiesFilename)); const needPipelinedImport = !!builderOptions.lazyCompilation && !isProd; virtualModuleMapping[storiesPath] = toImportFn(stories, { needPipelinedImport }); - const configEntryPath = path.resolve(path.join(workingDir, 'storybook-config-entry.js')); + const configEntryPath = resolve(join(workingDir, 'storybook-config-entry.js')); virtualModuleMapping[configEntryPath] = handlebars( await readTemplate( require.resolve( @@ -116,14 +128,12 @@ export default async ( } else { const rendererName = await getRendererName(options); - const rendererInitEntry = path.resolve( - path.join(workingDir, 'storybook-init-renderer-entry.js') - ); + const rendererInitEntry = resolve(join(workingDir, 'storybook-init-renderer-entry.js')); virtualModuleMapping[rendererInitEntry] = `import '${rendererName}';`; entries.push(rendererInitEntry); const entryTemplate = await readTemplate( - path.join(__dirname, '..', '..', 'templates', 'virtualModuleEntry.template.js') + join(__dirname, '..', '..', 'templates', 'virtualModuleEntry.template.js') ); previewAnnotations.forEach((previewAnnotationFilename: string | undefined) => { @@ -147,12 +157,12 @@ export default async ( }); if (stories.length > 0) { const storyTemplate = await readTemplate( - path.join(__dirname, '..', '..', 'templates', 'virtualModuleStory.template.js') + join(__dirname, '..', '..', 'templates', 'virtualModuleStory.template.js') ); // NOTE: this file has a `.cjs` extension as it is a CJS file (from `dist/cjs`) and runs // in the user's webpack mode, which may be strict about the use of require/import. // See https://github.com/storybookjs/storybook/issues/14877 - const storiesFilename = path.resolve(path.join(workingDir, `generated-stories-entry.cjs`)); + const storiesFilename = resolve(join(workingDir, `generated-stories-entry.cjs`)); virtualModuleMapping[storiesFilename] = interpolate(storyTemplate, { rendererName, }) @@ -180,7 +190,7 @@ export default async ( devtool: 'cheap-module-source-map', entry: entries, output: { - path: path.resolve(process.cwd(), outputDir), + path: resolve(process.cwd(), outputDir), filename: isProd ? '[name].[contenthash:8].iframe.bundle.js' : '[name].iframe.bundle.js', publicPath: '', }, diff --git a/code/lib/core-common/templates/preview.ejs b/code/lib/builder-webpack5/templates/preview.ejs similarity index 88% rename from code/lib/core-common/templates/preview.ejs rename to code/lib/builder-webpack5/templates/preview.ejs index 19d86834ef5a..d985b98b399c 100644 --- a/code/lib/core-common/templates/preview.ejs +++ b/code/lib/builder-webpack5/templates/preview.ejs @@ -36,8 +36,8 @@ <% } %> <% } %> - <% } %> <% htmlWebpackPlugin.files.js.forEach(file => { %> - - <% }); %> + <% } %> + + diff --git a/code/lib/core-common/src/utils/template.ts b/code/lib/core-common/src/utils/template.ts index b9902a627f6f..47541f40b454 100644 --- a/code/lib/core-common/src/utils/template.ts +++ b/code/lib/core-common/src/utils/template.ts @@ -36,7 +36,3 @@ export function getPreviewHeadTemplate( return interpolate(result, interpolations); } - -export function getPreviewMainTemplate() { - return `${sync(__dirname)}/templates/preview.ejs`; -} diff --git a/code/lib/core-server/src/core-presets.disabled-test.ts b/code/lib/core-server/src/core-presets.disabled-test.ts deleted file mode 100644 index 4c8f22320f2a..000000000000 --- a/code/lib/core-server/src/core-presets.disabled-test.ts +++ /dev/null @@ -1,304 +0,0 @@ -/* eslint-disable import/no-extraneous-dependencies */ -import 'jest-specific-snapshot'; -import path from 'path'; -import { mkdtemp as mkdtempCb } from 'fs'; -import os from 'os'; -import { promisify } from 'util'; -import type { Configuration } from 'webpack'; -import { - resolvePathInStorybookCache, - createFileSystemCache, - getProjectRoot, -} from '@storybook/core-common'; -import { executor as previewExecutor } from '@storybook/builder-webpack5'; -import { executor as managerExecutor } from '@storybook/builder-manager'; - -import { sync as readUpSync } from 'read-pkg-up'; -import { buildDevStandalone } from './build-dev'; -import { buildStaticStandalone } from './build-static'; - -import { outputStats } from './utils/output-stats'; - -const { SNAPSHOT_OS } = global; -const mkdtemp = promisify(mkdtempCb); -const { packageJson } = readUpSync({ cwd: __dirname }); - -// this only applies to this file -jest.setTimeout(10000); - -// FIXME: this doesn't work - -jest.mock('webpack', () => { - const value = jest.fn(() => false); - const actual = jest.requireActual('webpack'); - - Object.keys(actual).forEach((key) => { - value[key] = actual[key]; - }); - return value; -}); - -jest.mock('@storybook/telemetry', () => ({ - getStorybookMetadata: jest.fn(() => ({})), - telemetry: jest.fn(() => ({})), -})); -jest.mock('fs-extra', () => ({ - copy: jest.fn(() => undefined), - emptyDir: jest.fn(() => undefined), - ensureDir: jest.fn(() => true), - ensureFile: jest.fn(() => undefined), - pathExists: jest.fn(() => true), - readFile: jest.fn((f) => ''), - readJSON: jest.fn(() => ({})), - remove: jest.fn(() => undefined), - writeFile: jest.fn(() => undefined), - writeJSON: jest.fn(() => undefined), -})); - -jest.mock('./utils/StoryIndexGenerator', () => { - const { StoryIndexGenerator } = jest.requireActual('./utils/StoryIndexGenerator'); - return { - StoryIndexGenerator: class extends StoryIndexGenerator { - initialize() { - return Promise.resolve(undefined); - } - - getIndex() { - return { stories: {}, v: 3 }; - } - }, - }; -}); - -jest.mock('./utils/stories-json', () => ({ - extractStoriesJson: () => Promise.resolve(), - useStoriesJson: () => {}, -})); - -// we're not in the right directory for auto-title to work, so just -// stub it out -jest.mock('@storybook/store', () => { - const actualStore = jest.requireActual('@storybook/store'); - return { - ...actualStore, - autoTitle: () => 'auto-title', - autoTitleFromSpecifier: () => 'auto-title-from-specifier', - }; -}); - -jest.mock('http', () => ({ - ...jest.requireActual('http'), - createServer: () => ({ listen: (_options, cb) => cb(), on: jest.fn() }), -})); -jest.mock('ws'); -jest.mock('@storybook/node-logger', () => ({ - logger: { - info: jest.fn(), - warn: jest.fn(), - error: jest.fn(), - line: jest.fn(), - trace: jest.fn(), - }, -})); -jest.mock('./utils/output-startup-information', () => ({ - outputStartupInformation: jest.fn(), -})); - -jest.mock('./utils/output-stats'); -jest.mock('./utils/open-in-browser', () => ({ - openInBrowser: jest.fn(), -})); - -const cache = createFileSystemCache({ - basePath: resolvePathInStorybookCache('dev-server'), - ns: 'storybook-test', // Optional. A grouping namespace for items. -}); - -const managerOnly = false; -const baseOptions = { - ignorePreview: managerOnly, - // FIXME: this should just be ignorePreview everywhere - managerOnly, // production - docsMode: false, - cache, - configDir: path.resolve(`${__dirname}/__for-testing__/`), - ci: true, - managerCache: false, -}; - -const ROOT = getProjectRoot(); -const CWD = process.cwd(); -const NODE_MODULES = /.*node_modules/g; -const cleanRoots = (obj): any => { - if (!obj) return obj; - if (typeof obj === 'string') - return obj.replace(CWD, 'CWD').replace(ROOT, 'ROOT').replace(NODE_MODULES, 'NODE_MODULES'); - if (Array.isArray(obj)) return obj.map(cleanRoots); - if (obj instanceof RegExp) return cleanRoots(obj.toString()); - if (typeof obj === 'object') { - return Object.fromEntries( - Object.entries(obj).map(([key, val]) => { - if (key === 'version' && typeof val === 'string') { - return [key, '*']; - } - return [key, cleanRoots(val)]; - }) - ); - } - return obj; -}; - -const getConfig = (fn: any, name): Configuration | null => { - const call = fn.mock.calls.find((c) => c[0].name === name); - if (!call) { - return null; - } - return call[0]; -}; - -const prepareSnap = (get: any, name): Pick => { - const config = getConfig(get(), name); - if (!config) { - return null; - } - - const keys = Object.keys(config); - const { module, entry, plugins } = config; - - return cleanRoots({ keys, module, entry, plugins: plugins.map((p) => p.constructor.name) }); -}; - -const snap = (name: string) => `__snapshots__/${name}`; - -// FIXME: we no longer have test cases -// eslint-disable-next-line jest/no-disabled-tests -describe.skip('FIXME', () => { - describe.each([[]])('%s', (example) => { - describe.each([ - ['manager', managerExecutor], - ['preview', previewExecutor], - ])('%s', (component, executor) => { - beforeEach(async () => { - jest.clearAllMocks(); - await cache.clear(); - }); - - it.each([ - ['prod', buildStaticStandalone], - ['dev', buildDevStandalone], - ])('%s', async (mode, builder) => { - const options = { - ...baseOptions, - configDir: path.resolve(`${__dirname}/../../../examples/${example}/.storybook`), - // Only add an outputDir in production mode. - outputDir: - mode === 'prod' - ? await mkdtemp(path.join(os.tmpdir(), 'storybook-static-')) - : undefined, - ignorePreview: component === 'manager', - managerCache: component === 'preview', - packageJson, - }; - await builder(options); - const config = prepareSnap(executor.get, component); - expect(config).toMatchSpecificSnapshot( - snap(`${example}_${component}-${mode}-${SNAPSHOT_OS}`) - ); - }); - }); - }); -}); - -const progressPlugin = (config) => - config.plugins.find((p) => p.constructor.name === 'ProgressPlugin'); - -describe('dev cli flags', () => { - beforeEach(async () => { - jest.clearAllMocks(); - await cache.clear(); - }); - - const cliOptions = { ...baseOptions, packageJson }; - - // eslint-disable-next-line jest/no-disabled-tests - it.skip('baseline', async () => { - await buildDevStandalone(cliOptions); - const config = getConfig(previewExecutor.get, 'preview'); - expect(progressPlugin(config)).toBeTruthy(); - }); - - // eslint-disable-next-line jest/no-disabled-tests - it.skip('--quiet', async () => { - const options = { ...cliOptions, quiet: true }; - await buildDevStandalone(options); - const config = getConfig(previewExecutor.get, 'preview'); - expect(progressPlugin(config)).toBeFalsy(); - }); - - it('--webpack-stats-json calls output-stats', async () => { - await buildDevStandalone(cliOptions); - expect(outputStats).not.toHaveBeenCalled(); - - await buildDevStandalone({ ...cliOptions, webpackStatsJson: '/tmp/dir' }); - expect(outputStats).toHaveBeenCalledWith( - '/tmp/dir', - expect.objectContaining({ toJson: expect.any(Function) }) - ); - }); - - describe.each([ - ['root directory /', '/', "Won't remove directory '/'. Check your outputDir!"], - ['empty string ""', '', "Won't remove current directory. Check your outputDir!"], - ])('Invalid outputDir must throw: %s', (_, outputDir, expectedErrorMessage) => { - const optionsWithInvalidDir = { - ...cliOptions, - outputDir, - }; - - it('production mode', async () => { - expect.assertions(1); - await expect(buildStaticStandalone(optionsWithInvalidDir)).rejects.toThrow( - expectedErrorMessage - ); - }); - }); - - describe('Invalid staticDir must throw: root directory /', () => { - const optionsWithInvalidStaticDir = { - ...cliOptions, - staticDir: ['/'], - }; - - it('production mode', async () => { - expect.assertions(1); - await expect(buildStaticStandalone(optionsWithInvalidStaticDir)).rejects.toThrow( - "Won't copy root directory. Check your staticDirs!" - ); - }); - }); -}); - -describe('build cli flags', () => { - beforeEach(async () => { - jest.clearAllMocks(); - await cache.clear(); - }); - const cliOptions = { - ...baseOptions, - outputDir: `${__dirname}/storybook-static`, - packageJson, - }; - - it('does not call output-stats', async () => { - await buildStaticStandalone(cliOptions); - expect(outputStats).not.toHaveBeenCalled(); - }); - - it('--webpack-stats-json calls output-stats', async () => { - await buildStaticStandalone({ ...cliOptions, webpackStatsJson: '/tmp/dir' }); - expect(outputStats).toHaveBeenCalledWith( - '/tmp/dir', - expect.objectContaining({ toJson: expect.any(Function) }) - ); - }); -}); diff --git a/code/lib/core-server/src/index.ts b/code/lib/core-server/src/index.ts index 41d3a3b563cc..1b7764d305d9 100644 --- a/code/lib/core-server/src/index.ts +++ b/code/lib/core-server/src/index.ts @@ -1,11 +1,7 @@ // eslint-disable-next-line @typescript-eslint/triple-slash-reference /// -export { - getPreviewHeadTemplate, - getPreviewBodyTemplate, - getPreviewMainTemplate, -} from '@storybook/core-common'; +export { getPreviewHeadTemplate, getPreviewBodyTemplate } from '@storybook/core-common'; export * from './build-static'; export * from './build-dev'; diff --git a/code/lib/core-server/src/presets/common-preset.ts b/code/lib/core-server/src/presets/common-preset.ts index 4b325f4a7ab6..0f615d27f7e0 100644 --- a/code/lib/core-server/src/presets/common-preset.ts +++ b/code/lib/core-server/src/presets/common-preset.ts @@ -1,11 +1,6 @@ import fs from 'fs-extra'; import { deprecate } from '@storybook/node-logger'; -import { - getPreviewBodyTemplate, - getPreviewHeadTemplate, - getPreviewMainTemplate, - loadEnvs, -} from '@storybook/core-common'; +import { getPreviewBodyTemplate, getPreviewHeadTemplate, loadEnvs } from '@storybook/core-common'; import type { CLIOptions, CoreCommon_IndexerOptions, @@ -41,8 +36,6 @@ export const previewBody = async (base: any, { configDir, presets }: Options) => return getPreviewBodyTemplate(configDir, interpolations); }; -export const previewMainTemplate = () => getPreviewMainTemplate(); - export const typescript = () => ({ check: false, // 'react-docgen' faster but produces lower quality typescript results diff --git a/code/lib/core-server/src/utils/stories-json.test.ts b/code/lib/core-server/src/utils/stories-json.test.ts index c83ce87a1e90..f1c734d76abb 100644 --- a/code/lib/core-server/src/utils/stories-json.test.ts +++ b/code/lib/core-server/src/utils/stories-json.test.ts @@ -1,10 +1,12 @@ +/// ; + import fs from 'fs-extra'; import type { Router, Request, Response } from 'express'; import Watchpack from 'watchpack'; import path from 'path'; import debounce from 'lodash/debounce'; import { STORY_INDEX_INVALIDATED } from '@storybook/core-events'; -import type { StoryIndex } from '@storybook/store'; +import type { Store_StoryIndex } from '@storybook/types'; import { loadCsf } from '@storybook/csf-tools'; import { normalizeStoriesEntry } from '@storybook/core-common'; @@ -852,7 +854,7 @@ describe('useStoriesJson', () => { describe('convertToIndexV3', () => { it('converts v7 index.json to v6 stories.json', () => { - const indexJson: StoryIndex = { + const indexJson: Store_StoryIndex = { v: 4, entries: { 'a--docs': { diff --git a/code/lib/preview/README.md b/code/lib/preview/README.md new file mode 100644 index 000000000000..cb44e3b4b07e --- /dev/null +++ b/code/lib/preview/README.md @@ -0,0 +1,94 @@ +# Preview (Web) + +This is the main API for the (web) version of the Storybook Preview. + +The preview's job is: + +1. Read and update the URL (via the URL Store) + +2. Listen to instructions on the channel and emit events as things occur. + +3. Render the current selection to the web view in either story or docs mode. + +## V7 Store vs Legacy (V6) + +The story store is designed to load stories 'on demand', and will operate in this fashion if the `storyStoreV7` feature is enabled. + +However, for back-compat reasons, in v6 mode, we need to load all stories, synchronously on bootup, emitting the `SET_STORIES` event. + +In V7 mode we do not emit that event, instead preferring the `STORY_PREPARED` event, with the data for the single story being rendered. + +## Initialization + +The preview is `initialized` in two ways. + +### V7 Mode: + +- `importFn` - is an async `import()` function + +- `getProjectAnnotations` - is a simple function that evaluations `preview.js` and addon config files and combines them. If it errors, the Preview will show the error. + +- No `getStoryIndex` function is passed, instead the preview creates a `StoryIndexClient` that pulls `stories.json` from node and watches the event stream for invalidation events. + +### V6 Mode + +- `importFn` - is a simulated `import()` function, that is synchronous, see `client-api` for details. +- `getProjectAnnotations` - also evaluates `preview.js` et al, but watches for calls to `setStories`, and passes them to the `ClientApi` +- `getStoryIndex` is a local function (that must be called _after_ `getProjectAnnotations`) that gets the list of stories added. + +See `client-api` for more details on this process. + +## Story Rendering and interruptions + +The Preview is split into three parts responsible for state management: + +- `PreviewWeb` - which story is rendered, receives events and (maybe) changes/re-renders stories +- `StoryRender` - (imports +) prepares the story, renders it through the various phases +- `DocsRender` - if a story renders in docs mode, it is "transformed" into a `DocsRender` once we know. + +A rendering story goes through these phases: + +- `preparing` - (maybe async) import the story file and prepare the story function. +- `loading` - async loaders are running +- `rendering` - the `renderToDOM` function for the framework is running +- `playing` - the `play` function is running +- `completed` - the story is done. + +It also has two error states: + +- `aborted` - the story was stopped midway (see below) +- `errored` - there was an error thrown somewhere along the way. + +### Re-rendering and aborting + +A story may re-render due to various events, which can have implications if the story is not in the `completed` phase: + +- `UPDATE_STORY_ARGS` / `UPDATE_GLOBALS` -- change of inputs +- `FORCE_RE_RENDER` - re-render unchanged + +If these events happen during a render: + +- if the story is `preparing` or `loading`, leave thing unchanged and let the new `args`/`globals` be picked up by the render phase +- otherwise, use the result of the previous `loaders` run, and simply re-render over the top + +- `FORCE_REMOUNT` - remount (or equivalent) the component and re-render. + +If this happens during a render, treat `loading` similarly, but: + +- if the story is `rendering`, start a new render and abort the previous render immediately afterwards +- if the story is `playing`, attempt to abort the previous play function, and start a new render. + +### Changing story + +Also the `SET_CURRENT_STORY` event may change the current story. We need to check: + +- If the `storyId` changed +- If the `viewMode` changed +- If the story implementation changed (i.e if HMR occurred). + +If the _previous_ story is still `preparing`, we cannot know if the implementation changed, so we +abort the preparing immediately, and let the new story take over. + +Otherwise, if all of the above are the same, we do nothing. + +If they are different, and the old story is not `completed`, we try to abort it immediately. If that fails (e.g. the `play` function doesn't respond to the `abort` event), then we reload the window. diff --git a/code/lib/preview/package.json b/code/lib/preview/package.json new file mode 100644 index 000000000000..8e7f7e965c3f --- /dev/null +++ b/code/lib/preview/package.json @@ -0,0 +1,150 @@ +{ + "name": "@storybook/preview", + "version": "7.0.0-alpha.47", + "description": "", + "keywords": [ + "storybook" + ], + "homepage": "https://github.com/storybookjs/storybook/tree/main/code/lib/preview", + "bugs": { + "url": "https://github.com/storybookjs/storybook/issues" + }, + "repository": { + "type": "git", + "url": "https://github.com/storybookjs/storybook.git", + "directory": "code/lib/preview" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/storybook" + }, + "license": "MIT", + "sideEffects": false, + "exports": { + ".": { + "import": "./dist/index.mjs", + "require": "./dist/index.js", + "types": "./dist/index.d.ts" + }, + "./dist/addons": { + "import": "./dist/addons.mjs", + "require": "./dist/addons.js", + "types": "./dist/addons.d.ts" + }, + "./dist/client-api": { + "import": "./dist/client-api.mjs", + "require": "./dist/client-api.js", + "types": "./dist/client-api.d.ts" + }, + "./dist/core-client": { + "import": "./dist/core-client.mjs", + "require": "./dist/core-client.js", + "types": "./dist/core-client.d.ts" + }, + "./dist/preview-web": { + "import": "./dist/preview-web.mjs", + "require": "./dist/preview-web.js", + "types": "./dist/preview-web.d.ts" + }, + "./dist/store": { + "import": "./dist/store.mjs", + "require": "./dist/store.js", + "types": "./dist/store.d.ts" + }, + "./dist/global/addons": { + "import": "./dist/global/addons.mjs", + "require": "./dist/global/addons.js", + "types": "./dist/global/addons.d.ts" + }, + "./dist/global/client-api": { + "import": "./dist/global/client-api.mjs", + "require": "./dist/global/client-api.js", + "types": "./dist/global/client-api.d.ts" + }, + "./dist/global/core-client": { + "import": "./dist/global/core-client.mjs", + "require": "./dist/global/core-client.js", + "types": "./dist/global/core-client.d.ts" + }, + "./dist/global/preview-web": { + "import": "./dist/global/preview-web.mjs", + "require": "./dist/global/preview-web.js", + "types": "./dist/global/preview-web.d.ts" + }, + "./dist/global/store": { + "import": "./dist/global/store.mjs", + "require": "./dist/global/store.js", + "types": "./dist/global/store.d.ts" + }, + "./package.json": "./package.json" + }, + "main": "dist/index.js", + "module": "dist/index.mjs", + "types": "dist/index.d.ts", + "files": [ + "dist/**/*", + "README.md", + "*.js", + "*.d.ts" + ], + "scripts": { + "check": "../../../scripts/node_modules/.bin/tsc --noEmit", + "prep": "../../../scripts/prepare/bundle.ts" + }, + "devDependencies": { + "@storybook/api": "7.0.0-alpha.47", + "@storybook/channel-postmessage": "7.0.0-alpha.47", + "@storybook/channel-websocket": "7.0.0-alpha.47", + "@storybook/channels": "7.0.0-alpha.47", + "@storybook/client-logger": "7.0.0-alpha.47", + "@storybook/core-client": "7.0.0-alpha.47", + "@storybook/core-common": "7.0.0-alpha.47", + "@storybook/core-events": "7.0.0-alpha.47", + "@storybook/csf": "next", + "@storybook/preview-web": "7.0.0-alpha.47", + "@storybook/router": "7.0.0-alpha.47", + "@storybook/theming": "7.0.0-alpha.47", + "@storybook/types": "7.0.0-alpha.47", + "@types/qs": "^6.9.5", + "@types/webpack-env": "^1.16.4", + "ansi-to-html": "^0.6.11", + "dequal": "^2.0.2", + "global": "^4.4.0", + "lodash": "^4.17.21", + "memoizerific": "^1.11.3", + "qs": "^6.10.0", + "react": "16.14.0", + "slash": "^3.0.0", + "synchronous-promise": "^2.0.15", + "ts-dedent": "^2.0.0", + "ts-jest": "^28.0.8", + "typescript": "~4.6.3", + "util-deprecate": "^1.0.2" + }, + "publishConfig": { + "access": "public" + }, + "bundler": { + "entries": [ + "./src/index.ts", + "./src/addons.ts", + "./src/client-api.ts", + "./src/core-client.ts", + "./src/preview-web.ts", + "./src/store.ts" + ], + "untypedEntries": [ + "./src/global/addons.ts", + "./src/global/channel-postmessage.ts", + "./src/global/channel-websocket.ts", + "./src/global/channels.ts", + "./src/global/client-api.ts", + "./src/global/client-logger.ts", + "./src/global/core-client.ts", + "./src/global/core-events.ts", + "./src/global/preview-web.ts", + "./src/global/store.ts" + ] + }, + "gitHead": "3ef14366115c56c1d45c0359ff681cc47ed50532" +} diff --git a/code/lib/preview/src/addons.ts b/code/lib/preview/src/addons.ts new file mode 100644 index 000000000000..610dab5bfd22 --- /dev/null +++ b/code/lib/preview/src/addons.ts @@ -0,0 +1,2 @@ +/* eslint-disable import/no-extraneous-dependencies */ +export * from '@storybook/addons'; diff --git a/code/lib/preview/src/channel-postmessage.ts b/code/lib/preview/src/channel-postmessage.ts new file mode 100644 index 000000000000..3dd21c5dcd52 --- /dev/null +++ b/code/lib/preview/src/channel-postmessage.ts @@ -0,0 +1,2 @@ +/* eslint-disable import/no-extraneous-dependencies */ +export * from '@storybook/channel-postmessage'; diff --git a/code/lib/preview/src/channel-websocket.ts b/code/lib/preview/src/channel-websocket.ts new file mode 100644 index 000000000000..c1fa4d433cb2 --- /dev/null +++ b/code/lib/preview/src/channel-websocket.ts @@ -0,0 +1,2 @@ +/* eslint-disable import/no-extraneous-dependencies */ +export * from '@storybook/channel-websocket'; diff --git a/code/lib/preview/src/channels.ts b/code/lib/preview/src/channels.ts new file mode 100644 index 000000000000..f26adfc4bf6e --- /dev/null +++ b/code/lib/preview/src/channels.ts @@ -0,0 +1,2 @@ +/* eslint-disable import/no-extraneous-dependencies */ +export * from '@storybook/channels'; diff --git a/code/lib/preview/src/client-api.ts b/code/lib/preview/src/client-api.ts new file mode 100644 index 000000000000..f7fa2dedcc6a --- /dev/null +++ b/code/lib/preview/src/client-api.ts @@ -0,0 +1,2 @@ +/* eslint-disable import/no-extraneous-dependencies */ +export * from '@storybook/client-api'; diff --git a/code/lib/preview/src/client-logger.ts b/code/lib/preview/src/client-logger.ts new file mode 100644 index 000000000000..8af8721e54ad --- /dev/null +++ b/code/lib/preview/src/client-logger.ts @@ -0,0 +1,2 @@ +/* eslint-disable import/no-extraneous-dependencies */ +export * from '@storybook/client-logger'; diff --git a/code/lib/preview/src/core-client.ts b/code/lib/preview/src/core-client.ts new file mode 100644 index 000000000000..97d155a29697 --- /dev/null +++ b/code/lib/preview/src/core-client.ts @@ -0,0 +1,2 @@ +/* eslint-disable import/no-extraneous-dependencies */ +export * from '@storybook/core-client'; diff --git a/code/lib/preview/src/core-events.ts b/code/lib/preview/src/core-events.ts new file mode 100644 index 000000000000..2278f6494343 --- /dev/null +++ b/code/lib/preview/src/core-events.ts @@ -0,0 +1,2 @@ +/* eslint-disable import/no-extraneous-dependencies */ +export * from '@storybook/core-events'; diff --git a/code/lib/preview/src/global/addons.ts b/code/lib/preview/src/global/addons.ts new file mode 100644 index 000000000000..9de74a7b4788 --- /dev/null +++ b/code/lib/preview/src/global/addons.ts @@ -0,0 +1,46 @@ +/* eslint-disable no-underscore-dangle */ +import type * as MODULE from '../addons'; + +const { + addons, + AddonStore, + applyHooks, + HooksContext, + isSupportedType, + makeDecorator, + mockChannel, + types, + useArgs, + useCallback, + useChannel, + useEffect, + useGlobals, + useMemo, + useParameter, + useReducer, + useRef, + useState, + useStoryContext, +} = (globalThis as any).__STORYBOOK_MODULE_ADDONS__ as typeof MODULE; + +export { + addons, + AddonStore, + applyHooks, + HooksContext, + isSupportedType, + makeDecorator, + mockChannel, + types, + useArgs, + useCallback, + useChannel, + useEffect, + useGlobals, + useMemo, + useParameter, + useReducer, + useRef, + useState, + useStoryContext, +}; diff --git a/code/lib/preview/src/global/channel-postmessage.ts b/code/lib/preview/src/global/channel-postmessage.ts new file mode 100644 index 000000000000..eaf4c504907a --- /dev/null +++ b/code/lib/preview/src/global/channel-postmessage.ts @@ -0,0 +1,7 @@ +/* eslint-disable no-underscore-dangle */ +import type * as MODULE from '../channel-postmessage'; + +const { KEY, PostmsgTransport, createChannel } = (globalThis as any) + .__STORYBOOK_MODULE_CHANNEL_POSTMESSAGE__ as typeof MODULE; + +export { KEY, PostmsgTransport, createChannel }; diff --git a/code/lib/preview/src/global/channel-websocket.ts b/code/lib/preview/src/global/channel-websocket.ts new file mode 100644 index 000000000000..56598f7b4761 --- /dev/null +++ b/code/lib/preview/src/global/channel-websocket.ts @@ -0,0 +1,7 @@ +/* eslint-disable no-underscore-dangle */ +import type * as MODULE from '../channel-websocket'; + +const { WebsocketTransport, createChannel } = (globalThis as any) + .__STORYBOOK_MODULE_CHANNEL_WEBSOCKET__ as typeof MODULE; + +export { WebsocketTransport, createChannel }; diff --git a/code/lib/preview/src/global/channels.ts b/code/lib/preview/src/global/channels.ts new file mode 100644 index 000000000000..5f4b05ceb4c7 --- /dev/null +++ b/code/lib/preview/src/global/channels.ts @@ -0,0 +1,6 @@ +/* eslint-disable no-underscore-dangle */ +import type * as MODULE from '../channels'; + +const { Channel } = (globalThis as any).__STORYBOOK_MODULE_CHANNELS__ as typeof MODULE; + +export { Channel }; diff --git a/code/lib/preview/src/global/client-api.ts b/code/lib/preview/src/global/client-api.ts new file mode 100644 index 000000000000..f7e17e5d1427 --- /dev/null +++ b/code/lib/preview/src/global/client-api.ts @@ -0,0 +1,32 @@ +/* eslint-disable no-underscore-dangle */ +import type * as MODULE from '../client-api'; + +const { + addArgs, + addArgsEnhancer, + addArgTypes, + addArgTypesEnhancer, + addDecorator, + addLoader, + addParameters, + addStepRunner, + ClientApi, + getQueryParam, + getQueryParams, + setGlobalRender, +} = (globalThis as any).__STORYBOOK_MODULE_CLIENT_API__ as typeof MODULE; + +export { + addArgs, + addArgsEnhancer, + addArgTypes, + addArgTypesEnhancer, + addDecorator, + addLoader, + addParameters, + addStepRunner, + ClientApi, + getQueryParam, + getQueryParams, + setGlobalRender, +}; diff --git a/code/lib/preview/src/global/client-logger.ts b/code/lib/preview/src/global/client-logger.ts new file mode 100644 index 000000000000..3c933d0035a6 --- /dev/null +++ b/code/lib/preview/src/global/client-logger.ts @@ -0,0 +1,7 @@ +/* eslint-disable no-underscore-dangle */ +import type * as MODULE from '../client-logger'; + +const { deprecate, logger, once, pretty } = (globalThis as any) + .__STORYBOOK_MODULE_CLIENT_LOGGER__ as typeof MODULE; + +export { deprecate, logger, once, pretty }; diff --git a/code/lib/preview/src/global/core-client.ts b/code/lib/preview/src/global/core-client.ts new file mode 100644 index 000000000000..26b8d61b2a22 --- /dev/null +++ b/code/lib/preview/src/global/core-client.ts @@ -0,0 +1,7 @@ +/* eslint-disable no-underscore-dangle */ +import type * as MODULE from '../core-client'; + +const { ClientApi, StoryStore, start } = (globalThis as any) + .__STORYBOOK_MODULE_CORE_CLIENT__ as typeof MODULE; + +export { ClientApi, StoryStore, start }; diff --git a/code/lib/preview/src/global/core-events.ts b/code/lib/preview/src/global/core-events.ts new file mode 100644 index 000000000000..2e971a63d77f --- /dev/null +++ b/code/lib/preview/src/global/core-events.ts @@ -0,0 +1,86 @@ +/* eslint-disable no-underscore-dangle */ +import type * as MODULE from '../core-events'; + +const { + CHANNEL_CREATED, + CONFIG_ERROR, + CURRENT_STORY_WAS_SET, + DOCS_RENDERED, + FORCE_RE_RENDER, + FORCE_REMOUNT, + GLOBALS_UPDATED, + IGNORED_EXCEPTION, + NAVIGATE_URL, + PLAY_FUNCTION_THREW_EXCEPTION, + PRELOAD_ENTRIES, + PREVIEW_KEYDOWN, + REGISTER_SUBSCRIPTION, + RESET_STORY_ARGS, + SELECT_STORY, + SET_CONFIG, + SET_CURRENT_STORY, + SET_GLOBALS, + SET_INDEX, + SET_STORIES, + SHARED_STATE_CHANGED, + SHARED_STATE_SET, + STORIES_COLLAPSE_ALL, + STORIES_EXPAND_ALL, + STORY_ARGS_UPDATED, + STORY_CHANGED, + STORY_ERRORED, + STORY_INDEX_INVALIDATED, + STORY_MISSING, + STORY_PREPARED, + STORY_RENDER_PHASE_CHANGED, + STORY_RENDERED, + STORY_SPECIFIED, + STORY_THREW_EXCEPTION, + STORY_UNCHANGED, + UPDATE_GLOBALS, + UPDATE_QUERY_PARAMS, + UPDATE_STORY_ARGS, +} = (globalThis as any).__STORYBOOK_MODULE_ADDONS__ as typeof MODULE; + +export default (globalThis as any).__STORYBOOK_MODULE_CORE_EVENTS__.default; + +export { + CHANNEL_CREATED, + CONFIG_ERROR, + CURRENT_STORY_WAS_SET, + DOCS_RENDERED, + FORCE_RE_RENDER, + FORCE_REMOUNT, + GLOBALS_UPDATED, + IGNORED_EXCEPTION, + NAVIGATE_URL, + PLAY_FUNCTION_THREW_EXCEPTION, + PRELOAD_ENTRIES, + PREVIEW_KEYDOWN, + REGISTER_SUBSCRIPTION, + RESET_STORY_ARGS, + SELECT_STORY, + SET_CONFIG, + SET_CURRENT_STORY, + SET_GLOBALS, + SET_INDEX, + SET_STORIES, + SHARED_STATE_CHANGED, + SHARED_STATE_SET, + STORIES_COLLAPSE_ALL, + STORIES_EXPAND_ALL, + STORY_ARGS_UPDATED, + STORY_CHANGED, + STORY_ERRORED, + STORY_INDEX_INVALIDATED, + STORY_MISSING, + STORY_PREPARED, + STORY_RENDER_PHASE_CHANGED, + STORY_RENDERED, + STORY_SPECIFIED, + STORY_THREW_EXCEPTION, + STORY_UNCHANGED, + UPDATE_GLOBALS, + UPDATE_QUERY_PARAMS, + UPDATE_STORY_ARGS, +}; diff --git a/code/lib/preview/src/global/preview-web.ts b/code/lib/preview/src/global/preview-web.ts new file mode 100644 index 000000000000..760bd04cb388 --- /dev/null +++ b/code/lib/preview/src/global/preview-web.ts @@ -0,0 +1,20 @@ +/* eslint-disable no-underscore-dangle */ +import type * as MODULE from '../preview-web'; + +const { + DocsContext, + Preview, + PreviewWeb, + composeConfigs, + simulateDOMContentLoaded, + simulatePageLoad, +} = (globalThis as any).__STORYBOOK_MODULE_PREVIEW_WEB__ as typeof MODULE; + +export { + DocsContext, + Preview, + PreviewWeb, + composeConfigs, + simulateDOMContentLoaded, + simulatePageLoad, +}; diff --git a/code/lib/preview/src/global/store.ts b/code/lib/preview/src/global/store.ts new file mode 100644 index 000000000000..873b4aa78187 --- /dev/null +++ b/code/lib/preview/src/global/store.ts @@ -0,0 +1,84 @@ +/* eslint-disable no-underscore-dangle */ +import type * as MODULE from '../store'; + +const { + DEEPLY_EQUAL, + NO_TARGET_NAME, + StoryStore, + combineArgs, + combineParameters, + composeConfigs, + composeStepRunners, + composeStories, + composeStory, + decorateStory, + deepDiff, + defaultDecorateStory, + filterArgTypes, + getArrayField, + getField, + getObjectField, + getSingletonField, + getValuesFromArgTypes, + groupArgsByTarget, + inferControls, + mapArgsToTypes, + noTargetArgs, + normalizeComponentAnnotations, + normalizeInputType, + normalizeInputTypes, + normalizeProjectAnnotations, + normalizeStory, + prepareStory, + processCSFFile, + sanitizeStoryContextUpdate, + setProjectAnnotations, + sortStoriesV6, + sortStoriesV7, + useAddonState, + useSharedState, + userOrAutoTitle, + userOrAutoTitleFromSpecifier, + validateOptions, +} = (globalThis as any).__STORYBOOK_MODULE_STORE__ as typeof MODULE; + +export { + DEEPLY_EQUAL, + NO_TARGET_NAME, + StoryStore, + combineArgs, + combineParameters, + composeConfigs, + composeStepRunners, + composeStories, + composeStory, + decorateStory, + deepDiff, + defaultDecorateStory, + filterArgTypes, + getArrayField, + getField, + getObjectField, + getSingletonField, + getValuesFromArgTypes, + groupArgsByTarget, + inferControls, + mapArgsToTypes, + noTargetArgs, + normalizeComponentAnnotations, + normalizeInputType, + normalizeInputTypes, + normalizeProjectAnnotations, + normalizeStory, + prepareStory, + processCSFFile, + sanitizeStoryContextUpdate, + setProjectAnnotations, + sortStoriesV6, + sortStoriesV7, + useAddonState, + useSharedState, + userOrAutoTitle, + userOrAutoTitleFromSpecifier, + validateOptions, +}; diff --git a/code/lib/preview/src/index.ts b/code/lib/preview/src/index.ts new file mode 100644 index 000000000000..83f9f0a5903b --- /dev/null +++ b/code/lib/preview/src/index.ts @@ -0,0 +1,39 @@ +/* eslint-disable no-underscore-dangle */ + +import * as ADDONS from './addons'; +import * as CLIENT_API from './client-api'; +import * as CORE_CLIENT from './core-client'; +import * as PREVIEW_WEB from './preview-web'; +import * as STORE from './store'; +import * as CHANNELS from './channels'; +import * as CHANNEL_POSTMESSAGE from './channel-postmessage'; +import * as CHANNEL_WEBSOCKET from './channel-websocket'; +import * as CLIENT_LOGGER from './client-logger'; +import * as CORE_EVENTS from './core-events'; + +(globalThis as any).__STORYBOOK_MODULE_ADDONS__ = ADDONS; +(globalThis as any).__STORYBOOK_MODULE_CLIENT_API__ = CLIENT_API; +(globalThis as any).__STORYBOOK_MODULE_CORE_CLIENT__ = CORE_CLIENT; +(globalThis as any).__STORYBOOK_MODULE_PREVIEW_WEB__ = PREVIEW_WEB; +(globalThis as any).__STORYBOOK_MODULE_STORE__ = STORE; +(globalThis as any).__STORYBOOK_MODULE_CHANNELS__ = CHANNELS; +(globalThis as any).__STORYBOOK_MODULE_CHANNEL_POSTMESSAGE__ = CHANNEL_POSTMESSAGE; +(globalThis as any).__STORYBOOK_MODULE_CHANNEL_WEBSOCKET__ = CHANNEL_WEBSOCKET; +(globalThis as any).__STORYBOOK_MODULE_CLIENT_LOGGER__ = CLIENT_LOGGER; +(globalThis as any).__STORYBOOK_MODULE_CORE_EVENTS__ = CORE_EVENTS; + +const element = document.getElementById('storybook-script'); + +if (element) { + const { files } = element.dataset; + + if (files) { + const sources = files.split(',').map((file) => file.trim()); + + sources.forEach((source) => { + const imported = document.createElement('script'); + imported.src = source; + document.body.append(imported); + }); + } +} diff --git a/code/lib/preview/src/preview-web.ts b/code/lib/preview/src/preview-web.ts new file mode 100644 index 000000000000..d044c8dea7c1 --- /dev/null +++ b/code/lib/preview/src/preview-web.ts @@ -0,0 +1,2 @@ +/* eslint-disable import/no-extraneous-dependencies */ +export * from '@storybook/preview-web'; diff --git a/code/lib/preview/src/store.ts b/code/lib/preview/src/store.ts new file mode 100644 index 000000000000..ae79f8208a78 --- /dev/null +++ b/code/lib/preview/src/store.ts @@ -0,0 +1,2 @@ +/* eslint-disable import/no-extraneous-dependencies */ +export * from '@storybook/store'; diff --git a/code/lib/preview/tsconfig.json b/code/lib/preview/tsconfig.json new file mode 100644 index 000000000000..beef63b30edb --- /dev/null +++ b/code/lib/preview/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "strict": true, + "strictPropertyInitialization": false, + "useUnknownInCatchVariables": false, + "skipLibCheck": true + }, + "include": ["src/**/*"], + "exclude": [] +} diff --git a/code/renderers/html/src/public-api.ts b/code/renderers/html/src/public-api.ts index f531f34246b1..f6fef67d864d 100644 --- a/code/renderers/html/src/public-api.ts +++ b/code/renderers/html/src/public-api.ts @@ -13,7 +13,7 @@ interface ClientApi extends Addon_ClientStoryApi { raw: () => any; // todo add type } -const api = start(renderToDOM, { render }); +const api = start(renderToDOM, { render }); export const storiesOf: ClientApi['storiesOf'] = (kind, m) => { return (api.clientApi.storiesOf(kind, m) as ReturnType).addParameters({ diff --git a/code/renderers/preact/src/public-api.ts b/code/renderers/preact/src/public-api.ts index 8f0efb398e9d..37d98c15eebd 100644 --- a/code/renderers/preact/src/public-api.ts +++ b/code/renderers/preact/src/public-api.ts @@ -13,7 +13,7 @@ export interface ClientApi extends Addon_ClientStoryApi(renderToDOM); export const storiesOf: ClientApi['storiesOf'] = (kind, m) => { return (api.clientApi.storiesOf(kind, m) as ReturnType).addParameters({ diff --git a/code/renderers/react/src/__test__/Button.stories.tsx b/code/renderers/react/src/__test__/Button.stories.tsx index 373b31aad412..2daa84d9b10f 100644 --- a/code/renderers/react/src/__test__/Button.stories.tsx +++ b/code/renderers/react/src/__test__/Button.stories.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import type { StoryFn as CSF2Story, StoryObj as CSF3Story, Meta } from '@storybook/react'; import { within, userEvent } from '@storybook/testing-library'; +import type { StoryFn as CSF2Story, StoryObj as CSF3Story, Meta } from '..'; import type { ButtonProps } from './Button'; import { Button } from './Button'; diff --git a/code/renderers/react/src/__test__/Button.test.tsx b/code/renderers/react/src/__test__/Button.test.tsx index b685cb204757..0675ee50baf3 100644 --- a/code/renderers/react/src/__test__/Button.test.tsx +++ b/code/renderers/react/src/__test__/Button.test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { render, screen } from '@testing-library/react'; -import { setProjectAnnotations, composeStories, composeStory } from '@storybook/react'; +import { setProjectAnnotations, composeStories, composeStory } from '..'; import * as stories from './Button.stories'; diff --git a/code/renderers/react/src/__test__/internals.test.tsx b/code/renderers/react/src/__test__/internals.test.tsx index bb4d956a944e..dd4eb1b86ed0 100644 --- a/code/renderers/react/src/__test__/internals.test.tsx +++ b/code/renderers/react/src/__test__/internals.test.tsx @@ -4,7 +4,7 @@ import React from 'react'; import { addons } from '@storybook/addons'; import { render, screen } from '@testing-library/react'; -import { composeStories, composeStory } from '@storybook/react'; +import { composeStories, composeStory } from '..'; import * as stories from './Button.stories'; diff --git a/code/renderers/react/src/public-api.tsx b/code/renderers/react/src/public-api.tsx index 2cb268a6529a..412aecfd7ea1 100644 --- a/code/renderers/react/src/public-api.tsx +++ b/code/renderers/react/src/public-api.tsx @@ -17,7 +17,7 @@ interface ClientApi extends Addon_ClientStoryApi } const FRAMEWORK = 'react'; -const api = start(renderToDOM, { render }); +const api = start(renderToDOM, { render }); export const storiesOf: ClientApi['storiesOf'] = (kind, m) => { return (api.clientApi.storiesOf(kind, m) as ReturnType).addParameters({ diff --git a/code/renderers/react/src/testing-api.ts b/code/renderers/react/src/testing-api.ts index c1213f837eb7..0b655419f33f 100644 --- a/code/renderers/react/src/testing-api.ts +++ b/code/renderers/react/src/testing-api.ts @@ -34,7 +34,7 @@ import type { ReactFramework } from './types'; export function setProjectAnnotations( projectAnnotations: ProjectAnnotations | ProjectAnnotations[] ) { - originalSetProjectAnnotations(projectAnnotations); + originalSetProjectAnnotations(projectAnnotations); } /** Preserved for users migrating from `@storybook/testing-react`. diff --git a/code/renderers/server/src/public-api.ts b/code/renderers/server/src/public-api.ts index 75788fbbe4f7..01ace6c9761f 100644 --- a/code/renderers/server/src/public-api.ts +++ b/code/renderers/server/src/public-api.ts @@ -12,7 +12,7 @@ interface ClientApi extends Addon_ClientStoryApi raw: () => any; // todo add type } -const api = start(renderToDOM, { render }); +const api = start(renderToDOM, { render }); export const storiesOf: ClientApi['storiesOf'] = (kind, m) => { return (api.clientApi.storiesOf(kind, m) as ReturnType).addParameters({ diff --git a/code/renderers/svelte/src/public-api.ts b/code/renderers/svelte/src/public-api.ts index e972744c573d..95b61089e2ac 100644 --- a/code/renderers/svelte/src/public-api.ts +++ b/code/renderers/svelte/src/public-api.ts @@ -2,12 +2,13 @@ import { start } from '@storybook/core-client'; import { decorateStory } from './decorators'; import { render, renderToDOM } from './render'; +import type { SvelteFramework } from './types'; const { configure: coreConfigure, clientApi, forceReRender, -} = start(renderToDOM, { +} = start(renderToDOM, { decorateStory, render, }); diff --git a/code/renderers/vue/src/public-api.ts b/code/renderers/vue/src/public-api.ts index 4dcd7596faca..2f959aeb1513 100644 --- a/code/renderers/vue/src/public-api.ts +++ b/code/renderers/vue/src/public-api.ts @@ -15,7 +15,7 @@ interface ClientApi extends Addon_ClientStoryApi { load: (...args: any[]) => void; } -const api = start(renderToDOM, { decorateStory, render }); +const api = start(renderToDOM, { decorateStory, render }); export const storiesOf: ClientApi['storiesOf'] = (kind, m) => { return (api.clientApi.storiesOf(kind, m) as ReturnType).addParameters({ diff --git a/code/renderers/vue3/src/public-api.ts b/code/renderers/vue3/src/public-api.ts index 0b9e27a7f58f..291803d03264 100644 --- a/code/renderers/vue3/src/public-api.ts +++ b/code/renderers/vue3/src/public-api.ts @@ -17,7 +17,7 @@ interface ClientApi extends Addon_ClientStoryApi { app: App; } -const api = start(renderToDOM, { decorateStory, render }); +const api = start(renderToDOM, { decorateStory, render }); export const storiesOf: ClientApi['storiesOf'] = (kind, m) => { return (api.clientApi.storiesOf(kind, m) as ReturnType).addParameters({ diff --git a/code/renderers/web-components/src/public-api.ts b/code/renderers/web-components/src/public-api.ts index 96b63c389696..26cf76b2a637 100644 --- a/code/renderers/web-components/src/public-api.ts +++ b/code/renderers/web-components/src/public-api.ts @@ -13,7 +13,7 @@ interface ClientApi extends Addon_ClientStoryApi any; // todo add type } -const api = start(renderToDOM); +const api = start(renderToDOM); export const storiesOf: ClientApi['storiesOf'] = (kind, m) => { return (api.clientApi.storiesOf(kind, m) as ReturnType).addParameters({ diff --git a/code/ui/manager/src/components/panel/panel.tsx b/code/ui/manager/src/components/panel/panel.tsx index ad7141061cd6..c90e44f7676c 100644 --- a/code/ui/manager/src/components/panel/panel.tsx +++ b/code/ui/manager/src/components/panel/panel.tsx @@ -1,9 +1,9 @@ import type { ReactElement } from 'react'; import React, { Component, Fragment } from 'react'; -import { shortcutToHumanString } from '@storybook/api/shortcut'; import { styled } from '@storybook/theming'; import { Tabs, Icons, IconButton } from '@storybook/components'; import type { State } from '@storybook/api'; +import { shortcutToHumanString } from '@storybook/api'; const DesktopOnlyIconButton = styled(IconButton)({ // Hides full screen icon at mobile breakpoint defined in app.js diff --git a/code/ui/manager/src/containers/menu.tsx b/code/ui/manager/src/containers/menu.tsx index cc85f23387f5..61d678674aff 100644 --- a/code/ui/manager/src/containers/menu.tsx +++ b/code/ui/manager/src/containers/menu.tsx @@ -5,7 +5,7 @@ import { Badge } from '@storybook/components'; import type { API } from '@storybook/api'; import { styled, useTheme } from '@storybook/theming'; -import { shortcutToHumanString } from '@storybook/api/shortcut'; +import { shortcutToHumanString } from '@storybook/api'; import { MenuItemIcon } from '../components/sidebar/Menu'; const focusableUIElements = { diff --git a/code/ui/manager/src/globals/exports.ts b/code/ui/manager/src/globals/exports.ts index 36634b34a47d..5ebf52097129 100644 --- a/code/ui/manager/src/globals/exports.ts +++ b/code/ui/manager/src/globals/exports.ts @@ -200,7 +200,10 @@ export default { 'ManagerContext', 'Provider', 'combineParameters', + 'eventToShortcut', 'merge', + 'shortcutMatchesShortcut', + 'shortcutToHumanString', 'useAddonState', 'useArgTypes', 'useArgs', diff --git a/code/ui/manager/src/settings/shortcuts.tsx b/code/ui/manager/src/settings/shortcuts.tsx index 9b0fb39a8ed8..38968f2d0403 100644 --- a/code/ui/manager/src/settings/shortcuts.tsx +++ b/code/ui/manager/src/settings/shortcuts.tsx @@ -2,11 +2,7 @@ import type { ComponentProps, FC } from 'react'; import React, { Component } from 'react'; import { styled, keyframes } from '@storybook/theming'; -import { - eventToShortcut, - shortcutToHumanString, - shortcutMatchesShortcut, -} from '@storybook/api/shortcut'; +import { eventToShortcut, shortcutToHumanString, shortcutMatchesShortcut } from '@storybook/api'; import { Form, Icons } from '@storybook/components'; import SettingsFooter from './SettingsFooter'; diff --git a/code/workspace.json b/code/workspace.json index bbd44b617358..3d83aeb3fad8 100644 --- a/code/workspace.json +++ b/code/workspace.json @@ -156,6 +156,11 @@ "root": "lib/codemod", "type": "library" }, + "@storybook/[preview]": { + "implicitDependencies": [], + "root": "lib/preview", + "type": "library" + }, "@storybook/components": { "implicitDependencies": [], "root": "ui/components", diff --git a/code/yarn.lock b/code/yarn.lock index c827df0533da..fd7a5c652c77 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -332,13 +332,13 @@ __metadata: linkType: hard "@axe-core/puppeteer@npm:^4.2.0": - version: 4.4.5 - resolution: "@axe-core/puppeteer@npm:4.4.5" + version: 4.5.0 + resolution: "@axe-core/puppeteer@npm:4.5.0" dependencies: - axe-core: ^4.4.3 + axe-core: ^4.5.0 peerDependencies: - puppeteer: ">=1.10.0 <= 16" - checksum: 4e2d856ed5ae203f819dd23983714fd4cd91b9243c78bc261ea75a2a78ad148b1b022ea7adfe2549a621ea42c7752eb1949ae598be60e11e0e66d87044bf3d48 + puppeteer: ">=1.10.0 <= 18" + checksum: a93db97b4c096b19e6a2132a255a5699d101b68c77cd4e6395cb039c6432f3a51d59cfef95fd8ac6320906b462293b6a893180dead72362f6f097e0795af204d languageName: node linkType: hard @@ -378,10 +378,10 @@ __metadata: languageName: node linkType: hard -"@babel/compat-data@npm:^7.16.8, @babel/compat-data@npm:^7.17.7, @babel/compat-data@npm:^7.19.3, @babel/compat-data@npm:^7.19.4": - version: 7.19.4 - resolution: "@babel/compat-data@npm:7.19.4" - checksum: f6c3cec531e9c8ab2b0a7db64775f6f00e88ce1f727114cffb900c989ed3bcc42edee86cbe9c1d9f42ca2dbc490bcec91840cbe258dc7e0db82a4ea396ca1779 +"@babel/compat-data@npm:^7.16.8, @babel/compat-data@npm:^7.17.7, @babel/compat-data@npm:^7.19.4, @babel/compat-data@npm:^7.20.0": + version: 7.20.0 + resolution: "@babel/compat-data@npm:7.20.0" + checksum: fc02fe9cb5f5539ce12e281de4109a79fc2716d35150acf94f63445ab3c66e3fff81ae7996ebc1e1d5948ac85e4d11cc5ba3aae0b5fddb9c410af349dfcabbb5 languageName: node linkType: hard @@ -431,7 +431,7 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:^7.1.0, @babel/core@npm:^7.11.5, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.0, @babel/core@npm:^7.12.10, @babel/core@npm:^7.12.3, @babel/core@npm:^7.13.16, @babel/core@npm:^7.17.2, @babel/core@npm:^7.17.5, @babel/core@npm:^7.18.13, @babel/core@npm:^7.3.4, @babel/core@npm:^7.7.2, @babel/core@npm:^7.7.5, @babel/core@npm:^7.8.0": +"@babel/core@npm:^7.1.0, @babel/core@npm:^7.11.5, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.0, @babel/core@npm:^7.12.10, @babel/core@npm:^7.12.3, @babel/core@npm:^7.13.16, @babel/core@npm:^7.17.2, @babel/core@npm:^7.17.5, @babel/core@npm:^7.19.6, @babel/core@npm:^7.3.4, @babel/core@npm:^7.7.2, @babel/core@npm:^7.7.5, @babel/core@npm:^7.8.0": version: 7.19.6 resolution: "@babel/core@npm:7.19.6" dependencies: @@ -465,14 +465,14 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.12.11, @babel/generator@npm:^7.16.8, @babel/generator@npm:^7.19.6, @babel/generator@npm:^7.4.0, @babel/generator@npm:^7.7.2, @babel/generator@npm:^7.8.7": - version: 7.19.6 - resolution: "@babel/generator@npm:7.19.6" +"@babel/generator@npm:^7.12.11, @babel/generator@npm:^7.16.8, @babel/generator@npm:^7.19.6, @babel/generator@npm:^7.20.0, @babel/generator@npm:^7.4.0, @babel/generator@npm:^7.7.2, @babel/generator@npm:^7.8.7": + version: 7.20.0 + resolution: "@babel/generator@npm:7.20.0" dependencies: - "@babel/types": ^7.19.4 + "@babel/types": ^7.20.0 "@jridgewell/gen-mapping": ^0.3.2 jsesc: ^2.5.1 - checksum: 7c28a778310b718af5889a225bb004b51c86c0ddba5397cc3b90782fb6acf386bee29d4c23faa5d0e7fa8132a652213c1e08dbf01751f5aaada6e6f01a43258e + checksum: 12d981f2b391a7ffaacbc4b91bbed47721c8063bb66fccfdee0dc929629de674bb6a0b37000980cb24e2c6a6a04fd3e5a5df0eb4a9074315009c59de19f55a70 languageName: node linkType: hard @@ -505,16 +505,16 @@ __metadata: linkType: hard "@babel/helper-compilation-targets@npm:^7.12.0, @babel/helper-compilation-targets@npm:^7.16.7, @babel/helper-compilation-targets@npm:^7.17.7, @babel/helper-compilation-targets@npm:^7.18.9, @babel/helper-compilation-targets@npm:^7.19.0, @babel/helper-compilation-targets@npm:^7.19.3": - version: 7.19.3 - resolution: "@babel/helper-compilation-targets@npm:7.19.3" + version: 7.20.0 + resolution: "@babel/helper-compilation-targets@npm:7.20.0" dependencies: - "@babel/compat-data": ^7.19.3 + "@babel/compat-data": ^7.20.0 "@babel/helper-validator-option": ^7.18.6 browserslist: ^4.21.3 semver: ^6.3.0 peerDependencies: "@babel/core": ^7.0.0 - checksum: 05f5ea8c9310f6064d508e06c5523e3e7dee988056be7505fbdecdc9564027946d3163405b49c8f3dd27c819280c34fb99ab810e181de572c77e79c9ae303201 + checksum: d4250dec03d1eef1e2c3f1bed1ebf4e0b6899762111023d07c1c6cb1ce7f8456344bf488355f0780e92fc6ce0e25f977ae50b8b638291d55d0154f13b99c7530 languageName: node linkType: hard @@ -685,11 +685,11 @@ __metadata: linkType: hard "@babel/helper-skip-transparent-expression-wrappers@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.18.9" + version: 7.20.0 + resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.20.0" dependencies: - "@babel/types": ^7.18.9 - checksum: 243996398085f93ccde0174beffae3fd1c0d2a762df61713b32f1bd01b16e6eaccb47f38437706b2239e2b26673412e500e380c4b1f2413f801df4c7a6805e78 + "@babel/types": ^7.20.0 + checksum: 8529fb760ffbc3efc22ec5a079039fae65f40a90e9986642a85c1727aabdf6a79929546412f6210593970d2f97041f73bdd316e481d61110d6edcac1f97670a9 languageName: node linkType: hard @@ -736,13 +736,13 @@ __metadata: linkType: hard "@babel/helpers@npm:^7.16.7, @babel/helpers@npm:^7.19.4, @babel/helpers@npm:^7.8.4": - version: 7.19.4 - resolution: "@babel/helpers@npm:7.19.4" + version: 7.20.0 + resolution: "@babel/helpers@npm:7.20.0" dependencies: "@babel/template": ^7.18.10 - "@babel/traverse": ^7.19.4 - "@babel/types": ^7.19.4 - checksum: e13cca08375f5fe816f01173f6cffc685c3b0605bf7fd94ac76495209f57d69e352fa93bf0ff87f63d705d53b5d5e75abd0b5c2e653776c744911140e5ae7c7e + "@babel/traverse": ^7.20.0 + "@babel/types": ^7.20.0 + checksum: 55fb6e0f127b7941948d4d4a20d8e914c3799a028b5fe6ec801eef49487f668b5fbad8d7823e5cd40d02637c5ca83e2f23a486a07dbe9066fc48b3c40d0faab3 languageName: node linkType: hard @@ -757,12 +757,12 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.11.5, @babel/parser@npm:^7.12.11, @babel/parser@npm:^7.13.12, @babel/parser@npm:^7.13.16, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.16.12, @babel/parser@npm:^7.16.4, @babel/parser@npm:^7.16.7, @babel/parser@npm:^7.18.10, @babel/parser@npm:^7.18.4, @babel/parser@npm:^7.19.6, @babel/parser@npm:^7.4.3, @babel/parser@npm:^7.4.5, @babel/parser@npm:^7.6.0, @babel/parser@npm:^7.7.0, @babel/parser@npm:^7.8.6, @babel/parser@npm:^7.8.7, @babel/parser@npm:^7.9.6": - version: 7.19.6 - resolution: "@babel/parser@npm:7.19.6" +"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.11.5, @babel/parser@npm:^7.12.11, @babel/parser@npm:^7.13.12, @babel/parser@npm:^7.13.16, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.16.12, @babel/parser@npm:^7.16.4, @babel/parser@npm:^7.16.7, @babel/parser@npm:^7.18.10, @babel/parser@npm:^7.18.4, @babel/parser@npm:^7.19.6, @babel/parser@npm:^7.20.0, @babel/parser@npm:^7.4.3, @babel/parser@npm:^7.4.5, @babel/parser@npm:^7.6.0, @babel/parser@npm:^7.7.0, @babel/parser@npm:^7.8.6, @babel/parser@npm:^7.8.7, @babel/parser@npm:^7.9.6": + version: 7.20.0 + resolution: "@babel/parser@npm:7.20.0" bin: parser: ./bin/babel-parser.js - checksum: 1cebcfd242bf424adea11c364f54c4339796291b3b124f20f08dca800ece217588db09f23202f520c671e3ff9a9f97ca645c4f98df0127149d0c60331c7d3e39 + checksum: 644e0da72116cfbb7a084523f3cfc26685fb65202e9bcd4da45c0efa8e258ed66a653525000401f6f2d010f7fa8291892b6b81193aa01e359e6b58b20f69e609 languageName: node linkType: hard @@ -843,8 +843,8 @@ __metadata: linkType: hard "@babel/plugin-proposal-decorators@npm:^7.13.5, @babel/plugin-proposal-decorators@npm:^7.17.2": - version: 7.19.6 - resolution: "@babel/plugin-proposal-decorators@npm:7.19.6" + version: 7.20.0 + resolution: "@babel/plugin-proposal-decorators@npm:7.20.0" dependencies: "@babel/helper-create-class-features-plugin": ^7.19.0 "@babel/helper-plugin-utils": ^7.19.0 @@ -853,7 +853,7 @@ __metadata: "@babel/plugin-syntax-decorators": ^7.19.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 41390c8d0fe87072915eac1687bab638be8430b88494b2f40d1cf2ee2a64c08777b1f18949bb8e8dc76d341e79f0d26eca3ad8bd5c751ce02f9a9955bafb1a82 + checksum: 9ce24ddea4a6bc4fc084b7447b7ca903a6e0b2e3a17de0fcd3a02a8383c044db325f5e893a20cfe72811372b8051d1e1a223fe4233fb9af3c28e1eeb675d7eaa languageName: node linkType: hard @@ -1119,13 +1119,13 @@ __metadata: linkType: hard "@babel/plugin-syntax-import-assertions@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/plugin-syntax-import-assertions@npm:7.18.6" + version: 7.20.0 + resolution: "@babel/plugin-syntax-import-assertions@npm:7.20.0" dependencies: - "@babel/helper-plugin-utils": ^7.18.6 + "@babel/helper-plugin-utils": ^7.19.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: b2673462593bac392d09679b3f6273784d2c5b8424d5c9c37cc9318e66d190b585789f0ec8aea76a4eeb945210f3193757461e34f4ffec3a0011d338512f384d + checksum: 0ac0176984ad799b39264070007737c514ea95e4b3c3c515ecddef958629abcd3c8e8810fd60fb63de5a8f3f7022dd2c7af7580b819a9207acc372c8b8ec878e languageName: node linkType: hard @@ -1250,14 +1250,14 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-typescript@npm:^7.18.6, @babel/plugin-syntax-typescript@npm:^7.7.2": - version: 7.18.6 - resolution: "@babel/plugin-syntax-typescript@npm:7.18.6" +"@babel/plugin-syntax-typescript@npm:^7.20.0, @babel/plugin-syntax-typescript@npm:^7.7.2": + version: 7.20.0 + resolution: "@babel/plugin-syntax-typescript@npm:7.20.0" dependencies: - "@babel/helper-plugin-utils": ^7.18.6 + "@babel/helper-plugin-utils": ^7.19.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: b0acbed3a038c47142e5301d11b40aeedc05b55738d00204964f38608ee46135a7fa36439eeeaeba1ae3608a529a1660d61eb7d1d70978130ca940bd7ca645a3 + checksum: c57bb9b717b3b7324cc0c094d411bac23f6d78ed5e4e06fb89e3e8de37437e649c53440d8c29ecb3875f398ad1a9e8acc96e3af6b3802e83f7eab855de319e80 languageName: node linkType: hard @@ -1310,13 +1310,13 @@ __metadata: linkType: hard "@babel/plugin-transform-block-scoping@npm:^7.16.7, @babel/plugin-transform-block-scoping@npm:^7.19.4, @babel/plugin-transform-block-scoping@npm:^7.8.3": - version: 7.19.4 - resolution: "@babel/plugin-transform-block-scoping@npm:7.19.4" + version: 7.20.0 + resolution: "@babel/plugin-transform-block-scoping@npm:7.20.0" dependencies: "@babel/helper-plugin-utils": ^7.19.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 442e93711e3951d4f14e9ef1bc15220273a3d99cb5c1f1c785dac9e32f69eab9d9f3849c82fab8f9590116b0151ae5d2026029276448552e2201733aa394135d + checksum: 7a67d6760cfe6f785b80a099b110f23467c282b39ac34f059f37d7296a0fba64eeaeada0189cf23129ca74b8c9176260a34b5982bfc477a803e6114b7a42d5b0 languageName: node linkType: hard @@ -1351,13 +1351,13 @@ __metadata: linkType: hard "@babel/plugin-transform-destructuring@npm:^7.16.7, @babel/plugin-transform-destructuring@npm:^7.17.3, @babel/plugin-transform-destructuring@npm:^7.19.4": - version: 7.19.4 - resolution: "@babel/plugin-transform-destructuring@npm:7.19.4" + version: 7.20.0 + resolution: "@babel/plugin-transform-destructuring@npm:7.20.0" dependencies: "@babel/helper-plugin-utils": ^7.19.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 09f6e41b10e5c798bd9c2b09b7243b5c06088c220494aff699e604306797188698bb9f00f50963bb89707af11f979b888ff7ff0eb498a5200d64b759fc0ece34 + checksum: 5b6fcc18632fd2623b8d125a1bba648cff96864edc9f30f0e011b2c242927a5333ed78bc47049f2fe6676b092efa2951568aa2533397a03b26b74e5fa86bd6e3 languageName: node linkType: hard @@ -1606,7 +1606,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-react-jsx-source@npm:^7.18.6": +"@babel/plugin-transform-react-jsx-source@npm:^7.19.6": version: 7.19.6 resolution: "@babel/plugin-transform-react-jsx-source@npm:7.19.6" dependencies: @@ -1617,7 +1617,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-react-jsx@npm:^7.12.12, @babel/plugin-transform-react-jsx@npm:^7.18.10, @babel/plugin-transform-react-jsx@npm:^7.18.6": +"@babel/plugin-transform-react-jsx@npm:^7.12.12, @babel/plugin-transform-react-jsx@npm:^7.18.6, @babel/plugin-transform-react-jsx@npm:^7.19.0": version: 7.19.0 resolution: "@babel/plugin-transform-react-jsx@npm:7.19.0" dependencies: @@ -1756,15 +1756,15 @@ __metadata: linkType: hard "@babel/plugin-transform-typescript@npm:^7.13.0, @babel/plugin-transform-typescript@npm:^7.18.6": - version: 7.19.3 - resolution: "@babel/plugin-transform-typescript@npm:7.19.3" + version: 7.20.0 + resolution: "@babel/plugin-transform-typescript@npm:7.20.0" dependencies: "@babel/helper-create-class-features-plugin": ^7.19.0 "@babel/helper-plugin-utils": ^7.19.0 - "@babel/plugin-syntax-typescript": ^7.18.6 + "@babel/plugin-syntax-typescript": ^7.20.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 4933ff4ab278c3777c2cb382df96784ba2de4ef305a785a4bd7c600df0befd73826b34fb330c96706c0a720788721c35cb139c635f6963aa8778ab9bda6856f4 + checksum: e2893ade8dc06ef9aedd28e867a00ec4a8ac8363885c8ddf39258bf93e364ff06369b07452ee03b2236b73ae48ecdb9ab033a3221143e8fb8581521cba205a12 languageName: node linkType: hard @@ -2043,12 +2043,12 @@ __metadata: linkType: hard "@babel/runtime-corejs3@npm:^7.10.2": - version: 7.19.6 - resolution: "@babel/runtime-corejs3@npm:7.19.6" + version: 7.20.0 + resolution: "@babel/runtime-corejs3@npm:7.20.0" dependencies: core-js-pure: ^3.25.1 - regenerator-runtime: ^0.13.4 - checksum: df8d369446b24bc2f6d7428963f9976b83cba0449e8906b057c1a0e5c49177cd68f6e1cbcfa9efd2f1dc70c1dd9e71bfa2458e27e3d4569ea6478c8d77643803 + regenerator-runtime: ^0.13.10 + checksum: b4d45dc966263c05fa6b68201a6ed388abbd7c47fab43a200c54f9857e2d17dd84cb5f3b07cc15616b60b65c201684318ee74edb1fe9afe2c1b5fa38ad043c8d languageName: node linkType: hard @@ -2080,11 +2080,11 @@ __metadata: linkType: hard "@babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.8, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.18.9, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.0, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2": - version: 7.19.4 - resolution: "@babel/runtime@npm:7.19.4" + version: 7.20.0 + resolution: "@babel/runtime@npm:7.20.0" dependencies: - regenerator-runtime: ^0.13.4 - checksum: 3ad7f298262cf1f060a3bf2be9f65afa3c034c9c7a2e7c9d3ec41ab58c944c86756d0e0fdfc08d178f983f48d6b5613c15253d83216fbe02b6141c13d28f12e5 + regenerator-runtime: ^0.13.10 + checksum: 945bc7d406c5b39be3e72c9c8cc2ba4aa71e0ec0df8493b39c5af295e7ce728aa917783f80244a4e9f9c0f827988d88722b1c9e45845a3dd753e1025f72d787e languageName: node linkType: hard @@ -2130,36 +2130,25 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.1.0, @babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.12.11, @babel/traverse@npm:^7.16.10, @babel/traverse@npm:^7.19.0, @babel/traverse@npm:^7.19.1, @babel/traverse@npm:^7.19.4, @babel/traverse@npm:^7.19.6, @babel/traverse@npm:^7.4.3, @babel/traverse@npm:^7.4.5, @babel/traverse@npm:^7.7.0, @babel/traverse@npm:^7.7.2, @babel/traverse@npm:^7.8.6": - version: 7.19.6 - resolution: "@babel/traverse@npm:7.19.6" +"@babel/traverse@npm:^7.1.0, @babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.12.11, @babel/traverse@npm:^7.16.10, @babel/traverse@npm:^7.19.0, @babel/traverse@npm:^7.19.1, @babel/traverse@npm:^7.19.6, @babel/traverse@npm:^7.20.0, @babel/traverse@npm:^7.4.3, @babel/traverse@npm:^7.4.5, @babel/traverse@npm:^7.7.0, @babel/traverse@npm:^7.7.2, @babel/traverse@npm:^7.8.6": + version: 7.20.0 + resolution: "@babel/traverse@npm:7.20.0" dependencies: "@babel/code-frame": ^7.18.6 - "@babel/generator": ^7.19.6 + "@babel/generator": ^7.20.0 "@babel/helper-environment-visitor": ^7.18.9 "@babel/helper-function-name": ^7.19.0 "@babel/helper-hoist-variables": ^7.18.6 "@babel/helper-split-export-declaration": ^7.18.6 - "@babel/parser": ^7.19.6 - "@babel/types": ^7.19.4 + "@babel/parser": ^7.20.0 + "@babel/types": ^7.20.0 debug: ^4.1.0 globals: ^11.1.0 - checksum: 19fa31560fec222b7683003f75e724f77410319e6548c72fee268e17be7e481963f43b8fceb6cdd0557338e547646448f681369da07fc79d7e966485ed910fb8 - languageName: node - linkType: hard - -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.11.5, @babel/types@npm:^7.12.11, @babel/types@npm:^7.16.7, @babel/types@npm:^7.16.8, @babel/types@npm:^7.18.10, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.8, @babel/types@npm:^7.18.9, @babel/types@npm:^7.19.0, @babel/types@npm:^7.19.4, @babel/types@npm:^7.2.0, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.0, @babel/types@npm:^7.4.4, @babel/types@npm:^7.6.1, @babel/types@npm:^7.7.0, @babel/types@npm:^7.7.2, @babel/types@npm:^7.8.3, @babel/types@npm:^7.8.6, @babel/types@npm:^7.8.7, @babel/types@npm:^7.9.6": - version: 7.19.4 - resolution: "@babel/types@npm:7.19.4" - dependencies: - "@babel/helper-string-parser": ^7.19.4 - "@babel/helper-validator-identifier": ^7.19.1 - to-fast-properties: ^2.0.0 - checksum: 62d0d24fc87e36666874725b05bb0895a8834f09713ec76bf28eb2b615aa80287fd3f29801a923b9ff8a90d7f8ffd4b40bc7bc4840e4a530e165cdab3e6bfb78 + checksum: 6f34c946b85a29b2973b8bc37c7a7acaeee0ad050e5f0955dabe5009f514ad9e717c8978649ac237d536284ad9f3bb4d2b749c9cd78ed9fa07f635dcedb8afaa languageName: node linkType: hard -"@babel/types@npm:^7.14.8": +"@babel/types@npm:^7.0.0, @babel/types@npm:^7.11.5, @babel/types@npm:^7.12.11, @babel/types@npm:^7.14.8, @babel/types@npm:^7.16.7, @babel/types@npm:^7.16.8, @babel/types@npm:^7.18.10, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.8, @babel/types@npm:^7.18.9, @babel/types@npm:^7.19.0, @babel/types@npm:^7.19.4, @babel/types@npm:^7.2.0, @babel/types@npm:^7.20.0, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.0, @babel/types@npm:^7.4.4, @babel/types@npm:^7.6.1, @babel/types@npm:^7.7.0, @babel/types@npm:^7.7.2, @babel/types@npm:^7.8.3, @babel/types@npm:^7.8.6, @babel/types@npm:^7.8.7, @babel/types@npm:^7.9.6": version: 7.20.0 resolution: "@babel/types@npm:7.20.0" dependencies: @@ -2439,48 +2428,48 @@ __metadata: languageName: node linkType: hard -"@emotion/babel-plugin@npm:^11.10.0, @emotion/babel-plugin@npm:^11.10.2": - version: 11.10.2 - resolution: "@emotion/babel-plugin@npm:11.10.2" +"@emotion/babel-plugin@npm:^11.10.2, @emotion/babel-plugin@npm:^11.10.5": + version: 11.10.5 + resolution: "@emotion/babel-plugin@npm:11.10.5" dependencies: "@babel/helper-module-imports": ^7.16.7 "@babel/plugin-syntax-jsx": ^7.17.12 "@babel/runtime": ^7.18.3 "@emotion/hash": ^0.9.0 "@emotion/memoize": ^0.8.0 - "@emotion/serialize": ^1.1.0 + "@emotion/serialize": ^1.1.1 babel-plugin-macros: ^3.1.0 convert-source-map: ^1.5.0 escape-string-regexp: ^4.0.0 find-root: ^1.1.0 source-map: ^0.5.7 - stylis: 4.0.13 + stylis: 4.1.3 peerDependencies: "@babel/core": ^7.0.0 - checksum: 571876a4b1445c07c1a54721ab5ae72dbe4194586bceacf2b1891dce5e86755bff7e84c00af9fd047d8b96bf6a407ad8d6fcc2c788174857f84ec3c316c5c35c + checksum: b877d089c07ad7e571f7d1b8393c21b8ab54dc24b4b7533827c00549a4fe5345af55869f57c139f7dec09615b93ca66195aa31023bbc5af89cf3ec85e80a2281 languageName: node linkType: hard -"@emotion/cache@npm:^11.10.0, @emotion/cache@npm:^11.10.3": - version: 11.10.3 - resolution: "@emotion/cache@npm:11.10.3" +"@emotion/cache@npm:^11.10.3, @emotion/cache@npm:^11.10.5": + version: 11.10.5 + resolution: "@emotion/cache@npm:11.10.5" dependencies: "@emotion/memoize": ^0.8.0 - "@emotion/sheet": ^1.2.0 + "@emotion/sheet": ^1.2.1 "@emotion/utils": ^1.2.0 "@emotion/weak-memoize": ^0.3.0 - stylis: 4.0.13 - checksum: 5dde04418566adbd0c83042acb1b85f354dc40bad83e33f951694a36d00559ceea2dfcf533b9d9381f1bb5df8dbb436a94725b6558762da7c83f3171f1c0dbbe + stylis: 4.1.3 + checksum: eeb6891ab04cf17ace0e175742550b97c30df777d6c5b145e91c4c9fbd783c29b4dabe12a8c786b78f37176313a8295c9b90c69d875e6caab5f7e4677a18be91 languageName: node linkType: hard -"@emotion/css-prettifier@npm:^1.1.0": - version: 1.1.0 - resolution: "@emotion/css-prettifier@npm:1.1.0" +"@emotion/css-prettifier@npm:^1.1.1": + version: 1.1.1 + resolution: "@emotion/css-prettifier@npm:1.1.1" dependencies: "@emotion/memoize": ^0.8.0 - stylis: 4.0.13 - checksum: 0ca881d7096678de456ed74ca2a28ed7f7a473829f7b91f8d9480d1404afb14f36adfbe8a5f789ef7cfabd08ac3dd9aa56d6285babd6b6ed031f2e92dc23fe1b + stylis: 4.1.3 + checksum: b921139e04d443ea3c8170cb90ae3c758e9effacdba99c5edab5d69400bcf464da283d20a92b4a1e8c74bb3e5feb8ebaee2e74ff5c84d5eab9989b000e5c7c42 languageName: node linkType: hard @@ -2501,23 +2490,23 @@ __metadata: linkType: hard "@emotion/jest@npm:^11.10.0, @emotion/jest@npm:^11.8.0": - version: 11.10.0 - resolution: "@emotion/jest@npm:11.10.0" + version: 11.10.5 + resolution: "@emotion/jest@npm:11.10.5" dependencies: "@babel/runtime": ^7.18.3 - "@emotion/css-prettifier": ^1.1.0 + "@emotion/css-prettifier": ^1.1.1 chalk: ^4.1.0 specificity: ^0.4.1 - stylis: 4.0.13 + stylis: 4.1.3 peerDependencies: - "@types/jest": ^26.0.14 || ^27.0.0 || ^28.0.0 + "@types/jest": ^26.0.14 || ^27.0.0 || ^28.0.0 || ^29.0.0 enzyme-to-json: ^3.2.1 peerDependenciesMeta: "@types/jest": optional: true enzyme-to-json: optional: true - checksum: d1d566e3958fb17d1bc3fe37b398546bdfc92666a34c0281a27108d7630219af0c90ec05633ec7fc55794a5f714d517d1ee9489435620b40ec9982136ad6e16a + checksum: 4629a2eac0bf1aa5a590c0fecedfa908325f3c7f66f13811058162e1fe94e2fc5282dbe321f9cb1593a3220e193e88e054ab138276c3f425b4a202ce1d135f17 languageName: node linkType: hard @@ -2529,13 +2518,13 @@ __metadata: linkType: hard "@emotion/react@npm:^11.10.4": - version: 11.10.4 - resolution: "@emotion/react@npm:11.10.4" + version: 11.10.5 + resolution: "@emotion/react@npm:11.10.5" dependencies: "@babel/runtime": ^7.18.3 - "@emotion/babel-plugin": ^11.10.0 - "@emotion/cache": ^11.10.0 - "@emotion/serialize": ^1.1.0 + "@emotion/babel-plugin": ^11.10.5 + "@emotion/cache": ^11.10.5 + "@emotion/serialize": ^1.1.1 "@emotion/use-insertion-effect-with-fallbacks": ^1.0.0 "@emotion/utils": ^1.2.0 "@emotion/weak-memoize": ^0.3.0 @@ -2548,38 +2537,38 @@ __metadata: optional: true "@types/react": optional: true - checksum: da447676d10050b14534f9e903d8a058d4cdfa82f58caf4da5c150a55b2019a8b45187989085faa4b075db92f7df7abe188eb76fe5377a57516631ccf299367b + checksum: 911fdc54a44304e70e8f2721ba2c323695171856d5337c761ff5f952f2e651d54b1b5b68319573a0d9a5a847d13f622c2d951317176ea701607d349f8a9cd0f5 languageName: node linkType: hard -"@emotion/serialize@npm:^1.1.0": - version: 1.1.0 - resolution: "@emotion/serialize@npm:1.1.0" +"@emotion/serialize@npm:^1.1.1": + version: 1.1.1 + resolution: "@emotion/serialize@npm:1.1.1" dependencies: "@emotion/hash": ^0.9.0 "@emotion/memoize": ^0.8.0 "@emotion/unitless": ^0.8.0 "@emotion/utils": ^1.2.0 csstype: ^3.0.2 - checksum: a122fc4c34425bc76d0c72b14c8e0617ccc72709fbbed695c506ca493dc478df15eba0c1ec45807e7dd248430b2e0dbf8ba8fe9035832087138e0f8e51ac4100 + checksum: ea353abbf530ede8b74fe4df30eb626f245f710ce0bfcb9d34e72630a1dede688fddf02b1143f33a1a4ef5b66b70715a3c1cd6a12ec43f5b585ed60d4f3e8712 languageName: node linkType: hard -"@emotion/sheet@npm:^1.2.0": - version: 1.2.0 - resolution: "@emotion/sheet@npm:1.2.0" - checksum: 8d759a5211e09ef260604fd97737641b00c4bc476974202f298dfc0ad3b1c42838b512ad55547296d0082a50ce9be68251a276d7d0cf97c93a53d287a087a1e5 +"@emotion/sheet@npm:^1.2.1": + version: 1.2.1 + resolution: "@emotion/sheet@npm:1.2.1" + checksum: 88268c00005d310df3ebb249b839ad0b234943da5a0cc614b232b9bd4ae600292dca9b0f61c45cde3a592c77459e880d77a2aa73af20ec3c0d579afccc3f71af languageName: node linkType: hard "@emotion/styled@npm:^11.10.4": - version: 11.10.4 - resolution: "@emotion/styled@npm:11.10.4" + version: 11.10.5 + resolution: "@emotion/styled@npm:11.10.5" dependencies: "@babel/runtime": ^7.18.3 - "@emotion/babel-plugin": ^11.10.0 + "@emotion/babel-plugin": ^11.10.5 "@emotion/is-prop-valid": ^1.2.0 - "@emotion/serialize": ^1.1.0 + "@emotion/serialize": ^1.1.1 "@emotion/use-insertion-effect-with-fallbacks": ^1.0.0 "@emotion/utils": ^1.2.0 peerDependencies: @@ -2591,7 +2580,7 @@ __metadata: optional: true "@types/react": optional: true - checksum: 8067243991d31025967e993410298ca4c558e05e3b99e319d2734b022478001ac5b0fae7a010ba7fd5a74b762d264a17e5bddffbe09841c19857ab9b077077f3 + checksum: 63f974c508df651115ff28b2230feddfc27e0cfcb1a4b0dbdf03c57dfdb06edfc6858b298c0c475326d5a3b25982271625d75d107b4c85c2c0166c12fc0091b8 languageName: node linkType: hard @@ -5654,6 +5643,7 @@ __metadata: "@storybook/components": 7.0.0-alpha.47 "@storybook/core-events": 7.0.0-alpha.47 "@storybook/theming": 7.0.0-alpha.47 + "@storybook/types": 7.0.0-alpha.47 global: ^4.4.0 react-sizeme: ^3.0.1 typescript: ~4.6.3 @@ -5774,10 +5764,10 @@ __metadata: "@storybook/addons": 7.0.0-alpha.47 "@storybook/angular": 7.0.0-alpha.47 "@storybook/babel-plugin-require-context-hook": 1.0.1 - "@storybook/client-api": 7.0.0-alpha.47 "@storybook/core-client": 7.0.0-alpha.47 "@storybook/core-common": 7.0.0-alpha.47 "@storybook/core-webpack": 7.0.0-alpha.47 + "@storybook/preview": 7.0.0-alpha.47 "@storybook/react": 7.0.0-alpha.47 "@storybook/types": 7.0.0-alpha.47 "@storybook/vue": 7.0.0-alpha.47 @@ -5863,6 +5853,7 @@ __metadata: "@storybook/router": 7.0.0-alpha.47 "@storybook/source-loader": 7.0.0-alpha.47 "@storybook/theming": 7.0.0-alpha.47 + "@storybook/types": 7.0.0-alpha.47 "@types/react": ^16.14.23 "@types/react-syntax-highlighter": 11.0.5 estraverse: ^5.2.0 @@ -5881,8 +5872,8 @@ __metadata: linkType: soft "@storybook/addon-svelte-csf@npm:^2.0.0": - version: 2.0.8 - resolution: "@storybook/addon-svelte-csf@npm:2.0.8" + version: 2.0.10 + resolution: "@storybook/addon-svelte-csf@npm:2.0.10" dependencies: ts-dedent: ^2.0.0 peerDependencies: @@ -5892,7 +5883,7 @@ __metadata: peerDependenciesMeta: svelte-loader: optional: true - checksum: c4ded876963fdaa9c436a8d926dc843839d08b45febf37c8b28b73bd96eb16f808121a510bafc048c8ce194eea5f5505d12125e28317fdb0c2d3f722167878a1 + checksum: fc128896f0d7416fd671d7e392a11ced20f150dbddbac39a2e9f9948145409fdba1380d800a40ffc663a664829e01cffa71d2ec1ec4845c18f804117025a9d85 languageName: node linkType: hard @@ -6017,6 +6008,7 @@ __metadata: "@types/rimraf": ^3.0.2 "@types/semver": ^7.3.4 "@types/tmp": ^0.2.3 + "@types/webpack-env": ^1.18.0 core-js: ^3.8.2 cross-spawn: ^7.0.3 find-up: ^5.0.0 @@ -6231,6 +6223,7 @@ __metadata: "@storybook/core-events": 7.0.0-alpha.47 "@storybook/core-webpack": 7.0.0-alpha.47 "@storybook/node-logger": 7.0.0-alpha.47 + "@storybook/preview": 7.0.0-alpha.47 "@storybook/preview-web": 7.0.0-alpha.47 "@storybook/router": 7.0.0-alpha.47 "@storybook/store": 7.0.0-alpha.47 @@ -6247,7 +6240,9 @@ __metadata: browser-assert: ^1.2.1 case-sensitive-paths-webpack-plugin: ^2.4.0 css-loader: ^6.7.1 + express: ^4.17.1 fork-ts-checker-webpack-plugin: ^7.2.8 + fs-extra: ^9.0.1 global: ^4.4.0 html-webpack-plugin: ^5.5.0 path-browserify: ^1.0.1 @@ -6723,7 +6718,7 @@ __metadata: "@storybook/core-client": 7.0.0-alpha.47 "@storybook/core-common": 7.0.0-alpha.47 "@storybook/docs-tools": 7.0.0-alpha.47 - "@storybook/store": 7.0.0-alpha.47 + "@storybook/preview": 7.0.0-alpha.47 "@storybook/types": 7.0.0-alpha.47 ember-source: ~3.28.1 global: ^4.4.0 @@ -7265,6 +7260,41 @@ __metadata: languageName: unknown linkType: soft +"@storybook/preview@7.0.0-alpha.47, @storybook/preview@workspace:lib/preview": + version: 0.0.0-use.local + resolution: "@storybook/preview@workspace:lib/preview" + dependencies: + "@storybook/api": 7.0.0-alpha.47 + "@storybook/channel-postmessage": 7.0.0-alpha.47 + "@storybook/channel-websocket": 7.0.0-alpha.47 + "@storybook/channels": 7.0.0-alpha.47 + "@storybook/client-logger": 7.0.0-alpha.47 + "@storybook/core-client": 7.0.0-alpha.47 + "@storybook/core-common": 7.0.0-alpha.47 + "@storybook/core-events": 7.0.0-alpha.47 + "@storybook/csf": next + "@storybook/preview-web": 7.0.0-alpha.47 + "@storybook/router": 7.0.0-alpha.47 + "@storybook/theming": 7.0.0-alpha.47 + "@storybook/types": 7.0.0-alpha.47 + "@types/qs": ^6.9.5 + "@types/webpack-env": ^1.16.4 + ansi-to-html: ^0.6.11 + dequal: ^2.0.2 + global: ^4.4.0 + lodash: ^4.17.21 + memoizerific: ^1.11.3 + qs: ^6.10.0 + react: 16.14.0 + slash: ^3.0.0 + synchronous-promise: ^2.0.15 + ts-dedent: ^2.0.0 + ts-jest: ^28.0.8 + typescript: ~4.6.3 + util-deprecate: ^1.0.2 + languageName: unknown + linkType: soft + "@storybook/react-docgen-typescript-plugin@npm:1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0": version: 1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0 resolution: "@storybook/react-docgen-typescript-plugin@npm:1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0" @@ -7955,7 +7985,7 @@ __metadata: vue-template-compiler: ^2.6.14 peerDependencies: "@babel/core": "*" - babel-loader: ^7.0.0 || ^8.0.0 || ^9.0.0 + babel-loader: ^7.0.0 || ^8.0.0 css-loader: "*" vue: ^2.6.8 vue-loader: ^15.7.0 @@ -8876,16 +8906,16 @@ __metadata: linkType: hard "@types/node@npm:*, @types/node@npm:>= 8, @types/node@npm:^18.7.20": - version: 18.11.5 - resolution: "@types/node@npm:18.11.5" - checksum: 1c279db0eaebc3ba45a2802bbd7043f6ef84bda199adc26ff1321cb5cc3e6870278b4dc4c2a2736055f68193c2359063117be6e28ef0c169d3e7c8d2d8b3e753 + version: 18.11.7 + resolution: "@types/node@npm:18.11.7" + checksum: 65e95517d3a601ab1d2b473a2e7989da8c87681cbc201ea9a8bf1f2b50227bc8755e07a4b00258376c6a4df614c270ff059f08135397261c9dd6f12601ec8fd6 languageName: node linkType: hard "@types/node@npm:^14.14.20 || ^16.0.0, @types/node@npm:^16.0.0": - version: 16.18.0 - resolution: "@types/node@npm:16.18.0" - checksum: cab5add5b756c572461302b685910c1bd8ba98af516f82ea7061b5f4afa0fb3b90ee2c4d82ac722afb0058522835d5d0fa364e8f2f4aa69a363212ec0f401676 + version: 16.18.2 + resolution: "@types/node@npm:16.18.2" + checksum: babe6ee3409d5e4c1b1ba04c65ab16f156b717f2b5106d04c184897429449bb2838d8bff6e76b1e212f78c2dc9ecf2cf50fc4c78d42f4bc506a0657ff5cba07b languageName: node linkType: hard @@ -9035,11 +9065,11 @@ __metadata: linkType: hard "@types/react-dom@npm:^16.9.14": - version: 16.9.16 - resolution: "@types/react-dom@npm:16.9.16" + version: 16.9.17 + resolution: "@types/react-dom@npm:16.9.17" dependencies: "@types/react": ^16 - checksum: 1d3feea5f32d70644a94e6b3d15371585bd5f3defe3981a936f299d5a0ebd6ef0208057201c990e7feaab3c2092bb9e889ae74ee316e3a48e15069e72a8e1575 + checksum: c9c36d071f5e7480a74948ceed0cf2080194f9e0922de69a3c877629b1e7cb5f87e47afaea7d095a2dccfcf273746416f7780dd68830ea89dba68499758db10b languageName: node linkType: hard @@ -9053,13 +9083,13 @@ __metadata: linkType: hard "@types/react@npm:*, @types/react@npm:>=16, @types/react@npm:^16, @types/react@npm:^16.14.23": - version: 16.14.33 - resolution: "@types/react@npm:16.14.33" + version: 16.14.34 + resolution: "@types/react@npm:16.14.34" dependencies: "@types/prop-types": "*" "@types/scheduler": "*" csstype: ^3.0.2 - checksum: c77955b60c61ab2797649ba0d92a51f50b513e12246891502eda3d9ac34fb9a1f314403b5101d1d3a14e3e5f6d2b0f3e5745b4892a093102dfbafe8ce35d8fbd + checksum: 0cc204f87badeabd4641beb415e82b574152596e65304f5e63cd41948b23036f3e7ae658a86aa5357c2ab4f0f4f9402dfd5077c3df0c5294130a45d92add9bac languageName: node linkType: hard @@ -9107,9 +9137,9 @@ __metadata: linkType: hard "@types/semver@npm:^7.3.12, @types/semver@npm:^7.3.4": - version: 7.3.12 - resolution: "@types/semver@npm:7.3.12" - checksum: bd76432b8f58f6d853d0aa938377d7da623b21ae477797940cc84445203669b7acea042c66336976db3c26a7c27e8afc71707fec01ec1d83d5e4d191ea008182 + version: 7.3.13 + resolution: "@types/semver@npm:7.3.13" + checksum: 73295bb1fee46f8c76c7a759feeae5a3022f5bedfdc17d16982092e4b33af17560234fb94861560c20992a702a1e1b9a173bb623a96f95f80892105f5e7d25e3 languageName: node linkType: hard @@ -9290,7 +9320,7 @@ __metadata: languageName: node linkType: hard -"@types/webpack-env@npm:^1.16.0, @types/webpack-env@npm:^1.16.4, @types/webpack-env@npm:^1.17.0": +"@types/webpack-env@npm:^1.16.0, @types/webpack-env@npm:^1.16.4, @types/webpack-env@npm:^1.17.0, @types/webpack-env@npm:^1.18.0": version: 1.18.0 resolution: "@types/webpack-env@npm:1.18.0" checksum: ac2e91b025ea31b98b0271ccb40da789c5b54693c1efb18265a54c03b303b750501f080a44e99d7ce0a5422d68d535e600e851df4b8f2240444eca7ac3159719 @@ -9600,29 +9630,29 @@ __metadata: linkType: hard "@vitejs/plugin-react@npm:^2.0.0, @vitejs/plugin-react@npm:^2.1.0": - version: 2.1.0 - resolution: "@vitejs/plugin-react@npm:2.1.0" + version: 2.2.0 + resolution: "@vitejs/plugin-react@npm:2.2.0" dependencies: - "@babel/core": ^7.18.13 - "@babel/plugin-transform-react-jsx": ^7.18.10 + "@babel/core": ^7.19.6 + "@babel/plugin-transform-react-jsx": ^7.19.0 "@babel/plugin-transform-react-jsx-development": ^7.18.6 "@babel/plugin-transform-react-jsx-self": ^7.18.6 - "@babel/plugin-transform-react-jsx-source": ^7.18.6 - magic-string: ^0.26.2 + "@babel/plugin-transform-react-jsx-source": ^7.19.6 + magic-string: ^0.26.7 react-refresh: ^0.14.0 peerDependencies: vite: ^3.0.0 - checksum: e63e973e4de450e55215d5de705a388c1d72f08bacae44810225386fbed2ec49f8257603e9f86c2d6aa443e4b36d9f10a4d39b5aa2f566ed682d01836ddf65c8 + checksum: 85fe5c740fbe8aa5dd4c3516a02a937dff0e2b0858cfa7cf8a69b998b7d05e08c296a087fde66f9171367f5c9d10d6e4bc026df1fa1e2ec528f49e7eaabeeae1 languageName: node linkType: hard "@vitejs/plugin-vue@npm:^3.0.0": - version: 3.1.2 - resolution: "@vitejs/plugin-vue@npm:3.1.2" + version: 3.2.0 + resolution: "@vitejs/plugin-vue@npm:3.2.0" peerDependencies: vite: ^3.0.0 vue: ^3.2.25 - checksum: 53867c9367f1133305e858541a9094a44c5e60d82d0c68d5eb41194dcac01ecd273252786046b3e523d40112374ac7f47558f7b292394a4529355d64b82c04cf + checksum: a2583817306e7a8ae8d3224a97f3a0b302e474a7f2b1174d3b79a9b92bc4c846825a797162fdc70b36be96d637533c25f3f8cf6e66e3787f3105ec60304695cd languageName: node linkType: hard @@ -10772,11 +10802,11 @@ __metadata: linkType: hard "aria-query@npm:^5.0.0": - version: 5.1.1 - resolution: "aria-query@npm:5.1.1" + version: 5.1.2 + resolution: "aria-query@npm:5.1.2" dependencies: deep-equal: ^2.0.5 - checksum: 8be9b1e6e4e4c296082d13620555914749195a55ad1f10f0013f8cdaa2e1ce3adfb8ecca9e5b06b865e79ce505d8ab264e3edec158ade5ca154fe7d21a66fc6b + checksum: acf341fa0ee0a6abe783daee1cc035631405072157054382508ffa62073f338353ad4062f2e3610a36c39be003a7457602b1ac14b464abf91be6ef7ec3652cae languageName: node linkType: hard @@ -11174,11 +11204,11 @@ __metadata: linkType: hard "autoprefixer@npm:^10.4.2": - version: 10.4.12 - resolution: "autoprefixer@npm:10.4.12" + version: 10.4.13 + resolution: "autoprefixer@npm:10.4.13" dependencies: browserslist: ^4.21.4 - caniuse-lite: ^1.0.30001407 + caniuse-lite: ^1.0.30001426 fraction.js: ^4.2.0 normalize-range: ^0.1.2 picocolors: ^1.0.0 @@ -11187,7 +11217,7 @@ __metadata: postcss: ^8.1.0 bin: autoprefixer: bin/autoprefixer - checksum: 29e2ce3658afe9940450764266a896718b983429dfd8ef58fe55e0d3b103c0ff83712a343fcf5a7d3831616d15970ba17d729ac17d7433c5a7ec8a9c1af2fc15 + checksum: 55ef1feb555516f68c740b3a0050d89b663c4a806a52ff23b184869ddf511b561fa56d66b2adb533bfef3798aee87b31132474582968d84fa59da133f837a230 languageName: node linkType: hard @@ -11212,7 +11242,7 @@ __metadata: languageName: node linkType: hard -"axe-core@npm:^4.2.0, axe-core@npm:^4.4.3": +"axe-core@npm:^4.2.0, axe-core@npm:^4.4.3, axe-core@npm:^4.5.0": version: 4.5.0 resolution: "axe-core@npm:4.5.0" checksum: 7ca80c6815174eaf4355d88f0622e2f2d2982312a2cf152ec0775aef5c6059da042e50e11a018ee7faa5b06bdcae9e75a3a55164ca6f4249122841a3255f3b4e @@ -12648,10 +12678,10 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.30001299, caniuse-lite@npm:^1.0.30001400, caniuse-lite@npm:^1.0.30001406, caniuse-lite@npm:^1.0.30001407": - version: 1.0.30001425 - resolution: "caniuse-lite@npm:1.0.30001425" - checksum: ae6c3ef46ef62fa18ca31ab049d00ce63ed84bf3c4aa8e2a723b3907eb15341b6456538cab6a52f228bd90b201deba62c105767989b35294dd8ff9188ac0a1fc +"caniuse-lite@npm:^1.0.30001299, caniuse-lite@npm:^1.0.30001400, caniuse-lite@npm:^1.0.30001406, caniuse-lite@npm:^1.0.30001426": + version: 1.0.30001426 + resolution: "caniuse-lite@npm:1.0.30001426" + checksum: 5b955cc191c1d7f3fb92ccde08d3d2003f3071fe96ce416d6c17c8aa725aa50e2d1546b3a47334a435b2992e125b3d81b47641d98f6c447a5ac71aff3b858f9a languageName: node linkType: hard @@ -12902,8 +12932,8 @@ __metadata: linkType: hard "chromatic@npm:^6.10.2": - version: 6.11.1 - resolution: "chromatic@npm:6.11.1" + version: 6.11.2 + resolution: "chromatic@npm:6.11.2" dependencies: "@discoveryjs/json-ext": ^0.5.7 "@types/webpack-env": ^1.17.0 @@ -12911,7 +12941,7 @@ __metadata: chroma: bin/main.cjs chromatic: bin/main.cjs chromatic-cli: bin/main.cjs - checksum: 39d8b0ec6e4776bff167c5e7a1239de3afb816d8986bd7059e42e9fe3d19a8107d48d9f5014b78547d286fe93715d571363834a015616fe03b4f7fe5bb0aa90b + checksum: 9692af67638cd90be498f9fcbca5b2397204faf04b5ccdc97118950412ebe1140a240955426e174dfcfdecb9483db8236aa70af3c26dc9c17ef73d8415d4e229 languageName: node linkType: hard @@ -17816,9 +17846,9 @@ __metadata: linkType: hard "flow-parser@npm:0.*": - version: 0.190.1 - resolution: "flow-parser@npm:0.190.1" - checksum: d6a142b2c58b82715dd00b5258717c4754cdd7aa849dbefe522947757c198a0c1ade5a0ef82aa2c06ccf4d1fe4bb9cf67330a4d61d1f50ffe2932b4be6d51ecd + version: 0.191.0 + resolution: "flow-parser@npm:0.191.0" + checksum: 96445d0f02ef957ea95ca429de7381d462f30c79c786565c7ad8c560d3100c3d793f472d47ac662156cf2e4b233f62e1ef755c6b37312770fdff178facfb6e97 languageName: node linkType: hard @@ -24530,7 +24560,7 @@ __metadata: languageName: node linkType: hard -"magic-string@npm:^0.26.0, magic-string@npm:^0.26.1, magic-string@npm:^0.26.2, magic-string@npm:^0.26.7": +"magic-string@npm:^0.26.0, magic-string@npm:^0.26.1, magic-string@npm:^0.26.7": version: 0.26.7 resolution: "magic-string@npm:0.26.7" dependencies: @@ -25001,11 +25031,11 @@ __metadata: linkType: hard "memfs@npm:^3.2.2, memfs@npm:^3.4.1, memfs@npm:^3.4.3": - version: 3.4.7 - resolution: "memfs@npm:3.4.7" + version: 3.4.8 + resolution: "memfs@npm:3.4.8" dependencies: fs-monkey: ^1.0.3 - checksum: 56d85a1e6f808218096c17160eb7db694559a6307b76134e48a4927b7f3a3963941f2d86bac34f681cb16fc9d5010f0b7b42523c9b647451887be285a2348ea3 + checksum: 672d4da9e25ef9d8369c7eb1cc8cc775573a3fc59a0af2d48de3051d6092d22dddeee077184a737a40fc0c9b58346a84d550c0378988a2642bd29fe4fea22432 languageName: node linkType: hard @@ -28622,7 +28652,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.1.10, postcss@npm:^8.2.14, postcss@npm:^8.2.15, postcss@npm:^8.3.7, postcss@npm:^8.4.14, postcss@npm:^8.4.16, postcss@npm:^8.4.7": +"postcss@npm:^8.1.10, postcss@npm:^8.2.14, postcss@npm:^8.2.15, postcss@npm:^8.3.7, postcss@npm:^8.4.14, postcss@npm:^8.4.18, postcss@npm:^8.4.7": version: 8.4.18 resolution: "postcss@npm:8.4.18" dependencies: @@ -30142,7 +30172,7 @@ __metadata: languageName: node linkType: hard -"regenerator-runtime@npm:^0.13.2, regenerator-runtime@npm:^0.13.4, regenerator-runtime@npm:^0.13.7": +"regenerator-runtime@npm:^0.13.10, regenerator-runtime@npm:^0.13.2, regenerator-runtime@npm:^0.13.4, regenerator-runtime@npm:^0.13.7": version: 0.13.10 resolution: "regenerator-runtime@npm:0.13.10" checksum: 2990a7a998ff6bf5caf5597c5671751f447560c5060ae5628469620a7ce640131bf0744c506d63c2166783121535da4ed782c3383371f945fb9a37481598a761 @@ -31217,7 +31247,7 @@ __metadata: languageName: node linkType: hard -"rollup@npm:^2.74.1": +"rollup@npm:^2.74.1, rollup@npm:^2.79.1": version: 2.79.1 resolution: "rollup@npm:2.79.1" dependencies: @@ -31231,20 +31261,6 @@ __metadata: languageName: node linkType: hard -"rollup@npm:~2.78.0": - version: 2.78.1 - resolution: "rollup@npm:2.78.1" - dependencies: - fsevents: ~2.3.2 - dependenciesMeta: - fsevents: - optional: true - bin: - rollup: dist/bin/rollup - checksum: ae24b886adee31455ec030736b113f84628a4f74106ea47ebf666fa5c7eac23f49b7d15acb5b5ee47671f3e184fb1c8b05946e5c76eb889a1dafaf5c75c9b70a - languageName: node - linkType: hard - "rst-selector-parser@npm:^2.2.3": version: 2.2.3 resolution: "rst-selector-parser@npm:2.2.3" @@ -33043,10 +33059,10 @@ __metadata: languageName: node linkType: hard -"stylis@npm:4.0.13": - version: 4.0.13 - resolution: "stylis@npm:4.0.13" - checksum: bd567c440b4f1acf8962b1b3aa7985c4e04d7badfe1e0f1c7ee2a60912de2718973850c524001a3d52f5fc9a0e3dcd204b8bd7e2d47d4934462e9f749fd9c7bc +"stylis@npm:4.1.3": + version: 4.1.3 + resolution: "stylis@npm:4.1.3" + checksum: 3e4670f26f79bcfba628dcc2756d9d415edfcbf4ec51e40f3b628fd15286222257317cad57390752964eba85cca6163a7621ce90038d68dd630a674479e52334 languageName: node linkType: hard @@ -35436,18 +35452,19 @@ __metadata: linkType: hard "vite@npm:^3.1.0, vite@npm:^3.1.3, vite@npm:^3.1.7": - version: 3.1.8 - resolution: "vite@npm:3.1.8" + version: 3.2.1 + resolution: "vite@npm:3.2.1" dependencies: esbuild: ^0.15.9 fsevents: ~2.3.2 - postcss: ^8.4.16 + postcss: ^8.4.18 resolve: ^1.22.1 - rollup: ~2.78.0 + rollup: ^2.79.1 peerDependencies: less: "*" sass: "*" stylus: "*" + sugarss: "*" terser: ^5.4.0 dependenciesMeta: fsevents: @@ -35459,11 +35476,13 @@ __metadata: optional: true stylus: optional: true + sugarss: + optional: true terser: optional: true bin: vite: bin/vite.js - checksum: 75f3959c386b8126e0ed27fdb4723bf63689e9c12f5ea84f537be7c6df460978d53f3237293eecf7b9e8b07ee72eb82c44dca3c0c94063736b6d4bc8c0eeb96c + checksum: 727e1fa5325aafbf2f83bf15b354345dfd6d5736a3562294a0f042fee0ed0ca3eb9af48db87ee71506cf77bc1933384a65d348baa021f45a8e5cedd4b55ea416 languageName: node linkType: hard diff --git a/scripts/.eslintrc.js b/scripts/.eslintrc.js index 8942988a0a13..413858230b3f 100644 --- a/scripts/.eslintrc.js +++ b/scripts/.eslintrc.js @@ -1,6 +1,10 @@ module.exports = { root: true, extends: ['@storybook/eslint-config-storybook', 'plugin:storybook/recommended'], + parserOptions: { + tsconfigRootDir: __dirname, + project: ['./tsconfig.json'], + }, rules: { '@typescript-eslint/ban-ts-comment': 'error', '@typescript-eslint/consistent-type-imports': ['error', { disallowTypeAnnotations: false }], @@ -23,5 +27,26 @@ module.exports = { 'import/extensions': ['error', 'always'], }, }, + { + files: [ + '*.js', + '*.jsx', + '*.json', + '*.html', + '**/.storybook/*.ts', + '**/.storybook/*.tsx', + 'setup-jest.ts', + ], + parserOptions: { + project: null, + }, + rules: { + // '@typescript-eslint/no-var-requires': 'off', + '@typescript-eslint/dot-notation': 'off', + '@typescript-eslint/no-implied-eval': 'off', + '@typescript-eslint/no-throw-literal': 'off', + '@typescript-eslint/return-await': 'off', + }, + }, ], }; diff --git a/scripts/prepare/bundle.ts b/scripts/prepare/bundle.ts index 6f1258804de3..e8fda87ded12 100755 --- a/scripts/prepare/bundle.ts +++ b/scripts/prepare/bundle.ts @@ -15,7 +15,7 @@ const run = async ({ cwd, flags }: { cwd: string; flags: string[] }) => { name, dependencies, peerDependencies, - bundler: { entries, platform, pre, post }, + bundler: { entries = [], untypedEntries = [], platform, pre, post }, } = await fs.readJson(join(cwd, 'package.json')); const tsnodePath = join(__dirname, '..', 'node_modules', '.bin', 'ts-node'); @@ -55,7 +55,7 @@ const run = async ({ cwd, flags }: { cwd: string; flags: string[] }) => { const tsConfigExists = await fs.pathExists(tsConfigPath); await Promise.all([ build({ - entry: entries.map((e: string) => slash(join(cwd, e))), + entry: [...entries, ...untypedEntries].map((e: string) => slash(join(cwd, e))), watch, ...(tsConfigExists ? { tsconfig: tsConfigPath } : {}), outDir: join(process.cwd(), 'dist'), @@ -82,6 +82,7 @@ const run = async ({ cwd, flags }: { cwd: string; flags: string[] }) => { esbuildOptions: (c) => { /* eslint-disable no-param-reassign */ c.conditions = ['module']; + c.logLevel = 'error'; c.define = optimized ? { 'process.env.NODE_ENV': "'production'", @@ -102,7 +103,7 @@ const run = async ({ cwd, flags }: { cwd: string; flags: string[] }) => { }, }), build({ - entry: entries.map((e: string) => slash(join(cwd, e))), + entry: [...entries, ...untypedEntries].map((e: string) => slash(join(cwd, e))), watch, outDir: join(process.cwd(), 'dist'), ...(tsConfigExists ? { tsconfig: tsConfigPath } : {}), @@ -114,6 +115,7 @@ const run = async ({ cwd, flags }: { cwd: string; flags: string[] }) => { esbuildOptions: (c) => { /* eslint-disable no-param-reassign */ + c.logLevel = 'error'; c.platform = 'node'; c.legalComments = 'none'; c.minifyWhitespace = optimized; diff --git a/scripts/tasks/compile.ts b/scripts/tasks/compile.ts index 6f6c097642bb..03cb0378aff3 100644 --- a/scripts/tasks/compile.ts +++ b/scripts/tasks/compile.ts @@ -19,7 +19,7 @@ export const compile: Task = { // To check if the code has been compiled as we need, we check the compiled output of // `@storybook/store`. To check if it has been built for publishing (i.e. `--no-link`), // we check if it built types or references source files directly. - const contents = await readFile(resolve(codeDir, './lib/store/dist/index.d.ts'), 'utf8'); + const contents = await readFile(resolve(codeDir, './lib/preview/dist/index.d.ts'), 'utf8'); const isLinkedContents = contents.indexOf(linkedContents) !== -1; if (link) return isLinkedContents; return !isLinkedContents; diff --git a/scripts/tsconfig.json b/scripts/tsconfig.json index 19b4e68d4278..5b333267efb1 100644 --- a/scripts/tsconfig.json +++ b/scripts/tsconfig.json @@ -39,11 +39,7 @@ "dist", "**/dist", "node_modules", - "**/node_modules", - "**/*.spec.ts", - "**/__tests__", - "**/*.test.ts", - "**/setup-jest.ts" + "**/node_modules" ], "include": [ "./**/*" From f98bc37babc1d19b8a34dffec226904d048a47dc Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 2 Nov 2022 14:07:44 +0100 Subject: [PATCH 02/42] improvements --- code/lib/preview/package.json | 7 +------ code/ui/manager/src/components/preview/toolbar.tsx | 11 +++++++++-- code/yarn.lock | 8 +++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/code/lib/preview/package.json b/code/lib/preview/package.json index 8e7f7e965c3f..51fb42d12650 100644 --- a/code/lib/preview/package.json +++ b/code/lib/preview/package.json @@ -126,12 +126,7 @@ }, "bundler": { "entries": [ - "./src/index.ts", - "./src/addons.ts", - "./src/client-api.ts", - "./src/core-client.ts", - "./src/preview-web.ts", - "./src/store.ts" + "./src/index.ts" ], "untypedEntries": [ "./src/global/addons.ts", diff --git a/code/ui/manager/src/components/preview/toolbar.tsx b/code/ui/manager/src/components/preview/toolbar.tsx index 03d831780a51..c7212c968952 100644 --- a/code/ui/manager/src/components/preview/toolbar.tsx +++ b/code/ui/manager/src/components/preview/toolbar.tsx @@ -4,8 +4,15 @@ import React, { Fragment, useMemo } from 'react'; import { styled } from '@storybook/theming'; import { FlexBar, IconButton, Icons, Separator, TabButton, TabBar } from '@storybook/components'; -import { Consumer, type Combo, type API, type State, merge, type LeafEntry } from '@storybook/api'; -import { shortcutToHumanString } from '@storybook/api/shortcut'; +import { + shortcutToHumanString, + Consumer, + type Combo, + type API, + type State, + merge, + type LeafEntry, +} from '@storybook/api'; import { addons, type Addon, types } from '@storybook/addons'; import { Location, type RenderData } from '@storybook/router'; diff --git a/code/yarn.lock b/code/yarn.lock index fd7a5c652c77..e69325829457 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5643,7 +5643,6 @@ __metadata: "@storybook/components": 7.0.0-alpha.47 "@storybook/core-events": 7.0.0-alpha.47 "@storybook/theming": 7.0.0-alpha.47 - "@storybook/types": 7.0.0-alpha.47 global: ^4.4.0 react-sizeme: ^3.0.1 typescript: ~4.6.3 @@ -5764,10 +5763,10 @@ __metadata: "@storybook/addons": 7.0.0-alpha.47 "@storybook/angular": 7.0.0-alpha.47 "@storybook/babel-plugin-require-context-hook": 1.0.1 + "@storybook/client-api": 7.0.0-alpha.47 "@storybook/core-client": 7.0.0-alpha.47 "@storybook/core-common": 7.0.0-alpha.47 "@storybook/core-webpack": 7.0.0-alpha.47 - "@storybook/preview": 7.0.0-alpha.47 "@storybook/react": 7.0.0-alpha.47 "@storybook/types": 7.0.0-alpha.47 "@storybook/vue": 7.0.0-alpha.47 @@ -5853,7 +5852,6 @@ __metadata: "@storybook/router": 7.0.0-alpha.47 "@storybook/source-loader": 7.0.0-alpha.47 "@storybook/theming": 7.0.0-alpha.47 - "@storybook/types": 7.0.0-alpha.47 "@types/react": ^16.14.23 "@types/react-syntax-highlighter": 11.0.5 estraverse: ^5.2.0 @@ -6718,7 +6716,7 @@ __metadata: "@storybook/core-client": 7.0.0-alpha.47 "@storybook/core-common": 7.0.0-alpha.47 "@storybook/docs-tools": 7.0.0-alpha.47 - "@storybook/preview": 7.0.0-alpha.47 + "@storybook/store": 7.0.0-alpha.47 "@storybook/types": 7.0.0-alpha.47 ember-source: ~3.28.1 global: ^4.4.0 @@ -7985,7 +7983,7 @@ __metadata: vue-template-compiler: ^2.6.14 peerDependencies: "@babel/core": "*" - babel-loader: ^7.0.0 || ^8.0.0 + babel-loader: ^7.0.0 || ^8.0.0 || ^9.0.0 css-loader: "*" vue: ^2.6.8 vue-loader: ^15.7.0 From fb08bfccf99a9c2b5e55b67171b5d71c9f134289 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 7 Nov 2022 12:04:14 +0100 Subject: [PATCH 03/42] wip --- code/lib/builder-vite/package.json | 2 ++ code/lib/builder-vite/src/index.ts | 31 +++++++++++++++++++++++++++--- code/yarn.lock | 2 ++ 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/code/lib/builder-vite/package.json b/code/lib/builder-vite/package.json index 3b3b0129e05e..d4aa1d130773 100644 --- a/code/lib/builder-vite/package.json +++ b/code/lib/builder-vite/package.json @@ -30,6 +30,8 @@ "@vitejs/plugin-react": "^2.0.0", "browser-assert": "^1.2.1", "es-module-lexer": "^0.9.3", + "express": "^4.17.1", + "fs-extra": "^9.0.1", "glob": "^7.2.0", "glob-promise": "^4.2.0", "magic-string": "^0.26.1", diff --git a/code/lib/builder-vite/src/index.ts b/code/lib/builder-vite/src/index.ts index fccf5694b8f8..23d3de546d3b 100644 --- a/code/lib/builder-vite/src/index.ts +++ b/code/lib/builder-vite/src/index.ts @@ -1,10 +1,12 @@ // noinspection JSUnusedGlobalSymbols -import * as fs from 'fs'; +import fs from 'fs-extra'; import * as path from 'path'; import type { Builder, StorybookConfig as StorybookBaseConfig, Options } from '@storybook/types'; import type { RequestHandler, Request, Response } from 'express'; import type { InlineConfig, UserConfig, ViteDevServer } from 'vite'; +import express from 'express'; +import { dirname, join, parse } from 'path'; import { transformIframeHtml } from './transform-iframe-html'; import { createViteServer } from './vite-server'; import { build as viteBuild } from './build'; @@ -45,7 +47,7 @@ function iframeMiddleware(options: ExtendedOptions, server: ViteDevServer): Requ return; } - const indexHtml = fs.readFileSync( + const indexHtml = await fs.readFile( path.resolve(__dirname, '../..', 'input', 'iframe.html'), 'utf-8' ); @@ -83,6 +85,11 @@ export const start: ViteBuilder['start'] = async ({ res.header('Content-Type', 'text/event-stream'); }); + const previewResolvedDir = dirname(require.resolve('@storybook/preview/package.json')); + const previewDirOrigin = join(previewResolvedDir, 'dist'); + + router.use(`/sb-preview`, express.static(previewDirOrigin)); + router.use(iframeMiddleware(options as ExtendedOptions, server)); router.use(server.middlewares); @@ -94,5 +101,23 @@ export const start: ViteBuilder['start'] = async ({ }; export const build: ViteBuilder['build'] = async ({ options }) => { - return viteBuild(options as ExtendedOptions); + const viteCompilation = viteBuild(options as ExtendedOptions); + + const previewResolvedDir = dirname(require.resolve('@storybook/preview/package.json')); + const previewDirOrigin = join(previewResolvedDir, 'dist'); + const previewDirTarget = join(options.outputDir || '', `sb-preview`); + + const previewFiles = fs.copy(previewDirOrigin, previewDirTarget, { + filter: (src) => { + const { ext } = parse(src); + if (ext) { + return ext === '.mjs'; + } + return true; + }, + }); + + const [out] = await Promise.all([viteCompilation, previewFiles]); + + return out; }; diff --git a/code/yarn.lock b/code/yarn.lock index 25140f645511..b70d37b362fe 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6195,6 +6195,8 @@ __metadata: "@vitejs/plugin-react": ^2.0.0 browser-assert: ^1.2.1 es-module-lexer: ^0.9.3 + express: ^4.17.1 + fs-extra: ^9.0.1 glob: ^7.2.0 glob-promise: ^4.2.0 magic-string: ^0.26.1 From 17b876ff33abe8c82dcf950d41268f44aa7d3681 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 8 Nov 2022 12:56:03 +0100 Subject: [PATCH 04/42] wip --- code/addons/docs/package.json | 68 ++++++++++++------- code/addons/docs/preset.js | 2 +- code/addons/docs/preview.js | 2 +- code/addons/docs/src/shared.ts | 28 -------- .../src/plugins/code-generator-plugin.ts | 1 + code/yarn.lock | 18 +---- 6 files changed, 48 insertions(+), 71 deletions(-) delete mode 100644 code/addons/docs/src/shared.ts diff --git a/code/addons/docs/package.json b/code/addons/docs/package.json index 912874857cd0..a10539b0d4d8 100644 --- a/code/addons/docs/package.json +++ b/code/addons/docs/package.json @@ -24,9 +24,37 @@ "url": "https://opencollective.com/storybook" }, "license": "MIT", - "main": "dist/cjs/index.js", - "module": "dist/esm/index.js", - "types": "dist/types/index.d.ts", + "exports": { + ".": { + "require": "./dist/index.js", + "import": "./dist/index.mjs", + "types": "./dist/index.d.ts" + }, + "./preview": { + "require": "./dist/preview.js", + "import": "./dist/preview.mjs", + "types": "./dist/preview.d.ts" + }, + "./preset": { + "require": "./dist/preset.js", + "import": "./dist/preset.mjs", + "types": "./dist/preset.d.ts" + }, + "./blocks": { + "require": "./dist/blocks.js", + "import": "./dist/blocks.mjs", + "types": "./dist/blocks.d.ts" + }, + "./dist/blocks": { + "require": "./dist/blocks.js", + "import": "./dist/blocks.mjs", + "types": "./dist/blocks.d.ts" + }, + "./package.json": "./package.json" + }, + "main": "dist/index.js", + "module": "dist/index.mjs", + "types": "dist/index.d.ts", "files": [ "dist/**/*", "angular/**/*", @@ -46,29 +74,20 @@ ], "scripts": { "check": "../../../scripts/node_modules/.bin/tsc --noEmit", - "prep": "node ../../../scripts/prepare.js" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@babel/plugin-transform-react-jsx": "^7.12.12", "@jest/transform": "^26.6.2", - "@mdx-js/react": "^2.1.5", - "@storybook/addons": "7.0.0-alpha.48", - "@storybook/api": "7.0.0-alpha.48", "@storybook/blocks": "7.0.0-alpha.48", "@storybook/components": "7.0.0-alpha.48", - "@storybook/core-common": "7.0.0-alpha.48", - "@storybook/core-events": "7.0.0-alpha.48", "@storybook/csf-plugin": "7.0.0-alpha.48", "@storybook/csf-tools": "7.0.0-alpha.48", - "@storybook/docs-tools": "7.0.0-alpha.48", "@storybook/mdx2-csf": "next", "@storybook/node-logger": "7.0.0-alpha.48", "@storybook/postinstall": "7.0.0-alpha.48", "@storybook/preview-web": "7.0.0-alpha.48", - "@storybook/store": "7.0.0-alpha.48", - "@storybook/theming": "7.0.0-alpha.48", "@storybook/types": "7.0.0-alpha.48", - "dequal": "^2.0.2", "fs-extra": "^9.0.1", "global": "^4.4.0", "remark-external-links": "^8.0.0", @@ -77,23 +96,22 @@ }, "devDependencies": { "@babel/core": "^7.12.10", + "@mdx-js/react": "^2.1.5", + "react": "^16.8.0", + "react-dom": "16.14.0", "typescript": "~4.6.3" }, - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0 || ^18.0.0", - "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" - }, - "peerDependenciesMeta": { - "react": { - "optional": true - }, - "react-dom": { - "optional": true - } - }, "publishConfig": { "access": "public" }, + "bundler": { + "entries": [ + "./src/index.ts", + "./src/preset.ts", + "./src/preview.ts", + "./src/blocks.ts" + ] + }, "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd", "storybook": { "displayName": "Docs", diff --git a/code/addons/docs/preset.js b/code/addons/docs/preset.js index e45ac5b4cec0..a83f95279e7f 100644 --- a/code/addons/docs/preset.js +++ b/code/addons/docs/preset.js @@ -1 +1 @@ -module.exports = require('./dist/cjs/preset'); +module.exports = require('./dist/preset'); diff --git a/code/addons/docs/preview.js b/code/addons/docs/preview.js index e726cab5a1b6..49ad602f79f4 100644 --- a/code/addons/docs/preview.js +++ b/code/addons/docs/preview.js @@ -1 +1 @@ -export * from './dist/esm/preview'; +export * from './dist/preview'; diff --git a/code/addons/docs/src/shared.ts b/code/addons/docs/src/shared.ts deleted file mode 100644 index 178bf46ca387..000000000000 --- a/code/addons/docs/src/shared.ts +++ /dev/null @@ -1,28 +0,0 @@ -export const ADDON_ID = 'storybook/docs'; -export const PANEL_ID = `${ADDON_ID}/panel`; -export const PARAM_KEY = `docs`; - -export const SNIPPET_RENDERED = `${ADDON_ID}/snippet-rendered`; - -export enum SourceType { - /** - * AUTO is the default - * - * Use the CODE logic if: - * - the user has set a custom source snippet in `docs.source.code` story parameter - * - the story is not an args-based story - * - * Use the DYNAMIC rendered snippet if the story is an args story - */ - AUTO = 'auto', - - /** - * Render the code extracted by source-loader - */ - CODE = 'code', - - /** - * Render dynamically-rendered source snippet from the story's virtual DOM (currently React only) - */ - DYNAMIC = 'dynamic', -} diff --git a/code/lib/builder-vite/src/plugins/code-generator-plugin.ts b/code/lib/builder-vite/src/plugins/code-generator-plugin.ts index 6efa3d6ae4a2..99647dfa3fbf 100644 --- a/code/lib/builder-vite/src/plugins/code-generator-plugin.ts +++ b/code/lib/builder-vite/src/plugins/code-generator-plugin.ts @@ -105,6 +105,7 @@ export function codeGeneratorPlugin(options: ExtendedOptions): Plugin { if (source === virtualAddonSetupFile) { return virtualAddonSetupFile; } + return undefined; }, async load(id) { diff --git a/code/yarn.lock b/code/yarn.lock index 386eb4baad73..768098fad95c 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5512,37 +5512,23 @@ __metadata: "@babel/plugin-transform-react-jsx": ^7.12.12 "@jest/transform": ^26.6.2 "@mdx-js/react": ^2.1.5 - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/api": 7.0.0-alpha.48 "@storybook/blocks": 7.0.0-alpha.48 "@storybook/components": 7.0.0-alpha.48 - "@storybook/core-common": 7.0.0-alpha.48 - "@storybook/core-events": 7.0.0-alpha.48 "@storybook/csf-plugin": 7.0.0-alpha.48 "@storybook/csf-tools": 7.0.0-alpha.48 - "@storybook/docs-tools": 7.0.0-alpha.48 "@storybook/mdx2-csf": next "@storybook/node-logger": 7.0.0-alpha.48 "@storybook/postinstall": 7.0.0-alpha.48 "@storybook/preview-web": 7.0.0-alpha.48 - "@storybook/store": 7.0.0-alpha.48 - "@storybook/theming": 7.0.0-alpha.48 "@storybook/types": 7.0.0-alpha.48 - dequal: ^2.0.2 fs-extra: ^9.0.1 global: ^4.4.0 + react: ^16.8.0 + react-dom: 16.14.0 remark-external-links: ^8.0.0 remark-slug: ^6.0.0 ts-dedent: ^2.0.0 typescript: ~4.6.3 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true languageName: unknown linkType: soft From 1fe77d472d554eefc979c9d76440a8975b25b904 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 8 Nov 2022 12:58:59 +0100 Subject: [PATCH 05/42] fix lockfile --- code/yarn.lock | 1064 +++++++++++++++++++++++++----------------------- 1 file changed, 558 insertions(+), 506 deletions(-) diff --git a/code/yarn.lock b/code/yarn.lock index 768098fad95c..3d5cc731f427 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -378,10 +378,10 @@ __metadata: languageName: node linkType: hard -"@babel/compat-data@npm:^7.16.8, @babel/compat-data@npm:^7.17.7, @babel/compat-data@npm:^7.19.4, @babel/compat-data@npm:^7.20.0": - version: 7.20.0 - resolution: "@babel/compat-data@npm:7.20.0" - checksum: fc02fe9cb5f5539ce12e281de4109a79fc2716d35150acf94f63445ab3c66e3fff81ae7996ebc1e1d5948ac85e4d11cc5ba3aae0b5fddb9c410af349dfcabbb5 +"@babel/compat-data@npm:^7.16.8, @babel/compat-data@npm:^7.17.7, @babel/compat-data@npm:^7.20.0, @babel/compat-data@npm:^7.20.1": + version: 7.20.1 + resolution: "@babel/compat-data@npm:7.20.1" + checksum: d27b97d47be1b8928153525e1ffa1faa9068c2eae65bf4c0fbce1595841f6f52f7492a625c911688d32a91cb31f082ee1f72f3b9e43a970361215b38e2c28fc5 languageName: node linkType: hard @@ -432,25 +432,25 @@ __metadata: linkType: hard "@babel/core@npm:^7.1.0, @babel/core@npm:^7.11.5, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.0, @babel/core@npm:^7.12.10, @babel/core@npm:^7.12.3, @babel/core@npm:^7.13.16, @babel/core@npm:^7.17.2, @babel/core@npm:^7.17.5, @babel/core@npm:^7.19.6, @babel/core@npm:^7.3.4, @babel/core@npm:^7.7.2, @babel/core@npm:^7.7.5, @babel/core@npm:^7.8.0": - version: 7.19.6 - resolution: "@babel/core@npm:7.19.6" + version: 7.20.2 + resolution: "@babel/core@npm:7.20.2" dependencies: "@ampproject/remapping": ^2.1.0 "@babel/code-frame": ^7.18.6 - "@babel/generator": ^7.19.6 - "@babel/helper-compilation-targets": ^7.19.3 - "@babel/helper-module-transforms": ^7.19.6 - "@babel/helpers": ^7.19.4 - "@babel/parser": ^7.19.6 + "@babel/generator": ^7.20.2 + "@babel/helper-compilation-targets": ^7.20.0 + "@babel/helper-module-transforms": ^7.20.2 + "@babel/helpers": ^7.20.1 + "@babel/parser": ^7.20.2 "@babel/template": ^7.18.10 - "@babel/traverse": ^7.19.6 - "@babel/types": ^7.19.4 + "@babel/traverse": ^7.20.1 + "@babel/types": ^7.20.2 convert-source-map: ^1.7.0 debug: ^4.1.0 gensync: ^1.0.0-beta.2 json5: ^2.2.1 semver: ^6.3.0 - checksum: 58a095dac601444128ca17ffa08bd08cb3ea31305f49389ff882a2df450937f6929108810e94742306f5ccb13cd113244a9012a2f50bdbd7539873d6fd767521 + checksum: 7c2a040db56f9807a7b11f19a056a842864512b5f3e5ca00491dae8501b9a19a57ae8c268373bc425bc734d47d6d01db711cc6e662bfb24794baa15e73f6fd20 languageName: node linkType: hard @@ -465,14 +465,14 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.12.11, @babel/generator@npm:^7.16.8, @babel/generator@npm:^7.19.6, @babel/generator@npm:^7.20.0, @babel/generator@npm:^7.4.0, @babel/generator@npm:^7.7.2, @babel/generator@npm:^7.8.7": - version: 7.20.0 - resolution: "@babel/generator@npm:7.20.0" +"@babel/generator@npm:^7.12.11, @babel/generator@npm:^7.16.8, @babel/generator@npm:^7.20.1, @babel/generator@npm:^7.20.2, @babel/generator@npm:^7.4.0, @babel/generator@npm:^7.7.2, @babel/generator@npm:^7.8.7": + version: 7.20.3 + resolution: "@babel/generator@npm:7.20.3" dependencies: - "@babel/types": ^7.20.0 + "@babel/types": ^7.20.2 "@jridgewell/gen-mapping": ^0.3.2 jsesc: ^2.5.1 - checksum: 12d981f2b391a7ffaacbc4b91bbed47721c8063bb66fccfdee0dc929629de674bb6a0b37000980cb24e2c6a6a04fd3e5a5df0eb4a9074315009c59de19f55a70 + checksum: 7287321925d8a451d8f852d5d83f70ac413089a4a91798dbf0037a139750dd1e52ca760c8530f2608a71b82df75a575f9d028ff40f268b5964983184ed226694 languageName: node linkType: hard @@ -504,7 +504,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-compilation-targets@npm:^7.12.0, @babel/helper-compilation-targets@npm:^7.16.7, @babel/helper-compilation-targets@npm:^7.17.7, @babel/helper-compilation-targets@npm:^7.18.9, @babel/helper-compilation-targets@npm:^7.19.0, @babel/helper-compilation-targets@npm:^7.19.3": +"@babel/helper-compilation-targets@npm:^7.12.0, @babel/helper-compilation-targets@npm:^7.16.7, @babel/helper-compilation-targets@npm:^7.17.7, @babel/helper-compilation-targets@npm:^7.18.9, @babel/helper-compilation-targets@npm:^7.20.0": version: 7.20.0 resolution: "@babel/helper-compilation-targets@npm:7.20.0" dependencies: @@ -518,20 +518,20 @@ __metadata: languageName: node linkType: hard -"@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.19.0": - version: 7.19.0 - resolution: "@babel/helper-create-class-features-plugin@npm:7.19.0" +"@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.20.2": + version: 7.20.2 + resolution: "@babel/helper-create-class-features-plugin@npm:7.20.2" dependencies: "@babel/helper-annotate-as-pure": ^7.18.6 "@babel/helper-environment-visitor": ^7.18.9 "@babel/helper-function-name": ^7.19.0 "@babel/helper-member-expression-to-functions": ^7.18.9 "@babel/helper-optimise-call-expression": ^7.18.6 - "@babel/helper-replace-supers": ^7.18.9 + "@babel/helper-replace-supers": ^7.19.1 "@babel/helper-split-export-declaration": ^7.18.6 peerDependencies: "@babel/core": ^7.0.0 - checksum: f61b98942d40d904e697c14fb24f30975c639f7d40e011a80b22fb22f5e423abe857ad7bba56318592a268420426d82c94a9193e8f761a8cd0717080549ca7ac + checksum: 93ae5401481b59b9fbed64c77b1c83d6e83f361fe2963fd521cf6863b8ff70b7173499de8662900c33d7487c0913ee866d5a0d87d4c19a873f479df99605e686 languageName: node linkType: hard @@ -616,19 +616,19 @@ __metadata: languageName: node linkType: hard -"@babel/helper-module-transforms@npm:^7.16.7, @babel/helper-module-transforms@npm:^7.18.6, @babel/helper-module-transforms@npm:^7.19.6": - version: 7.19.6 - resolution: "@babel/helper-module-transforms@npm:7.19.6" +"@babel/helper-module-transforms@npm:^7.16.7, @babel/helper-module-transforms@npm:^7.18.6, @babel/helper-module-transforms@npm:^7.19.6, @babel/helper-module-transforms@npm:^7.20.2": + version: 7.20.2 + resolution: "@babel/helper-module-transforms@npm:7.20.2" dependencies: "@babel/helper-environment-visitor": ^7.18.9 "@babel/helper-module-imports": ^7.18.6 - "@babel/helper-simple-access": ^7.19.4 + "@babel/helper-simple-access": ^7.20.2 "@babel/helper-split-export-declaration": ^7.18.6 "@babel/helper-validator-identifier": ^7.19.1 "@babel/template": ^7.18.10 - "@babel/traverse": ^7.19.6 - "@babel/types": ^7.19.4 - checksum: c6d5fd5cb299591b005144ee2e142d6bba06f8c2a87c9b19e2e9a5189f39a59e313266a6ca0213cdd185e4757c47accc2f3e346b5004da0a69da87e214bd7f09 + "@babel/traverse": ^7.20.1 + "@babel/types": ^7.20.2 + checksum: 9c5e9853a5b83cb7f4ec5ac15ae0e57a9ea47be47c57bb7ef56b6b3d55eb30547bfa9acb90f6a2b25f94764765c10de196908eba745a27b2bcf4fefcbb314ee7 languageName: node linkType: hard @@ -641,10 +641,10 @@ __metadata: languageName: node linkType: hard -"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.16.7, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.18.9, @babel/helper-plugin-utils@npm:^7.19.0, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3": - version: 7.19.0 - resolution: "@babel/helper-plugin-utils@npm:7.19.0" - checksum: 9ae9c09cf7e3b6023be2bb66f3ca3b5fa8c2b21b58bd09819d494fcd7ab2a1844056c8dfd609ffb474e3c857a1bc979fa7a60931b0c71d69a3e939ba724498ac +"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.16.7, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.18.9, @babel/helper-plugin-utils@npm:^7.19.0, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3": + version: 7.20.2 + resolution: "@babel/helper-plugin-utils@npm:7.20.2" + checksum: bf4de040e57b7ddff36ea599e963c391eb246d5a95207bb9ef3e33073c451bcc0821e3a9cc08dfede862a6dcc110d7e6e7d9a483482f852be358c5b60add499c languageName: node linkType: hard @@ -662,7 +662,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-replace-supers@npm:^7.18.6, @babel/helper-replace-supers@npm:^7.18.9, @babel/helper-replace-supers@npm:^7.19.1": +"@babel/helper-replace-supers@npm:^7.18.6, @babel/helper-replace-supers@npm:^7.19.1": version: 7.19.1 resolution: "@babel/helper-replace-supers@npm:7.19.1" dependencies: @@ -675,12 +675,12 @@ __metadata: languageName: node linkType: hard -"@babel/helper-simple-access@npm:^7.19.4": - version: 7.19.4 - resolution: "@babel/helper-simple-access@npm:7.19.4" +"@babel/helper-simple-access@npm:^7.19.4, @babel/helper-simple-access@npm:^7.20.2": + version: 7.20.2 + resolution: "@babel/helper-simple-access@npm:7.20.2" dependencies: - "@babel/types": ^7.19.4 - checksum: 23e36b7a5063200e8ec722746ac41baad70d4c192f3fff5a435e02f599cde5f2b20bb23ff15833fe8763ffebd7677be900f7f9286b848363a97adc9aab642016 + "@babel/types": ^7.20.2 + checksum: 79cea28155536c74b37839748caea534bc413fac8c512e6101e9eecfe83f670db77bc782bdb41114caecbb1e2a73007ff6015d6a5ce58cae5363b8c5bd2dcee9 languageName: node linkType: hard @@ -735,14 +735,14 @@ __metadata: languageName: node linkType: hard -"@babel/helpers@npm:^7.16.7, @babel/helpers@npm:^7.19.4, @babel/helpers@npm:^7.8.4": - version: 7.20.0 - resolution: "@babel/helpers@npm:7.20.0" +"@babel/helpers@npm:^7.16.7, @babel/helpers@npm:^7.20.1, @babel/helpers@npm:^7.8.4": + version: 7.20.1 + resolution: "@babel/helpers@npm:7.20.1" dependencies: "@babel/template": ^7.18.10 - "@babel/traverse": ^7.20.0 + "@babel/traverse": ^7.20.1 "@babel/types": ^7.20.0 - checksum: 55fb6e0f127b7941948d4d4a20d8e914c3799a028b5fe6ec801eef49487f668b5fbad8d7823e5cd40d02637c5ca83e2f23a486a07dbe9066fc48b3c40d0faab3 + checksum: be1096271946b265ea1b9391d3fa1a8690230858081f6ba35ef3c0030ec0113aa9c350a764c65b1d162584c73a853c1ed2dac294e9dd113885097b172078f0b6 languageName: node linkType: hard @@ -757,12 +757,12 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.11.5, @babel/parser@npm:^7.12.11, @babel/parser@npm:^7.13.12, @babel/parser@npm:^7.13.16, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.16.12, @babel/parser@npm:^7.16.4, @babel/parser@npm:^7.16.7, @babel/parser@npm:^7.18.10, @babel/parser@npm:^7.18.4, @babel/parser@npm:^7.19.6, @babel/parser@npm:^7.20.0, @babel/parser@npm:^7.4.3, @babel/parser@npm:^7.4.5, @babel/parser@npm:^7.6.0, @babel/parser@npm:^7.7.0, @babel/parser@npm:^7.8.6, @babel/parser@npm:^7.8.7, @babel/parser@npm:^7.9.6": - version: 7.20.0 - resolution: "@babel/parser@npm:7.20.0" +"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.11.5, @babel/parser@npm:^7.12.11, @babel/parser@npm:^7.13.12, @babel/parser@npm:^7.13.16, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.16.12, @babel/parser@npm:^7.16.4, @babel/parser@npm:^7.16.7, @babel/parser@npm:^7.18.10, @babel/parser@npm:^7.18.4, @babel/parser@npm:^7.20.1, @babel/parser@npm:^7.20.2, @babel/parser@npm:^7.4.3, @babel/parser@npm:^7.4.5, @babel/parser@npm:^7.6.0, @babel/parser@npm:^7.7.0, @babel/parser@npm:^7.8.6, @babel/parser@npm:^7.8.7, @babel/parser@npm:^7.9.6": + version: 7.20.3 + resolution: "@babel/parser@npm:7.20.3" bin: parser: ./bin/babel-parser.js - checksum: 644e0da72116cfbb7a084523f3cfc26685fb65202e9bcd4da45c0efa8e258ed66a653525000401f6f2d010f7fa8291892b6b81193aa01e359e6b58b20f69e609 + checksum: 6bd67dd32683cd3a8d4c5ed19085fc47582361eb28cf1dbd03f655350827002e3d8abc8be7c9e3a79d17668bf855899a4bd7f261b7fafcc82870bd9de18f9016 languageName: node linkType: hard @@ -803,9 +803,9 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-async-generator-functions@npm:^7.16.8, @babel/plugin-proposal-async-generator-functions@npm:^7.19.1": - version: 7.19.1 - resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.19.1" +"@babel/plugin-proposal-async-generator-functions@npm:^7.16.8, @babel/plugin-proposal-async-generator-functions@npm:^7.20.1": + version: 7.20.1 + resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.20.1" dependencies: "@babel/helper-environment-visitor": ^7.18.9 "@babel/helper-plugin-utils": ^7.19.0 @@ -813,7 +813,7 @@ __metadata: "@babel/plugin-syntax-async-generators": ^7.8.4 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: e2b93724dedf2571957d3e46d0710553f2a01794f9abab1c2f896132a70a5d4a3aafd3687b4a848ccddcfa911d40f0b17e4a89351e5de50d31d0d88519da941c + checksum: b99ba70c51143921bc84f37b59cf1cbb6b264301e49048fcc4964a15865e865c3ddb48d4ac7a3d2a48c186eb8964ff975370a99082b23484b046d3206f988590 languageName: node linkType: hard @@ -843,17 +843,17 @@ __metadata: linkType: hard "@babel/plugin-proposal-decorators@npm:^7.13.5, @babel/plugin-proposal-decorators@npm:^7.17.2": - version: 7.20.0 - resolution: "@babel/plugin-proposal-decorators@npm:7.20.0" + version: 7.20.2 + resolution: "@babel/plugin-proposal-decorators@npm:7.20.2" dependencies: - "@babel/helper-create-class-features-plugin": ^7.19.0 - "@babel/helper-plugin-utils": ^7.19.0 + "@babel/helper-create-class-features-plugin": ^7.20.2 + "@babel/helper-plugin-utils": ^7.20.2 "@babel/helper-replace-supers": ^7.19.1 "@babel/helper-split-export-declaration": ^7.18.6 "@babel/plugin-syntax-decorators": ^7.19.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 9ce24ddea4a6bc4fc084b7447b7ca903a6e0b2e3a17de0fcd3a02a8383c044db325f5e893a20cfe72811372b8051d1e1a223fe4233fb9af3c28e1eeb675d7eaa + checksum: 814699de0c0ca8eda6161b70ad0e454107bbb366d4c3fa9e20e15a824cd08429c6bbe7d6ea474e3ceaedd4594e23f0a5d06c481c81f2dca33b35f7ad273c081a languageName: node linkType: hard @@ -941,18 +941,18 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-object-rest-spread@npm:^7.16.7, @babel/plugin-proposal-object-rest-spread@npm:^7.17.3, @babel/plugin-proposal-object-rest-spread@npm:^7.19.4": - version: 7.19.4 - resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.19.4" +"@babel/plugin-proposal-object-rest-spread@npm:^7.16.7, @babel/plugin-proposal-object-rest-spread@npm:^7.17.3, @babel/plugin-proposal-object-rest-spread@npm:^7.20.2": + version: 7.20.2 + resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.20.2" dependencies: - "@babel/compat-data": ^7.19.4 - "@babel/helper-compilation-targets": ^7.19.3 - "@babel/helper-plugin-utils": ^7.19.0 + "@babel/compat-data": ^7.20.1 + "@babel/helper-compilation-targets": ^7.20.0 + "@babel/helper-plugin-utils": ^7.20.2 "@babel/plugin-syntax-object-rest-spread": ^7.8.3 - "@babel/plugin-transform-parameters": ^7.18.8 + "@babel/plugin-transform-parameters": ^7.20.1 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 0c51c3ef25890ee69bec275db6d4a79b475b809dcb473cd64d5afed96f60be51d928a59356beb69e40b1328c34715e400b48322c6af823ba3792bbe52d7cc7d9 + checksum: 2d803fd45b42312580cab2197ce9bbd4d12b60c9560bfacb2398178baf3d5c9d29538959a40463021b831c32eeb2a4fa109f1069361f6de80a17a4344ba80b7a languageName: node linkType: hard @@ -1118,7 +1118,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-import-assertions@npm:^7.18.6": +"@babel/plugin-syntax-import-assertions@npm:^7.20.0": version: 7.20.0 resolution: "@babel/plugin-syntax-import-assertions@npm:7.20.0" dependencies: @@ -1309,33 +1309,33 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-block-scoping@npm:^7.16.7, @babel/plugin-transform-block-scoping@npm:^7.19.4, @babel/plugin-transform-block-scoping@npm:^7.8.3": - version: 7.20.0 - resolution: "@babel/plugin-transform-block-scoping@npm:7.20.0" +"@babel/plugin-transform-block-scoping@npm:^7.16.7, @babel/plugin-transform-block-scoping@npm:^7.20.2, @babel/plugin-transform-block-scoping@npm:^7.8.3": + version: 7.20.2 + resolution: "@babel/plugin-transform-block-scoping@npm:7.20.2" dependencies: - "@babel/helper-plugin-utils": ^7.19.0 + "@babel/helper-plugin-utils": ^7.20.2 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 7a67d6760cfe6f785b80a099b110f23467c282b39ac34f059f37d7296a0fba64eeaeada0189cf23129ca74b8c9176260a34b5982bfc477a803e6114b7a42d5b0 + checksum: e1cf333d384c642c9f44c57fe14f384e11e91627e7df37256821891686e0464f1c3b7de93312ec46155a8f1313019f31aed6ce878d22259764f8835509ecb60a languageName: node linkType: hard -"@babel/plugin-transform-classes@npm:^7.16.7, @babel/plugin-transform-classes@npm:^7.19.0": - version: 7.19.0 - resolution: "@babel/plugin-transform-classes@npm:7.19.0" +"@babel/plugin-transform-classes@npm:^7.16.7, @babel/plugin-transform-classes@npm:^7.20.2": + version: 7.20.2 + resolution: "@babel/plugin-transform-classes@npm:7.20.2" dependencies: "@babel/helper-annotate-as-pure": ^7.18.6 - "@babel/helper-compilation-targets": ^7.19.0 + "@babel/helper-compilation-targets": ^7.20.0 "@babel/helper-environment-visitor": ^7.18.9 "@babel/helper-function-name": ^7.19.0 "@babel/helper-optimise-call-expression": ^7.18.6 - "@babel/helper-plugin-utils": ^7.19.0 - "@babel/helper-replace-supers": ^7.18.9 + "@babel/helper-plugin-utils": ^7.20.2 + "@babel/helper-replace-supers": ^7.19.1 "@babel/helper-split-export-declaration": ^7.18.6 globals: ^11.1.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 843db7da466b6e40f9da96827051d970ed7800c1acccb24b702ddc8b05e87cfbbbf53bd4b0f3ffd5b8365db03ea97a5cd6e9efc3ec176a7697a1a4601d7071e8 + checksum: b9956a774a1d10d20e157abe4e1834156c46152ec3b5231b2f4a0e7fe4e2b934465d5e39872d424b4baa55944f95646ca6f2b23070ac3a824223fea918981d11 languageName: node linkType: hard @@ -1350,14 +1350,14 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-destructuring@npm:^7.16.7, @babel/plugin-transform-destructuring@npm:^7.17.3, @babel/plugin-transform-destructuring@npm:^7.19.4": - version: 7.20.0 - resolution: "@babel/plugin-transform-destructuring@npm:7.20.0" +"@babel/plugin-transform-destructuring@npm:^7.16.7, @babel/plugin-transform-destructuring@npm:^7.17.3, @babel/plugin-transform-destructuring@npm:^7.20.2": + version: 7.20.2 + resolution: "@babel/plugin-transform-destructuring@npm:7.20.2" dependencies: - "@babel/helper-plugin-utils": ^7.19.0 + "@babel/helper-plugin-utils": ^7.20.2 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 5b6fcc18632fd2623b8d125a1bba648cff96864edc9f30f0e011b2c242927a5333ed78bc47049f2fe6676b092efa2951568aa2533397a03b26b74e5fa86bd6e3 + checksum: 1989312c031636103d1fc83a6edf9e24f8445a5395a72b8dc9741f98c31dacbf13db7831b651975d9d7ee57381abce299fae8b4bde599f8efa00dd8b7eb8e298 languageName: node linkType: hard @@ -1454,7 +1454,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-modules-amd@npm:^7.13.0, @babel/plugin-transform-modules-amd@npm:^7.16.7, @babel/plugin-transform-modules-amd@npm:^7.18.6": +"@babel/plugin-transform-modules-amd@npm:^7.13.0, @babel/plugin-transform-modules-amd@npm:^7.16.7, @babel/plugin-transform-modules-amd@npm:^7.19.6": version: 7.19.6 resolution: "@babel/plugin-transform-modules-amd@npm:7.19.6" dependencies: @@ -1466,7 +1466,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-modules-commonjs@npm:^7.13.8, @babel/plugin-transform-modules-commonjs@npm:^7.16.8, @babel/plugin-transform-modules-commonjs@npm:^7.18.6, @babel/plugin-transform-modules-commonjs@npm:^7.2.0": +"@babel/plugin-transform-modules-commonjs@npm:^7.13.8, @babel/plugin-transform-modules-commonjs@npm:^7.16.8, @babel/plugin-transform-modules-commonjs@npm:^7.19.6, @babel/plugin-transform-modules-commonjs@npm:^7.2.0": version: 7.19.6 resolution: "@babel/plugin-transform-modules-commonjs@npm:7.19.6" dependencies: @@ -1479,7 +1479,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-modules-systemjs@npm:^7.16.7, @babel/plugin-transform-modules-systemjs@npm:^7.19.0": +"@babel/plugin-transform-modules-systemjs@npm:^7.16.7, @babel/plugin-transform-modules-systemjs@npm:^7.19.6": version: 7.19.6 resolution: "@babel/plugin-transform-modules-systemjs@npm:7.19.6" dependencies: @@ -1551,14 +1551,14 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-parameters@npm:^7.16.7, @babel/plugin-transform-parameters@npm:^7.18.8": - version: 7.18.8 - resolution: "@babel/plugin-transform-parameters@npm:7.18.8" +"@babel/plugin-transform-parameters@npm:^7.16.7, @babel/plugin-transform-parameters@npm:^7.20.1": + version: 7.20.3 + resolution: "@babel/plugin-transform-parameters@npm:7.20.3" dependencies: - "@babel/helper-plugin-utils": ^7.18.6 + "@babel/helper-plugin-utils": ^7.20.2 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: ca12c2cdb67012fc7d886941bf194225054cb11a117dd2b6a065ca5433f38368e8cf1e23f0fb81ccfc026991e95c7444a4cb594f4fd27b9e292304c0f96724ca + checksum: 34cd3b5c9019cad22e3ec1f7ec16cdab4858fb45073a7ddac8f269e5151c4ce8edece04ef76376767572024b506c1a30024b840371d014df61cd869a889ad16c languageName: node linkType: hard @@ -1756,15 +1756,15 @@ __metadata: linkType: hard "@babel/plugin-transform-typescript@npm:^7.13.0, @babel/plugin-transform-typescript@npm:^7.18.6": - version: 7.20.0 - resolution: "@babel/plugin-transform-typescript@npm:7.20.0" + version: 7.20.2 + resolution: "@babel/plugin-transform-typescript@npm:7.20.2" dependencies: - "@babel/helper-create-class-features-plugin": ^7.19.0 - "@babel/helper-plugin-utils": ^7.19.0 + "@babel/helper-create-class-features-plugin": ^7.20.2 + "@babel/helper-plugin-utils": ^7.20.2 "@babel/plugin-syntax-typescript": ^7.20.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: e2893ade8dc06ef9aedd28e867a00ec4a8ac8363885c8ddf39258bf93e364ff06369b07452ee03b2236b73ae48ecdb9ab033a3221143e8fb8581521cba205a12 + checksum: 0b4a42b5953c658f31d0a9ebdead733a9d4850b0ae767d4f7bca6e55c8ffcc27afd0cfe88347fe85bea45a3292a5d362f55f1fa369fc48eb9aa66f49991bcb68 languageName: node linkType: hard @@ -1886,16 +1886,16 @@ __metadata: linkType: hard "@babel/preset-env@npm:^7.12.11, @babel/preset-env@npm:^7.16.11, @babel/preset-env@npm:^7.16.5": - version: 7.19.4 - resolution: "@babel/preset-env@npm:7.19.4" + version: 7.20.2 + resolution: "@babel/preset-env@npm:7.20.2" dependencies: - "@babel/compat-data": ^7.19.4 - "@babel/helper-compilation-targets": ^7.19.3 - "@babel/helper-plugin-utils": ^7.19.0 + "@babel/compat-data": ^7.20.1 + "@babel/helper-compilation-targets": ^7.20.0 + "@babel/helper-plugin-utils": ^7.20.2 "@babel/helper-validator-option": ^7.18.6 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.18.6 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.18.9 - "@babel/plugin-proposal-async-generator-functions": ^7.19.1 + "@babel/plugin-proposal-async-generator-functions": ^7.20.1 "@babel/plugin-proposal-class-properties": ^7.18.6 "@babel/plugin-proposal-class-static-block": ^7.18.6 "@babel/plugin-proposal-dynamic-import": ^7.18.6 @@ -1904,7 +1904,7 @@ __metadata: "@babel/plugin-proposal-logical-assignment-operators": ^7.18.9 "@babel/plugin-proposal-nullish-coalescing-operator": ^7.18.6 "@babel/plugin-proposal-numeric-separator": ^7.18.6 - "@babel/plugin-proposal-object-rest-spread": ^7.19.4 + "@babel/plugin-proposal-object-rest-spread": ^7.20.2 "@babel/plugin-proposal-optional-catch-binding": ^7.18.6 "@babel/plugin-proposal-optional-chaining": ^7.18.9 "@babel/plugin-proposal-private-methods": ^7.18.6 @@ -1915,7 +1915,7 @@ __metadata: "@babel/plugin-syntax-class-static-block": ^7.14.5 "@babel/plugin-syntax-dynamic-import": ^7.8.3 "@babel/plugin-syntax-export-namespace-from": ^7.8.3 - "@babel/plugin-syntax-import-assertions": ^7.18.6 + "@babel/plugin-syntax-import-assertions": ^7.20.0 "@babel/plugin-syntax-json-strings": ^7.8.3 "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4 "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3 @@ -1928,10 +1928,10 @@ __metadata: "@babel/plugin-transform-arrow-functions": ^7.18.6 "@babel/plugin-transform-async-to-generator": ^7.18.6 "@babel/plugin-transform-block-scoped-functions": ^7.18.6 - "@babel/plugin-transform-block-scoping": ^7.19.4 - "@babel/plugin-transform-classes": ^7.19.0 + "@babel/plugin-transform-block-scoping": ^7.20.2 + "@babel/plugin-transform-classes": ^7.20.2 "@babel/plugin-transform-computed-properties": ^7.18.9 - "@babel/plugin-transform-destructuring": ^7.19.4 + "@babel/plugin-transform-destructuring": ^7.20.2 "@babel/plugin-transform-dotall-regex": ^7.18.6 "@babel/plugin-transform-duplicate-keys": ^7.18.9 "@babel/plugin-transform-exponentiation-operator": ^7.18.6 @@ -1939,14 +1939,14 @@ __metadata: "@babel/plugin-transform-function-name": ^7.18.9 "@babel/plugin-transform-literals": ^7.18.9 "@babel/plugin-transform-member-expression-literals": ^7.18.6 - "@babel/plugin-transform-modules-amd": ^7.18.6 - "@babel/plugin-transform-modules-commonjs": ^7.18.6 - "@babel/plugin-transform-modules-systemjs": ^7.19.0 + "@babel/plugin-transform-modules-amd": ^7.19.6 + "@babel/plugin-transform-modules-commonjs": ^7.19.6 + "@babel/plugin-transform-modules-systemjs": ^7.19.6 "@babel/plugin-transform-modules-umd": ^7.18.6 "@babel/plugin-transform-named-capturing-groups-regex": ^7.19.1 "@babel/plugin-transform-new-target": ^7.18.6 "@babel/plugin-transform-object-super": ^7.18.6 - "@babel/plugin-transform-parameters": ^7.18.8 + "@babel/plugin-transform-parameters": ^7.20.1 "@babel/plugin-transform-property-literals": ^7.18.6 "@babel/plugin-transform-regenerator": ^7.18.6 "@babel/plugin-transform-reserved-words": ^7.18.6 @@ -1958,7 +1958,7 @@ __metadata: "@babel/plugin-transform-unicode-escapes": ^7.18.10 "@babel/plugin-transform-unicode-regex": ^7.18.6 "@babel/preset-modules": ^0.1.5 - "@babel/types": ^7.19.4 + "@babel/types": ^7.20.2 babel-plugin-polyfill-corejs2: ^0.3.3 babel-plugin-polyfill-corejs3: ^0.6.0 babel-plugin-polyfill-regenerator: ^0.4.1 @@ -1966,7 +1966,7 @@ __metadata: semver: ^6.3.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: a0c1e9e575c497d71ccf84242276356abb6c4fede7c52733785e988131458433dd2329bd96921465c23b30d2cad19977c23617b657d986dac3d6fed544b45a29 + checksum: 8e4c86d9acf2557eaca4c55ffe69bb76f30d675f2576e5e1b872ef671acec7c80df3759d77cd33ff934d5a49f26950c4d9e63718c4c3295455bc2df88788d7ad languageName: node linkType: hard @@ -2043,12 +2043,12 @@ __metadata: linkType: hard "@babel/runtime-corejs3@npm:^7.10.2": - version: 7.20.0 - resolution: "@babel/runtime-corejs3@npm:7.20.0" + version: 7.20.1 + resolution: "@babel/runtime-corejs3@npm:7.20.1" dependencies: core-js-pure: ^3.25.1 regenerator-runtime: ^0.13.10 - checksum: b4d45dc966263c05fa6b68201a6ed388abbd7c47fab43a200c54f9857e2d17dd84cb5f3b07cc15616b60b65c201684318ee74edb1fe9afe2c1b5fa38ad043c8d + checksum: 95859391570f788875e4c2d10e56998cff165c81b3366508f7c224cf9358b7cd52cf5c62eebcfb9e1c32f8bb6d6bf2e7658620c4c56d6ab0612aa152e2f0469a languageName: node linkType: hard @@ -2080,11 +2080,11 @@ __metadata: linkType: hard "@babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.8, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.18.9, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.0, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2": - version: 7.20.0 - resolution: "@babel/runtime@npm:7.20.0" + version: 7.20.1 + resolution: "@babel/runtime@npm:7.20.1" dependencies: regenerator-runtime: ^0.13.10 - checksum: 945bc7d406c5b39be3e72c9c8cc2ba4aa71e0ec0df8493b39c5af295e7ce728aa917783f80244a4e9f9c0f827988d88722b1c9e45845a3dd753e1025f72d787e + checksum: ec10f4c4cb23d6473b5451ecc44f8993629d56f02dbaa597f40920b3ade49d9ff0f82e752cf768afb48cf9c9e73febab9da393e239a318b2fc8a11136622eea4 languageName: node linkType: hard @@ -2130,43 +2130,32 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.1.0, @babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.12.11, @babel/traverse@npm:^7.16.10, @babel/traverse@npm:^7.19.0, @babel/traverse@npm:^7.19.1, @babel/traverse@npm:^7.19.6, @babel/traverse@npm:^7.20.0, @babel/traverse@npm:^7.4.3, @babel/traverse@npm:^7.4.5, @babel/traverse@npm:^7.7.0, @babel/traverse@npm:^7.7.2, @babel/traverse@npm:^7.8.6": - version: 7.20.0 - resolution: "@babel/traverse@npm:7.20.0" +"@babel/traverse@npm:^7.1.0, @babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.12.11, @babel/traverse@npm:^7.16.10, @babel/traverse@npm:^7.19.0, @babel/traverse@npm:^7.19.1, @babel/traverse@npm:^7.20.1, @babel/traverse@npm:^7.4.3, @babel/traverse@npm:^7.4.5, @babel/traverse@npm:^7.7.0, @babel/traverse@npm:^7.7.2, @babel/traverse@npm:^7.8.6": + version: 7.20.1 + resolution: "@babel/traverse@npm:7.20.1" dependencies: "@babel/code-frame": ^7.18.6 - "@babel/generator": ^7.20.0 + "@babel/generator": ^7.20.1 "@babel/helper-environment-visitor": ^7.18.9 "@babel/helper-function-name": ^7.19.0 "@babel/helper-hoist-variables": ^7.18.6 "@babel/helper-split-export-declaration": ^7.18.6 - "@babel/parser": ^7.20.0 + "@babel/parser": ^7.20.1 "@babel/types": ^7.20.0 debug: ^4.1.0 globals: ^11.1.0 - checksum: 6f34c946b85a29b2973b8bc37c7a7acaeee0ad050e5f0955dabe5009f514ad9e717c8978649ac237d536284ad9f3bb4d2b749c9cd78ed9fa07f635dcedb8afaa + checksum: 6b2611f26bcc52bcdf515ed4932c316b20511f4595ca26a1db71b18273d7e2aaf435156708f968914bbf34a2dfac7c3e6618fffc9169eed5537dcdb85143da5a languageName: node linkType: hard -"@babel/types@npm:^7.0.0, @babel/types@npm:^7.11.5, @babel/types@npm:^7.12.11, @babel/types@npm:^7.16.7, @babel/types@npm:^7.16.8, @babel/types@npm:^7.18.10, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.8, @babel/types@npm:^7.18.9, @babel/types@npm:^7.19.0, @babel/types@npm:^7.19.4, @babel/types@npm:^7.2.0, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.0, @babel/types@npm:^7.4.4, @babel/types@npm:^7.6.1, @babel/types@npm:^7.7.0, @babel/types@npm:^7.7.2, @babel/types@npm:^7.8.3, @babel/types@npm:^7.8.6, @babel/types@npm:^7.8.7, @babel/types@npm:^7.9.6": - version: 7.19.4 - resolution: "@babel/types@npm:7.19.4" +"@babel/types@npm:^7.0.0, @babel/types@npm:^7.11.5, @babel/types@npm:^7.12.11, @babel/types@npm:^7.16.7, @babel/types@npm:^7.16.8, @babel/types@npm:^7.18.10, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.8, @babel/types@npm:^7.18.9, @babel/types@npm:^7.19.0, @babel/types@npm:^7.2.0, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.2, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.0, @babel/types@npm:^7.4.4, @babel/types@npm:^7.6.1, @babel/types@npm:^7.7.0, @babel/types@npm:^7.7.2, @babel/types@npm:^7.8.3, @babel/types@npm:^7.8.6, @babel/types@npm:^7.8.7, @babel/types@npm:^7.9.6": + version: 7.20.2 + resolution: "@babel/types@npm:7.20.2" dependencies: "@babel/helper-string-parser": ^7.19.4 "@babel/helper-validator-identifier": ^7.19.1 to-fast-properties: ^2.0.0 - checksum: 62d0d24fc87e36666874725b05bb0895a8834f09713ec76bf28eb2b615aa80287fd3f29801a923b9ff8a90d7f8ffd4b40bc7bc4840e4a530e165cdab3e6bfb78 - languageName: node - linkType: hard - -"@babel/types@npm:^7.20.0": - version: 7.20.0 - resolution: "@babel/types@npm:7.20.0" - dependencies: - "@babel/helper-string-parser": ^7.19.4 - "@babel/helper-validator-identifier": ^7.19.1 - to-fast-properties: ^2.0.0 - checksum: 8b9c960eb013142eaf6294d77b75e469b7e97461bd7ad939e625ed74865fbf5a1c20b7989ec3357d0f4ffd93dd79d6daead08c0c06647815d8bbe94dae445f5c + checksum: 62bb4665a9fcb149a8791f42c0509c23f6bd5da01c8319d4f49a16b5b49e2bfb97c5f7a99cf7935f94994da059feabaf90c29e3f380684f5328fc33fafb09984 languageName: node linkType: hard @@ -2828,13 +2817,13 @@ __metadata: linkType: hard "@humanwhocodes/config-array@npm:^0.11.6": - version: 0.11.6 - resolution: "@humanwhocodes/config-array@npm:0.11.6" + version: 0.11.7 + resolution: "@humanwhocodes/config-array@npm:0.11.7" dependencies: "@humanwhocodes/object-schema": ^1.2.1 debug: ^4.1.1 - minimatch: ^3.0.4 - checksum: 28bc0630d11c77c45aeff7cbab79159c9cce88ff1f3bc0e4cb9ff4fb271b6d3bfebcbc1ec56ae7f2b28cb31f0903ba98960b6730e66b232cc5d8f374b7d3239d + minimatch: ^3.0.5 + checksum: 88b24aa7ff7ba7f4313de530b7c162cb4bcd75451a7765eb2810b2841c61989f184a1f7ef76f3160df8a8735615fda64075e9da83273190731e5a26e03c6920c languageName: node linkType: hard @@ -4495,9 +4484,9 @@ __metadata: linkType: hard "@lit/reactive-element@npm:^1.3.0, @lit/reactive-element@npm:^1.4.0": - version: 1.4.1 - resolution: "@lit/reactive-element@npm:1.4.1" - checksum: 7bc477c1e383618d2b859e0e1f26064497c85a027c561aef7b1a658fb0a28a24771284d9f5a54cc0d34b1114c729e585d3d21e2a0c3a1a2f4f644aea9c4ad852 + version: 1.4.2 + resolution: "@lit/reactive-element@npm:1.4.2" + checksum: 97e73098a9e6d13b65d7df7b8de1bdea752f128dc260923c38ef8e02a849068c4cacca48bac1abf6ef2db56b75b373ae6d1757fb36ba6a6d743bb3014e28005d languageName: node linkType: hard @@ -4548,100 +4537,100 @@ __metadata: languageName: node linkType: hard -"@next/env@npm:12.3.1": - version: 12.3.1 - resolution: "@next/env@npm:12.3.1" - checksum: 22c6478903a60b32544b3fe5e1cf2463f4bedc51c42eccc9b806cac9c8045dee5d83c63a117d58ff209806c273b5349f23ff9e7beabcdbdacf66739f13cf41a2 +"@next/env@npm:12.3.2": + version: 12.3.2 + resolution: "@next/env@npm:12.3.2" + checksum: 99ba0ccbfadc5a5e64ee363e16f08da3313220cc5b571d6fe16cdc67cc366ee48c0cfc5486600120a02dc0d90c9ae1ce504a136830337125e335ad7b46711d95 languageName: node linkType: hard -"@next/swc-android-arm-eabi@npm:12.3.1": - version: 12.3.1 - resolution: "@next/swc-android-arm-eabi@npm:12.3.1" +"@next/swc-android-arm-eabi@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-android-arm-eabi@npm:12.3.2" conditions: os=android & cpu=arm languageName: node linkType: hard -"@next/swc-android-arm64@npm:12.3.1": - version: 12.3.1 - resolution: "@next/swc-android-arm64@npm:12.3.1" +"@next/swc-android-arm64@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-android-arm64@npm:12.3.2" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"@next/swc-darwin-arm64@npm:12.3.1": - version: 12.3.1 - resolution: "@next/swc-darwin-arm64@npm:12.3.1" +"@next/swc-darwin-arm64@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-darwin-arm64@npm:12.3.2" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@next/swc-darwin-x64@npm:12.3.1": - version: 12.3.1 - resolution: "@next/swc-darwin-x64@npm:12.3.1" +"@next/swc-darwin-x64@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-darwin-x64@npm:12.3.2" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@next/swc-freebsd-x64@npm:12.3.1": - version: 12.3.1 - resolution: "@next/swc-freebsd-x64@npm:12.3.1" +"@next/swc-freebsd-x64@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-freebsd-x64@npm:12.3.2" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@next/swc-linux-arm-gnueabihf@npm:12.3.1": - version: 12.3.1 - resolution: "@next/swc-linux-arm-gnueabihf@npm:12.3.1" +"@next/swc-linux-arm-gnueabihf@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-linux-arm-gnueabihf@npm:12.3.2" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@next/swc-linux-arm64-gnu@npm:12.3.1": - version: 12.3.1 - resolution: "@next/swc-linux-arm64-gnu@npm:12.3.1" +"@next/swc-linux-arm64-gnu@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-linux-arm64-gnu@npm:12.3.2" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@next/swc-linux-arm64-musl@npm:12.3.1": - version: 12.3.1 - resolution: "@next/swc-linux-arm64-musl@npm:12.3.1" +"@next/swc-linux-arm64-musl@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-linux-arm64-musl@npm:12.3.2" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@next/swc-linux-x64-gnu@npm:12.3.1": - version: 12.3.1 - resolution: "@next/swc-linux-x64-gnu@npm:12.3.1" +"@next/swc-linux-x64-gnu@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-linux-x64-gnu@npm:12.3.2" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@next/swc-linux-x64-musl@npm:12.3.1": - version: 12.3.1 - resolution: "@next/swc-linux-x64-musl@npm:12.3.1" +"@next/swc-linux-x64-musl@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-linux-x64-musl@npm:12.3.2" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@next/swc-win32-arm64-msvc@npm:12.3.1": - version: 12.3.1 - resolution: "@next/swc-win32-arm64-msvc@npm:12.3.1" +"@next/swc-win32-arm64-msvc@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-win32-arm64-msvc@npm:12.3.2" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@next/swc-win32-ia32-msvc@npm:12.3.1": - version: 12.3.1 - resolution: "@next/swc-win32-ia32-msvc@npm:12.3.1" +"@next/swc-win32-ia32-msvc@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-win32-ia32-msvc@npm:12.3.2" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@next/swc-win32-x64-msvc@npm:12.3.1": - version: 12.3.1 - resolution: "@next/swc-win32-x64-msvc@npm:12.3.1" +"@next/swc-win32-x64-msvc@npm:12.3.2": + version: 12.3.2 + resolution: "@next/swc-win32-x64-msvc@npm:12.3.2" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -5353,11 +5342,11 @@ __metadata: linkType: hard "@sinonjs/commons@npm:^1.7.0": - version: 1.8.3 - resolution: "@sinonjs/commons@npm:1.8.3" + version: 1.8.5 + resolution: "@sinonjs/commons@npm:1.8.5" dependencies: type-detect: 4.0.8 - checksum: e4d2471feb19f735654f798fcdf389b90fab5913da609f566b04c4cdd9131a97e897d565251d35389aeebcca70a22ab4ed2291c7f7927706ead12e4f94841bf1 + checksum: ac25e2e1b232353fd3bb65d7a15db7651e4fa7c63327cc9164a51ea93cacd61730ea4c80335e4474b39b527ac3acbb0d533d12f9052d94b7cb59e690cdf5466d languageName: node linkType: hard @@ -6669,13 +6658,13 @@ __metadata: linkType: hard "@storybook/csf@npm:next": - version: 0.0.2-next.1 - resolution: "@storybook/csf@npm:0.0.2-next.1" + version: 0.0.2-next.2 + resolution: "@storybook/csf@npm:0.0.2-next.2" dependencies: expect-type: ^0.14.2 lodash: ^4.17.15 type-fest: ^2.19.0 - checksum: 941ed6463ffd5dd15b70c624d34abf800dc55d8bffb923740df25d2e675e55702417bef489e7c955388aec4c4b74a7435acc0b8d721cd5ef7f75b31972f6c864 + checksum: 744e701c826826af065faf3ea3d932a761396fc5e348d097dbe66528e8184b2f5ae67dec8432262e0341dba87997c1d77020697803884e2766f29a4d2fc9f90d languageName: node linkType: hard @@ -8334,15 +8323,15 @@ __metadata: linkType: hard "@types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.1.14, @types/babel__core@npm:^7.1.7": - version: 7.1.19 - resolution: "@types/babel__core@npm:7.1.19" + version: 7.1.20 + resolution: "@types/babel__core@npm:7.1.20" dependencies: "@babel/parser": ^7.1.0 "@babel/types": ^7.0.0 "@types/babel__generator": "*" "@types/babel__template": "*" "@types/babel__traverse": "*" - checksum: d07442fee0a1331405c80efc06dd74fe815fc9ac1351de54c4eaf06fea9e516992a6f6a139361d78df5828b0a94977f33c977d9391b09949b959fd20d80f48d8 + checksum: f88025726047188c9ee96790294d5bb56bf452f6b65f80389788e8b11c16aab77fd709e2d1c07117ddee4e8a267615a88434b0570318301554daf304e20d7ad3 languageName: node linkType: hard @@ -8536,12 +8525,12 @@ __metadata: linkType: hard "@types/eslint@npm:*": - version: 8.4.8 - resolution: "@types/eslint@npm:8.4.8" + version: 8.4.10 + resolution: "@types/eslint@npm:8.4.10" dependencies: "@types/estree": "*" "@types/json-schema": "*" - checksum: 42b6857b9673c6e881805c130ab6730e5440a3e8bc932fc71b8a8e42ac23c64e34e74484ec3551e07e47d0eeb99cebc9e94160e36ac3c3c087e8fbaf1c2e5b56 + checksum: ff245f08f2a687a78314f7f5054af833ea17fc392587196d11c9811efe396f3bdf4aaba20c4be763607315ebb81c68da64f58726d14ab1d2ca4a98aaa758e1c9 languageName: node linkType: hard @@ -8742,12 +8731,12 @@ __metadata: linkType: hard "@types/jest@npm:*, @types/jest@npm:>=26.0.0": - version: 29.2.0 - resolution: "@types/jest@npm:29.2.0" + version: 29.2.2 + resolution: "@types/jest@npm:29.2.2" dependencies: expect: ^29.0.0 pretty-format: ^29.0.0 - checksum: b992f309b18b919aa25a74e7d5f9ec3d4712d5a5251ec7cb4b393ac586ca675e046cbbdff6612defc1177052150dab371777a18f208b236676d2994375315049 + checksum: c13bf199d38e41d8f6b28add5c4a8dedfb711080cdf83f58dd6476c365e25456771d4c2484ca05c5d5507cadf3617a1aedfce125fe73f43f229f23ac21f0dfa5 languageName: node linkType: hard @@ -8804,9 +8793,9 @@ __metadata: linkType: hard "@types/lodash@npm:^4.14.167": - version: 4.14.186 - resolution: "@types/lodash@npm:4.14.186" - checksum: 6e0c73ead3eb5073e37c9b8141004369776fba31a3876d2b647d590b78256e414b770753f767a548a70ad23408ac5cc83b174adfd5dba2bb88b833f2763c632b + version: 4.14.188 + resolution: "@types/lodash@npm:4.14.188" + checksum: 4debfc61d27544ac71296d5b1128bb86ae78fd38d2f9378ab5e8de6a99eb4403f8d0efc0ac4c055930c4f6014433bc2ce39a2e9245d036aa75e596ff786b16ff languageName: node linkType: hard @@ -8895,16 +8884,16 @@ __metadata: linkType: hard "@types/node@npm:*, @types/node@npm:>= 8, @types/node@npm:^18.7.20": - version: 18.11.7 - resolution: "@types/node@npm:18.11.7" - checksum: 65e95517d3a601ab1d2b473a2e7989da8c87681cbc201ea9a8bf1f2b50227bc8755e07a4b00258376c6a4df614c270ff059f08135397261c9dd6f12601ec8fd6 + version: 18.11.9 + resolution: "@types/node@npm:18.11.9" + checksum: aeaa925406f841c41679b32def9391a9892171e977105e025050e9f66e2830b4c50d0d974a1af0077ead3337a1f3bdf49ee7e7f402ebf2e034a3f97d9d240dba languageName: node linkType: hard "@types/node@npm:^14.14.20 || ^16.0.0, @types/node@npm:^16.0.0": - version: 16.18.2 - resolution: "@types/node@npm:16.18.2" - checksum: babe6ee3409d5e4c1b1ba04c65ab16f156b717f2b5106d04c184897429449bb2838d8bff6e76b1e212f78c2dc9ecf2cf50fc4c78d42f4bc506a0657ff5cba07b + version: 16.18.3 + resolution: "@types/node@npm:16.18.3" + checksum: 058ddd61a3d39f517bc9c30b82b9d6257d903e84c42ba66aae63bd13203b6deb2acf7f7e14caefd5d7cebadbe8c90604c04f9851cd41cd6a1bc2fc4dcec85f01 languageName: node linkType: hard @@ -9430,14 +9419,15 @@ __metadata: linkType: hard "@typescript-eslint/eslint-plugin@npm:^5.40.1": - version: 5.41.0 - resolution: "@typescript-eslint/eslint-plugin@npm:5.41.0" + version: 5.42.1 + resolution: "@typescript-eslint/eslint-plugin@npm:5.42.1" dependencies: - "@typescript-eslint/scope-manager": 5.41.0 - "@typescript-eslint/type-utils": 5.41.0 - "@typescript-eslint/utils": 5.41.0 + "@typescript-eslint/scope-manager": 5.42.1 + "@typescript-eslint/type-utils": 5.42.1 + "@typescript-eslint/utils": 5.42.1 debug: ^4.3.4 ignore: ^5.2.0 + natural-compare-lite: ^1.4.0 regexpp: ^3.2.0 semver: ^7.3.7 tsutils: ^3.21.0 @@ -9447,54 +9437,54 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 3954e4885a75c201e8f180d5710d43e26d61d156eed3007c00f0d5e37b96a94a361bbee1929982b982dbc98b3c8eae013b3bd85d307b3fd5a408afab4397c601 + checksum: 906bde546130628726efeceeace6e1984bb304b7b539753add88034fd31b299c3ddf80a842637de92b6ee7ec9b2193dc07f9cf694cc59ee851173082a27e5b57 languageName: node linkType: hard "@typescript-eslint/experimental-utils@npm:^5.40.1": - version: 5.41.0 - resolution: "@typescript-eslint/experimental-utils@npm:5.41.0" + version: 5.42.1 + resolution: "@typescript-eslint/experimental-utils@npm:5.42.1" dependencies: - "@typescript-eslint/utils": 5.41.0 + "@typescript-eslint/utils": 5.42.1 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 63cdd0b5918042f46a1bb9d6ec7e98bf9edb3d3bf964921bec9c0f7f99b4a8bdd2c5e440c2eadeb6e4a69db09611dfbfc4cd27e58b6b076a8611393f0be24acd + checksum: 290c4e423e79adeaff39b988517f54b959549048320a86c14fed5ea9a31397447935923f7038960163c555d5ab5619f5baeb0f929849747be12c4526e9f97cf9 languageName: node linkType: hard "@typescript-eslint/parser@npm:^5.40.1": - version: 5.41.0 - resolution: "@typescript-eslint/parser@npm:5.41.0" + version: 5.42.1 + resolution: "@typescript-eslint/parser@npm:5.42.1" dependencies: - "@typescript-eslint/scope-manager": 5.41.0 - "@typescript-eslint/types": 5.41.0 - "@typescript-eslint/typescript-estree": 5.41.0 + "@typescript-eslint/scope-manager": 5.42.1 + "@typescript-eslint/types": 5.42.1 + "@typescript-eslint/typescript-estree": 5.42.1 debug: ^4.3.4 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: d07df9fe001cc79df1e57460312dcbede03f4d524b99350fb9ef5af896b132bb747d96865a28dbae3566393c212e779315e67aa582072a59bb23d3675ab9ad2b + checksum: 812e3389f4c44e916aaf82210b2e816654efacd1e4112a8430735f138078feaca633b256fca1d33e6043d97ef29c0281ff1654e778d1f4aee4467785529020d7 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.41.0": - version: 5.41.0 - resolution: "@typescript-eslint/scope-manager@npm:5.41.0" +"@typescript-eslint/scope-manager@npm:5.42.1": + version: 5.42.1 + resolution: "@typescript-eslint/scope-manager@npm:5.42.1" dependencies: - "@typescript-eslint/types": 5.41.0 - "@typescript-eslint/visitor-keys": 5.41.0 - checksum: 76c1fb1d0838d333d0dd2caa52e18b471ff7b711899cd541fa0a011289fc79115e8617da4279273103a4e1b4d2cc7f8d0ddb1c396642a41acdd5b7fa6379aa55 + "@typescript-eslint/types": 5.42.1 + "@typescript-eslint/visitor-keys": 5.42.1 + checksum: fb0a0b89c7ff51b91767027326181064dfa78477c2c255d87ce14640540ce5fd048efdafdbf2ea544d72a9b41ec4f0e69794dc8e29ecf2a30922b99474cd3c1c languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.41.0": - version: 5.41.0 - resolution: "@typescript-eslint/type-utils@npm:5.41.0" +"@typescript-eslint/type-utils@npm:5.42.1": + version: 5.42.1 + resolution: "@typescript-eslint/type-utils@npm:5.42.1" dependencies: - "@typescript-eslint/typescript-estree": 5.41.0 - "@typescript-eslint/utils": 5.41.0 + "@typescript-eslint/typescript-estree": 5.42.1 + "@typescript-eslint/utils": 5.42.1 debug: ^4.3.4 tsutils: ^3.21.0 peerDependencies: @@ -9502,23 +9492,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 2bf0e893b210a0f6a021bdaa9c16a3d98d65b38e4e4af4e7b056b1a9a6535dee7c73f3aff80f008d98152488bc1e468b05ef48bb93f14385eb1e9d9329693736 + checksum: c1302b5351051e0b81593fd07d3f5bb7773ee0ee8ba58540eab5e16cba745ccb577d2907c1c1be3f40dc2c1281af91516c339214d8d2075b0c73a6c542174c86 languageName: node linkType: hard -"@typescript-eslint/types@npm:5.41.0": - version: 5.41.0 - resolution: "@typescript-eslint/types@npm:5.41.0" - checksum: 015a7a550f451ad9a78937254429f55bc2e0d1c2e7de263180fdbf55735a20dd39b4beac42a24e8568a5aaf3b5db4704f69518f15a1b7e973135f0939c272019 +"@typescript-eslint/types@npm:5.42.1": + version: 5.42.1 + resolution: "@typescript-eslint/types@npm:5.42.1" + checksum: 1c35cf44fe9b7790e4270c97f19284439df37faa206aee6e2a10b61a03efdb4c68309856d3f526df69b74e4ae0ce43e9c8303fb74f5b0263751f5862253a6140 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.41.0": - version: 5.41.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.41.0" +"@typescript-eslint/typescript-estree@npm:5.42.1": + version: 5.42.1 + resolution: "@typescript-eslint/typescript-estree@npm:5.42.1" dependencies: - "@typescript-eslint/types": 5.41.0 - "@typescript-eslint/visitor-keys": 5.41.0 + "@typescript-eslint/types": 5.42.1 + "@typescript-eslint/visitor-keys": 5.42.1 debug: ^4.3.4 globby: ^11.1.0 is-glob: ^4.0.3 @@ -9527,35 +9517,35 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 3a1c1f3b7026dcdaac920adeb3565fb2102aa8c69cb653a51e24cdd7ca0c2cdfcd2cc1f1c461ac9f88533f570fdf9094df5d0eaf4093245b4572568feabf1192 + checksum: 537c7a7c3e95f465eca00fcecf7023956996dfff55e27b64004717122aa70bff806c2e68efd2862c89abab88c876bf7bbdd49df91c37dce203cbdd466613fc94 languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.41.0": - version: 5.41.0 - resolution: "@typescript-eslint/utils@npm:5.41.0" +"@typescript-eslint/utils@npm:5.42.1": + version: 5.42.1 + resolution: "@typescript-eslint/utils@npm:5.42.1" dependencies: "@types/json-schema": ^7.0.9 "@types/semver": ^7.3.12 - "@typescript-eslint/scope-manager": 5.41.0 - "@typescript-eslint/types": 5.41.0 - "@typescript-eslint/typescript-estree": 5.41.0 + "@typescript-eslint/scope-manager": 5.42.1 + "@typescript-eslint/types": 5.42.1 + "@typescript-eslint/typescript-estree": 5.42.1 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 semver: ^7.3.7 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 9248526d537374c5ab0bf471d112ff5f8cb6403c65632865dd55585757d02361ffacda47849032415921b9237552cfb96f18e5c431c430dfaa2085f36fe3613d + checksum: a6bb90010c77b3e4a518001dbd3b25a34f51c489ac809be94af7227fd7427b5f9888a4d6a3a62cbc435fe2aa250898b6b1b9da9cbf7afa427788b7bdd1304203 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.41.0": - version: 5.41.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.41.0" +"@typescript-eslint/visitor-keys@npm:5.42.1": + version: 5.42.1 + resolution: "@typescript-eslint/visitor-keys@npm:5.42.1" dependencies: - "@typescript-eslint/types": 5.41.0 + "@typescript-eslint/types": 5.42.1 eslint-visitor-keys: ^3.3.0 - checksum: 5dfce8e4980dabbbaf3b85eb68913251c153c2602d7e32ea52ccd3c8d702b1c298f0b8339d1b61016f01d539556eb4bc386e33c339f64da19bb1ee42ce11fe65 + checksum: 7b162c56848cf94e2897ff8b9227e7bf80d2b88a3c1fd904a10701502731cfa4cc73347b58a26e99d5777a1e957f27261b7385c5e79a4ad25de4ebec3872977e languageName: node linkType: hard @@ -10791,11 +10781,11 @@ __metadata: linkType: hard "aria-query@npm:^5.0.0": - version: 5.1.2 - resolution: "aria-query@npm:5.1.2" + version: 5.1.3 + resolution: "aria-query@npm:5.1.3" dependencies: deep-equal: ^2.0.5 - checksum: acf341fa0ee0a6abe783daee1cc035631405072157054382508ffa62073f338353ad4062f2e3610a36c39be003a7457602b1ac14b464abf91be6ef7ec3652cae + checksum: edcbc8044c4663d6f88f785e983e6784f98cb62b4ba1e9dd8d61b725d0203e4cfca38d676aee984c31f354103461102a3d583aa4fbe4fd0a89b679744f4e5faf languageName: node linkType: hard @@ -10870,15 +10860,15 @@ __metadata: linkType: hard "array-includes@npm:^3.1.4, array-includes@npm:^3.1.5": - version: 3.1.5 - resolution: "array-includes@npm:3.1.5" + version: 3.1.6 + resolution: "array-includes@npm:3.1.6" dependencies: call-bind: ^1.0.2 define-properties: ^1.1.4 - es-abstract: ^1.19.5 - get-intrinsic: ^1.1.1 + es-abstract: ^1.20.4 + get-intrinsic: ^1.1.3 is-string: ^1.0.7 - checksum: a328af3cc590e077863d6a9fa673eda0ddac8e64d05da6696a18ab376f8bc633fc29c98b858a860ab93e4a98be8aef5e62ac00142275acd4090e7b077d2e1909 + checksum: d0caeaa57bea7d14b8480daee30cf8611899321006b15a6cd872b831bd7aaed7649f8764e060d01c5d33b8d9e998e5de5c87f4901874e1c1f467f429b7db2929 languageName: node linkType: hard @@ -10920,64 +10910,64 @@ __metadata: linkType: hard "array.prototype.filter@npm:^1.0.0": - version: 1.0.1 - resolution: "array.prototype.filter@npm:1.0.1" + version: 1.0.2 + resolution: "array.prototype.filter@npm:1.0.2" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.3 - es-abstract: ^1.19.0 + define-properties: ^1.1.4 + es-abstract: ^1.20.4 es-array-method-boxes-properly: ^1.0.0 is-string: ^1.0.7 - checksum: e1254222151c4535e69e42e9852295c09337e239a6f62276f7a0b15e099bbdf25447bcfa465873124b1a6a6553c118311193f8be2ba2b9d1988e54cdbf003aff + checksum: f49da13cb9110c7caede682e22b32208aaaea3b5d9760e5b417e3d62d72b5a092f0c26ad648879900cd9694371fc75e47f80a08b6a1eb5e3cc15976e8f4bc0c7 languageName: node linkType: hard "array.prototype.find@npm:^2.1.1": - version: 2.2.0 - resolution: "array.prototype.find@npm:2.2.0" + version: 2.2.1 + resolution: "array.prototype.find@npm:2.2.1" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.3 - es-abstract: ^1.19.4 + define-properties: ^1.1.4 + es-abstract: ^1.20.4 es-shim-unscopables: ^1.0.0 - checksum: 5b757cca258e3613ec1b3f19653dd00fa70d604e01303666056aad50f9359de4b8666d2b23626a5e9ca8633616f7da8eb80b68048aebebd1a6f6b8f6545380cc + checksum: 09211690d57a114a0d7de39dbd812f7844322aaed74aaa353ff2b7ee9f5a416581ca72a4c0c1cdf520cf5bad62aa33f8ca7d972afa83204ebedcb72582f08a49 languageName: node linkType: hard "array.prototype.flat@npm:^1.2.3, array.prototype.flat@npm:^1.2.5": - version: 1.3.0 - resolution: "array.prototype.flat@npm:1.3.0" + version: 1.3.1 + resolution: "array.prototype.flat@npm:1.3.1" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.3 - es-abstract: ^1.19.2 + define-properties: ^1.1.4 + es-abstract: ^1.20.4 es-shim-unscopables: ^1.0.0 - checksum: 59010c65c428c68eafa5ffe3d7fc304c7e3a4ebcbb229e87ee2f51507f6eb439371e80297e25e7f59f84741db4712fe006c4c570f7a54a3018b9b563afd72601 + checksum: 8eda91d6925cc84b73ebf5a3d406ff28745d93a22ef6a0afb967755107081a937cf6c4555d3c18354870b2c5366c0ff51b3f597c11079e689869810a418b1b4f languageName: node linkType: hard "array.prototype.flatmap@npm:^1.3.0": - version: 1.3.0 - resolution: "array.prototype.flatmap@npm:1.3.0" + version: 1.3.1 + resolution: "array.prototype.flatmap@npm:1.3.1" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.3 - es-abstract: ^1.19.2 + define-properties: ^1.1.4 + es-abstract: ^1.20.4 es-shim-unscopables: ^1.0.0 - checksum: f837de45bd1f22eb0aaf5fd79324e18a1461d6cf93edc4d48ef4695587cb5bf051c1e3de87477fbd7bb70fe6c71c8d11f10ea3c8c797553709ad1d11e649d120 + checksum: 2bd58a0e79d5d90cb4f5ef0e287edf8b28e87c65428f54025ac6b7b4c204224b92811c266f296c53a2dbc93872117c0fcea2e51d3c9e8cecfd5024d4a4a57db4 languageName: node linkType: hard -"array.prototype.reduce@npm:^1.0.4": - version: 1.0.4 - resolution: "array.prototype.reduce@npm:1.0.4" +"array.prototype.reduce@npm:^1.0.5": + version: 1.0.5 + resolution: "array.prototype.reduce@npm:1.0.5" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.3 - es-abstract: ^1.19.2 + define-properties: ^1.1.4 + es-abstract: ^1.20.4 es-array-method-boxes-properly: ^1.0.0 is-string: ^1.0.7 - checksum: 1a71487c9f1e75447b7abd97f1abadb39f6f6aecbb2073c35231574e9be6faee2588e828aca2ae302b5646f069b30cb5d80b4e3144c18f8f6bcc78fcadfee7e7 + checksum: 0c6c589d22d6cda4a32458c6fd57a41f420a4fa6cd184a3f6fe7b507f457bc4a073aff6accd595bcd6ac29cad856e7ac306549f127acdb098f401eea13c54901 languageName: node linkType: hard @@ -11232,9 +11222,9 @@ __metadata: linkType: hard "axe-core@npm:^4.2.0, axe-core@npm:^4.4.3, axe-core@npm:^4.5.0": - version: 4.5.0 - resolution: "axe-core@npm:4.5.0" - checksum: 7ca80c6815174eaf4355d88f0622e2f2d2982312a2cf152ec0775aef5c6059da042e50e11a018ee7faa5b06bdcae9e75a3a55164ca6f4249122841a3255f3b4e + version: 4.5.1 + resolution: "axe-core@npm:4.5.1" + checksum: 9b8ecb90329d73d34faea3a6bf3132b9070cc7a8d3fb12e1bf02ded29e4c938276d3435e83d59d844ea62b7069caebf18ec78a6b99754d7f9bbec7eea379bec0 languageName: node linkType: hard @@ -11332,7 +11322,7 @@ __metadata: languageName: node linkType: hard -"babel-loader@npm:8.2.5, babel-loader@npm:^7.0.0 || ^8.0.0, babel-loader@npm:^8.2.5": +"babel-loader@npm:8.2.5": version: 8.2.5 resolution: "babel-loader@npm:8.2.5" dependencies: @@ -11347,6 +11337,21 @@ __metadata: languageName: node linkType: hard +"babel-loader@npm:^7.0.0 || ^8.0.0, babel-loader@npm:^8.2.5": + version: 8.3.0 + resolution: "babel-loader@npm:8.3.0" + dependencies: + find-cache-dir: ^3.3.1 + loader-utils: ^2.0.0 + make-dir: ^3.1.0 + schema-utils: ^2.6.5 + peerDependencies: + "@babel/core": ^7.0.0 + webpack: ">=2" + checksum: 7b83bae35a12fbc5cdf250e2d36a288305fe5b6d20ab044ab7c09bbf456c8895b80af7a4f1e8b64b5c07a4fd48d4b5144dab40b4bc72a4fed532dc000362f38f + languageName: node + linkType: hard + "babel-plugin-add-react-displayname@npm:^0.0.5": version: 0.0.5 resolution: "babel-plugin-add-react-displayname@npm:0.0.5" @@ -12309,14 +12314,14 @@ __metadata: languageName: node linkType: hard -"bundle-require@npm:^3.1.0": - version: 3.1.0 - resolution: "bundle-require@npm:3.1.0" +"bundle-require@npm:^3.1.2": + version: 3.1.2 + resolution: "bundle-require@npm:3.1.2" dependencies: load-tsconfig: ^0.2.0 peerDependencies: esbuild: ">=0.13" - checksum: 6bd8f68caeb191dfa7348d9da75f9599989babf335c67c8dc1a5372c773967c76010bdd8971cae19c6bc807e82a540314cb89abfbe6fa1d9c27e14e093b6d0ec + checksum: 73f77df391a46f2cefc3bfc4777cd0169a47db1e69a64a16cb6a37208a03992ef68f02921e18ae4fba3387e076f37bcac8388077cba316ce9fd96105aec43f89 languageName: node linkType: hard @@ -12541,9 +12546,9 @@ __metadata: linkType: hard "call-me-maybe@npm:^1.0.1": - version: 1.0.1 - resolution: "call-me-maybe@npm:1.0.1" - checksum: 551991433adc2d257d24a5dea5049addc75b182cc7f64860d41bb5ec2c2f1f72efcd6f34be475e70bbb62fde9f9ba380c1a52c922daf2b4111f25fee2509550f + version: 1.0.2 + resolution: "call-me-maybe@npm:1.0.2" + checksum: 8eff5dbb61141ebb236ed71b4e9549e488bcb5451c48c11e5667d5c75b0532303788a1101e6978cafa2d0c8c1a727805599c2741e3e0982855c9f1d78cd06c9f languageName: node linkType: hard @@ -12668,9 +12673,9 @@ __metadata: linkType: hard "caniuse-lite@npm:^1.0.30001299, caniuse-lite@npm:^1.0.30001400, caniuse-lite@npm:^1.0.30001406, caniuse-lite@npm:^1.0.30001426": - version: 1.0.30001426 - resolution: "caniuse-lite@npm:1.0.30001426" - checksum: 5b955cc191c1d7f3fb92ccde08d3d2003f3071fe96ce416d6c17c8aa725aa50e2d1546b3a47334a435b2992e125b3d81b47641d98f6c447a5ac71aff3b858f9a + version: 1.0.30001431 + resolution: "caniuse-lite@npm:1.0.30001431" + checksum: 720e53b7e4afbb91cc7683d64037da23b98a3199b4d34cecbba3e702646910873c21df8e3aa7cea1c37095a99ca9aff24deff610dbccd61c0436907234d77e90 languageName: node linkType: hard @@ -12921,8 +12926,8 @@ __metadata: linkType: hard "chromatic@npm:^6.10.2": - version: 6.11.2 - resolution: "chromatic@npm:6.11.2" + version: 6.11.4 + resolution: "chromatic@npm:6.11.4" dependencies: "@discoveryjs/json-ext": ^0.5.7 "@types/webpack-env": ^1.17.0 @@ -12930,7 +12935,7 @@ __metadata: chroma: bin/main.cjs chromatic: bin/main.cjs chromatic-cli: bin/main.cjs - checksum: 9692af67638cd90be498f9fcbca5b2397204faf04b5ccdc97118950412ebe1140a240955426e174dfcfdecb9483db8236aa70af3c26dc9c17ef73d8415d4e229 + checksum: 403544ebe647013c5d5db2188c07426094febe6e3254fc782f8218410792f25e20fabb16d9746f3d8864f255589e90fc620f1902f66a5796713ca665a40e5b96 languageName: node linkType: hard @@ -14418,12 +14423,12 @@ __metadata: linkType: hard "decamelize-keys@npm:^1.0.0, decamelize-keys@npm:^1.1.0": - version: 1.1.0 - resolution: "decamelize-keys@npm:1.1.0" + version: 1.1.1 + resolution: "decamelize-keys@npm:1.1.1" dependencies: decamelize: ^1.1.0 map-obj: ^1.0.0 - checksum: 95d4e3692cf7cf6568042658b780f16475a2145910a3d4e996a8d1686c2328c061365643b67b19fee5ea4a03448afc65c9fbb844400c0ecd7dadad175a72e6ef + checksum: 4ca385933127437658338c65fb9aead5f21b28d3dd3ccd7956eb29aab0953b5d3c047fbc207111672220c71ecf7a4d34f36c92851b7bbde6fca1a02c541bdd7d languageName: node linkType: hard @@ -14497,25 +14502,25 @@ __metadata: linkType: hard "deep-equal@npm:^2.0.5": - version: 2.0.5 - resolution: "deep-equal@npm:2.0.5" + version: 2.1.0 + resolution: "deep-equal@npm:2.1.0" dependencies: - call-bind: ^1.0.0 - es-get-iterator: ^1.1.1 - get-intrinsic: ^1.0.1 - is-arguments: ^1.0.4 - is-date-object: ^1.0.2 - is-regex: ^1.1.1 + call-bind: ^1.0.2 + es-get-iterator: ^1.1.2 + get-intrinsic: ^1.1.3 + is-arguments: ^1.1.1 + is-date-object: ^1.0.5 + is-regex: ^1.1.4 isarray: ^2.0.5 - object-is: ^1.1.4 + object-is: ^1.1.5 object-keys: ^1.1.1 - object.assign: ^4.1.2 - regexp.prototype.flags: ^1.3.0 - side-channel: ^1.0.3 - which-boxed-primitive: ^1.0.1 + object.assign: ^4.1.4 + regexp.prototype.flags: ^1.4.3 + side-channel: ^1.0.4 + which-boxed-primitive: ^1.0.2 which-collection: ^1.0.1 - which-typed-array: ^1.1.2 - checksum: e36a16ef53a4d3010f6bb9a3f7945cb0c15910590fa04444cfa965d6e1cd77b75418e2e7e45083f22bd769c18b606fc6e24b6a05232405bb51d9b897ee7c55f5 + which-typed-array: ^1.1.8 + checksum: dbe6bdf8bcddc0e5f91d79601bc563bf615bcae4fc385068ad8ce8f911c347b7097fd57137b0a9b465fdb0ca2a08af705d5be3e10342366cef671dc3a5b41b6e languageName: node linkType: hard @@ -15457,8 +15462,8 @@ __metadata: linkType: hard "ember-source@npm:~3.28.1": - version: 3.28.9 - resolution: "ember-source@npm:3.28.9" + version: 3.28.10 + resolution: "ember-source@npm:3.28.10" dependencies: "@babel/helper-module-imports": ^7.8.3 "@babel/plugin-transform-block-scoping": ^7.8.3 @@ -15486,7 +15491,7 @@ __metadata: resolve: ^1.17.0 semver: ^7.3.4 silent-error: ^1.1.1 - checksum: d6a26354a147a5a33dcf9cefe883cdb6ec7979aa1599b4cbaa86c765dd7a32be607ea7fb6e681545ba49b719509937b25c9de27345f5e7871f15f74b1c47ddd7 + checksum: 5dc9fa1d16084fc6b2c3b4210a26246ba8d8d6ae21e381b4d2d3810ed397e06bc699f2d5c7d86abfe5426e9ba808b350e5a244c1e2c81d8beabe63b81b2b2f92 languageName: node linkType: hard @@ -15667,15 +15672,15 @@ __metadata: linkType: hard "enzyme-adapter-react-16@npm:^1.15.5": - version: 1.15.6 - resolution: "enzyme-adapter-react-16@npm:1.15.6" + version: 1.15.7 + resolution: "enzyme-adapter-react-16@npm:1.15.7" dependencies: - enzyme-adapter-utils: ^1.14.0 - enzyme-shallow-equal: ^1.0.4 + enzyme-adapter-utils: ^1.14.1 + enzyme-shallow-equal: ^1.0.5 has: ^1.0.3 - object.assign: ^4.1.2 - object.values: ^1.1.2 - prop-types: ^15.7.2 + object.assign: ^4.1.4 + object.values: ^1.1.5 + prop-types: ^15.8.1 react-is: ^16.13.1 react-test-renderer: ^16.0.0-0 semver: ^5.7.0 @@ -15683,24 +15688,24 @@ __metadata: enzyme: ^3.0.0 react: ^16.0.0-0 react-dom: ^16.0.0-0 - checksum: 28f940fe6c1d314117890d20fff336c0836ba75f3c68b88abda800269ef4dfd04ba6846459981f55695fb94d46d7d4224f90396c0fda4c27e38b16a3748b4ad4 + checksum: 7cb69fcdc4bf2390ffe440cfa906c698b90d533032180b5b6ddf5ace1edac0e09a687b7f36706e1bba3b02a91585d8d5bd0317c237b5f5eab00bdb5512f330ee languageName: node linkType: hard -"enzyme-adapter-utils@npm:^1.14.0": - version: 1.14.0 - resolution: "enzyme-adapter-utils@npm:1.14.0" +"enzyme-adapter-utils@npm:^1.14.1": + version: 1.14.1 + resolution: "enzyme-adapter-utils@npm:1.14.1" dependencies: airbnb-prop-types: ^2.16.0 - function.prototype.name: ^1.1.3 + function.prototype.name: ^1.1.5 has: ^1.0.3 - object.assign: ^4.1.2 - object.fromentries: ^2.0.3 - prop-types: ^15.7.2 + object.assign: ^4.1.4 + object.fromentries: ^2.0.5 + prop-types: ^15.8.1 semver: ^5.7.1 peerDependencies: react: 0.13.x || 0.14.x || ^15.0.0-0 || ^16.0.0-0 - checksum: 9d02d69115ecf5864ce25b4bc1a55358ebb039e8330c867bad93cae5195713e6e5bc474777f23cb5c76800265d879000612d9f791c9f33a5b214f726798f1b4f + checksum: f07423c9181ed22fda4d761ec54aca6d9fb65d8b95da48c1471d39892f8af3d3fa54c971ed73a16acbc9a483ccda3a58f97a590bf95b4d5f77f99ae37c1ac8bb languageName: node linkType: hard @@ -15716,13 +15721,13 @@ __metadata: languageName: node linkType: hard -"enzyme-shallow-equal@npm:^1.0.1, enzyme-shallow-equal@npm:^1.0.4": - version: 1.0.4 - resolution: "enzyme-shallow-equal@npm:1.0.4" +"enzyme-shallow-equal@npm:^1.0.1, enzyme-shallow-equal@npm:^1.0.5": + version: 1.0.5 + resolution: "enzyme-shallow-equal@npm:1.0.5" dependencies: has: ^1.0.3 - object-is: ^1.1.2 - checksum: c94ad4eb012610719e0cd2e0780225c20880052cf61b7120af43a84ea1414b170a19ed9853fdfc4f5910e7f4159445d168179d2fe7e93fe10da0bdeeb93a2348 + object-is: ^1.1.5 + checksum: 30ace0c5be2d454fb001a50dd30791c18e1f86b3b7238456b464921017f6add73ea6b2a2527f1e96958d8bfe84d0afcba30b0c9e4087ebda2feb42b7800419c4 languageName: node linkType: hard @@ -15812,7 +15817,7 @@ __metadata: languageName: node linkType: hard -"es-abstract@npm:^1.19.0, es-abstract@npm:^1.19.1, es-abstract@npm:^1.19.2, es-abstract@npm:^1.19.4, es-abstract@npm:^1.19.5, es-abstract@npm:^1.20.0, es-abstract@npm:^1.20.1": +"es-abstract@npm:^1.19.0, es-abstract@npm:^1.20.4": version: 1.20.4 resolution: "es-abstract@npm:1.20.4" dependencies: @@ -15851,7 +15856,7 @@ __metadata: languageName: node linkType: hard -"es-get-iterator@npm:^1.1.1": +"es-get-iterator@npm:^1.1.2": version: 1.1.2 resolution: "es-get-iterator@npm:1.1.2" dependencies: @@ -16138,11 +16143,11 @@ __metadata: linkType: hard "esbuild-wasm@npm:>=0.13.8": - version: 0.15.12 - resolution: "esbuild-wasm@npm:0.15.12" + version: 0.15.13 + resolution: "esbuild-wasm@npm:0.15.13" bin: esbuild: bin/esbuild - checksum: 112e1a35e05bcaa932b26182ffa574162ce745cc9dd6f8e6a471ea48e2841d49e18026bc32577eb1cbdf2f6ac639042a49a16c6aefc3e67cb88375c3b6e57a51 + checksum: 9bedcb95a11003467f1bd2192348c2fa796e247adc3eb36207f1d416a9d466f905ff675aeee97c554606a384e96d32a898f92124319816d45a3f4fd0a838a42d languageName: node linkType: hard @@ -16623,8 +16628,8 @@ __metadata: linkType: hard "eslint-plugin-storybook@npm:^0.6.6": - version: 0.6.6 - resolution: "eslint-plugin-storybook@npm:0.6.6" + version: 0.6.7 + resolution: "eslint-plugin-storybook@npm:0.6.7" dependencies: "@storybook/csf": ^0.0.1 "@typescript-eslint/experimental-utils": ^5.3.0 @@ -16632,7 +16637,7 @@ __metadata: ts-dedent: ^2.2.0 peerDependencies: eslint: ">=6" - checksum: aad2d3bda6b1a676b685029cb8ee1140bd5aeb40d29394b320175e6ebd47ce025d96990ae6bef905cf631dde181216bb9283a1ef9a483028fd8aa72d4d2b98ec + checksum: 55b7ac0acfb088824db475863ba2f488865cbd7fc5d23acb30e2d7fc8bc044e15b79e1ec307abc8d97c5f207f87012f74fae7b85dc0e623575b40bea137b1e21 languageName: node linkType: hard @@ -16689,8 +16694,8 @@ __metadata: linkType: hard "eslint@npm:^8.26.0": - version: 8.26.0 - resolution: "eslint@npm:8.26.0" + version: 8.27.0 + resolution: "eslint@npm:8.27.0" dependencies: "@eslint/eslintrc": ^1.3.3 "@humanwhocodes/config-array": ^0.11.6 @@ -16733,7 +16738,7 @@ __metadata: text-table: ^0.2.0 bin: eslint: bin/eslint.js - checksum: da97a44bac58770d44dc6a2daa57cbb67ac888c060dde5a87c7785ea34a2cea61568d5238d375a14bfd548ffff7cd61691ab5a81c4625c7c97412b2d45b63843 + checksum: 8fc3ecac3c620ca8758b63428981dee35758a312e607dfec0fd3815b9847b49e466ed7d0e2cadeb35e2a46d7f430581cc38e1e26bfd77728dde4e34bd9bd8686 languageName: node linkType: hard @@ -16756,13 +16761,13 @@ __metadata: linkType: hard "espree@npm:^9.4.0": - version: 9.4.0 - resolution: "espree@npm:9.4.0" + version: 9.4.1 + resolution: "espree@npm:9.4.1" dependencies: acorn: ^8.8.0 acorn-jsx: ^5.3.2 eslint-visitor-keys: ^3.3.0 - checksum: 95f1f9ac49fa112bfc2d2e82fd9e85192367090a9ee03b1e43594e85e29a3458b603b4cf7cd5ccfb156da2b94d07e7f5428474c830faa6f19db47a0b86dd3656 + checksum: f7c8f891f3b247c76ed16259522c772bb35e6a9cb5f5b2e0f111ffc60624e7533c89a0aa1f830d8f8baa2b7676313bb9ce7f64ae00ccffc223ebbf880ab691ee languageName: node linkType: hard @@ -17162,15 +17167,15 @@ __metadata: linkType: hard "expect@npm:^29.0.0": - version: 29.2.2 - resolution: "expect@npm:29.2.2" + version: 29.3.0 + resolution: "expect@npm:29.3.0" dependencies: "@jest/expect-utils": ^29.2.2 jest-get-type: ^29.2.0 jest-matcher-utils: ^29.2.2 jest-message-util: ^29.2.1 jest-util: ^29.2.1 - checksum: 4e9a08548b4bf9240ab68c5a9de22fe4460abfd6a65fbf9eac724266406cae6851bc51044a6edea46e666924b709c984eb221125394dee9b99e17138c62d1216 + checksum: b18ecfffc9b49afa1702d8ab54cccc63a5a1e2e410afc92c9a104978e397065df00af87a59d0c136e462362f3e6174e963b4a2ff1e7e1efc8217923305c449fc languageName: node linkType: hard @@ -17835,9 +17840,9 @@ __metadata: linkType: hard "flow-parser@npm:0.*": - version: 0.191.0 - resolution: "flow-parser@npm:0.191.0" - checksum: 96445d0f02ef957ea95ca429de7381d462f30c79c786565c7ad8c560d3100c3d793f472d47ac662156cf2e4b233f62e1ef755c6b37312770fdff178facfb6e97 + version: 0.192.0 + resolution: "flow-parser@npm:0.192.0" + checksum: 99cd6096b119f8afb02abab7ac82cb6da1500fd7e5c16c66b212c266903087330c8a9da8d8d4ef321e3a56762510014e54ec0924ae84e082b77a3a39e8f9b10c languageName: node linkType: hard @@ -18287,7 +18292,7 @@ __metadata: languageName: node linkType: hard -"function.prototype.name@npm:^1.1.2, function.prototype.name@npm:^1.1.3, function.prototype.name@npm:^1.1.5": +"function.prototype.name@npm:^1.1.2, function.prototype.name@npm:^1.1.5": version: 1.1.5 resolution: "function.prototype.name@npm:1.1.5" dependencies: @@ -18399,7 +18404,7 @@ __metadata: languageName: node linkType: hard -"get-intrinsic@npm:^1.0.1, get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.0, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3": +"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.0, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3": version: 1.1.3 resolution: "get-intrinsic@npm:1.1.3" dependencies: @@ -18919,6 +18924,15 @@ __metadata: languageName: node linkType: hard +"gopd@npm:^1.0.1": + version: 1.0.1 + resolution: "gopd@npm:1.0.1" + dependencies: + get-intrinsic: ^1.1.3 + checksum: 505c05487f7944c552cee72087bf1567debb470d4355b1335f2c262d218ebbff805cd3715448fe29b4b380bae6912561d0467233e4165830efd28da241418c63 + languageName: node + linkType: hard + "got@npm:^12.1.0": version: 12.5.2 resolution: "got@npm:12.5.2" @@ -20343,7 +20357,7 @@ __metadata: languageName: node linkType: hard -"is-arguments@npm:^1.0.4, is-arguments@npm:^1.1.0": +"is-arguments@npm:^1.0.4, is-arguments@npm:^1.1.0, is-arguments@npm:^1.1.1": version: 1.1.1 resolution: "is-arguments@npm:1.1.1" dependencies: @@ -20458,7 +20472,7 @@ __metadata: languageName: node linkType: hard -"is-date-object@npm:^1.0.1, is-date-object@npm:^1.0.2": +"is-date-object@npm:^1.0.1, is-date-object@npm:^1.0.5": version: 1.0.5 resolution: "is-date-object@npm:1.0.5" dependencies: @@ -20809,7 +20823,7 @@ __metadata: languageName: node linkType: hard -"is-regex@npm:^1.0.3, is-regex@npm:^1.0.4, is-regex@npm:^1.0.5, is-regex@npm:^1.1.0, is-regex@npm:^1.1.1, is-regex@npm:^1.1.2, is-regex@npm:^1.1.4": +"is-regex@npm:^1.0.3, is-regex@npm:^1.0.4, is-regex@npm:^1.0.5, is-regex@npm:^1.1.0, is-regex@npm:^1.1.2, is-regex@npm:^1.1.4": version: 1.1.4 resolution: "is-regex@npm:1.1.4" dependencies: @@ -20899,16 +20913,16 @@ __metadata: languageName: node linkType: hard -"is-typed-array@npm:^1.1.3, is-typed-array@npm:^1.1.9": - version: 1.1.9 - resolution: "is-typed-array@npm:1.1.9" +"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.3": + version: 1.1.10 + resolution: "is-typed-array@npm:1.1.10" dependencies: available-typed-arrays: ^1.0.5 call-bind: ^1.0.2 - es-abstract: ^1.20.0 for-each: ^0.3.3 + gopd: ^1.0.1 has-tostringtag: ^1.0.0 - checksum: 613b7dd6d121c331bb7456f6b678ebd74aee9d77f61c3df09da2cd7841c060d4f8cff14ae8ab54977180d5da2f2da300394810bc92a05a985b3438f55cf629b2 + checksum: b71268a2e5f493f2b95af4cbfe7a65254a822f07d57f20c18f084347cd45f11810915fe37d7a6831fe4b81def24621a042fd1169ec558c50f830b591bc8c1f66 languageName: node linkType: hard @@ -22881,15 +22895,15 @@ __metadata: linkType: hard "joi@npm:^17.3.0": - version: 17.6.4 - resolution: "joi@npm:17.6.4" + version: 17.7.0 + resolution: "joi@npm:17.7.0" dependencies: "@hapi/hoek": ^9.0.0 "@hapi/topo": ^5.0.0 "@sideway/address": ^4.1.3 "@sideway/formula": ^3.0.0 "@sideway/pinpoint": ^2.0.0 - checksum: 187f7e807653c5802db52fc64dd25183ba55db86f97b02507abbc5dc5a4c466ee96c74c0b79b3592fe99fdf9a29b02cf55a95d8292e88a422d5ef059ff6d2673 + checksum: 7cf12839eeb200d935d969f2a2836df86e2e0e33bd0c1883487157990258b537d10e3b7d7b6048cdd1a046f1a276c562cd11482ecfd08f413c3a770b9a73709a languageName: node linkType: hard @@ -23447,11 +23461,11 @@ __metadata: linkType: hard "keyv@npm:^4.5.0": - version: 4.5.0 - resolution: "keyv@npm:4.5.0" + version: 4.5.2 + resolution: "keyv@npm:4.5.2" dependencies: json-buffer: 3.0.1 - checksum: 78d6f885352dffa2b85dc9c1c4bbc4d68d8971edea4ca29b0c10d6a447e04b9ac0b2030325ca00377510a7e3b47ecc088dacdc346d96dc00c9fe9c42dba7252f + checksum: b633bf53a5afa5591f383d326746226e110e59f13c7e1e8d3e3c9580d2c2345c5eefc21cce168cd5be7fa34b9163e391927146fbd2b7ee7aa2f3aa02b7f0a7de languageName: node linkType: hard @@ -23987,13 +24001,13 @@ __metadata: linkType: hard "loader-utils@npm:^1.0.2, loader-utils@npm:^1.1.0, loader-utils@npm:^1.2.3": - version: 1.4.0 - resolution: "loader-utils@npm:1.4.0" + version: 1.4.1 + resolution: "loader-utils@npm:1.4.1" dependencies: big.js: ^5.2.2 emojis-list: ^3.0.0 json5: ^1.0.1 - checksum: b3f383612c23c0adf535d61709fb3eaf864afa54dae45608e3831156b89b4b05a0a4ddc6db7d742071babe872750ba3f4f9ce89326d94f6e096dbed978fa424e + checksum: 38096fc9fba3160eb7b7408eb88658a854a992fed2106fe3972d144035688dc4fcb3767cf353f85513ac0e654efbf1001735bd5a8d8bb5429fdb5a6b0712ce92 languageName: node linkType: hard @@ -24470,9 +24484,9 @@ __metadata: linkType: hard "lru-cache@npm:^7.7.1": - version: 7.14.0 - resolution: "lru-cache@npm:7.14.0" - checksum: 88f1a8c2fd3bafc69121104740dcebc71e4ace97fb03f0ccf3b7d52df7dc10eedb78951af74f08437cf5fdb8c50d5956a0bcc944a073540f027efd8357f87cd1 + version: 7.14.1 + resolution: "lru-cache@npm:7.14.1" + checksum: d54e01ae3bedbd7bb0562fe48e61e509c86102bcc2c8babba1ba5498a6859a796adc697fa917459a455969a45c7d8645b29d938c0142b97fa3b5fb9c234d2390 languageName: node linkType: hard @@ -24771,11 +24785,11 @@ __metadata: linkType: hard "marked@npm:^4.0.12": - version: 4.1.1 - resolution: "marked@npm:4.1.1" + version: 4.2.2 + resolution: "marked@npm:4.2.2" bin: marked: bin/marked.js - checksum: 3c614fd0d11534e9b08ce5411a1e280379334392bdae4df30d5805d275c1bb29c1e3c8cc4febc898be7bb3735b83e36bb403e144fce8cd0f895dc796c33453f5 + checksum: 18aa3837d76e59f74de771ef0cc2a98fc7cc0e39b41aeccf9925fe650a8c92605b565c49a5eab90b397270acef7db71661bb4dcdd83ef06367d4cc2777be996e languageName: node linkType: hard @@ -25013,11 +25027,11 @@ __metadata: linkType: hard "memfs@npm:^3.2.2, memfs@npm:^3.4.1, memfs@npm:^3.4.3": - version: 3.4.8 - resolution: "memfs@npm:3.4.8" + version: 3.4.10 + resolution: "memfs@npm:3.4.10" dependencies: fs-monkey: ^1.0.3 - checksum: 672d4da9e25ef9d8369c7eb1cc8cc775573a3fc59a0af2d48de3051d6092d22dddeee077184a737a40fc0c9b58346a84d550c0378988a2642bd29fe4fea22432 + checksum: 7bf17f35dbf787019266cb55b9488f82fd8f33cae32272df0a86979c99ee028f03b98a165c219abbc3c47f47d1b09ce8d4d0fbd73237fee70e62aec9c933f7bc languageName: node linkType: hard @@ -25636,7 +25650,7 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:2 || 3, minimatch@npm:^3.0.0, minimatch@npm:^3.0.2, minimatch@npm:^3.0.4, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": +"minimatch@npm:2 || 3, minimatch@npm:^3.0.0, minimatch@npm:^3.0.2, minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": version: 3.1.2 resolution: "minimatch@npm:3.1.2" dependencies: @@ -26131,6 +26145,13 @@ __metadata: languageName: node linkType: hard +"natural-compare-lite@npm:^1.4.0": + version: 1.4.0 + resolution: "natural-compare-lite@npm:1.4.0" + checksum: f6cef26f5044515754802c0fc475d81426f3b90fe88c20fabe08771ce1f736ce46e0397c10acb569a4dd0acb84c7f1ee70676122f95d5bfdd747af3a6c6bbaa8 + languageName: node + linkType: hard + "natural-compare@npm:^1.4.0": version: 1.4.0 resolution: "natural-compare@npm:1.4.0" @@ -26199,23 +26220,23 @@ __metadata: linkType: hard "next@npm:^12.2.4": - version: 12.3.1 - resolution: "next@npm:12.3.1" - dependencies: - "@next/env": 12.3.1 - "@next/swc-android-arm-eabi": 12.3.1 - "@next/swc-android-arm64": 12.3.1 - "@next/swc-darwin-arm64": 12.3.1 - "@next/swc-darwin-x64": 12.3.1 - "@next/swc-freebsd-x64": 12.3.1 - "@next/swc-linux-arm-gnueabihf": 12.3.1 - "@next/swc-linux-arm64-gnu": 12.3.1 - "@next/swc-linux-arm64-musl": 12.3.1 - "@next/swc-linux-x64-gnu": 12.3.1 - "@next/swc-linux-x64-musl": 12.3.1 - "@next/swc-win32-arm64-msvc": 12.3.1 - "@next/swc-win32-ia32-msvc": 12.3.1 - "@next/swc-win32-x64-msvc": 12.3.1 + version: 12.3.2 + resolution: "next@npm:12.3.2" + dependencies: + "@next/env": 12.3.2 + "@next/swc-android-arm-eabi": 12.3.2 + "@next/swc-android-arm64": 12.3.2 + "@next/swc-darwin-arm64": 12.3.2 + "@next/swc-darwin-x64": 12.3.2 + "@next/swc-freebsd-x64": 12.3.2 + "@next/swc-linux-arm-gnueabihf": 12.3.2 + "@next/swc-linux-arm64-gnu": 12.3.2 + "@next/swc-linux-arm64-musl": 12.3.2 + "@next/swc-linux-x64-gnu": 12.3.2 + "@next/swc-linux-x64-musl": 12.3.2 + "@next/swc-win32-arm64-msvc": 12.3.2 + "@next/swc-win32-ia32-msvc": 12.3.2 + "@next/swc-win32-x64-msvc": 12.3.2 "@swc/helpers": 0.4.11 caniuse-lite: ^1.0.30001406 postcss: 8.4.14 @@ -26263,7 +26284,7 @@ __metadata: optional: true bin: next: dist/bin/next - checksum: a59628271f9d7eb94d49692f8d3d1201066c5d80ceed41699e1346a70760aef8c29763229820389cbb7accdb2b95076ab6762e1952e05f0d21b16db28897e56f + checksum: fb55616937867599e257766669eee37119ebb30df3d16a533ea7b7213e80bf403157852d0e189fe027b3dc4dd40fc3eec7866c2b3823214901f3ebbf60a4dd72 languageName: node linkType: hard @@ -26889,7 +26910,7 @@ __metadata: languageName: node linkType: hard -"object-is@npm:^1.0.1, object-is@npm:^1.0.2, object-is@npm:^1.1.2, object-is@npm:^1.1.4": +"object-is@npm:^1.0.1, object-is@npm:^1.0.2, object-is@npm:^1.1.2, object-is@npm:^1.1.5": version: 1.1.5 resolution: "object-is@npm:1.1.5" dependencies: @@ -26928,46 +26949,46 @@ __metadata: linkType: hard "object.entries@npm:^1.1.1, object.entries@npm:^1.1.2, object.entries@npm:^1.1.5": - version: 1.1.5 - resolution: "object.entries@npm:1.1.5" + version: 1.1.6 + resolution: "object.entries@npm:1.1.6" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.3 - es-abstract: ^1.19.1 - checksum: 308c07970818b0fb2b0ed92120b8fad76fb69a63c853592eac48c8437bb2385bc43f00b80d263aa2920b352c66c944018df7221099fc8e2d3bfb778566ca4ebb + define-properties: ^1.1.4 + es-abstract: ^1.20.4 + checksum: 8782c71db3a068ccbae9e0541e6b4ac2c25dc67c63f97b7e6ad3c88271d7820197e7398e37747f96542ed47c27f0b81148cdf14c42df15dc22f64818ae7bb5bf languageName: node linkType: hard -"object.fromentries@npm:^2.0.3, object.fromentries@npm:^2.0.5": - version: 2.0.5 - resolution: "object.fromentries@npm:2.0.5" +"object.fromentries@npm:^2.0.5": + version: 2.0.6 + resolution: "object.fromentries@npm:2.0.6" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.3 - es-abstract: ^1.19.1 - checksum: a1bedcdec0e1f15fc1f9dccecf7df18ae4678fc95deb42099b649a3660511f2d1dead3b09b8f7dcf15205b0f7ce69d74e3cc3368511abf85b021d86226aa77d4 + define-properties: ^1.1.4 + es-abstract: ^1.20.4 + checksum: db6759ea68131cbdb70b1152f9984b49db03e81de4f6de079b39929bebd8b45501e5333ca2351991e07ee56f4651606c023396644e8f25c0806fa39a26c4c6e6 languageName: node linkType: hard "object.getownpropertydescriptors@npm:^2.0.3, object.getownpropertydescriptors@npm:^2.1.1": - version: 2.1.4 - resolution: "object.getownpropertydescriptors@npm:2.1.4" + version: 2.1.5 + resolution: "object.getownpropertydescriptors@npm:2.1.5" dependencies: - array.prototype.reduce: ^1.0.4 + array.prototype.reduce: ^1.0.5 call-bind: ^1.0.2 define-properties: ^1.1.4 - es-abstract: ^1.20.1 - checksum: 5c8bfddd2c8e68e4f70d56db3f4ccf18d3cc0f90ffc59c362668ce680ac32101ed1a2d700916371850fcd06277db9014e92b1f829b6a611b36549e842360d1ea + es-abstract: ^1.20.4 + checksum: 2a27afa5628bc200ddb511c5d030be867e049246388c100fcd81371c4d538c186014cf17f415f3e1430231ba75bbb021dff287727221c88156ab483cae02ab0a languageName: node linkType: hard "object.hasown@npm:^1.1.1": - version: 1.1.1 - resolution: "object.hasown@npm:1.1.1" + version: 1.1.2 + resolution: "object.hasown@npm:1.1.2" dependencies: define-properties: ^1.1.4 - es-abstract: ^1.19.5 - checksum: 79f40bf3da7c689122dc38c56114fa0280cde3e6a255f95736933240d495a2556f7ca7413c08d691bfc22e743b0d3ea82620890f21155b94c18551f3909cba8d + es-abstract: ^1.20.4 + checksum: 419fc1c74a2aea7ebb4d49b79d5b1599a010b26c18eae35bd061ccdd013ccb749c499d8dd6ee21a91e6d7264ccc592573d0f13562970f76e25fc844d8c1b02ce languageName: node linkType: hard @@ -26980,14 +27001,14 @@ __metadata: languageName: node linkType: hard -"object.values@npm:^1.1.1, object.values@npm:^1.1.2, object.values@npm:^1.1.5": - version: 1.1.5 - resolution: "object.values@npm:1.1.5" +"object.values@npm:^1.1.1, object.values@npm:^1.1.5": + version: 1.1.6 + resolution: "object.values@npm:1.1.6" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.3 - es-abstract: ^1.19.1 - checksum: 9c6afa9a25ce36c27c8baef2321eaa719fc2b042ef17aa462b1fa1502ed7ce7acf18b269be2e7b0d91f228839f10a28fa30ebc8cb7e47dbf6a2e4e67cad466c1 + define-properties: ^1.1.4 + es-abstract: ^1.20.4 + checksum: 3381204390f10c9f653a4875a50d221c67b5c16cb80a6ac06c706fc82a7cad8400857d4c7a0731193b0abb56b84fe803eabcf7addcf32de76397bbf207e68c66 languageName: node linkType: hard @@ -30178,7 +30199,7 @@ __metadata: languageName: node linkType: hard -"regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.3.0, regexp.prototype.flags@npm:^1.4.1, regexp.prototype.flags@npm:^1.4.3": +"regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.4.3": version: 1.4.3 resolution: "regexp.prototype.flags@npm:1.4.3" dependencies: @@ -31220,7 +31241,7 @@ __metadata: languageName: node linkType: hard -"rollup@npm:^2.74.1, rollup@npm:^2.79.1": +"rollup@npm:^2.79.1": version: 2.79.1 resolution: "rollup@npm:2.79.1" dependencies: @@ -31234,6 +31255,20 @@ __metadata: languageName: node linkType: hard +"rollup@npm:^3.2.5": + version: 3.2.5 + resolution: "rollup@npm:3.2.5" + dependencies: + fsevents: ~2.3.2 + dependenciesMeta: + fsevents: + optional: true + bin: + rollup: dist/bin/rollup + checksum: f9332142d6f9298cc634a472ba913205edec518f165c6f1d31934585df5d4d6582c20d3ab88ca98a4325ee9a150597c3a548e3ed904180485cd60e0f813dd66f + languageName: node + linkType: hard + "rst-selector-parser@npm:^2.2.3": version: 2.2.3 resolution: "rst-selector-parser@npm:2.2.3" @@ -31892,7 +31927,7 @@ __metadata: languageName: node linkType: hard -"side-channel@npm:^1.0.3, side-channel@npm:^1.0.4": +"side-channel@npm:^1.0.4": version: 1.0.4 resolution: "side-channel@npm:1.0.4" dependencies: @@ -32752,51 +32787,51 @@ __metadata: linkType: hard "string.prototype.matchall@npm:^4.0.7": - version: 4.0.7 - resolution: "string.prototype.matchall@npm:4.0.7" + version: 4.0.8 + resolution: "string.prototype.matchall@npm:4.0.8" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.3 - es-abstract: ^1.19.1 - get-intrinsic: ^1.1.1 + define-properties: ^1.1.4 + es-abstract: ^1.20.4 + get-intrinsic: ^1.1.3 has-symbols: ^1.0.3 internal-slot: ^1.0.3 - regexp.prototype.flags: ^1.4.1 + regexp.prototype.flags: ^1.4.3 side-channel: ^1.0.4 - checksum: 85bfc0c18b73b90b4a10771bd1afa4c6e42fc78885196dee680b45d023afc81cec6a9944f2f0e25d81f8e5643d5412df5a4649ea624ab375598c6dba0864c9a2 + checksum: 644523d05c1ee93bab7474e999a5734ee5f6ad2d7ad24ed6ea8706c270dc92b352bde0f2a5420bfbeed54e28cb6a770c3800e1988a5267a70fd5e677c7750abc languageName: node linkType: hard "string.prototype.trim@npm:^1.2.1": - version: 1.2.6 - resolution: "string.prototype.trim@npm:1.2.6" + version: 1.2.7 + resolution: "string.prototype.trim@npm:1.2.7" dependencies: call-bind: ^1.0.2 define-properties: ^1.1.4 - es-abstract: ^1.19.5 - checksum: 8376a85aafc3afefd525c76fdc1d9866de0ed8b51b6800a473987435d55d176bea7ffb221ae28f03b5c89b27e5515fca65b0437e2dee9b61da82ed9b81fc193f + es-abstract: ^1.20.4 + checksum: 31698f6d718794e422db6fcfa6685dcd9243097273b3b2a8b7948b5d45a183cd336378893ff0d4a7b2531b604c32bb5c45193dd6da3d2f5504df5cd222372c09 languageName: node linkType: hard "string.prototype.trimend@npm:^1.0.5": - version: 1.0.5 - resolution: "string.prototype.trimend@npm:1.0.5" + version: 1.0.6 + resolution: "string.prototype.trimend@npm:1.0.6" dependencies: call-bind: ^1.0.2 define-properties: ^1.1.4 - es-abstract: ^1.19.5 - checksum: efcb7d4e943366efde2786be9abf7a79ac9e427bb184aeb4c532ce81d7cb94e1a4d323b256f706dafe6ed5a4ee3d6025a65ec4337d47d07014802be5bcdd4864 + es-abstract: ^1.20.4 + checksum: 51b663e3195a74b58620a250b3fc4efb58951000f6e7d572a9f671c038f2f37f24a2b8c6994500a882aeab2f1c383fac1e8c023c01eb0c8b4e52d2f13b6c4513 languageName: node linkType: hard "string.prototype.trimstart@npm:^1.0.5": - version: 1.0.5 - resolution: "string.prototype.trimstart@npm:1.0.5" + version: 1.0.6 + resolution: "string.prototype.trimstart@npm:1.0.6" dependencies: call-bind: ^1.0.2 define-properties: ^1.1.4 - es-abstract: ^1.19.5 - checksum: c42d2f7732a98d9402aabcfb6ac05e4e36bbc429f5aa98bd199b5e55162b19b87db941ed68382c68ec6527a200a3d01cb3d4c16f668296c383e63693d8493772 + es-abstract: ^1.20.4 + checksum: 13b9970d4e234002dfc8069c655c1fe19e83e10ced208b54858c41bb0f7544e581ac0ce746e92b279563664ad63910039f7253f36942113fec413b2b4e7c1fcd languageName: node linkType: hard @@ -33363,7 +33398,7 @@ __metadata: languageName: node linkType: hard -"tar@npm:6.1.11, tar@npm:^6.0.2, tar@npm:^6.1.0, tar@npm:^6.1.11, tar@npm:^6.1.2": +"tar@npm:6.1.11": version: 6.1.11 resolution: "tar@npm:6.1.11" dependencies: @@ -33392,6 +33427,20 @@ __metadata: languageName: node linkType: hard +"tar@npm:^6.0.2, tar@npm:^6.1.0, tar@npm:^6.1.11, tar@npm:^6.1.2": + version: 6.1.12 + resolution: "tar@npm:6.1.12" + dependencies: + chownr: ^2.0.0 + fs-minipass: ^2.0.0 + minipass: ^3.0.0 + minizlib: ^2.1.1 + mkdirp: ^1.0.3 + yallist: ^4.0.0 + checksum: 183a858baba2eabfb1589ea9030601865190a074597bf0926de2460b6fe8adee9278509ac1c8460c05af7a0c8794db62c4e8cc395589470103946c55bf68e6cc + languageName: node + linkType: hard + "teeny-request@npm:7.0.1": version: 7.0.1 resolution: "teeny-request@npm:7.0.1" @@ -34180,9 +34229,9 @@ __metadata: linkType: hard "tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.3.0, tslib@npm:^2.4.0": - version: 2.4.0 - resolution: "tslib@npm:2.4.0" - checksum: eb19bda3ae545b03caea6a244b34593468e23d53b26bf8649fbc20fce43e9b21a71127fd6d2b9662c0fe48ee6ff668ead48fd00d3b88b2b716b1c12edae25b5d + version: 2.4.1 + resolution: "tslib@npm:2.4.1" + checksum: 9ac0e4fd1033861f0b4f0d848dc3009ebcc3aa4757a06e8602a2d8a7aed252810e3540e54e70709f06c0f95311faa8584f769bcbede48aff785eb7e4d399b9ec languageName: node linkType: hard @@ -34194,10 +34243,10 @@ __metadata: linkType: hard "tsup@npm:^6.2.2": - version: 6.3.0 - resolution: "tsup@npm:6.3.0" + version: 6.4.0 + resolution: "tsup@npm:6.4.0" dependencies: - bundle-require: ^3.1.0 + bundle-require: ^3.1.2 cac: ^6.7.12 chokidar: ^3.5.1 debug: ^4.3.1 @@ -34207,7 +34256,7 @@ __metadata: joycon: ^3.0.1 postcss-load-config: ^3.0.1 resolve-from: ^5.0.0 - rollup: ^2.74.1 + rollup: ^3.2.5 source-map: 0.8.0-beta.0 sucrase: ^3.20.3 tree-kill: ^1.2.2 @@ -34225,7 +34274,7 @@ __metadata: bin: tsup: dist/cli-default.js tsup-node: dist/cli-node.js - checksum: fc60bc67ab93d0e59ebb028d980d853cc22328ba05ec0a09b3e6a0ea21bb2078a68e8c6978a2a1f9bd03090a8cbe77400c8c750bfdb639b47bab1bfea7232a2a + checksum: fd745b8669ad56eb96fe76afd482afab01020ee8c9f6f12b7796627862d98e9c0ed1b19cfdac3a5127afc1421ef5495f80f688f76dfb136f2b136ba23b9fe8a3 languageName: node linkType: hard @@ -35425,8 +35474,8 @@ __metadata: linkType: hard "vite@npm:^3.1.0, vite@npm:^3.1.3, vite@npm:^3.1.7": - version: 3.2.1 - resolution: "vite@npm:3.2.1" + version: 3.2.3 + resolution: "vite@npm:3.2.3" dependencies: esbuild: ^0.15.9 fsevents: ~2.3.2 @@ -35434,6 +35483,7 @@ __metadata: resolve: ^1.22.1 rollup: ^2.79.1 peerDependencies: + "@types/node": ">= 14" less: "*" sass: "*" stylus: "*" @@ -35443,6 +35493,8 @@ __metadata: fsevents: optional: true peerDependenciesMeta: + "@types/node": + optional: true less: optional: true sass: @@ -35455,7 +35507,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: 727e1fa5325aafbf2f83bf15b354345dfd6d5736a3562294a0f042fee0ed0ca3eb9af48db87ee71506cf77bc1933384a65d348baa021f45a8e5cedd4b55ea416 + checksum: 90c7cd812322301bba7869aba505394286dd27a8664b5e02935733a8a3bfcd8041deaa7c4316139b87ac3fca45cbbffc7287185110fc006783cc1c53bac5109e languageName: node linkType: hard @@ -36061,9 +36113,9 @@ __metadata: linkType: hard "webpack-virtual-modules@npm:^0.4.3, webpack-virtual-modules@npm:^0.4.5": - version: 0.4.5 - resolution: "webpack-virtual-modules@npm:0.4.5" - checksum: 2a7c2dbb2e5e32b06b4ab3778609ce70d1ba4bbc05d3231a3da5219dc03131d555dda4a7d4694d100a344f87e458378ea7ba241ba2a8b81b1866e53c99af5aee + version: 0.4.6 + resolution: "webpack-virtual-modules@npm:0.4.6" + checksum: d3ecd680289e04f6fac70f09a682385b176303cfdc69ad08f11fce6fa031f9c054b3e728cb54967da48f051cd2ebe3f0d0d02bf78d3dfc8a3a9be91ea7544bbb languageName: node linkType: hard @@ -36217,7 +36269,7 @@ __metadata: languageName: node linkType: hard -"which-boxed-primitive@npm:^1.0.1, which-boxed-primitive@npm:^1.0.2": +"which-boxed-primitive@npm:^1.0.2": version: 1.0.2 resolution: "which-boxed-primitive@npm:1.0.2" dependencies: @@ -36256,17 +36308,17 @@ __metadata: languageName: node linkType: hard -"which-typed-array@npm:^1.1.2": - version: 1.1.8 - resolution: "which-typed-array@npm:1.1.8" +"which-typed-array@npm:^1.1.2, which-typed-array@npm:^1.1.8": + version: 1.1.9 + resolution: "which-typed-array@npm:1.1.9" dependencies: available-typed-arrays: ^1.0.5 call-bind: ^1.0.2 - es-abstract: ^1.20.0 for-each: ^0.3.3 + gopd: ^1.0.1 has-tostringtag: ^1.0.0 - is-typed-array: ^1.1.9 - checksum: bdab0d7d077015a8e9710d93951614f2a7962ed62f5240d2852c61eb578a888c4a9da5ef93ba9d0191812e05db1817168e1ab746036d39e863d555f9b68008f1 + is-typed-array: ^1.1.10 + checksum: 7edb12cfd04bfe2e2d3ec3e6046417c59e6a8c72209e4fe41fe1a1a40a3b196626c2ca63dac2a0fa2491d5c37c065dfabd2fcf7c0c15f1d19f5640fef88f6368 languageName: node linkType: hard @@ -36550,8 +36602,8 @@ __metadata: linkType: hard "ws@npm:^8.1.0, ws@npm:^8.2.3": - version: 8.10.0 - resolution: "ws@npm:8.10.0" + version: 8.11.0 + resolution: "ws@npm:8.11.0" peerDependencies: bufferutil: ^4.0.1 utf-8-validate: ^5.0.2 @@ -36560,7 +36612,7 @@ __metadata: optional: true utf-8-validate: optional: true - checksum: db88d92897c7547ca5b24c91eca8e401788bac96c5a7935d647766481ec27fbc020947149ff820156cb1a574477e7f042962e0561cf58257e4e8be8e095534a3 + checksum: b672b312f357afba8568b9dbb9e08b9e8a20845659b35fa6b340dc848efe371379f5e22bb1dc89c4b2940d5e2dc52dd1de85dde41776875fce115a448f94754f languageName: node linkType: hard @@ -36708,7 +36760,7 @@ __metadata: languageName: node linkType: hard -"yargs-parser@npm:>=21.0.1, yargs-parser@npm:^21.0.0, yargs-parser@npm:^21.0.1": +"yargs-parser@npm:>=21.0.1, yargs-parser@npm:^21.0.1, yargs-parser@npm:^21.1.1": version: 21.1.1 resolution: "yargs-parser@npm:21.1.1" checksum: f84b5e48169479d2f402239c59f084cfd1c3acc197a05c59b98bab067452e6b3ea46d4dd8ba2985ba7b3d32a343d77df0debd6b343e5dae3da2aab2cdf5886b2 @@ -36817,8 +36869,8 @@ __metadata: linkType: hard "yargs@npm:^17.2.1, yargs@npm:^17.4.0": - version: 17.6.0 - resolution: "yargs@npm:17.6.0" + version: 17.6.2 + resolution: "yargs@npm:17.6.2" dependencies: cliui: ^8.0.1 escalade: ^3.1.1 @@ -36826,8 +36878,8 @@ __metadata: require-directory: ^2.1.1 string-width: ^4.2.3 y18n: ^5.0.5 - yargs-parser: ^21.0.0 - checksum: 9f3d40f482d37df26f66f9b8d3010645ebf9485dd1c4bab6b55c87ac4e4924836bca93f52afb1a0483e178f540e5ab6fbea60d9fc56ecba10d386ecbdc9857e6 + yargs-parser: ^21.1.1 + checksum: dd5c89aa8186d2a18625b26b68beb635df648617089135e9661107a92561056427bbd41dbfa228db5a7d968ea1043d96c036c2eb978acf7b61a0ae48bf3be206 languageName: node linkType: hard From 1db803d3bba0505d91195b385d48ee4b88decbe2 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 8 Nov 2022 13:09:55 +0100 Subject: [PATCH 06/42] fixes for angular --- code/frameworks/angular/src/client/types.ts | 5 +++-- code/lib/types/src/modules/addons.ts | 6 +++++- code/lib/types/src/modules/csf.ts | 2 ++ code/workspace.json | 24 ++++++++++----------- 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/code/frameworks/angular/src/client/types.ts b/code/frameworks/angular/src/client/types.ts index a12d98a5e0c9..7843b255ada9 100644 --- a/code/frameworks/angular/src/client/types.ts +++ b/code/frameworks/angular/src/client/types.ts @@ -1,4 +1,5 @@ import { + Framework, Parameters as DefaultParameters, StoryContext as DefaultStoryContext, } from '@storybook/types'; @@ -26,10 +27,10 @@ export interface StoryFnAngularReturnType { userDefinedTemplate?: boolean; } -export type AngularFramework = { +export interface AngularFramework extends Framework { component: any; storyResult: StoryFnAngularReturnType; -}; +} export type Parameters = DefaultParameters & { /** Uses legacy angular rendering engine that use dynamic component */ diff --git a/code/lib/types/src/modules/addons.ts b/code/lib/types/src/modules/addons.ts index ab3434113634..95fc89bb6cca 100644 --- a/code/lib/types/src/modules/addons.ts +++ b/code/lib/types/src/modules/addons.ts @@ -8,6 +8,7 @@ import type { ArgsStoryFn as ArgsStoryFnForFramework, ComponentTitle, DecoratorFunction as DecoratorFunctionForFramework, + Framework, InputType, LegacyStoryFn as LegacyStoryFnForFramework, LoaderFunction as LoaderFunctionForFramework, @@ -93,7 +94,10 @@ export type Addon_StoryContext = StoryContextForFramework; export type Addon_StoryContextUpdate = Partial; -type Addon_ReturnTypeFramework = { component: any; storyResult: ReturnType }; +interface Addon_ReturnTypeFramework extends Framework { + component: any; + storyResult: ReturnType; +} export type Addon_PartialStoryFn = PartialStoryFnForFramework< Addon_ReturnTypeFramework >; diff --git a/code/lib/types/src/modules/csf.ts b/code/lib/types/src/modules/csf.ts index dce0151e225c..fa666208da60 100644 --- a/code/lib/types/src/modules/csf.ts +++ b/code/lib/types/src/modules/csf.ts @@ -16,6 +16,7 @@ import type { Conditional, DecoratorApplicator, DecoratorFunction, + Framework, Globals, GlobalTypes, IncludeExcludeOptions, @@ -76,6 +77,7 @@ export type { Conditional, DecoratorApplicator, DecoratorFunction, + Framework, Globals, GlobalTypes, IncludeExcludeOptions, diff --git a/code/workspace.json b/code/workspace.json index da2a6f6efd40..8b7bb4af3eef 100644 --- a/code/workspace.json +++ b/code/workspace.json @@ -156,11 +156,6 @@ "root": "lib/codemod", "type": "library" }, - "@storybook/[preview]": { - "implicitDependencies": [], - "root": "lib/preview", - "type": "library" - }, "@storybook/components": { "implicitDependencies": [], "root": "ui/components", @@ -236,10 +231,15 @@ "root": "lib/instrumenter", "type": "library" }, + "@storybook/manager": { + "implicitDependencies": [], + "root": "ui/manager", + "type": "library" + }, "@storybook/nextjs": { + "implicitDependencies": [], "root": "frameworks/nextjs", - "type": "library", - "implicitDependencies": [] + "type": "library" }, "@storybook/node-logger": { "implicitDependencies": [], @@ -301,6 +301,11 @@ "root": "presets/web-components-webpack", "type": "library" }, + "@storybook/preview": { + "implicitDependencies": [], + "root": "lib/preview", + "type": "library" + }, "@storybook/preview-web": { "implicitDependencies": [], "root": "lib/preview-web", @@ -376,11 +381,6 @@ "root": "lib/types", "type": "library" }, - "@storybook/manager": { - "implicitDependencies": [], - "root": "ui/manager", - "type": "library" - }, "@storybook/vue": { "implicitDependencies": [], "root": "renderers/vue", From ab687a133fe71caa6c459962dc603d0861d0a931 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 8 Nov 2022 13:16:06 +0100 Subject: [PATCH 07/42] fix the other renderers types --- code/frameworks/ember/src/client/preview/types.ts | 6 ++++-- code/renderers/html/src/types.ts | 6 +++--- code/renderers/preact/src/types.ts | 5 +++-- code/renderers/react/src/types.ts | 4 ++-- code/renderers/server/src/types.ts | 6 +++--- code/renderers/svelte/src/types.ts | 4 ++-- code/renderers/vue/src/types.ts | 6 +++--- code/renderers/vue3/src/types.ts | 4 ++-- code/renderers/web-components/src/types.ts | 6 +++--- 9 files changed, 25 insertions(+), 22 deletions(-) diff --git a/code/frameworks/ember/src/client/preview/types.ts b/code/frameworks/ember/src/client/preview/types.ts index 29cfbcd153a9..711a54f46bdf 100644 --- a/code/frameworks/ember/src/client/preview/types.ts +++ b/code/frameworks/ember/src/client/preview/types.ts @@ -1,3 +1,5 @@ +import type { Framework } from '@storybook/types'; + export type { RenderContext } from '@storybook/types'; export interface ShowErrorArgs { @@ -11,7 +13,7 @@ export interface OptionsArgs { element: any; } -export type EmberFramework = { +export interface EmberFramework extends Framework { component: any; storyResult: OptionsArgs; -}; +} diff --git a/code/renderers/html/src/types.ts b/code/renderers/html/src/types.ts index e022dda9d0a7..6814ea3634ad 100644 --- a/code/renderers/html/src/types.ts +++ b/code/renderers/html/src/types.ts @@ -1,4 +1,4 @@ -import type { ArgsStoryFn, StoryContext as DefaultStoryContext } from '@storybook/types'; +import type { ArgsStoryFn, Framework, StoryContext as DefaultStoryContext } from '@storybook/types'; import type { parameters } from './config'; @@ -11,10 +11,10 @@ export interface ShowErrorArgs { description: string; } -export type HtmlFramework = { +export interface HtmlFramework extends Framework { component: string | HTMLElement | ArgsStoryFn; storyResult: StoryFnHtmlReturnType; -}; +} export type StoryContext = DefaultStoryContext & { parameters: DefaultStoryContext['parameters'] & typeof parameters; diff --git a/code/renderers/preact/src/types.ts b/code/renderers/preact/src/types.ts index 281f995d70a9..0a17f5f3ef92 100644 --- a/code/renderers/preact/src/types.ts +++ b/code/renderers/preact/src/types.ts @@ -1,3 +1,4 @@ +import type { Framework } from '@storybook/types'; import type { AnyComponent } from 'preact'; export type { RenderContext } from '@storybook/types'; @@ -9,7 +10,7 @@ export interface ShowErrorArgs { description: string; } -export type PreactFramework = { +export interface PreactFramework extends Framework { component: AnyComponent; storyResult: StoryFnPreactReturnType; -}; +} diff --git a/code/renderers/react/src/types.ts b/code/renderers/react/src/types.ts index f9ac2fe4503f..223029944974 100644 --- a/code/renderers/react/src/types.ts +++ b/code/renderers/react/src/types.ts @@ -1,10 +1,10 @@ import type { ComponentType, ReactElement } from 'react'; -import type { AnyFramework } from '@storybook/types'; +import type { Framework } from '@storybook/types'; export type { Store_RenderContext as RenderContext } from '@storybook/types'; export type { StoryContext } from '@storybook/types'; -export interface ReactFramework extends AnyFramework { +export interface ReactFramework extends Framework { component: ComponentType; storyResult: StoryFnReactReturnType; } diff --git a/code/renderers/server/src/types.ts b/code/renderers/server/src/types.ts index decf1ddd21ca..9e61968468df 100644 --- a/code/renderers/server/src/types.ts +++ b/code/renderers/server/src/types.ts @@ -1,14 +1,14 @@ -import type { StoryContext as StoryContextBase } from '@storybook/types'; +import type { Framework, StoryContext as StoryContextBase } from '@storybook/types'; export type { RenderContext } from '@storybook/types'; export type StoryFnServerReturnType = any; export type StoryContext = StoryContextBase; -export type ServerFramework = { +export interface ServerFramework extends Framework { component: string; storyResult: StoryFnServerReturnType; -}; +} export type FetchStoryHtmlType = ( url: string, diff --git a/code/renderers/svelte/src/types.ts b/code/renderers/svelte/src/types.ts index 32f25dbab053..84ae92d48799 100644 --- a/code/renderers/svelte/src/types.ts +++ b/code/renderers/svelte/src/types.ts @@ -1,4 +1,4 @@ -import type { AnyFramework, StoryContext as StoryContextBase } from '@storybook/types'; +import type { Framework, StoryContext as StoryContextBase } from '@storybook/types'; import type { ComponentConstructorOptions, ComponentEvents, SvelteComponentTyped } from 'svelte'; export type StoryContext = StoryContextBase; @@ -32,7 +32,7 @@ type ComponentType< }; export interface SvelteFramework - extends AnyFramework { + extends Framework { component: ComponentType ? this['T'] : any>; storyResult: this['T'] extends Record ? SvelteStoryResult> diff --git a/code/renderers/vue/src/types.ts b/code/renderers/vue/src/types.ts index 22621b946371..976bfd43775c 100644 --- a/code/renderers/vue/src/types.ts +++ b/code/renderers/vue/src/types.ts @@ -1,4 +1,4 @@ -import type { StoryContext as StoryContextBase } from '@storybook/types'; +import type { Framework, StoryContext as StoryContextBase } from '@storybook/types'; import type { Component, AsyncComponent } from 'vue'; export type { RenderContext } from '@storybook/types'; @@ -14,7 +14,7 @@ export type StoryFnVueReturnType = export type StoryContext = StoryContextBase; -export type VueFramework = { +export interface VueFramework extends Framework { component: Component | AsyncComponent; storyResult: StoryFnVueReturnType; -}; +} diff --git a/code/renderers/vue3/src/types.ts b/code/renderers/vue3/src/types.ts index 04d9a10f01f7..009309d82ac9 100644 --- a/code/renderers/vue3/src/types.ts +++ b/code/renderers/vue3/src/types.ts @@ -1,4 +1,4 @@ -import type { AnyFramework, StoryContext as StoryContextBase } from '@storybook/types'; +import type { Framework, StoryContext as StoryContextBase } from '@storybook/types'; import type { ConcreteComponent } from 'vue'; export type { RenderContext } from '@storybook/types'; @@ -12,7 +12,7 @@ export type StoryFnVueReturnType = ConcreteComponent; export type StoryContext = StoryContextBase; -export interface VueFramework extends AnyFramework { +export interface VueFramework extends Framework { // We are omitting props, as we don't use it internally, and more importantly, it completely changes the assignability of meta.component. // Try not omitting, and check the type errros in the test file, if you want to learn more. component: Omit, 'props'>; diff --git a/code/renderers/web-components/src/types.ts b/code/renderers/web-components/src/types.ts index 3c01fc6f0a23..a33f9cfb2602 100644 --- a/code/renderers/web-components/src/types.ts +++ b/code/renderers/web-components/src/types.ts @@ -1,14 +1,14 @@ -import type { StoryContext as StoryContextBase } from '@storybook/types'; +import type { Framework, StoryContext as StoryContextBase } from '@storybook/types'; import type { TemplateResult, SVGTemplateResult } from 'lit-html'; export type StoryFnHtmlReturnType = string | Node | TemplateResult | SVGTemplateResult; export type StoryContext = StoryContextBase; -export type WebComponentsFramework = { +export interface WebComponentsFramework extends Framework { component: string; storyResult: StoryFnHtmlReturnType; -}; +} export interface ShowErrorArgs { title: string; From c52304288f6b532a4b1862a4de37ead7fca3d2be Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 8 Nov 2022 16:50:39 +0100 Subject: [PATCH 08/42] make blocks more self-contained --- code/addons/docs/package.json | 46 ++++------------------------------- code/addons/docs/preset.js | 2 +- code/addons/docs/preview.js | 2 +- code/ui/blocks/package.json | 19 ++++++--------- code/yarn.lock | 4 --- 5 files changed, 15 insertions(+), 58 deletions(-) diff --git a/code/addons/docs/package.json b/code/addons/docs/package.json index a10539b0d4d8..1b4645ff9175 100644 --- a/code/addons/docs/package.json +++ b/code/addons/docs/package.json @@ -24,37 +24,9 @@ "url": "https://opencollective.com/storybook" }, "license": "MIT", - "exports": { - ".": { - "require": "./dist/index.js", - "import": "./dist/index.mjs", - "types": "./dist/index.d.ts" - }, - "./preview": { - "require": "./dist/preview.js", - "import": "./dist/preview.mjs", - "types": "./dist/preview.d.ts" - }, - "./preset": { - "require": "./dist/preset.js", - "import": "./dist/preset.mjs", - "types": "./dist/preset.d.ts" - }, - "./blocks": { - "require": "./dist/blocks.js", - "import": "./dist/blocks.mjs", - "types": "./dist/blocks.d.ts" - }, - "./dist/blocks": { - "require": "./dist/blocks.js", - "import": "./dist/blocks.mjs", - "types": "./dist/blocks.d.ts" - }, - "./package.json": "./package.json" - }, - "main": "dist/index.js", - "module": "dist/index.mjs", - "types": "dist/index.d.ts", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.mjs", + "types": "dist/types/index.d.ts", "files": [ "dist/**/*", "angular/**/*", @@ -74,11 +46,12 @@ ], "scripts": { "check": "../../../scripts/node_modules/.bin/tsc --noEmit", - "prep": "../../../scripts/prepare/bundle.ts" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@babel/plugin-transform-react-jsx": "^7.12.12", "@jest/transform": "^26.6.2", + "@mdx-js/react": "^2.1.5", "@storybook/blocks": "7.0.0-alpha.48", "@storybook/components": "7.0.0-alpha.48", "@storybook/csf-plugin": "7.0.0-alpha.48", @@ -96,7 +69,6 @@ }, "devDependencies": { "@babel/core": "^7.12.10", - "@mdx-js/react": "^2.1.5", "react": "^16.8.0", "react-dom": "16.14.0", "typescript": "~4.6.3" @@ -104,14 +76,6 @@ "publishConfig": { "access": "public" }, - "bundler": { - "entries": [ - "./src/index.ts", - "./src/preset.ts", - "./src/preview.ts", - "./src/blocks.ts" - ] - }, "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd", "storybook": { "displayName": "Docs", diff --git a/code/addons/docs/preset.js b/code/addons/docs/preset.js index a83f95279e7f..e45ac5b4cec0 100644 --- a/code/addons/docs/preset.js +++ b/code/addons/docs/preset.js @@ -1 +1 @@ -module.exports = require('./dist/preset'); +module.exports = require('./dist/cjs/preset'); diff --git a/code/addons/docs/preview.js b/code/addons/docs/preview.js index 49ad602f79f4..e726cab5a1b6 100644 --- a/code/addons/docs/preview.js +++ b/code/addons/docs/preview.js @@ -1 +1 @@ -export * from './dist/preview'; +export * from './dist/esm/preview'; diff --git a/code/ui/blocks/package.json b/code/ui/blocks/package.json index cc047e6a9a3e..667bc5714203 100644 --- a/code/ui/blocks/package.json +++ b/code/ui/blocks/package.json @@ -38,13 +38,12 @@ "*.d.ts" ], "scripts": { + "check": "../../../scripts/node_modules/.bin/tsc --noEmit", "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/api": "7.0.0-alpha.48", "@storybook/channels": "7.0.0-alpha.48", "@storybook/client-logger": "7.0.0-alpha.48", - "@storybook/components": "7.0.0-alpha.48", "@storybook/core-events": "7.0.0-alpha.48", "@storybook/csf": "next", "@storybook/docs-tools": "7.0.0-alpha.48", @@ -53,21 +52,19 @@ "@storybook/theming": "7.0.0-alpha.48", "@storybook/types": "7.0.0-alpha.48", "@types/lodash": "^4.14.167", - "color-convert": "^2.0.1", "dequal": "^2.0.2", "global": "^4.4.0", "lodash": "^4.17.21", - "markdown-to-jsx": "^7.1.3", - "memoizerific": "^1.11.3", - "polished": "^4.2.2", - "react-colorful": "^5.1.2", - "ts-dedent": "^2.0.0", - "util-deprecate": "^1.0.2" + "memoizerific": "^1.11.3" }, "devDependencies": { "@storybook/addon-actions": "7.0.0-alpha.48", - "@storybook/addons": "7.0.0-alpha.48", - "@types/color-convert": "^2.0.0" + "@storybook/components": "7.0.0-alpha.48", + "@types/color-convert": "^2.0.0", + "color-convert": "^2.0.1", + "markdown-to-jsx": "^7.1.3", + "polished": "^4.2.2", + "react-colorful": "^5.1.2" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0" diff --git a/code/yarn.lock b/code/yarn.lock index 3d5cc731f427..f174a1f80e1f 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6111,8 +6111,6 @@ __metadata: resolution: "@storybook/blocks@workspace:ui/blocks" dependencies: "@storybook/addon-actions": 7.0.0-alpha.48 - "@storybook/addons": 7.0.0-alpha.48 - "@storybook/api": 7.0.0-alpha.48 "@storybook/channels": 7.0.0-alpha.48 "@storybook/client-logger": 7.0.0-alpha.48 "@storybook/components": 7.0.0-alpha.48 @@ -6133,8 +6131,6 @@ __metadata: memoizerific: ^1.11.3 polished: ^4.2.2 react-colorful: ^5.1.2 - ts-dedent: ^2.0.0 - util-deprecate: ^1.0.2 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 languageName: unknown From 34ab45af21b7facf642aaa6ebe0dab76086b8b3e Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 9 Nov 2022 12:30:34 +0100 Subject: [PATCH 09/42] making docs work maybe --- code/addons/docs/package.json | 52 ++++++++++++++++--- code/addons/docs/preset.js | 2 +- code/addons/docs/preview.js | 2 +- code/addons/docs/src/DocsRenderer.tsx | 5 +- code/addons/docs/src/blocks.ts | 1 - code/addons/docs/src/index.ts | 2 +- .../src/render/StandaloneDocsRender.ts | 4 +- code/lib/preview/package.json | 25 +++++---- code/lib/preview/src/index.ts | 20 +++---- code/ui/blocks/package.json | 3 +- code/ui/blocks/src/blocks/Docs.tsx | 4 +- .../src/blocks/external/ExternalDocs.tsx | 6 +-- code/yarn.lock | 3 +- 13 files changed, 88 insertions(+), 41 deletions(-) delete mode 100644 code/addons/docs/src/blocks.ts diff --git a/code/addons/docs/package.json b/code/addons/docs/package.json index 1b4645ff9175..d76893e6ec1d 100644 --- a/code/addons/docs/package.json +++ b/code/addons/docs/package.json @@ -24,9 +24,41 @@ "url": "https://opencollective.com/storybook" }, "license": "MIT", - "main": "dist/cjs/index.js", - "module": "dist/esm/index.mjs", - "types": "dist/types/index.d.ts", + "exports": { + ".": { + "require": "./dist/index.js", + "import": "./dist/index.mjs", + "types": "./dist/index.d.ts" + }, + "./preview": { + "require": "./dist/preview.js", + "import": "./dist/preview.mjs", + "types": "./dist/preview.d.ts" + }, + "./preset": { + "require": "./dist/preset.js", + "import": "./dist/preset.mjs", + "types": "./dist/preset.d.ts" + }, + "./blocks": { + "require": "./dist/blocks.js", + "import": "./dist/blocks.mjs", + "types": "./dist/blocks.d.ts" + }, + "./dist/blocks": { + "require": "./dist/blocks.js", + "import": "./dist/blocks.mjs", + "types": "./dist/blocks.d.ts" + }, + "./svelte/HOC.svelte": "./svelte/HOC.svelte", + "./ember/index.js": "./ember/index.js", + "./web-components/index.js": "./web-components/index.js", + "./jest-transform-mdx.js": "./jest-transform-mdx.js", + "./package.json": "./package.json" + }, + "main": "dist/index.js", + "module": "dist/index.mjs", + "types": "dist/index.d.ts", "files": [ "dist/**/*", "angular/**/*", @@ -46,7 +78,7 @@ ], "scripts": { "check": "../../../scripts/node_modules/.bin/tsc --noEmit", - "prep": "node ../../../scripts/prepare.js" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@babel/plugin-transform-react-jsx": "^7.12.12", @@ -63,19 +95,27 @@ "@storybook/types": "7.0.0-alpha.48", "fs-extra": "^9.0.1", "global": "^4.4.0", + "react": "^16.8.0", + "react-dom": "^16.14.0", "remark-external-links": "^8.0.0", "remark-slug": "^6.0.0", "ts-dedent": "^2.0.0" }, "devDependencies": { "@babel/core": "^7.12.10", - "react": "^16.8.0", - "react-dom": "16.14.0", "typescript": "~4.6.3" }, "publishConfig": { "access": "public" }, + "bundler": { + "entries": [ + "./src/index.ts", + "./src/preset.ts", + "./src/preview.ts", + "./src/blocks.ts" + ] + }, "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd", "storybook": { "displayName": "Docs", diff --git a/code/addons/docs/preset.js b/code/addons/docs/preset.js index e45ac5b4cec0..a83f95279e7f 100644 --- a/code/addons/docs/preset.js +++ b/code/addons/docs/preset.js @@ -1 +1 @@ -module.exports = require('./dist/cjs/preset'); +module.exports = require('./dist/preset'); diff --git a/code/addons/docs/preview.js b/code/addons/docs/preview.js index e726cab5a1b6..49ad602f79f4 100644 --- a/code/addons/docs/preview.js +++ b/code/addons/docs/preview.js @@ -1 +1 @@ -export * from './dist/esm/preview'; +export * from './dist/preview'; diff --git a/code/addons/docs/src/DocsRenderer.tsx b/code/addons/docs/src/DocsRenderer.tsx index 83f9a2e49af1..7da390037fc1 100644 --- a/code/addons/docs/src/DocsRenderer.tsx +++ b/code/addons/docs/src/DocsRenderer.tsx @@ -1,6 +1,6 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import type { AnyFramework, Parameters } from '@storybook/types'; +import type { Framework, Parameters } from '@storybook/types'; import type { DocsContextProps, DocsRenderFunction } from '@storybook/preview-web'; import { components as htmlComponents } from '@storybook/components'; import { Docs, CodeOrSourceMdx, AnchorMdx, HeadersMdx } from '@storybook/blocks'; @@ -14,7 +14,7 @@ export const defaultComponents: Record = { ...HeadersMdx, }; -export class DocsRenderer { +export class DocsRenderer { public render: DocsRenderFunction; public unmount: (element: HTMLElement) => void; @@ -33,6 +33,7 @@ export class DocsRenderer { ...defaultComponents, ...docsParameter?.components, }; + ReactDOM.render( diff --git a/code/addons/docs/src/blocks.ts b/code/addons/docs/src/blocks.ts deleted file mode 100644 index 119f7ce62757..000000000000 --- a/code/addons/docs/src/blocks.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@storybook/blocks'; diff --git a/code/addons/docs/src/index.ts b/code/addons/docs/src/index.ts index 807e2656e5b8..b74399955f12 100644 --- a/code/addons/docs/src/index.ts +++ b/code/addons/docs/src/index.ts @@ -1,2 +1,2 @@ -export * from './blocks'; +export * from '@storybook/blocks'; export { DocsRenderer } from './DocsRenderer'; diff --git a/code/lib/preview-web/src/render/StandaloneDocsRender.ts b/code/lib/preview-web/src/render/StandaloneDocsRender.ts index 02137c7c8927..0a8cf5f5061d 100644 --- a/code/lib/preview-web/src/render/StandaloneDocsRender.ts +++ b/code/lib/preview-web/src/render/StandaloneDocsRender.ts @@ -1,6 +1,6 @@ import type { Addon_IndexEntry, - AnyFramework, + Framework, Store_CSFFile, Store_ModuleExports, StoryId, @@ -24,7 +24,7 @@ import { DocsContext } from '../docs-context/DocsContext'; * - *.mdx file that may or may not reference a specific CSF file with `` */ -export class StandaloneDocsRender implements Render { +export class StandaloneDocsRender implements Render { public readonly type: RenderType = 'docs'; public readonly id: StoryId; diff --git a/code/lib/preview/package.json b/code/lib/preview/package.json index 85fe0fc0072f..d01a080cb7c7 100644 --- a/code/lib/preview/package.json +++ b/code/lib/preview/package.json @@ -41,21 +41,16 @@ "require": "./dist/core-client.js", "types": "./dist/core-client.d.ts" }, - "./dist/preview-web": { - "import": "./dist/preview-web.mjs", - "require": "./dist/preview-web.js", - "types": "./dist/preview-web.d.ts" - }, - "./dist/store": { - "import": "./dist/store.mjs", - "require": "./dist/store.js", - "types": "./dist/store.d.ts" - }, "./dist/global/addons": { "import": "./dist/global/addons.mjs", "require": "./dist/global/addons.js", "types": "./dist/global/addons.d.ts" }, + "./dist/global/blocks": { + "import": "./dist/global/blocks.mjs", + "require": "./dist/global/blocks.js", + "types": "./dist/global/blocks.d.ts" + }, "./dist/global/client-api": { "import": "./dist/global/client-api.mjs", "require": "./dist/global/client-api.js", @@ -76,6 +71,16 @@ "require": "./dist/global/store.js", "types": "./dist/global/store.d.ts" }, + "./dist/preview-web": { + "import": "./dist/preview-web.mjs", + "require": "./dist/preview-web.js", + "types": "./dist/preview-web.d.ts" + }, + "./dist/store": { + "import": "./dist/store.mjs", + "require": "./dist/store.js", + "types": "./dist/store.d.ts" + }, "./package.json": "./package.json" }, "main": "dist/index.js", diff --git a/code/lib/preview/src/index.ts b/code/lib/preview/src/index.ts index 83f9f0a5903b..93bec3c69bc4 100644 --- a/code/lib/preview/src/index.ts +++ b/code/lib/preview/src/index.ts @@ -1,26 +1,26 @@ /* eslint-disable no-underscore-dangle */ import * as ADDONS from './addons'; -import * as CLIENT_API from './client-api'; -import * as CORE_CLIENT from './core-client'; -import * as PREVIEW_WEB from './preview-web'; -import * as STORE from './store'; -import * as CHANNELS from './channels'; import * as CHANNEL_POSTMESSAGE from './channel-postmessage'; import * as CHANNEL_WEBSOCKET from './channel-websocket'; +import * as CHANNELS from './channels'; +import * as CLIENT_API from './client-api'; import * as CLIENT_LOGGER from './client-logger'; +import * as CORE_CLIENT from './core-client'; import * as CORE_EVENTS from './core-events'; +import * as PREVIEW_WEB from './preview-web'; +import * as STORE from './store'; (globalThis as any).__STORYBOOK_MODULE_ADDONS__ = ADDONS; -(globalThis as any).__STORYBOOK_MODULE_CLIENT_API__ = CLIENT_API; -(globalThis as any).__STORYBOOK_MODULE_CORE_CLIENT__ = CORE_CLIENT; -(globalThis as any).__STORYBOOK_MODULE_PREVIEW_WEB__ = PREVIEW_WEB; -(globalThis as any).__STORYBOOK_MODULE_STORE__ = STORE; -(globalThis as any).__STORYBOOK_MODULE_CHANNELS__ = CHANNELS; (globalThis as any).__STORYBOOK_MODULE_CHANNEL_POSTMESSAGE__ = CHANNEL_POSTMESSAGE; (globalThis as any).__STORYBOOK_MODULE_CHANNEL_WEBSOCKET__ = CHANNEL_WEBSOCKET; +(globalThis as any).__STORYBOOK_MODULE_CHANNELS__ = CHANNELS; +(globalThis as any).__STORYBOOK_MODULE_CLIENT_API__ = CLIENT_API; (globalThis as any).__STORYBOOK_MODULE_CLIENT_LOGGER__ = CLIENT_LOGGER; +(globalThis as any).__STORYBOOK_MODULE_CORE_CLIENT__ = CORE_CLIENT; (globalThis as any).__STORYBOOK_MODULE_CORE_EVENTS__ = CORE_EVENTS; +(globalThis as any).__STORYBOOK_MODULE_PREVIEW_WEB__ = PREVIEW_WEB; +(globalThis as any).__STORYBOOK_MODULE_STORE__ = STORE; const element = document.getElementById('storybook-script'); diff --git a/code/ui/blocks/package.json b/code/ui/blocks/package.json index 667bc5714203..fbab6e9ef3ad 100644 --- a/code/ui/blocks/package.json +++ b/code/ui/blocks/package.json @@ -67,7 +67,8 @@ "react-colorful": "^5.1.2" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + "react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" }, "publishConfig": { "access": "public" diff --git a/code/ui/blocks/src/blocks/Docs.tsx b/code/ui/blocks/src/blocks/Docs.tsx index d630bdcf2c38..41c0ccb84426 100644 --- a/code/ui/blocks/src/blocks/Docs.tsx +++ b/code/ui/blocks/src/blocks/Docs.tsx @@ -1,13 +1,13 @@ import React from 'react'; import type { FunctionComponent, ComponentType } from 'react'; -import type { AnyFramework, Parameters } from '@storybook/types'; +import type { Framework, Parameters } from '@storybook/types'; import type { Theme } from '@storybook/theming'; import type { DocsContextProps } from './DocsContext'; import { DocsContainer } from './DocsContainer'; import { DocsPage } from './DocsPage'; -export type DocsProps = { +export type DocsProps = { docsParameter: Parameters; context: DocsContextProps; }; diff --git a/code/ui/blocks/src/blocks/external/ExternalDocs.tsx b/code/ui/blocks/src/blocks/external/ExternalDocs.tsx index a4ac09145b42..d7488015851d 100644 --- a/code/ui/blocks/src/blocks/external/ExternalDocs.tsx +++ b/code/ui/blocks/src/blocks/external/ExternalDocs.tsx @@ -1,16 +1,16 @@ import type { FunctionComponent } from 'react'; import React, { useRef } from 'react'; -import type { AnyFramework, ProjectAnnotations } from '@storybook/types'; +import type { Framework, ProjectAnnotations } from '@storybook/types'; import { composeConfigs } from '@storybook/store'; import { Docs } from '../Docs'; import { ExternalPreview } from './ExternalPreview'; -export type ExternalDocsProps = { +export type ExternalDocsProps = { projectAnnotationsList: ProjectAnnotations[]; }; -function usePreview( +function usePreview( projectAnnotations: ProjectAnnotations ) { const previewRef = useRef(); diff --git a/code/yarn.lock b/code/yarn.lock index f174a1f80e1f..a4e1fa244c53 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5513,7 +5513,7 @@ __metadata: fs-extra: ^9.0.1 global: ^4.4.0 react: ^16.8.0 - react-dom: 16.14.0 + react-dom: ^16.14.0 remark-external-links: ^8.0.0 remark-slug: ^6.0.0 ts-dedent: ^2.0.0 @@ -6133,6 +6133,7 @@ __metadata: react-colorful: ^5.1.2 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 + react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 languageName: unknown linkType: soft From d15e5a08c141dbc20c89fa5ef79f08d3aac0da03 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 9 Nov 2022 12:55:03 +0100 Subject: [PATCH 10/42] fix lockfile --- code/addons/docs/package.json | 27 ++++++++++---------- code/addons/essentials/package.json | 38 ----------------------------- code/yarn.lock | 35 ++++++-------------------- 3 files changed, 21 insertions(+), 79 deletions(-) diff --git a/code/addons/docs/package.json b/code/addons/docs/package.json index d76893e6ec1d..4f927a07d114 100644 --- a/code/addons/docs/package.json +++ b/code/addons/docs/package.json @@ -40,16 +40,6 @@ "import": "./dist/preset.mjs", "types": "./dist/preset.d.ts" }, - "./blocks": { - "require": "./dist/blocks.js", - "import": "./dist/blocks.mjs", - "types": "./dist/blocks.d.ts" - }, - "./dist/blocks": { - "require": "./dist/blocks.js", - "import": "./dist/blocks.mjs", - "types": "./dist/blocks.d.ts" - }, "./svelte/HOC.svelte": "./svelte/HOC.svelte", "./ember/index.js": "./ember/index.js", "./web-components/index.js": "./web-components/index.js", @@ -95,8 +85,6 @@ "@storybook/types": "7.0.0-alpha.48", "fs-extra": "^9.0.1", "global": "^4.4.0", - "react": "^16.8.0", - "react-dom": "^16.14.0", "remark-external-links": "^8.0.0", "remark-slug": "^6.0.0", "ts-dedent": "^2.0.0" @@ -105,6 +93,18 @@ "@babel/core": "^7.12.10", "typescript": "~4.6.3" }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "react": { + "optional": true + }, + "react-dom": { + "optional": true + } + }, "publishConfig": { "access": "public" }, @@ -112,8 +112,7 @@ "entries": [ "./src/index.ts", "./src/preset.ts", - "./src/preview.ts", - "./src/blocks.ts" + "./src/preview.ts" ] }, "gitHead": "b58a29b785462f8a8b711b6bb2d7223fd6dc17fd", diff --git a/code/addons/essentials/package.json b/code/addons/essentials/package.json index 7445ad9c83d3..8fbdf1b5fda0 100644 --- a/code/addons/essentials/package.json +++ b/code/addons/essentials/package.json @@ -65,44 +65,6 @@ "peerDependencies": { "@babel/core": "^7.9.6" }, - "peerDependenciesMeta": { - "@storybook/angular": { - "optional": true - }, - "@storybook/html": { - "optional": true - }, - "@storybook/vue": { - "optional": true - }, - "@storybook/vue3": { - "optional": true - }, - "@storybook/web-components": { - "optional": true - }, - "lit": { - "optional": true - }, - "lit-html": { - "optional": true - }, - "react": { - "optional": true - }, - "react-dom": { - "optional": true - }, - "svelte": { - "optional": true - }, - "sveltedoc-parser": { - "optional": true - }, - "vue": { - "optional": true - } - }, "publishConfig": { "access": "public" }, diff --git a/code/yarn.lock b/code/yarn.lock index a4e1fa244c53..0a712f99da7e 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5512,12 +5512,18 @@ __metadata: "@storybook/types": 7.0.0-alpha.48 fs-extra: ^9.0.1 global: ^4.4.0 - react: ^16.8.0 - react-dom: ^16.14.0 remark-external-links: ^8.0.0 remark-slug: ^6.0.0 ts-dedent: ^2.0.0 typescript: ~4.6.3 + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + react: + optional: true + react-dom: + optional: true languageName: unknown linkType: soft @@ -5545,31 +5551,6 @@ __metadata: typescript: ~4.6.3 peerDependencies: "@babel/core": ^7.9.6 - peerDependenciesMeta: - "@storybook/angular": - optional: true - "@storybook/html": - optional: true - "@storybook/vue": - optional: true - "@storybook/vue3": - optional: true - "@storybook/web-components": - optional: true - lit: - optional: true - lit-html: - optional: true - react: - optional: true - react-dom: - optional: true - svelte: - optional: true - sveltedoc-parser: - optional: true - vue: - optional: true languageName: unknown linkType: soft From 247c52723110c8673c2eaeb9fae04e8bf960de10 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 9 Nov 2022 14:13:23 +0100 Subject: [PATCH 11/42] fixes --- code/ui/blocks/src/blocks/enhanceSource.ts | 5 ++--- code/ui/blocks/src/blocks/external/ExternalPreview.ts | 2 +- .../src/controls/react-editable-json-tree/JsonNodes.tsx | 6 ------ 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/code/ui/blocks/src/blocks/enhanceSource.ts b/code/ui/blocks/src/blocks/enhanceSource.ts index 704d36abdba9..05d912f8e81e 100644 --- a/code/ui/blocks/src/blocks/enhanceSource.ts +++ b/code/ui/blocks/src/blocks/enhanceSource.ts @@ -1,5 +1,4 @@ -import type { Parameters } from '@storybook/types'; -import type { Story } from '@storybook/store'; +import type { Parameters, Store_Story } from '@storybook/types'; import { combineParameters } from '@storybook/store'; // ============================================================ @@ -77,7 +76,7 @@ const extract = (targetId: string, { source, locationsMap }: StorySource) => { return extractSource(location, lines); }; -export const enhanceSource = (story: Story): Parameters => { +export const enhanceSource = (story: Store_Story): Parameters => { const { id, parameters } = story; const { storySource, docs = {} } = parameters; const { transformSource } = docs; diff --git a/code/ui/blocks/src/blocks/external/ExternalPreview.ts b/code/ui/blocks/src/blocks/external/ExternalPreview.ts index 3f11aa9bdf46..2c9955af00d4 100644 --- a/code/ui/blocks/src/blocks/external/ExternalPreview.ts +++ b/code/ui/blocks/src/blocks/external/ExternalPreview.ts @@ -36,7 +36,7 @@ export class ExternalPreview extends P private moduleExportsByImportPath: Record = {}; - constructor(public projectAnnotations: ProjectAnnotations) { + constructor(public projectAnnotations: ProjectAnnotations) { super(new Channel()); this.initialize({ diff --git a/code/ui/blocks/src/controls/react-editable-json-tree/JsonNodes.tsx b/code/ui/blocks/src/controls/react-editable-json-tree/JsonNodes.tsx index c78738a2aff0..541a2423d6d1 100644 --- a/code/ui/blocks/src/controls/react-editable-json-tree/JsonNodes.tsx +++ b/code/ui/blocks/src/controls/react-editable-json-tree/JsonNodes.tsx @@ -1086,7 +1086,6 @@ export class JsonObject extends Component { onChildUpdate(childKey: string, childData: any) { const { data, keyPath } = this.state; // Update data - // @ts-expect-error (Converted from ts-ignore) data[childKey] = childData; // Put new data this.setState({ @@ -1117,7 +1116,6 @@ export class JsonObject extends Component { beforeAddAction(key, keyPath, deep, newValue) .then(() => { // Update data - // @ts-expect-error (Converted from ts-ignore) data[key] = newValue; this.setState({ data, @@ -1143,7 +1141,6 @@ export class JsonObject extends Component { return () => { const { beforeRemoveAction, logger } = this.props; const { data, keyPath, nextDeep: deep } = this.state; - // @ts-expect-error (Converted from ts-ignore) const oldValue = data[key]; // Before Remove Action beforeRemoveAction(key, keyPath, deep, oldValue) @@ -1156,7 +1153,6 @@ export class JsonObject extends Component { type: deltaTypes.REMOVE_DELTA_TYPE, }; - // @ts-expect-error (Converted from ts-ignore) delete data[key]; this.setState({ data }); @@ -1182,14 +1178,12 @@ export class JsonObject extends Component { const { data, keyPath, nextDeep: deep } = this.state; // Old value - // @ts-expect-error (Converted from ts-ignore) const oldValue = data[key]; // Before update action beforeUpdateAction(key, keyPath, deep, oldValue, value) .then(() => { // Update value - // @ts-expect-error (Converted from ts-ignore) data[key] = value; // Set state this.setState({ From 655c89cf0a66d067380582b18a120f38961b2683 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 9 Nov 2022 14:26:45 +0100 Subject: [PATCH 12/42] linting --- code/ui/blocks/src/blocks/Heading.tsx | 2 +- code/ui/blocks/src/blocks/Subheading.tsx | 2 +- code/ui/blocks/src/blocks/mdx.tsx | 2 +- code/ui/blocks/src/components/ArgsTable/ArgJsDoc.tsx | 2 +- code/ui/blocks/src/components/ArgsTable/ArgRow.tsx | 6 +++--- code/ui/blocks/src/components/ArgsTable/ArgValue.tsx | 2 +- code/ui/blocks/src/components/ArgsTable/ArgsTable.tsx | 4 ++-- .../blocks/src/components/ArgsTable/NoControlsWarning.tsx | 2 +- code/ui/blocks/src/components/ArgsTable/SectionRow.tsx | 4 ++-- code/ui/blocks/src/components/ArgsTable/TabbedArgsTable.tsx | 2 +- code/ui/blocks/src/components/ColorPalette.tsx | 4 ++-- code/ui/blocks/src/components/Description.tsx | 4 ++-- code/ui/blocks/src/components/DocsPage.tsx | 4 ++-- code/ui/blocks/src/components/EmptyBlock.tsx | 4 ++-- code/ui/blocks/src/components/IconGallery.tsx | 2 +- code/ui/blocks/src/components/Preview.tsx | 6 +++--- code/ui/blocks/src/components/Source.tsx | 2 +- code/ui/blocks/src/components/Story.tsx | 2 +- code/ui/blocks/src/components/Title.tsx | 2 +- code/ui/blocks/src/components/Toolbar.tsx | 1 + code/ui/blocks/src/components/Typeset.tsx | 4 ++-- code/ui/blocks/src/controls/Boolean.tsx | 4 ++-- code/ui/blocks/src/controls/Color.tsx | 6 +++--- code/ui/blocks/src/controls/Date.tsx | 2 +- code/ui/blocks/src/controls/Files.tsx | 2 +- code/ui/blocks/src/controls/Number.tsx | 2 +- code/ui/blocks/src/controls/Object.tsx | 2 +- code/ui/blocks/src/controls/Range.tsx | 2 +- code/ui/blocks/src/controls/Text.tsx | 2 +- code/ui/blocks/src/controls/options/Select.tsx | 2 +- 30 files changed, 44 insertions(+), 43 deletions(-) diff --git a/code/ui/blocks/src/blocks/Heading.tsx b/code/ui/blocks/src/blocks/Heading.tsx index 8f2535fc3d44..351680e53c57 100644 --- a/code/ui/blocks/src/blocks/Heading.tsx +++ b/code/ui/blocks/src/blocks/Heading.tsx @@ -1,6 +1,6 @@ import type { FC } from 'react'; import React from 'react'; -import { H2 } from '@storybook/components'; +import { H2 } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies import { HeaderMdx } from './mdx'; export interface HeadingProps { diff --git a/code/ui/blocks/src/blocks/Subheading.tsx b/code/ui/blocks/src/blocks/Subheading.tsx index 857facdda25f..026d92244905 100644 --- a/code/ui/blocks/src/blocks/Subheading.tsx +++ b/code/ui/blocks/src/blocks/Subheading.tsx @@ -1,6 +1,6 @@ import type { FC } from 'react'; import React from 'react'; -import { H3 } from '@storybook/components'; +import { H3 } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies import { HeaderMdx } from './mdx'; import type { HeadingProps } from './Heading'; diff --git a/code/ui/blocks/src/blocks/mdx.tsx b/code/ui/blocks/src/blocks/mdx.tsx index c7e14328a6ac..a0f66b528465 100644 --- a/code/ui/blocks/src/blocks/mdx.tsx +++ b/code/ui/blocks/src/blocks/mdx.tsx @@ -1,7 +1,7 @@ import type { FC, SyntheticEvent } from 'react'; import React, { useContext } from 'react'; import { NAVIGATE_URL } from '@storybook/core-events'; -import { Code, components } from '@storybook/components'; +import { Code, components } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies import global from 'global'; import { styled } from '@storybook/theming'; import { Source } from '../components'; diff --git a/code/ui/blocks/src/components/ArgsTable/ArgJsDoc.tsx b/code/ui/blocks/src/components/ArgsTable/ArgJsDoc.tsx index 2533f06842aa..1609bf8616d3 100644 --- a/code/ui/blocks/src/components/ArgsTable/ArgJsDoc.tsx +++ b/code/ui/blocks/src/components/ArgsTable/ArgJsDoc.tsx @@ -1,7 +1,7 @@ import type { FC } from 'react'; import React from 'react'; import { styled } from '@storybook/theming'; -import { codeCommon } from '@storybook/components'; +import { codeCommon } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies import type { JsDocTags } from './types'; interface ArgJsDocArgs { diff --git a/code/ui/blocks/src/components/ArgsTable/ArgRow.tsx b/code/ui/blocks/src/components/ArgsTable/ArgRow.tsx index ea5f856c0027..1bc6a19ac0a5 100644 --- a/code/ui/blocks/src/components/ArgsTable/ArgRow.tsx +++ b/code/ui/blocks/src/components/ArgsTable/ArgRow.tsx @@ -1,9 +1,9 @@ import type { FC } from 'react'; import React from 'react'; -import Markdown from 'markdown-to-jsx'; -import { transparentize } from 'polished'; +import Markdown from 'markdown-to-jsx'; // eslint-disable-line import/no-extraneous-dependencies +import { transparentize } from 'polished'; // eslint-disable-line import/no-extraneous-dependencies import { styled } from '@storybook/theming'; -import { codeCommon } from '@storybook/components'; +import { codeCommon } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies import type { ArgType, Args, TableAnnotation } from './types'; import { ArgJsDoc } from './ArgJsDoc'; import { ArgValue } from './ArgValue'; diff --git a/code/ui/blocks/src/components/ArgsTable/ArgValue.tsx b/code/ui/blocks/src/components/ArgsTable/ArgValue.tsx index 2a101f5c71e0..96c978f24723 100644 --- a/code/ui/blocks/src/components/ArgsTable/ArgValue.tsx +++ b/code/ui/blocks/src/components/ArgsTable/ArgValue.tsx @@ -3,7 +3,7 @@ import React, { useState } from 'react'; import memoize from 'memoizerific'; import uniq from 'lodash/uniq'; import { styled } from '@storybook/theming'; -import { WithTooltipPure, Icons, SyntaxHighlighter, codeCommon } from '@storybook/components'; +import { WithTooltipPure, Icons, SyntaxHighlighter, codeCommon } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies import type { PropSummaryValue } from './types'; interface ArgValueProps { diff --git a/code/ui/blocks/src/components/ArgsTable/ArgsTable.tsx b/code/ui/blocks/src/components/ArgsTable/ArgsTable.tsx index d950828b2e74..15e8e7588c82 100644 --- a/code/ui/blocks/src/components/ArgsTable/ArgsTable.tsx +++ b/code/ui/blocks/src/components/ArgsTable/ArgsTable.tsx @@ -2,10 +2,10 @@ import type { FC } from 'react'; import React from 'react'; import pickBy from 'lodash/pickBy'; import { styled } from '@storybook/theming'; -import { opacify, transparentize, darken, lighten } from 'polished'; +import { opacify, transparentize, darken, lighten } from 'polished'; // eslint-disable-line import/no-extraneous-dependencies import { includeConditionalArg } from '@storybook/csf'; import { once } from '@storybook/client-logger'; -import { IconButton, Icons, Link, ResetWrapper } from '@storybook/components'; +import { IconButton, Icons, Link, ResetWrapper } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies import { ArgRow } from './ArgRow'; import { SectionRow } from './SectionRow'; diff --git a/code/ui/blocks/src/components/ArgsTable/NoControlsWarning.tsx b/code/ui/blocks/src/components/ArgsTable/NoControlsWarning.tsx index 5347cad17d42..19eaec60a3ba 100644 --- a/code/ui/blocks/src/components/ArgsTable/NoControlsWarning.tsx +++ b/code/ui/blocks/src/components/ArgsTable/NoControlsWarning.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { styled } from '@storybook/theming'; -import { Link } from '@storybook/components'; +import { Link } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies const NoControlsWrapper = styled.div(({ theme }) => ({ background: theme.background.warning, diff --git a/code/ui/blocks/src/components/ArgsTable/SectionRow.tsx b/code/ui/blocks/src/components/ArgsTable/SectionRow.tsx index 5504c9411da1..2dbe5f70545e 100644 --- a/code/ui/blocks/src/components/ArgsTable/SectionRow.tsx +++ b/code/ui/blocks/src/components/ArgsTable/SectionRow.tsx @@ -1,8 +1,8 @@ import type { FC } from 'react'; import React, { useState } from 'react'; -import { transparentize } from 'polished'; +import { transparentize } from 'polished'; // eslint-disable-line import/no-extraneous-dependencies import { styled } from '@storybook/theming'; -import { Icons } from '@storybook/components'; +import { Icons } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies type Level = 'section' | 'subsection'; diff --git a/code/ui/blocks/src/components/ArgsTable/TabbedArgsTable.tsx b/code/ui/blocks/src/components/ArgsTable/TabbedArgsTable.tsx index 99a1b46f902c..50f4871b81f8 100644 --- a/code/ui/blocks/src/components/ArgsTable/TabbedArgsTable.tsx +++ b/code/ui/blocks/src/components/ArgsTable/TabbedArgsTable.tsx @@ -1,6 +1,6 @@ import type { FC } from 'react'; import React from 'react'; -import { TabsState } from '@storybook/components'; +import { TabsState } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies import type { ArgsTableProps, SortType } from './ArgsTable'; // eslint-disable-next-line import/no-cycle diff --git a/code/ui/blocks/src/components/ColorPalette.tsx b/code/ui/blocks/src/components/ColorPalette.tsx index 5e018b24388e..488c71b04ad9 100644 --- a/code/ui/blocks/src/components/ColorPalette.tsx +++ b/code/ui/blocks/src/components/ColorPalette.tsx @@ -1,8 +1,8 @@ import type { FunctionComponent } from 'react'; import React from 'react'; -import { transparentize } from 'polished'; +import { transparentize } from 'polished'; // eslint-disable-line import/no-extraneous-dependencies import { styled } from '@storybook/theming'; -import { ResetWrapper } from '@storybook/components'; +import { ResetWrapper } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies import { getBlockBackgroundStyle } from './BlockBackgroundStyles'; diff --git a/code/ui/blocks/src/components/Description.tsx b/code/ui/blocks/src/components/Description.tsx index fa8d5fff5ae5..fc6f07dc8139 100644 --- a/code/ui/blocks/src/components/Description.tsx +++ b/code/ui/blocks/src/components/Description.tsx @@ -1,7 +1,7 @@ import type { FC } from 'react'; import React from 'react'; -import Markdown from 'markdown-to-jsx'; -import { components, ResetWrapper } from '@storybook/components'; +import Markdown from 'markdown-to-jsx'; // eslint-disable-line import/no-extraneous-dependencies +import { components, ResetWrapper } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies export interface DescriptionProps { markdown: string; diff --git a/code/ui/blocks/src/components/DocsPage.tsx b/code/ui/blocks/src/components/DocsPage.tsx index 651c8c9c6a4f..089a02ecbd62 100644 --- a/code/ui/blocks/src/components/DocsPage.tsx +++ b/code/ui/blocks/src/components/DocsPage.tsx @@ -1,6 +1,6 @@ -import { withReset } from '@storybook/components'; +import { withReset } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies import { styled } from '@storybook/theming'; -import { transparentize } from 'polished'; +import { transparentize } from 'polished'; // eslint-disable-line import/no-extraneous-dependencies import type { FC } from 'react'; import React from 'react'; diff --git a/code/ui/blocks/src/components/EmptyBlock.tsx b/code/ui/blocks/src/components/EmptyBlock.tsx index 41e84c48070b..47f7bb15b434 100644 --- a/code/ui/blocks/src/components/EmptyBlock.tsx +++ b/code/ui/blocks/src/components/EmptyBlock.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { transparentize } from 'polished'; +import { transparentize } from 'polished'; // eslint-disable-line import/no-extraneous-dependencies import { styled } from '@storybook/theming'; -import { withReset } from '@storybook/components'; +import { withReset } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies const Wrapper = styled.div(withReset, ({ theme }) => ({ backgroundColor: theme.base === 'light' ? 'rgba(0,0,0,.01)' : 'rgba(255,255,255,.01)', diff --git a/code/ui/blocks/src/components/IconGallery.tsx b/code/ui/blocks/src/components/IconGallery.tsx index 22456d889ae2..cf27be34a3eb 100644 --- a/code/ui/blocks/src/components/IconGallery.tsx +++ b/code/ui/blocks/src/components/IconGallery.tsx @@ -1,7 +1,7 @@ import type { FunctionComponent } from 'react'; import React from 'react'; import { styled } from '@storybook/theming'; -import { ResetWrapper } from '@storybook/components'; +import { ResetWrapper } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies import { getBlockBackgroundStyle } from './BlockBackgroundStyles'; diff --git a/code/ui/blocks/src/components/Preview.tsx b/code/ui/blocks/src/components/Preview.tsx index f93ba28cdf2f..96865be5dd46 100644 --- a/code/ui/blocks/src/components/Preview.tsx +++ b/code/ui/blocks/src/components/Preview.tsx @@ -1,10 +1,10 @@ import type { ClipboardEvent, FC, ReactElement, ReactNode } from 'react'; import React, { Children, useCallback, useState } from 'react'; -import { darken } from 'polished'; +import { darken } from 'polished'; // eslint-disable-line import/no-extraneous-dependencies import { styled } from '@storybook/theming'; import global from 'global'; -import { ActionBar, Zoom } from '@storybook/components'; +import { ActionBar, Zoom } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies import type { ActionItem } from '@storybook/components'; import type { SourceProps } from '.'; @@ -218,7 +218,7 @@ export const Preview: FC = ({ const { window: globalWindow } = global; const copyToClipboard = useCallback(async (text: string) => { - const { createCopyToClipboardFunction } = await import('@storybook/components'); + const { createCopyToClipboardFunction } = await import('@storybook/components'); // eslint-disable-line import/no-extraneous-dependencies createCopyToClipboardFunction(); }, []); diff --git a/code/ui/blocks/src/components/Source.tsx b/code/ui/blocks/src/components/Source.tsx index 26dc904b1b18..730dfc6c24a9 100644 --- a/code/ui/blocks/src/components/Source.tsx +++ b/code/ui/blocks/src/components/Source.tsx @@ -1,7 +1,7 @@ import type { ComponentProps, FunctionComponent } from 'react'; import React from 'react'; import { styled, ThemeProvider, convert, themes } from '@storybook/theming'; -import { SyntaxHighlighter } from '@storybook/components'; +import { SyntaxHighlighter } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies import { EmptyBlock } from './EmptyBlock'; diff --git a/code/ui/blocks/src/components/Story.tsx b/code/ui/blocks/src/components/Story.tsx index 4719a8ab6f4f..11570922cc1f 100644 --- a/code/ui/blocks/src/components/Story.tsx +++ b/code/ui/blocks/src/components/Story.tsx @@ -2,7 +2,7 @@ import global from 'global'; import type { ElementType, FunctionComponent } from 'react'; import React, { createElement, Fragment } from 'react'; import type { Parameters } from '@storybook/types'; -import { Loader, getStoryHref } from '@storybook/components'; +import { Loader, getStoryHref } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies // eslint-disable-next-line import/no-cycle import { EmptyBlock } from '.'; import { IFrame } from './IFrame'; diff --git a/code/ui/blocks/src/components/Title.tsx b/code/ui/blocks/src/components/Title.tsx index bbff95701d41..20e1db72310d 100644 --- a/code/ui/blocks/src/components/Title.tsx +++ b/code/ui/blocks/src/components/Title.tsx @@ -1,6 +1,6 @@ import type { Theme } from '@storybook/theming'; import { styled } from '@storybook/theming'; -import { withReset } from '@storybook/components'; +import { withReset } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies const breakpoint = 600; diff --git a/code/ui/blocks/src/components/Toolbar.tsx b/code/ui/blocks/src/components/Toolbar.tsx index 0838f19f1818..df1c70dff877 100644 --- a/code/ui/blocks/src/components/Toolbar.tsx +++ b/code/ui/blocks/src/components/Toolbar.tsx @@ -1,6 +1,7 @@ import type { FC, MouseEvent } from 'react'; import React, { Fragment } from 'react'; import { styled } from '@storybook/theming'; +// eslint-disable-next-line import/no-extraneous-dependencies import { FlexBar, Icons, diff --git a/code/ui/blocks/src/components/Typeset.tsx b/code/ui/blocks/src/components/Typeset.tsx index 35f0dda5f31d..4ecf8ab70929 100644 --- a/code/ui/blocks/src/components/Typeset.tsx +++ b/code/ui/blocks/src/components/Typeset.tsx @@ -1,8 +1,8 @@ import type { FC } from 'react'; import React from 'react'; -import { transparentize } from 'polished'; +import { transparentize } from 'polished'; // eslint-disable-line import/no-extraneous-dependencies import { styled } from '@storybook/theming'; -import { withReset } from '@storybook/components'; +import { withReset } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies import { getBlockBackgroundStyle } from './BlockBackgroundStyles'; const Label = styled.div(({ theme }) => ({ diff --git a/code/ui/blocks/src/controls/Boolean.tsx b/code/ui/blocks/src/controls/Boolean.tsx index 8abec1e34902..8bd205b8373c 100644 --- a/code/ui/blocks/src/controls/Boolean.tsx +++ b/code/ui/blocks/src/controls/Boolean.tsx @@ -1,10 +1,10 @@ import type { FC } from 'react'; import React, { useCallback } from 'react'; -import { opacify, transparentize } from 'polished'; +import { opacify, transparentize } from 'polished'; // eslint-disable-line import/no-extraneous-dependencies import { styled } from '@storybook/theming'; -import { Form } from '@storybook/components'; +import { Form } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies import { getControlId, getControlSetterButtonId } from './helpers'; import type { ControlProps, BooleanValue, BooleanConfig } from './types'; diff --git a/code/ui/blocks/src/controls/Color.tsx b/code/ui/blocks/src/controls/Color.tsx index 3fa5a655e224..995c4d1152b1 100644 --- a/code/ui/blocks/src/controls/Color.tsx +++ b/code/ui/blocks/src/controls/Color.tsx @@ -1,10 +1,10 @@ import type { FC, ChangeEvent, FocusEvent } from 'react'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; -import { HexColorPicker, HslaStringColorPicker, RgbaStringColorPicker } from 'react-colorful'; -import convert from 'color-convert'; +import { HexColorPicker, HslaStringColorPicker, RgbaStringColorPicker } from 'react-colorful'; // eslint-disable-line import/no-extraneous-dependencies +import convert from 'color-convert'; // eslint-disable-line import/no-extraneous-dependencies import throttle from 'lodash/throttle'; import { styled } from '@storybook/theming'; -import { TooltipNote, WithTooltip, Form, Icons } from '@storybook/components'; +import { TooltipNote, WithTooltip, Form, Icons } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies import type { ControlProps, ColorValue, ColorConfig, PresetColor } from './types'; import { getControlId } from './helpers'; diff --git a/code/ui/blocks/src/controls/Date.tsx b/code/ui/blocks/src/controls/Date.tsx index 0baf920593db..a850fff46b13 100644 --- a/code/ui/blocks/src/controls/Date.tsx +++ b/code/ui/blocks/src/controls/Date.tsx @@ -1,7 +1,7 @@ import type { FC, ChangeEvent, RefObject } from 'react'; import React, { useState, useRef, useEffect } from 'react'; import { styled } from '@storybook/theming'; -import { Form } from '@storybook/components'; +import { Form } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies import type { ControlProps, DateValue, DateConfig } from './types'; import { getControlId } from './helpers'; diff --git a/code/ui/blocks/src/controls/Files.tsx b/code/ui/blocks/src/controls/Files.tsx index 2354703c2917..eb80b40fe8d1 100644 --- a/code/ui/blocks/src/controls/Files.tsx +++ b/code/ui/blocks/src/controls/Files.tsx @@ -1,7 +1,7 @@ import type { ChangeEvent, FC } from 'react'; import React from 'react'; import { styled } from '@storybook/theming'; -import { Form } from '@storybook/components'; +import { Form } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies import type { ControlProps } from './types'; import { getControlId } from './helpers'; diff --git a/code/ui/blocks/src/controls/Number.tsx b/code/ui/blocks/src/controls/Number.tsx index 551d5fb7417e..42a8ae2129dd 100644 --- a/code/ui/blocks/src/controls/Number.tsx +++ b/code/ui/blocks/src/controls/Number.tsx @@ -1,7 +1,7 @@ import type { FC, ChangeEvent } from 'react'; import React, { useState, useCallback, useEffect, useRef } from 'react'; import { styled } from '@storybook/theming'; -import { Form } from '@storybook/components'; +import { Form } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies import { getControlId, getControlSetterButtonId } from './helpers'; import type { ControlProps, NumberValue, NumberConfig } from './types'; diff --git a/code/ui/blocks/src/controls/Object.tsx b/code/ui/blocks/src/controls/Object.tsx index fbd0a91ab9ad..e628afee6ec6 100644 --- a/code/ui/blocks/src/controls/Object.tsx +++ b/code/ui/blocks/src/controls/Object.tsx @@ -3,7 +3,7 @@ import cloneDeep from 'lodash/cloneDeep'; import type { ComponentProps, SyntheticEvent, FC, FocusEvent } from 'react'; import React, { useCallback, useMemo, useState, useEffect, useRef } from 'react'; import { styled, useTheme, type Theme } from '@storybook/theming'; -import { Form, Icons, type IconsProps, IconButton } from '@storybook/components'; +import { Form, Icons, type IconsProps, IconButton } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies import { JsonTree, getObjectType } from './react-editable-json-tree'; import { getControlId, getControlSetterButtonId } from './helpers'; import type { ControlProps, ObjectValue, ObjectConfig } from './types'; diff --git a/code/ui/blocks/src/controls/Range.tsx b/code/ui/blocks/src/controls/Range.tsx index adf0aafd11f8..0c5459ca6f06 100644 --- a/code/ui/blocks/src/controls/Range.tsx +++ b/code/ui/blocks/src/controls/Range.tsx @@ -2,7 +2,7 @@ import type { FC, ChangeEvent } from 'react'; import React, { useMemo } from 'react'; import { styled } from '@storybook/theming'; -import { lighten, darken, rgba } from 'polished'; +import { lighten, darken, rgba } from 'polished'; // eslint-disable-line import/no-extraneous-dependencies import { getControlId } from './helpers'; import type { ControlProps, NumberValue, RangeConfig } from './types'; diff --git a/code/ui/blocks/src/controls/Text.tsx b/code/ui/blocks/src/controls/Text.tsx index d7a1e312784d..ec7d45643abe 100644 --- a/code/ui/blocks/src/controls/Text.tsx +++ b/code/ui/blocks/src/controls/Text.tsx @@ -1,7 +1,7 @@ import type { FC, ChangeEvent } from 'react'; import React, { useCallback, useState } from 'react'; import { styled } from '@storybook/theming'; -import { Form } from '@storybook/components'; +import { Form } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies import { getControlId, getControlSetterButtonId } from './helpers'; import type { ControlProps, TextValue, TextConfig } from './types'; diff --git a/code/ui/blocks/src/controls/options/Select.tsx b/code/ui/blocks/src/controls/options/Select.tsx index f033c131bd71..ffca796a50eb 100644 --- a/code/ui/blocks/src/controls/options/Select.tsx +++ b/code/ui/blocks/src/controls/options/Select.tsx @@ -3,7 +3,7 @@ import React from 'react'; import { styled } from '@storybook/theming'; import type { CSSObject } from '@storybook/theming'; import { logger } from '@storybook/client-logger'; -import { Icons } from '@storybook/components'; +import { Icons } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies import type { ControlProps, OptionsSelection, NormalizedOptionsConfig } from '../types'; From 9bcf7350defcea5bbc63b072568ebd1a3ba891b2 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 9 Nov 2022 15:03:11 +0100 Subject: [PATCH 13/42] fixes --- code/lib/builder-vite/package.json | 1 + code/yarn.lock | 1 + 2 files changed, 2 insertions(+) diff --git a/code/lib/builder-vite/package.json b/code/lib/builder-vite/package.json index 59917fbdc834..fcb6fed5af64 100644 --- a/code/lib/builder-vite/package.json +++ b/code/lib/builder-vite/package.json @@ -24,6 +24,7 @@ "@storybook/core-common": "7.0.0-alpha.48", "@storybook/mdx2-csf": "next", "@storybook/node-logger": "7.0.0-alpha.48", + "@storybook/preview": "7.0.0-alpha.48", "@storybook/preview-web": "7.0.0-alpha.48", "@storybook/source-loader": "7.0.0-alpha.48", "@storybook/types": "7.0.0-alpha.48", diff --git a/code/yarn.lock b/code/yarn.lock index c80c03729fdd..0c1a92210f20 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6151,6 +6151,7 @@ __metadata: "@storybook/core-common": 7.0.0-alpha.48 "@storybook/mdx2-csf": next "@storybook/node-logger": 7.0.0-alpha.48 + "@storybook/preview": 7.0.0-alpha.48 "@storybook/preview-web": 7.0.0-alpha.48 "@storybook/source-loader": 7.0.0-alpha.48 "@storybook/types": 7.0.0-alpha.48 From e3a46f59b427697838a60cd246f263393644ab3e Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 11 Nov 2022 11:11:07 +0100 Subject: [PATCH 14/42] fixes --- code/ui/blocks/package.json | 18 +++++++++++------- code/ui/blocks/src/blocks/Heading.tsx | 2 +- code/ui/blocks/src/blocks/Subheading.tsx | 2 +- code/ui/blocks/src/blocks/mdx.tsx | 2 +- .../src/components/ArgsTable/ArgJsDoc.tsx | 2 +- .../blocks/src/components/ArgsTable/ArgRow.tsx | 6 +++--- .../src/components/ArgsTable/ArgValue.tsx | 2 +- .../src/components/ArgsTable/ArgsTable.tsx | 4 ++-- .../components/ArgsTable/NoControlsWarning.tsx | 2 +- .../src/components/ArgsTable/SectionRow.tsx | 4 ++-- .../components/ArgsTable/TabbedArgsTable.tsx | 2 +- code/ui/blocks/src/components/ColorPalette.tsx | 4 ++-- code/ui/blocks/src/components/Description.tsx | 4 ++-- code/ui/blocks/src/components/DocsPage.tsx | 4 ++-- code/ui/blocks/src/components/EmptyBlock.tsx | 4 ++-- code/ui/blocks/src/components/IconGallery.tsx | 2 +- code/ui/blocks/src/components/Preview.tsx | 6 +++--- code/ui/blocks/src/components/Source.tsx | 2 +- code/ui/blocks/src/components/Story.tsx | 2 +- code/ui/blocks/src/components/Title.tsx | 2 +- code/ui/blocks/src/components/Toolbar.tsx | 1 - code/ui/blocks/src/components/Typeset.tsx | 4 ++-- code/ui/blocks/src/controls/Boolean.tsx | 4 ++-- code/ui/blocks/src/controls/Color.tsx | 6 +++--- code/ui/blocks/src/controls/Date.tsx | 2 +- code/ui/blocks/src/controls/Files.tsx | 2 +- code/ui/blocks/src/controls/Number.tsx | 2 +- code/ui/blocks/src/controls/Object.tsx | 2 +- code/ui/blocks/src/controls/Range.tsx | 2 +- code/ui/blocks/src/controls/Text.tsx | 2 +- code/ui/blocks/src/controls/options/Select.tsx | 2 +- code/yarn.lock | 4 ++++ 32 files changed, 58 insertions(+), 51 deletions(-) diff --git a/code/ui/blocks/package.json b/code/ui/blocks/package.json index fbab6e9ef3ad..72c46be00fa6 100644 --- a/code/ui/blocks/package.json +++ b/code/ui/blocks/package.json @@ -42,8 +42,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { + "@storybook/api": "7.0.0-alpha.48", "@storybook/channels": "7.0.0-alpha.48", "@storybook/client-logger": "7.0.0-alpha.48", + "@storybook/components": "7.0.0-alpha.48", "@storybook/core-events": "7.0.0-alpha.48", "@storybook/csf": "next", "@storybook/docs-tools": "7.0.0-alpha.48", @@ -52,19 +54,21 @@ "@storybook/theming": "7.0.0-alpha.48", "@storybook/types": "7.0.0-alpha.48", "@types/lodash": "^4.14.167", + "color-convert": "^2.0.1", "dequal": "^2.0.2", "global": "^4.4.0", "lodash": "^4.17.21", - "memoizerific": "^1.11.3" + "markdown-to-jsx": "^7.1.3", + "memoizerific": "^1.11.3", + "polished": "^4.2.2", + "react-colorful": "^5.1.2", + "ts-dedent": "^2.0.0", + "util-deprecate": "^1.0.2" }, "devDependencies": { "@storybook/addon-actions": "7.0.0-alpha.48", - "@storybook/components": "7.0.0-alpha.48", - "@types/color-convert": "^2.0.0", - "color-convert": "^2.0.1", - "markdown-to-jsx": "^7.1.3", - "polished": "^4.2.2", - "react-colorful": "^5.1.2" + "@storybook/addons": "7.0.0-alpha.48", + "@types/color-convert": "^2.0.0" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0", diff --git a/code/ui/blocks/src/blocks/Heading.tsx b/code/ui/blocks/src/blocks/Heading.tsx index 351680e53c57..8f2535fc3d44 100644 --- a/code/ui/blocks/src/blocks/Heading.tsx +++ b/code/ui/blocks/src/blocks/Heading.tsx @@ -1,6 +1,6 @@ import type { FC } from 'react'; import React from 'react'; -import { H2 } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { H2 } from '@storybook/components'; import { HeaderMdx } from './mdx'; export interface HeadingProps { diff --git a/code/ui/blocks/src/blocks/Subheading.tsx b/code/ui/blocks/src/blocks/Subheading.tsx index 026d92244905..857facdda25f 100644 --- a/code/ui/blocks/src/blocks/Subheading.tsx +++ b/code/ui/blocks/src/blocks/Subheading.tsx @@ -1,6 +1,6 @@ import type { FC } from 'react'; import React from 'react'; -import { H3 } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { H3 } from '@storybook/components'; import { HeaderMdx } from './mdx'; import type { HeadingProps } from './Heading'; diff --git a/code/ui/blocks/src/blocks/mdx.tsx b/code/ui/blocks/src/blocks/mdx.tsx index a0f66b528465..c7e14328a6ac 100644 --- a/code/ui/blocks/src/blocks/mdx.tsx +++ b/code/ui/blocks/src/blocks/mdx.tsx @@ -1,7 +1,7 @@ import type { FC, SyntheticEvent } from 'react'; import React, { useContext } from 'react'; import { NAVIGATE_URL } from '@storybook/core-events'; -import { Code, components } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { Code, components } from '@storybook/components'; import global from 'global'; import { styled } from '@storybook/theming'; import { Source } from '../components'; diff --git a/code/ui/blocks/src/components/ArgsTable/ArgJsDoc.tsx b/code/ui/blocks/src/components/ArgsTable/ArgJsDoc.tsx index 1609bf8616d3..2533f06842aa 100644 --- a/code/ui/blocks/src/components/ArgsTable/ArgJsDoc.tsx +++ b/code/ui/blocks/src/components/ArgsTable/ArgJsDoc.tsx @@ -1,7 +1,7 @@ import type { FC } from 'react'; import React from 'react'; import { styled } from '@storybook/theming'; -import { codeCommon } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { codeCommon } from '@storybook/components'; import type { JsDocTags } from './types'; interface ArgJsDocArgs { diff --git a/code/ui/blocks/src/components/ArgsTable/ArgRow.tsx b/code/ui/blocks/src/components/ArgsTable/ArgRow.tsx index 1bc6a19ac0a5..ea5f856c0027 100644 --- a/code/ui/blocks/src/components/ArgsTable/ArgRow.tsx +++ b/code/ui/blocks/src/components/ArgsTable/ArgRow.tsx @@ -1,9 +1,9 @@ import type { FC } from 'react'; import React from 'react'; -import Markdown from 'markdown-to-jsx'; // eslint-disable-line import/no-extraneous-dependencies -import { transparentize } from 'polished'; // eslint-disable-line import/no-extraneous-dependencies +import Markdown from 'markdown-to-jsx'; +import { transparentize } from 'polished'; import { styled } from '@storybook/theming'; -import { codeCommon } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { codeCommon } from '@storybook/components'; import type { ArgType, Args, TableAnnotation } from './types'; import { ArgJsDoc } from './ArgJsDoc'; import { ArgValue } from './ArgValue'; diff --git a/code/ui/blocks/src/components/ArgsTable/ArgValue.tsx b/code/ui/blocks/src/components/ArgsTable/ArgValue.tsx index 96c978f24723..2a101f5c71e0 100644 --- a/code/ui/blocks/src/components/ArgsTable/ArgValue.tsx +++ b/code/ui/blocks/src/components/ArgsTable/ArgValue.tsx @@ -3,7 +3,7 @@ import React, { useState } from 'react'; import memoize from 'memoizerific'; import uniq from 'lodash/uniq'; import { styled } from '@storybook/theming'; -import { WithTooltipPure, Icons, SyntaxHighlighter, codeCommon } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { WithTooltipPure, Icons, SyntaxHighlighter, codeCommon } from '@storybook/components'; import type { PropSummaryValue } from './types'; interface ArgValueProps { diff --git a/code/ui/blocks/src/components/ArgsTable/ArgsTable.tsx b/code/ui/blocks/src/components/ArgsTable/ArgsTable.tsx index 15e8e7588c82..d950828b2e74 100644 --- a/code/ui/blocks/src/components/ArgsTable/ArgsTable.tsx +++ b/code/ui/blocks/src/components/ArgsTable/ArgsTable.tsx @@ -2,10 +2,10 @@ import type { FC } from 'react'; import React from 'react'; import pickBy from 'lodash/pickBy'; import { styled } from '@storybook/theming'; -import { opacify, transparentize, darken, lighten } from 'polished'; // eslint-disable-line import/no-extraneous-dependencies +import { opacify, transparentize, darken, lighten } from 'polished'; import { includeConditionalArg } from '@storybook/csf'; import { once } from '@storybook/client-logger'; -import { IconButton, Icons, Link, ResetWrapper } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { IconButton, Icons, Link, ResetWrapper } from '@storybook/components'; import { ArgRow } from './ArgRow'; import { SectionRow } from './SectionRow'; diff --git a/code/ui/blocks/src/components/ArgsTable/NoControlsWarning.tsx b/code/ui/blocks/src/components/ArgsTable/NoControlsWarning.tsx index 19eaec60a3ba..5347cad17d42 100644 --- a/code/ui/blocks/src/components/ArgsTable/NoControlsWarning.tsx +++ b/code/ui/blocks/src/components/ArgsTable/NoControlsWarning.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { styled } from '@storybook/theming'; -import { Link } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { Link } from '@storybook/components'; const NoControlsWrapper = styled.div(({ theme }) => ({ background: theme.background.warning, diff --git a/code/ui/blocks/src/components/ArgsTable/SectionRow.tsx b/code/ui/blocks/src/components/ArgsTable/SectionRow.tsx index 2dbe5f70545e..5504c9411da1 100644 --- a/code/ui/blocks/src/components/ArgsTable/SectionRow.tsx +++ b/code/ui/blocks/src/components/ArgsTable/SectionRow.tsx @@ -1,8 +1,8 @@ import type { FC } from 'react'; import React, { useState } from 'react'; -import { transparentize } from 'polished'; // eslint-disable-line import/no-extraneous-dependencies +import { transparentize } from 'polished'; import { styled } from '@storybook/theming'; -import { Icons } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { Icons } from '@storybook/components'; type Level = 'section' | 'subsection'; diff --git a/code/ui/blocks/src/components/ArgsTable/TabbedArgsTable.tsx b/code/ui/blocks/src/components/ArgsTable/TabbedArgsTable.tsx index 50f4871b81f8..99a1b46f902c 100644 --- a/code/ui/blocks/src/components/ArgsTable/TabbedArgsTable.tsx +++ b/code/ui/blocks/src/components/ArgsTable/TabbedArgsTable.tsx @@ -1,6 +1,6 @@ import type { FC } from 'react'; import React from 'react'; -import { TabsState } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { TabsState } from '@storybook/components'; import type { ArgsTableProps, SortType } from './ArgsTable'; // eslint-disable-next-line import/no-cycle diff --git a/code/ui/blocks/src/components/ColorPalette.tsx b/code/ui/blocks/src/components/ColorPalette.tsx index 488c71b04ad9..5e018b24388e 100644 --- a/code/ui/blocks/src/components/ColorPalette.tsx +++ b/code/ui/blocks/src/components/ColorPalette.tsx @@ -1,8 +1,8 @@ import type { FunctionComponent } from 'react'; import React from 'react'; -import { transparentize } from 'polished'; // eslint-disable-line import/no-extraneous-dependencies +import { transparentize } from 'polished'; import { styled } from '@storybook/theming'; -import { ResetWrapper } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { ResetWrapper } from '@storybook/components'; import { getBlockBackgroundStyle } from './BlockBackgroundStyles'; diff --git a/code/ui/blocks/src/components/Description.tsx b/code/ui/blocks/src/components/Description.tsx index fc6f07dc8139..fa8d5fff5ae5 100644 --- a/code/ui/blocks/src/components/Description.tsx +++ b/code/ui/blocks/src/components/Description.tsx @@ -1,7 +1,7 @@ import type { FC } from 'react'; import React from 'react'; -import Markdown from 'markdown-to-jsx'; // eslint-disable-line import/no-extraneous-dependencies -import { components, ResetWrapper } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import Markdown from 'markdown-to-jsx'; +import { components, ResetWrapper } from '@storybook/components'; export interface DescriptionProps { markdown: string; diff --git a/code/ui/blocks/src/components/DocsPage.tsx b/code/ui/blocks/src/components/DocsPage.tsx index 089a02ecbd62..651c8c9c6a4f 100644 --- a/code/ui/blocks/src/components/DocsPage.tsx +++ b/code/ui/blocks/src/components/DocsPage.tsx @@ -1,6 +1,6 @@ -import { withReset } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { withReset } from '@storybook/components'; import { styled } from '@storybook/theming'; -import { transparentize } from 'polished'; // eslint-disable-line import/no-extraneous-dependencies +import { transparentize } from 'polished'; import type { FC } from 'react'; import React from 'react'; diff --git a/code/ui/blocks/src/components/EmptyBlock.tsx b/code/ui/blocks/src/components/EmptyBlock.tsx index 47f7bb15b434..41e84c48070b 100644 --- a/code/ui/blocks/src/components/EmptyBlock.tsx +++ b/code/ui/blocks/src/components/EmptyBlock.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { transparentize } from 'polished'; // eslint-disable-line import/no-extraneous-dependencies +import { transparentize } from 'polished'; import { styled } from '@storybook/theming'; -import { withReset } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { withReset } from '@storybook/components'; const Wrapper = styled.div(withReset, ({ theme }) => ({ backgroundColor: theme.base === 'light' ? 'rgba(0,0,0,.01)' : 'rgba(255,255,255,.01)', diff --git a/code/ui/blocks/src/components/IconGallery.tsx b/code/ui/blocks/src/components/IconGallery.tsx index cf27be34a3eb..22456d889ae2 100644 --- a/code/ui/blocks/src/components/IconGallery.tsx +++ b/code/ui/blocks/src/components/IconGallery.tsx @@ -1,7 +1,7 @@ import type { FunctionComponent } from 'react'; import React from 'react'; import { styled } from '@storybook/theming'; -import { ResetWrapper } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { ResetWrapper } from '@storybook/components'; import { getBlockBackgroundStyle } from './BlockBackgroundStyles'; diff --git a/code/ui/blocks/src/components/Preview.tsx b/code/ui/blocks/src/components/Preview.tsx index 96865be5dd46..f93ba28cdf2f 100644 --- a/code/ui/blocks/src/components/Preview.tsx +++ b/code/ui/blocks/src/components/Preview.tsx @@ -1,10 +1,10 @@ import type { ClipboardEvent, FC, ReactElement, ReactNode } from 'react'; import React, { Children, useCallback, useState } from 'react'; -import { darken } from 'polished'; // eslint-disable-line import/no-extraneous-dependencies +import { darken } from 'polished'; import { styled } from '@storybook/theming'; import global from 'global'; -import { ActionBar, Zoom } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { ActionBar, Zoom } from '@storybook/components'; import type { ActionItem } from '@storybook/components'; import type { SourceProps } from '.'; @@ -218,7 +218,7 @@ export const Preview: FC = ({ const { window: globalWindow } = global; const copyToClipboard = useCallback(async (text: string) => { - const { createCopyToClipboardFunction } = await import('@storybook/components'); // eslint-disable-line import/no-extraneous-dependencies + const { createCopyToClipboardFunction } = await import('@storybook/components'); createCopyToClipboardFunction(); }, []); diff --git a/code/ui/blocks/src/components/Source.tsx b/code/ui/blocks/src/components/Source.tsx index 730dfc6c24a9..26dc904b1b18 100644 --- a/code/ui/blocks/src/components/Source.tsx +++ b/code/ui/blocks/src/components/Source.tsx @@ -1,7 +1,7 @@ import type { ComponentProps, FunctionComponent } from 'react'; import React from 'react'; import { styled, ThemeProvider, convert, themes } from '@storybook/theming'; -import { SyntaxHighlighter } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { SyntaxHighlighter } from '@storybook/components'; import { EmptyBlock } from './EmptyBlock'; diff --git a/code/ui/blocks/src/components/Story.tsx b/code/ui/blocks/src/components/Story.tsx index 11570922cc1f..4719a8ab6f4f 100644 --- a/code/ui/blocks/src/components/Story.tsx +++ b/code/ui/blocks/src/components/Story.tsx @@ -2,7 +2,7 @@ import global from 'global'; import type { ElementType, FunctionComponent } from 'react'; import React, { createElement, Fragment } from 'react'; import type { Parameters } from '@storybook/types'; -import { Loader, getStoryHref } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { Loader, getStoryHref } from '@storybook/components'; // eslint-disable-next-line import/no-cycle import { EmptyBlock } from '.'; import { IFrame } from './IFrame'; diff --git a/code/ui/blocks/src/components/Title.tsx b/code/ui/blocks/src/components/Title.tsx index 20e1db72310d..bbff95701d41 100644 --- a/code/ui/blocks/src/components/Title.tsx +++ b/code/ui/blocks/src/components/Title.tsx @@ -1,6 +1,6 @@ import type { Theme } from '@storybook/theming'; import { styled } from '@storybook/theming'; -import { withReset } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { withReset } from '@storybook/components'; const breakpoint = 600; diff --git a/code/ui/blocks/src/components/Toolbar.tsx b/code/ui/blocks/src/components/Toolbar.tsx index df1c70dff877..0838f19f1818 100644 --- a/code/ui/blocks/src/components/Toolbar.tsx +++ b/code/ui/blocks/src/components/Toolbar.tsx @@ -1,7 +1,6 @@ import type { FC, MouseEvent } from 'react'; import React, { Fragment } from 'react'; import { styled } from '@storybook/theming'; -// eslint-disable-next-line import/no-extraneous-dependencies import { FlexBar, Icons, diff --git a/code/ui/blocks/src/components/Typeset.tsx b/code/ui/blocks/src/components/Typeset.tsx index 4ecf8ab70929..35f0dda5f31d 100644 --- a/code/ui/blocks/src/components/Typeset.tsx +++ b/code/ui/blocks/src/components/Typeset.tsx @@ -1,8 +1,8 @@ import type { FC } from 'react'; import React from 'react'; -import { transparentize } from 'polished'; // eslint-disable-line import/no-extraneous-dependencies +import { transparentize } from 'polished'; import { styled } from '@storybook/theming'; -import { withReset } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { withReset } from '@storybook/components'; import { getBlockBackgroundStyle } from './BlockBackgroundStyles'; const Label = styled.div(({ theme }) => ({ diff --git a/code/ui/blocks/src/controls/Boolean.tsx b/code/ui/blocks/src/controls/Boolean.tsx index 8bd205b8373c..8abec1e34902 100644 --- a/code/ui/blocks/src/controls/Boolean.tsx +++ b/code/ui/blocks/src/controls/Boolean.tsx @@ -1,10 +1,10 @@ import type { FC } from 'react'; import React, { useCallback } from 'react'; -import { opacify, transparentize } from 'polished'; // eslint-disable-line import/no-extraneous-dependencies +import { opacify, transparentize } from 'polished'; import { styled } from '@storybook/theming'; -import { Form } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { Form } from '@storybook/components'; import { getControlId, getControlSetterButtonId } from './helpers'; import type { ControlProps, BooleanValue, BooleanConfig } from './types'; diff --git a/code/ui/blocks/src/controls/Color.tsx b/code/ui/blocks/src/controls/Color.tsx index 995c4d1152b1..3fa5a655e224 100644 --- a/code/ui/blocks/src/controls/Color.tsx +++ b/code/ui/blocks/src/controls/Color.tsx @@ -1,10 +1,10 @@ import type { FC, ChangeEvent, FocusEvent } from 'react'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; -import { HexColorPicker, HslaStringColorPicker, RgbaStringColorPicker } from 'react-colorful'; // eslint-disable-line import/no-extraneous-dependencies -import convert from 'color-convert'; // eslint-disable-line import/no-extraneous-dependencies +import { HexColorPicker, HslaStringColorPicker, RgbaStringColorPicker } from 'react-colorful'; +import convert from 'color-convert'; import throttle from 'lodash/throttle'; import { styled } from '@storybook/theming'; -import { TooltipNote, WithTooltip, Form, Icons } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { TooltipNote, WithTooltip, Form, Icons } from '@storybook/components'; import type { ControlProps, ColorValue, ColorConfig, PresetColor } from './types'; import { getControlId } from './helpers'; diff --git a/code/ui/blocks/src/controls/Date.tsx b/code/ui/blocks/src/controls/Date.tsx index a850fff46b13..0baf920593db 100644 --- a/code/ui/blocks/src/controls/Date.tsx +++ b/code/ui/blocks/src/controls/Date.tsx @@ -1,7 +1,7 @@ import type { FC, ChangeEvent, RefObject } from 'react'; import React, { useState, useRef, useEffect } from 'react'; import { styled } from '@storybook/theming'; -import { Form } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { Form } from '@storybook/components'; import type { ControlProps, DateValue, DateConfig } from './types'; import { getControlId } from './helpers'; diff --git a/code/ui/blocks/src/controls/Files.tsx b/code/ui/blocks/src/controls/Files.tsx index eb80b40fe8d1..2354703c2917 100644 --- a/code/ui/blocks/src/controls/Files.tsx +++ b/code/ui/blocks/src/controls/Files.tsx @@ -1,7 +1,7 @@ import type { ChangeEvent, FC } from 'react'; import React from 'react'; import { styled } from '@storybook/theming'; -import { Form } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { Form } from '@storybook/components'; import type { ControlProps } from './types'; import { getControlId } from './helpers'; diff --git a/code/ui/blocks/src/controls/Number.tsx b/code/ui/blocks/src/controls/Number.tsx index 42a8ae2129dd..551d5fb7417e 100644 --- a/code/ui/blocks/src/controls/Number.tsx +++ b/code/ui/blocks/src/controls/Number.tsx @@ -1,7 +1,7 @@ import type { FC, ChangeEvent } from 'react'; import React, { useState, useCallback, useEffect, useRef } from 'react'; import { styled } from '@storybook/theming'; -import { Form } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { Form } from '@storybook/components'; import { getControlId, getControlSetterButtonId } from './helpers'; import type { ControlProps, NumberValue, NumberConfig } from './types'; diff --git a/code/ui/blocks/src/controls/Object.tsx b/code/ui/blocks/src/controls/Object.tsx index e628afee6ec6..fbd0a91ab9ad 100644 --- a/code/ui/blocks/src/controls/Object.tsx +++ b/code/ui/blocks/src/controls/Object.tsx @@ -3,7 +3,7 @@ import cloneDeep from 'lodash/cloneDeep'; import type { ComponentProps, SyntheticEvent, FC, FocusEvent } from 'react'; import React, { useCallback, useMemo, useState, useEffect, useRef } from 'react'; import { styled, useTheme, type Theme } from '@storybook/theming'; -import { Form, Icons, type IconsProps, IconButton } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { Form, Icons, type IconsProps, IconButton } from '@storybook/components'; import { JsonTree, getObjectType } from './react-editable-json-tree'; import { getControlId, getControlSetterButtonId } from './helpers'; import type { ControlProps, ObjectValue, ObjectConfig } from './types'; diff --git a/code/ui/blocks/src/controls/Range.tsx b/code/ui/blocks/src/controls/Range.tsx index 0c5459ca6f06..adf0aafd11f8 100644 --- a/code/ui/blocks/src/controls/Range.tsx +++ b/code/ui/blocks/src/controls/Range.tsx @@ -2,7 +2,7 @@ import type { FC, ChangeEvent } from 'react'; import React, { useMemo } from 'react'; import { styled } from '@storybook/theming'; -import { lighten, darken, rgba } from 'polished'; // eslint-disable-line import/no-extraneous-dependencies +import { lighten, darken, rgba } from 'polished'; import { getControlId } from './helpers'; import type { ControlProps, NumberValue, RangeConfig } from './types'; diff --git a/code/ui/blocks/src/controls/Text.tsx b/code/ui/blocks/src/controls/Text.tsx index ec7d45643abe..d7a1e312784d 100644 --- a/code/ui/blocks/src/controls/Text.tsx +++ b/code/ui/blocks/src/controls/Text.tsx @@ -1,7 +1,7 @@ import type { FC, ChangeEvent } from 'react'; import React, { useCallback, useState } from 'react'; import { styled } from '@storybook/theming'; -import { Form } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { Form } from '@storybook/components'; import { getControlId, getControlSetterButtonId } from './helpers'; import type { ControlProps, TextValue, TextConfig } from './types'; diff --git a/code/ui/blocks/src/controls/options/Select.tsx b/code/ui/blocks/src/controls/options/Select.tsx index ffca796a50eb..f033c131bd71 100644 --- a/code/ui/blocks/src/controls/options/Select.tsx +++ b/code/ui/blocks/src/controls/options/Select.tsx @@ -3,7 +3,7 @@ import React from 'react'; import { styled } from '@storybook/theming'; import type { CSSObject } from '@storybook/theming'; import { logger } from '@storybook/client-logger'; -import { Icons } from '@storybook/components'; // eslint-disable-line import/no-extraneous-dependencies +import { Icons } from '@storybook/components'; import type { ControlProps, OptionsSelection, NormalizedOptionsConfig } from '../types'; diff --git a/code/yarn.lock b/code/yarn.lock index 0c1a92210f20..3872c59af38b 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6092,6 +6092,8 @@ __metadata: resolution: "@storybook/blocks@workspace:ui/blocks" dependencies: "@storybook/addon-actions": 7.0.0-alpha.48 + "@storybook/addons": 7.0.0-alpha.48 + "@storybook/api": 7.0.0-alpha.48 "@storybook/channels": 7.0.0-alpha.48 "@storybook/client-logger": 7.0.0-alpha.48 "@storybook/components": 7.0.0-alpha.48 @@ -6112,6 +6114,8 @@ __metadata: memoizerific: ^1.11.3 polished: ^4.2.2 react-colorful: ^5.1.2 + ts-dedent: ^2.0.0 + util-deprecate: ^1.0.2 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 From 8cf492d7ad51cb74d35cfd5311e1654b05bd4f35 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 14 Nov 2022 11:59:25 +0100 Subject: [PATCH 15/42] fixes --- code/renderers/react/src/testing-api.ts | 2 +- code/renderers/svelte/src/public-api.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/renderers/react/src/testing-api.ts b/code/renderers/react/src/testing-api.ts index 4477ec8bb812..885cb450be2a 100644 --- a/code/renderers/react/src/testing-api.ts +++ b/code/renderers/react/src/testing-api.ts @@ -34,7 +34,7 @@ import type { ReactRenderer } from './types'; export function setProjectAnnotations( projectAnnotations: ProjectAnnotations | ProjectAnnotations[] ) { - originalSetProjectAnnotations(projectAnnotations); + originalSetProjectAnnotations(projectAnnotations); } /** Preserved for users migrating from `@storybook/testing-react`. diff --git a/code/renderers/svelte/src/public-api.ts b/code/renderers/svelte/src/public-api.ts index a16af2ba11b8..2a6a63a82454 100644 --- a/code/renderers/svelte/src/public-api.ts +++ b/code/renderers/svelte/src/public-api.ts @@ -1,14 +1,14 @@ import { start } from '@storybook/core-client'; import { decorateStory } from './decorators'; -import type { SvelteFramework } from './types'; +import type { SvelteRenderer } from './types'; import { render, renderToCanvas } from './render'; const { configure: coreConfigure, clientApi, forceReRender, -} = start(renderToCanvas, { +} = start(renderToCanvas, { decorateStory, render, }); From 39fd00cfd6815711c92824ae0b4c98d3193ed9b4 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 15 Nov 2022 09:37:38 +0100 Subject: [PATCH 16/42] add explanation --- .../lib/builder-webpack5/src/preview/iframe-webpack.config.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/lib/builder-webpack5/src/preview/iframe-webpack.config.ts b/code/lib/builder-webpack5/src/preview/iframe-webpack.config.ts index fac280a3c8bb..9ca9e7176636 100644 --- a/code/lib/builder-webpack5/src/preview/iframe-webpack.config.ts +++ b/code/lib/builder-webpack5/src/preview/iframe-webpack.config.ts @@ -26,7 +26,7 @@ import { createBabelLoader } from './babel-loader-preview'; const storybookPaths: Record = { global: dirname(require.resolve(`global/package.json`)), ...[ - // + // these packages are not pre-bundled because of react dependencies 'api', 'components', 'router', @@ -39,7 +39,7 @@ const storybookPaths: Record = { {} ), ...[ - // + // these packages are pre-bundled, so they are mapped to global shims 'channels', 'channel-postmessage', 'channel-websocket', From b105b210013aea7d50b3a9f7c8e7a9253151c87e Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 15 Nov 2022 10:06:58 +0100 Subject: [PATCH 17/42] regen lockfile, sync csf package version --- code/addons/links/package.json | 2 +- .../storyshots-puppeteer/package.json | 2 +- code/lib/api/package.json | 2 +- code/lib/client-api/package.json | 2 +- code/lib/codemod/package.json | 2 +- code/lib/core-client/package.json | 2 +- code/lib/core-server/package.json | 2 +- code/lib/csf-tools/package.json | 2 +- code/lib/source-loader/package.json | 2 +- code/lib/store/package.json | 2 +- code/lib/types/package.json | 2 +- code/package.json | 2 +- code/ui/blocks/package.json | 2 +- code/ui/components/package.json | 2 +- code/yarn.lock | 844 +++++++++--------- 15 files changed, 447 insertions(+), 425 deletions(-) diff --git a/code/addons/links/package.json b/code/addons/links/package.json index d9addd073bac..90887ef5dc1c 100644 --- a/code/addons/links/package.json +++ b/code/addons/links/package.json @@ -79,7 +79,7 @@ "@storybook/addons": "7.0.0-alpha.49", "@storybook/client-logger": "7.0.0-alpha.49", "@storybook/core-events": "7.0.0-alpha.49", - "@storybook/csf": "0.0.2-next.5", + "@storybook/csf": "next", "@storybook/router": "7.0.0-alpha.49", "@storybook/types": "7.0.0-alpha.49", "global": "^4.4.0", diff --git a/code/addons/storyshots/storyshots-puppeteer/package.json b/code/addons/storyshots/storyshots-puppeteer/package.json index 424c69a28e85..36818bc00c61 100644 --- a/code/addons/storyshots/storyshots-puppeteer/package.json +++ b/code/addons/storyshots/storyshots-puppeteer/package.json @@ -34,7 +34,7 @@ }, "dependencies": { "@axe-core/puppeteer": "^4.2.0", - "@storybook/csf": "0.0.2-next.5", + "@storybook/csf": "next", "@storybook/node-logger": "7.0.0-alpha.49", "@storybook/types": "7.0.0-alpha.49", "@types/jest-image-snapshot": "^4.1.3", diff --git a/code/lib/api/package.json b/code/lib/api/package.json index e8d0abff7d82..08767f02b2a3 100644 --- a/code/lib/api/package.json +++ b/code/lib/api/package.json @@ -43,7 +43,7 @@ "@storybook/channels": "7.0.0-alpha.49", "@storybook/client-logger": "7.0.0-alpha.49", "@storybook/core-events": "7.0.0-alpha.49", - "@storybook/csf": "0.0.2-next.5", + "@storybook/csf": "next", "@storybook/router": "7.0.0-alpha.49", "@storybook/theming": "7.0.0-alpha.49", "@storybook/types": "7.0.0-alpha.49", diff --git a/code/lib/client-api/package.json b/code/lib/client-api/package.json index 8d85202539f5..b08d8634e771 100644 --- a/code/lib/client-api/package.json +++ b/code/lib/client-api/package.json @@ -44,7 +44,7 @@ "dependencies": { "@storybook/addons": "7.0.0-alpha.49", "@storybook/client-logger": "7.0.0-alpha.49", - "@storybook/csf": "0.0.2-next.5", + "@storybook/csf": "next", "@storybook/store": "7.0.0-alpha.49", "@storybook/types": "7.0.0-alpha.49", "@types/qs": "^6.9.5", diff --git a/code/lib/codemod/package.json b/code/lib/codemod/package.json index 277954cf4fb2..35d83720c17a 100644 --- a/code/lib/codemod/package.json +++ b/code/lib/codemod/package.json @@ -38,7 +38,7 @@ }, "dependencies": { "@babel/types": "^7.12.11", - "@storybook/csf": "0.0.2-next.5", + "@storybook/csf": "next", "@storybook/csf-tools": "7.0.0-alpha.49", "@storybook/node-logger": "7.0.0-alpha.49", "@storybook/types": "7.0.0-alpha.49", diff --git a/code/lib/core-client/package.json b/code/lib/core-client/package.json index 98df76cace1a..62523b50f44b 100644 --- a/code/lib/core-client/package.json +++ b/code/lib/core-client/package.json @@ -42,7 +42,7 @@ "@storybook/client-api": "7.0.0-alpha.49", "@storybook/client-logger": "7.0.0-alpha.49", "@storybook/core-events": "7.0.0-alpha.49", - "@storybook/csf": "0.0.2-next.5", + "@storybook/csf": "next", "@storybook/preview-web": "7.0.0-alpha.49", "@storybook/store": "7.0.0-alpha.49", "@storybook/types": "7.0.0-alpha.49", diff --git a/code/lib/core-server/package.json b/code/lib/core-server/package.json index 8584853295bb..a5b98d2b0d31 100644 --- a/code/lib/core-server/package.json +++ b/code/lib/core-server/package.json @@ -39,7 +39,7 @@ "@storybook/core-client": "7.0.0-alpha.49", "@storybook/core-common": "7.0.0-alpha.49", "@storybook/core-events": "7.0.0-alpha.49", - "@storybook/csf": "0.0.2-next.5", + "@storybook/csf": "next", "@storybook/csf-tools": "7.0.0-alpha.49", "@storybook/docs-mdx": "0.0.1-canary.12433cf.0", "@storybook/node-logger": "7.0.0-alpha.49", diff --git a/code/lib/csf-tools/package.json b/code/lib/csf-tools/package.json index 862ab1eb903c..07d78191e179 100644 --- a/code/lib/csf-tools/package.json +++ b/code/lib/csf-tools/package.json @@ -43,7 +43,7 @@ }, "dependencies": { "@babel/types": "^7.12.11", - "@storybook/csf": "0.0.2-next.5", + "@storybook/csf": "next", "@storybook/types": "7.0.0-alpha.49", "fs-extra": "^9.0.1", "ts-dedent": "^2.0.0" diff --git a/code/lib/source-loader/package.json b/code/lib/source-loader/package.json index 4e980fc6acf9..7580323b7f2b 100644 --- a/code/lib/source-loader/package.json +++ b/code/lib/source-loader/package.json @@ -43,7 +43,7 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/csf": "0.0.2-next.5", + "@storybook/csf": "next", "@storybook/types": "7.0.0-alpha.49", "estraverse": "^5.2.0", "lodash": "^4.17.21", diff --git a/code/lib/store/package.json b/code/lib/store/package.json index 56840e6c62a5..ffc9b2add791 100644 --- a/code/lib/store/package.json +++ b/code/lib/store/package.json @@ -45,7 +45,7 @@ "@storybook/addons": "7.0.0-alpha.49", "@storybook/client-logger": "7.0.0-alpha.49", "@storybook/core-events": "7.0.0-alpha.49", - "@storybook/csf": "0.0.2-next.5", + "@storybook/csf": "next", "@storybook/types": "7.0.0-alpha.49", "dequal": "^2.0.2", "global": "^4.4.0", diff --git a/code/lib/types/package.json b/code/lib/types/package.json index 02719893f890..9b532efc3e84 100644 --- a/code/lib/types/package.json +++ b/code/lib/types/package.json @@ -47,7 +47,7 @@ "file-system-cache": "^2.0.0" }, "devDependencies": { - "@storybook/csf": "0.0.2-next.5", + "@storybook/csf": "next", "@types/node": "^16.0.0", "synchronous-promise": "^2.0.15", "typescript": "~4.6.3" diff --git a/code/package.json b/code/package.json index e69db64de779..1262423e03f0 100644 --- a/code/package.json +++ b/code/package.json @@ -184,7 +184,7 @@ "@storybook/core-events": "workspace:*", "@storybook/core-server": "workspace:*", "@storybook/core-webpack": "workspace:*", - "@storybook/csf": "0.0.2-next.5", + "@storybook/csf": "next", "@storybook/csf-plugin": "workspace:*", "@storybook/csf-tools": "workspace:*", "@storybook/docs-tools": "workspace:*", diff --git a/code/ui/blocks/package.json b/code/ui/blocks/package.json index 4612b09b4578..c54c19b6caed 100644 --- a/code/ui/blocks/package.json +++ b/code/ui/blocks/package.json @@ -47,7 +47,7 @@ "@storybook/client-logger": "7.0.0-alpha.49", "@storybook/components": "7.0.0-alpha.49", "@storybook/core-events": "7.0.0-alpha.49", - "@storybook/csf": "0.0.2-next.5", + "@storybook/csf": "next", "@storybook/docs-tools": "7.0.0-alpha.49", "@storybook/preview-web": "7.0.0-alpha.49", "@storybook/store": "7.0.0-alpha.49", diff --git a/code/ui/components/package.json b/code/ui/components/package.json index 9a77b2bb4354..a04b12c9269e 100644 --- a/code/ui/components/package.json +++ b/code/ui/components/package.json @@ -52,7 +52,7 @@ }, "dependencies": { "@storybook/client-logger": "7.0.0-alpha.49", - "@storybook/csf": "0.0.2-next.5", + "@storybook/csf": "next", "@storybook/theming": "7.0.0-alpha.49", "@storybook/types": "7.0.0-alpha.49", "memoizerific": "^1.11.3", diff --git a/code/yarn.lock b/code/yarn.lock index 029d2d8eb1b2..00e233604741 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -332,13 +332,13 @@ __metadata: linkType: hard "@axe-core/puppeteer@npm:^4.2.0": - version: 4.5.0 - resolution: "@axe-core/puppeteer@npm:4.5.0" + version: 4.5.1 + resolution: "@axe-core/puppeteer@npm:4.5.1" dependencies: - axe-core: ^4.5.0 + axe-core: ^4.5.1 peerDependencies: puppeteer: ">=1.10.0 <= 18" - checksum: a93db97b4c096b19e6a2132a255a5699d101b68c77cd4e6395cb039c6432f3a51d59cfef95fd8ac6320906b462293b6a893180dead72362f6f097e0795af204d + checksum: f9b815b4bce727474a60f11f437003a93c68f14b408c04fd3a69fc7582c36817319209934fe24658f11df3910db909924a722e8fce41b5febb87d93f12886d77 languageName: node linkType: hard @@ -466,13 +466,13 @@ __metadata: linkType: hard "@babel/generator@npm:^7.12.11, @babel/generator@npm:^7.16.8, @babel/generator@npm:^7.20.1, @babel/generator@npm:^7.20.2, @babel/generator@npm:^7.4.0, @babel/generator@npm:^7.7.2, @babel/generator@npm:^7.8.7": - version: 7.20.3 - resolution: "@babel/generator@npm:7.20.3" + version: 7.20.4 + resolution: "@babel/generator@npm:7.20.4" dependencies: "@babel/types": ^7.20.2 "@jridgewell/gen-mapping": ^0.3.2 jsesc: ^2.5.1 - checksum: 7287321925d8a451d8f852d5d83f70ac413089a4a91798dbf0037a139750dd1e52ca760c8530f2608a71b82df75a575f9d028ff40f268b5964983184ed226694 + checksum: 48181434693f3348804f01dad53b5fd293319bc71119662bdfa64ccc3c32c5cf1a51b2ea3f7091310c950a894f418e05f3c957ee3f7f1790443487a93608d57e languageName: node linkType: hard @@ -3048,12 +3048,12 @@ __metadata: languageName: node linkType: hard -"@jest/expect-utils@npm:^29.2.2": - version: 29.2.2 - resolution: "@jest/expect-utils@npm:29.2.2" +"@jest/expect-utils@npm:^29.3.1": + version: 29.3.1 + resolution: "@jest/expect-utils@npm:29.3.1" dependencies: jest-get-type: ^29.2.0 - checksum: 1241e80d307724df38668334cecff28c6dce28e5eeda1893b1f8be8b74dcb286ed4f8f40db0b15c32e3fd376563a69a8ffce30189a357fc4bd75a0450ae4e6d9 + checksum: dc58ff9c5c7e893c056f3560cb1445771dcc1555df0b5aeff4808c6425ca9b921eae5b4f92b433b89c401e445694f5484b352f06620bac9e7cb97b8f56ee3e21 languageName: node linkType: hard @@ -3567,9 +3567,9 @@ __metadata: languageName: node linkType: hard -"@jest/types@npm:^29.2.1": - version: 29.2.1 - resolution: "@jest/types@npm:29.2.1" +"@jest/types@npm:^29.3.1": + version: 29.3.1 + resolution: "@jest/types@npm:29.3.1" dependencies: "@jest/schemas": ^29.0.0 "@types/istanbul-lib-coverage": ^2.0.0 @@ -3577,7 +3577,7 @@ __metadata: "@types/node": "*" "@types/yargs": ^17.0.8 chalk: ^4.0.0 - checksum: 4f3ed71cec9bc9511d2bdb3637c587269a3e0f846610bfd085db1b34ae96c37eee805100f4ec094382549802a20327e79d4fcaf91a47a9d4a7d7fb7106b7baa9 + checksum: c1ae1a66fbe403c82578d55cc5a061bffce2426f830c9365d0ab033f48580f3beb378631efe85e420709ff898fca6f7dd8fca9eb412dfed3d88a80c422065188 languageName: node linkType: hard @@ -4537,100 +4537,100 @@ __metadata: languageName: node linkType: hard -"@next/env@npm:12.3.2": - version: 12.3.2 - resolution: "@next/env@npm:12.3.2" - checksum: 99ba0ccbfadc5a5e64ee363e16f08da3313220cc5b571d6fe16cdc67cc366ee48c0cfc5486600120a02dc0d90c9ae1ce504a136830337125e335ad7b46711d95 +"@next/env@npm:12.3.3": + version: 12.3.3 + resolution: "@next/env@npm:12.3.3" + checksum: 3eecf70e002f6f5c608a3e550f07ab1503b87a3d822f5d8435f3857627510e1442bb82f7734398477b2d0b86dda084aa5ffffd4b52c21af97e1da5f225f4d0d5 languageName: node linkType: hard -"@next/swc-android-arm-eabi@npm:12.3.2": - version: 12.3.2 - resolution: "@next/swc-android-arm-eabi@npm:12.3.2" +"@next/swc-android-arm-eabi@npm:12.3.3": + version: 12.3.3 + resolution: "@next/swc-android-arm-eabi@npm:12.3.3" conditions: os=android & cpu=arm languageName: node linkType: hard -"@next/swc-android-arm64@npm:12.3.2": - version: 12.3.2 - resolution: "@next/swc-android-arm64@npm:12.3.2" +"@next/swc-android-arm64@npm:12.3.3": + version: 12.3.3 + resolution: "@next/swc-android-arm64@npm:12.3.3" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"@next/swc-darwin-arm64@npm:12.3.2": - version: 12.3.2 - resolution: "@next/swc-darwin-arm64@npm:12.3.2" +"@next/swc-darwin-arm64@npm:12.3.3": + version: 12.3.3 + resolution: "@next/swc-darwin-arm64@npm:12.3.3" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@next/swc-darwin-x64@npm:12.3.2": - version: 12.3.2 - resolution: "@next/swc-darwin-x64@npm:12.3.2" +"@next/swc-darwin-x64@npm:12.3.3": + version: 12.3.3 + resolution: "@next/swc-darwin-x64@npm:12.3.3" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@next/swc-freebsd-x64@npm:12.3.2": - version: 12.3.2 - resolution: "@next/swc-freebsd-x64@npm:12.3.2" +"@next/swc-freebsd-x64@npm:12.3.3": + version: 12.3.3 + resolution: "@next/swc-freebsd-x64@npm:12.3.3" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@next/swc-linux-arm-gnueabihf@npm:12.3.2": - version: 12.3.2 - resolution: "@next/swc-linux-arm-gnueabihf@npm:12.3.2" +"@next/swc-linux-arm-gnueabihf@npm:12.3.3": + version: 12.3.3 + resolution: "@next/swc-linux-arm-gnueabihf@npm:12.3.3" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@next/swc-linux-arm64-gnu@npm:12.3.2": - version: 12.3.2 - resolution: "@next/swc-linux-arm64-gnu@npm:12.3.2" +"@next/swc-linux-arm64-gnu@npm:12.3.3": + version: 12.3.3 + resolution: "@next/swc-linux-arm64-gnu@npm:12.3.3" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@next/swc-linux-arm64-musl@npm:12.3.2": - version: 12.3.2 - resolution: "@next/swc-linux-arm64-musl@npm:12.3.2" +"@next/swc-linux-arm64-musl@npm:12.3.3": + version: 12.3.3 + resolution: "@next/swc-linux-arm64-musl@npm:12.3.3" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@next/swc-linux-x64-gnu@npm:12.3.2": - version: 12.3.2 - resolution: "@next/swc-linux-x64-gnu@npm:12.3.2" +"@next/swc-linux-x64-gnu@npm:12.3.3": + version: 12.3.3 + resolution: "@next/swc-linux-x64-gnu@npm:12.3.3" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@next/swc-linux-x64-musl@npm:12.3.2": - version: 12.3.2 - resolution: "@next/swc-linux-x64-musl@npm:12.3.2" +"@next/swc-linux-x64-musl@npm:12.3.3": + version: 12.3.3 + resolution: "@next/swc-linux-x64-musl@npm:12.3.3" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@next/swc-win32-arm64-msvc@npm:12.3.2": - version: 12.3.2 - resolution: "@next/swc-win32-arm64-msvc@npm:12.3.2" +"@next/swc-win32-arm64-msvc@npm:12.3.3": + version: 12.3.3 + resolution: "@next/swc-win32-arm64-msvc@npm:12.3.3" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@next/swc-win32-ia32-msvc@npm:12.3.2": - version: 12.3.2 - resolution: "@next/swc-win32-ia32-msvc@npm:12.3.2" +"@next/swc-win32-ia32-msvc@npm:12.3.3": + version: 12.3.3 + resolution: "@next/swc-win32-ia32-msvc@npm:12.3.3" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@next/swc-win32-x64-msvc@npm:12.3.2": - version: 12.3.2 - resolution: "@next/swc-win32-x64-msvc@npm:12.3.2" +"@next/swc-win32-x64-msvc@npm:12.3.3": + version: 12.3.3 + resolution: "@next/swc-win32-x64-msvc@npm:12.3.3" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -5217,8 +5217,8 @@ __metadata: linkType: hard "@pmmmwh/react-refresh-webpack-plugin@npm:^0.5.5": - version: 0.5.8 - resolution: "@pmmmwh/react-refresh-webpack-plugin@npm:0.5.8" + version: 0.5.9 + resolution: "@pmmmwh/react-refresh-webpack-plugin@npm:0.5.9" dependencies: ansi-html-community: ^0.0.8 common-path-prefix: ^3.0.0 @@ -5226,7 +5226,7 @@ __metadata: error-stack-parser: ^2.0.6 find-up: ^5.0.0 html-entities: ^2.1.0 - loader-utils: ^2.0.0 + loader-utils: ^2.0.3 schema-utils: ^3.0.0 source-map: ^0.7.3 peerDependencies: @@ -5251,7 +5251,7 @@ __metadata: optional: true webpack-plugin-serve: optional: true - checksum: dc304daf9fc7e0d5729fd790434112b5331541b4531f80ed4767ef78b24614cac8efeb51c3047cd4b15ee598fc93ee58b197801019aa1067fd084193877826ea + checksum: 387594d4e5b6f1dd6d8c82da2ce9e878d667c5d6de2bf3659a3b4cd2bb5a0567fb5ddae55372d7cca4c6cb70b546ab386662e0dfbe84b6431589ad3d206137a6 languageName: node linkType: hard @@ -5646,7 +5646,7 @@ __metadata: "@storybook/addons": 7.0.0-alpha.49 "@storybook/client-logger": 7.0.0-alpha.49 "@storybook/core-events": 7.0.0-alpha.49 - "@storybook/csf": 0.0.2-next.5 + "@storybook/csf": next "@storybook/router": 7.0.0-alpha.49 "@storybook/types": 7.0.0-alpha.49 global: ^4.4.0 @@ -5716,7 +5716,7 @@ __metadata: resolution: "@storybook/addon-storyshots-puppeteer@workspace:addons/storyshots/storyshots-puppeteer" dependencies: "@axe-core/puppeteer": ^4.2.0 - "@storybook/csf": 0.0.2-next.5 + "@storybook/csf": next "@storybook/node-logger": 7.0.0-alpha.49 "@storybook/types": 7.0.0-alpha.49 "@types/jest-image-snapshot": ^4.1.3 @@ -6042,7 +6042,7 @@ __metadata: "@storybook/client-logger": 7.0.0-alpha.49 "@storybook/core-common": 7.0.0-alpha.49 "@storybook/core-events": 7.0.0-alpha.49 - "@storybook/csf": 0.0.2-next.5 + "@storybook/csf": next "@storybook/router": 7.0.0-alpha.49 "@storybook/theming": 7.0.0-alpha.49 "@storybook/types": 7.0.0-alpha.49 @@ -6112,7 +6112,7 @@ __metadata: "@storybook/client-logger": 7.0.0-alpha.49 "@storybook/components": 7.0.0-alpha.49 "@storybook/core-events": 7.0.0-alpha.49 - "@storybook/csf": 0.0.2-next.5 + "@storybook/csf": next "@storybook/docs-tools": 7.0.0-alpha.49 "@storybook/preview-web": 7.0.0-alpha.49 "@storybook/store": 7.0.0-alpha.49 @@ -6354,7 +6354,7 @@ __metadata: "@storybook/addons": 7.0.0-alpha.49 "@storybook/client-logger": 7.0.0-alpha.49 "@storybook/core-common": 7.0.0-alpha.49 - "@storybook/csf": 0.0.2-next.5 + "@storybook/csf": next "@storybook/store": 7.0.0-alpha.49 "@storybook/types": 7.0.0-alpha.49 "@types/qs": ^6.9.5 @@ -6395,7 +6395,7 @@ __metadata: resolution: "@storybook/codemod@workspace:lib/codemod" dependencies: "@babel/types": ^7.12.11 - "@storybook/csf": 0.0.2-next.5 + "@storybook/csf": next "@storybook/csf-tools": 7.0.0-alpha.49 "@storybook/node-logger": 7.0.0-alpha.49 "@storybook/types": 7.0.0-alpha.49 @@ -6418,7 +6418,7 @@ __metadata: dependencies: "@popperjs/core": ^2.6.0 "@storybook/client-logger": 7.0.0-alpha.49 - "@storybook/csf": 0.0.2-next.5 + "@storybook/csf": next "@storybook/theming": 7.0.0-alpha.49 "@storybook/types": 7.0.0-alpha.49 "@types/overlayscrollbars": ^1.12.0 @@ -6453,7 +6453,7 @@ __metadata: "@storybook/client-api": 7.0.0-alpha.49 "@storybook/client-logger": 7.0.0-alpha.49 "@storybook/core-events": 7.0.0-alpha.49 - "@storybook/csf": 0.0.2-next.5 + "@storybook/csf": next "@storybook/preview-web": 7.0.0-alpha.49 "@storybook/store": 7.0.0-alpha.49 "@storybook/types": 7.0.0-alpha.49 @@ -6537,7 +6537,7 @@ __metadata: "@storybook/core-client": 7.0.0-alpha.49 "@storybook/core-common": 7.0.0-alpha.49 "@storybook/core-events": 7.0.0-alpha.49 - "@storybook/csf": 0.0.2-next.5 + "@storybook/csf": next "@storybook/csf-tools": 7.0.0-alpha.49 "@storybook/docs-mdx": 0.0.1-canary.12433cf.0 "@storybook/node-logger": 7.0.0-alpha.49 @@ -6625,7 +6625,7 @@ __metadata: "@babel/parser": ^7.12.11 "@babel/traverse": ^7.12.11 "@babel/types": ^7.12.11 - "@storybook/csf": 0.0.2-next.5 + "@storybook/csf": next "@storybook/types": 7.0.0-alpha.49 "@types/fs-extra": ^9.0.6 fs-extra: ^9.0.1 @@ -6644,23 +6644,23 @@ __metadata: languageName: node linkType: hard -"@storybook/csf@npm:0.0.2-next.5, @storybook/csf@npm:next": - version: 0.0.2-next.5 - resolution: "@storybook/csf@npm:0.0.2-next.5" +"@storybook/csf@npm:^0.0.1": + version: 0.0.1 + resolution: "@storybook/csf@npm:0.0.1" dependencies: - expect-type: ^0.14.2 lodash: ^4.17.15 - type-fest: ^2.19.0 - checksum: 5be51f30cf91895085ff2a2ab45af086f3a46233c2899b251c0ec04a14636dd58428af0f1ab9fb7a8995011e7fb2498ed6590e57b403d9f0cfefb2685403ca85 + checksum: 7b0f75763415f9147692a460b44417ee56ea9639433716a1fd4d1df4c8b0221cbc71b8da0fbed4dcecb3ccd6c7ed64be39f5c255c713539a6088a1d6488aaa24 languageName: node linkType: hard -"@storybook/csf@npm:^0.0.1": - version: 0.0.1 - resolution: "@storybook/csf@npm:0.0.1" +"@storybook/csf@npm:next": + version: 0.0.2-next.7 + resolution: "@storybook/csf@npm:0.0.2-next.7" dependencies: + expect-type: ^0.14.2 lodash: ^4.17.15 - checksum: 7b0f75763415f9147692a460b44417ee56ea9639433716a1fd4d1df4c8b0221cbc71b8da0fbed4dcecb3ccd6c7ed64be39f5c255c713539a6088a1d6488aaa24 + type-fest: ^2.19.0 + checksum: 3920626fdd6dc4875ba95ae46fa0776051f544a479029ee7d561b87602511010161750a42b0d5e1371ec336b47262e1098524c834805ca686d9bc2de5cae0e4e languageName: node linkType: hard @@ -7441,7 +7441,7 @@ __metadata: "@storybook/core-events": "workspace:*" "@storybook/core-server": "workspace:*" "@storybook/core-webpack": "workspace:*" - "@storybook/csf": 0.0.2-next.5 + "@storybook/csf": next "@storybook/csf-plugin": "workspace:*" "@storybook/csf-tools": "workspace:*" "@storybook/docs-tools": "workspace:*" @@ -7724,7 +7724,7 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/source-loader@workspace:lib/source-loader" dependencies: - "@storybook/csf": 0.0.2-next.5 + "@storybook/csf": next "@storybook/types": 7.0.0-alpha.49 estraverse: ^5.2.0 jest-specific-snapshot: ^4.0.0 @@ -7744,7 +7744,7 @@ __metadata: "@storybook/addons": 7.0.0-alpha.49 "@storybook/client-logger": 7.0.0-alpha.49 "@storybook/core-events": 7.0.0-alpha.49 - "@storybook/csf": 0.0.2-next.5 + "@storybook/csf": next "@storybook/types": 7.0.0-alpha.49 dequal: ^2.0.2 global: ^4.4.0 @@ -7909,7 +7909,7 @@ __metadata: resolution: "@storybook/types@workspace:lib/types" dependencies: "@babel/core": ^7.12.10 - "@storybook/csf": 0.0.2-next.5 + "@storybook/csf": next "@types/babel__core": ^7.0.0 "@types/express": ^4.7.0 "@types/node": ^16.0.0 @@ -8139,14 +8139,15 @@ __metadata: linkType: hard "@sveltejs/vite-plugin-svelte@npm:^1.0.0": - version: 1.1.0 - resolution: "@sveltejs/vite-plugin-svelte@npm:1.1.0" + version: 1.2.0 + resolution: "@sveltejs/vite-plugin-svelte@npm:1.2.0" dependencies: debug: ^4.3.4 deepmerge: ^4.2.2 kleur: ^4.1.5 magic-string: ^0.26.7 - svelte-hmr: ^0.15.0 + svelte-hmr: ^0.15.1 + vitefu: ^0.2.1 peerDependencies: diff-match-patch: ^1.0.5 svelte: ^3.44.0 @@ -8154,7 +8155,7 @@ __metadata: peerDependenciesMeta: diff-match-patch: optional: true - checksum: 36cdbcd7dca912623d5c478525f44b3cb4880d9a0260a19f76affbef334715fd0e08ef504b9fbda709e3c463c1d645139c347ab59e1ffdf6e4eb7df002b88b96 + checksum: 48611772657a77c9f762bc6712d343f090e407178a114d144b76b90cad6073dcd7c4f247eac4586306e15caa7ff6a0bcf0a7423e3ec7f211634f43a7282ed453 languageName: node linkType: hard @@ -8719,12 +8720,12 @@ __metadata: linkType: hard "@types/jest@npm:*, @types/jest@npm:>=26.0.0": - version: 29.2.2 - resolution: "@types/jest@npm:29.2.2" + version: 29.2.3 + resolution: "@types/jest@npm:29.2.3" dependencies: expect: ^29.0.0 pretty-format: ^29.0.0 - checksum: c13bf199d38e41d8f6b28add5c4a8dedfb711080cdf83f58dd6476c365e25456771d4c2484ca05c5d5507cadf3617a1aedfce125fe73f43f229f23ac21f0dfa5 + checksum: fffd007edfb13f80ca5da3385922fafed807a00d7f3236377d90b27314c811f4ef8c0089ec37e8049ae33fb3ce3b75d9fc32f92261a5782fb4e3920beca86042 languageName: node linkType: hard @@ -8771,9 +8772,9 @@ __metadata: linkType: hard "@types/lodash@npm:^4.14.167": - version: 4.14.188 - resolution: "@types/lodash@npm:4.14.188" - checksum: 4debfc61d27544ac71296d5b1128bb86ae78fd38d2f9378ab5e8de6a99eb4403f8d0efc0ac4c055930c4f6014433bc2ce39a2e9245d036aa75e596ff786b16ff + version: 4.14.189 + resolution: "@types/lodash@npm:4.14.189" + checksum: af4a0178e52e55682c7fc5b7376eed1e64ce3879800940b1e608e14e97566fcdc9c830bf0db3c19052bfdf17129062fa02044ed4b8a30381fe16384de6ca307e languageName: node linkType: hard @@ -9397,12 +9398,12 @@ __metadata: linkType: hard "@typescript-eslint/eslint-plugin@npm:^5.40.1": - version: 5.42.1 - resolution: "@typescript-eslint/eslint-plugin@npm:5.42.1" + version: 5.43.0 + resolution: "@typescript-eslint/eslint-plugin@npm:5.43.0" dependencies: - "@typescript-eslint/scope-manager": 5.42.1 - "@typescript-eslint/type-utils": 5.42.1 - "@typescript-eslint/utils": 5.42.1 + "@typescript-eslint/scope-manager": 5.43.0 + "@typescript-eslint/type-utils": 5.43.0 + "@typescript-eslint/utils": 5.43.0 debug: ^4.3.4 ignore: ^5.2.0 natural-compare-lite: ^1.4.0 @@ -9415,54 +9416,54 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 906bde546130628726efeceeace6e1984bb304b7b539753add88034fd31b299c3ddf80a842637de92b6ee7ec9b2193dc07f9cf694cc59ee851173082a27e5b57 + checksum: 98f984ab9e0fbae0536a49f1d32c367ff54e3dbf4619710370c917abac865c90b363435a79b8860f6cdc34941661e3e321eca558f0584aaf0b937953ffb3d7cc languageName: node linkType: hard "@typescript-eslint/experimental-utils@npm:^5.40.1": - version: 5.42.1 - resolution: "@typescript-eslint/experimental-utils@npm:5.42.1" + version: 5.43.0 + resolution: "@typescript-eslint/experimental-utils@npm:5.43.0" dependencies: - "@typescript-eslint/utils": 5.42.1 + "@typescript-eslint/utils": 5.43.0 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 290c4e423e79adeaff39b988517f54b959549048320a86c14fed5ea9a31397447935923f7038960163c555d5ab5619f5baeb0f929849747be12c4526e9f97cf9 + checksum: 28fbb4e62059dcb88b6397e81aa30053fbe30ccec76cdc6d947c305c8062e7b47306a13918483a63e4e97ca0871a9b22a481f4ef2b8316bac81e030becbfb3b1 languageName: node linkType: hard "@typescript-eslint/parser@npm:^5.40.1": - version: 5.42.1 - resolution: "@typescript-eslint/parser@npm:5.42.1" + version: 5.43.0 + resolution: "@typescript-eslint/parser@npm:5.43.0" dependencies: - "@typescript-eslint/scope-manager": 5.42.1 - "@typescript-eslint/types": 5.42.1 - "@typescript-eslint/typescript-estree": 5.42.1 + "@typescript-eslint/scope-manager": 5.43.0 + "@typescript-eslint/types": 5.43.0 + "@typescript-eslint/typescript-estree": 5.43.0 debug: ^4.3.4 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 812e3389f4c44e916aaf82210b2e816654efacd1e4112a8430735f138078feaca633b256fca1d33e6043d97ef29c0281ff1654e778d1f4aee4467785529020d7 + checksum: e32a411b08d22e5e33f1d8160ce45882ec7596d360de459bda2d30cc4f0eec71d0b05c99567c33529c18789e48e430f0b89634cf43481db010b3ab5ecca0f5a6 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.42.1": - version: 5.42.1 - resolution: "@typescript-eslint/scope-manager@npm:5.42.1" +"@typescript-eslint/scope-manager@npm:5.43.0": + version: 5.43.0 + resolution: "@typescript-eslint/scope-manager@npm:5.43.0" dependencies: - "@typescript-eslint/types": 5.42.1 - "@typescript-eslint/visitor-keys": 5.42.1 - checksum: fb0a0b89c7ff51b91767027326181064dfa78477c2c255d87ce14640540ce5fd048efdafdbf2ea544d72a9b41ec4f0e69794dc8e29ecf2a30922b99474cd3c1c + "@typescript-eslint/types": 5.43.0 + "@typescript-eslint/visitor-keys": 5.43.0 + checksum: f30f7ae64cf518123959c6189508372041a60acad8b412c5fe628214707161f7cb66730aca575be0bca2ccee83c2b59de6c1c139cfb269f6b344cd0921a466b4 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.42.1": - version: 5.42.1 - resolution: "@typescript-eslint/type-utils@npm:5.42.1" +"@typescript-eslint/type-utils@npm:5.43.0": + version: 5.43.0 + resolution: "@typescript-eslint/type-utils@npm:5.43.0" dependencies: - "@typescript-eslint/typescript-estree": 5.42.1 - "@typescript-eslint/utils": 5.42.1 + "@typescript-eslint/typescript-estree": 5.43.0 + "@typescript-eslint/utils": 5.43.0 debug: ^4.3.4 tsutils: ^3.21.0 peerDependencies: @@ -9470,23 +9471,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: c1302b5351051e0b81593fd07d3f5bb7773ee0ee8ba58540eab5e16cba745ccb577d2907c1c1be3f40dc2c1281af91516c339214d8d2075b0c73a6c542174c86 + checksum: 4ed87a1856ab556d2c456c6696ad791dc71b7ae4e745281eba148418695b2a5848403a607352516c8f2007b10dd4b0884a356e8edda51f1d6fcb52d4216c600a languageName: node linkType: hard -"@typescript-eslint/types@npm:5.42.1": - version: 5.42.1 - resolution: "@typescript-eslint/types@npm:5.42.1" - checksum: 1c35cf44fe9b7790e4270c97f19284439df37faa206aee6e2a10b61a03efdb4c68309856d3f526df69b74e4ae0ce43e9c8303fb74f5b0263751f5862253a6140 +"@typescript-eslint/types@npm:5.43.0": + version: 5.43.0 + resolution: "@typescript-eslint/types@npm:5.43.0" + checksum: 93feae3f3a51100f46076649cc02bcd80bdeec88670a8fdfa63927b614f90b039cf1ec4f98367107112e744b567d35eec5fedc465aaea0a92aa835933dfc45e5 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.42.1": - version: 5.42.1 - resolution: "@typescript-eslint/typescript-estree@npm:5.42.1" +"@typescript-eslint/typescript-estree@npm:5.43.0": + version: 5.43.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.43.0" dependencies: - "@typescript-eslint/types": 5.42.1 - "@typescript-eslint/visitor-keys": 5.42.1 + "@typescript-eslint/types": 5.43.0 + "@typescript-eslint/visitor-keys": 5.43.0 debug: ^4.3.4 globby: ^11.1.0 is-glob: ^4.0.3 @@ -9495,35 +9496,35 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 537c7a7c3e95f465eca00fcecf7023956996dfff55e27b64004717122aa70bff806c2e68efd2862c89abab88c876bf7bbdd49df91c37dce203cbdd466613fc94 + checksum: ba08a7093d285966bef5938d3874bbad647ca929bae245e3d67ef22062868e540661b42c13a3166b052d8d6738f18ab83df9207fbd632ffdf255001f2f329ce8 languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.42.1": - version: 5.42.1 - resolution: "@typescript-eslint/utils@npm:5.42.1" +"@typescript-eslint/utils@npm:5.43.0": + version: 5.43.0 + resolution: "@typescript-eslint/utils@npm:5.43.0" dependencies: "@types/json-schema": ^7.0.9 "@types/semver": ^7.3.12 - "@typescript-eslint/scope-manager": 5.42.1 - "@typescript-eslint/types": 5.42.1 - "@typescript-eslint/typescript-estree": 5.42.1 + "@typescript-eslint/scope-manager": 5.43.0 + "@typescript-eslint/types": 5.43.0 + "@typescript-eslint/typescript-estree": 5.43.0 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 semver: ^7.3.7 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: a6bb90010c77b3e4a518001dbd3b25a34f51c489ac809be94af7227fd7427b5f9888a4d6a3a62cbc435fe2aa250898b6b1b9da9cbf7afa427788b7bdd1304203 + checksum: 8e8ce2c710601cdaba8919382f81383aa0c4e8f0d01755cd35c7ad08e145b09bd43e1b7fa032bc685490057c89b84fc1082c3f4bde0bed20ef54363fcb7200c0 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.42.1": - version: 5.42.1 - resolution: "@typescript-eslint/visitor-keys@npm:5.42.1" +"@typescript-eslint/visitor-keys@npm:5.43.0": + version: 5.43.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.43.0" dependencies: - "@typescript-eslint/types": 5.42.1 + "@typescript-eslint/types": 5.43.0 eslint-visitor-keys: ^3.3.0 - checksum: 7b162c56848cf94e2897ff8b9227e7bf80d2b88a3c1fd904a10701502731cfa4cc73347b58a26e99d5777a1e957f27261b7385c5e79a4ad25de4ebec3872977e + checksum: 8a5511dcfffd0167d0db9f71b995ca79353b7fe196a91a6c64e2161640ad5fb622f402930bac81febde204fe7946940e395d3e31f9c8df69cb2a1349c5ac7ef7 languageName: node linkType: hard @@ -9681,15 +9682,15 @@ __metadata: languageName: node linkType: hard -"@vue/compiler-core@npm:3.2.41": - version: 3.2.41 - resolution: "@vue/compiler-core@npm:3.2.41" +"@vue/compiler-core@npm:3.2.45": + version: 3.2.45 + resolution: "@vue/compiler-core@npm:3.2.45" dependencies: "@babel/parser": ^7.16.4 - "@vue/shared": 3.2.41 + "@vue/shared": 3.2.45 estree-walker: ^2.0.2 source-map: ^0.6.1 - checksum: 9f1023c2f0e8834a8056f5d0a4ac5d751b351d901e8cd03163aca10e317b08c599d326ef5de70a3d2ba1c7ee333e7a2289fc72ce4f6ac0496e750b044689f803 + checksum: 5efbbb4ceca47c34e74b3e40dc68768317c0f15f23f428d72a04d62c27bbb1b37a0d2ba4423dd2d3e7e2a4eda34b730758da2b23dd14b13cc625de3083e55639 languageName: node linkType: hard @@ -9703,24 +9704,24 @@ __metadata: languageName: node linkType: hard -"@vue/compiler-dom@npm:3.2.41, @vue/compiler-dom@npm:^3.2.0, @vue/compiler-dom@npm:^3.2.40": - version: 3.2.41 - resolution: "@vue/compiler-dom@npm:3.2.41" +"@vue/compiler-dom@npm:3.2.45, @vue/compiler-dom@npm:^3.2.0, @vue/compiler-dom@npm:^3.2.40": + version: 3.2.45 + resolution: "@vue/compiler-dom@npm:3.2.45" dependencies: - "@vue/compiler-core": 3.2.41 - "@vue/shared": 3.2.41 - checksum: 5dbbd925d4603668f5edcb134c8e8718e22738b7890e1cd6f2e8621aabf42a96df2f851f722f1176ca1744345fc74000c941b7cf4dc323dbbcd70da87ccdf378 + "@vue/compiler-core": 3.2.45 + "@vue/shared": 3.2.45 + checksum: 3984ff10f3c34c61f036bcd5379525f4ddb3f68e3fc531b265e1de2d5704359e3f16f88e39584e26a1bd8c9e4bc01f60ce67073fe9ca01a4080a77aa97255033 languageName: node linkType: hard -"@vue/compiler-sfc@npm:2.7.13": - version: 2.7.13 - resolution: "@vue/compiler-sfc@npm:2.7.13" +"@vue/compiler-sfc@npm:2.7.14": + version: 2.7.14 + resolution: "@vue/compiler-sfc@npm:2.7.14" dependencies: "@babel/parser": ^7.18.4 postcss: ^8.4.14 source-map: ^0.6.1 - checksum: 3a55e888b7b0b998cdfac6f000f16214efc5a159f41642a76c4de1778f3f8fbafbc3447d2ad78b09c3b90615b23108675119d4359372856c5a51e9169a797da9 + checksum: 29fe06d8da1f8721488468653be671aaa48d63fcd03c47261164cb770b4ecbde1e1455e6affbc9ef062f2729da6988000ba470fc43a2f8a454a61d51af68725d languageName: node linkType: hard @@ -9750,21 +9751,21 @@ __metadata: languageName: node linkType: hard -"@vue/compiler-sfc@npm:3.2.41, @vue/compiler-sfc@npm:^3.2.0, @vue/compiler-sfc@npm:^3.2.33, @vue/compiler-sfc@npm:^3.2.40": - version: 3.2.41 - resolution: "@vue/compiler-sfc@npm:3.2.41" +"@vue/compiler-sfc@npm:3.2.45, @vue/compiler-sfc@npm:^3.2.0, @vue/compiler-sfc@npm:^3.2.33, @vue/compiler-sfc@npm:^3.2.40": + version: 3.2.45 + resolution: "@vue/compiler-sfc@npm:3.2.45" dependencies: "@babel/parser": ^7.16.4 - "@vue/compiler-core": 3.2.41 - "@vue/compiler-dom": 3.2.41 - "@vue/compiler-ssr": 3.2.41 - "@vue/reactivity-transform": 3.2.41 - "@vue/shared": 3.2.41 + "@vue/compiler-core": 3.2.45 + "@vue/compiler-dom": 3.2.45 + "@vue/compiler-ssr": 3.2.45 + "@vue/reactivity-transform": 3.2.45 + "@vue/shared": 3.2.45 estree-walker: ^2.0.2 magic-string: ^0.25.7 postcss: ^8.1.10 source-map: ^0.6.1 - checksum: 327fb7acff404ac007c8eabefe485efb4d070e347bffca2c170232f502021fac01fabeda5f4f91a7b0b175b48cef184e053da9a2ef46b7ab188b8383bef188cb + checksum: 4e277066b3e89e8081a318dfc2aaf2bf8dfd4f14d93b9c868e51d994c45a766091703ba4299a7c83efff3749aee7ce2be67de666e8cc2f73fa23fdd833ad3b2c languageName: node linkType: hard @@ -9778,13 +9779,13 @@ __metadata: languageName: node linkType: hard -"@vue/compiler-ssr@npm:3.2.41": - version: 3.2.41 - resolution: "@vue/compiler-ssr@npm:3.2.41" +"@vue/compiler-ssr@npm:3.2.45": + version: 3.2.45 + resolution: "@vue/compiler-ssr@npm:3.2.45" dependencies: - "@vue/compiler-dom": 3.2.41 - "@vue/shared": 3.2.41 - checksum: 508361b2799097d86abd740548eabf7a20f9a6e1af29cda23dad07ed0b7d72569371492619f80ba2283c3e87c66016985a531cf2110742dabafe5566ca22e6eb + "@vue/compiler-dom": 3.2.45 + "@vue/shared": 3.2.45 + checksum: f7b587eb154d7686b8b92ecc16057cdc5875a4834115429a64343cc71df20e481310166784b24c1caeca15b84e0b761c526fd9438d10b505b5b7c899a47223b1 languageName: node linkType: hard @@ -9808,16 +9809,16 @@ __metadata: languageName: node linkType: hard -"@vue/reactivity-transform@npm:3.2.41": - version: 3.2.41 - resolution: "@vue/reactivity-transform@npm:3.2.41" +"@vue/reactivity-transform@npm:3.2.45": + version: 3.2.45 + resolution: "@vue/reactivity-transform@npm:3.2.45" dependencies: "@babel/parser": ^7.16.4 - "@vue/compiler-core": 3.2.41 - "@vue/shared": 3.2.41 + "@vue/compiler-core": 3.2.45 + "@vue/shared": 3.2.45 estree-walker: ^2.0.2 magic-string: ^0.25.7 - checksum: 8f4350efa220ed3ba8f0c4721a54ae4a2c043a8cff2d8d7227525df59f09145bb76a842f30fd3b0684c083b3e776653b464d737c7c53e43ce0739ac3d958a24a + checksum: 28f74ee0d178c478d67569a7f22748dc0c4423d4e16b8befb2de8641ff8d5f4cb988693bf75951231bfd02a7bdd97a4b525100d282f7453c465ca28cc1d3e7df languageName: node linkType: hard @@ -9830,12 +9831,12 @@ __metadata: languageName: node linkType: hard -"@vue/reactivity@npm:3.2.41, @vue/reactivity@npm:^3.2.40": - version: 3.2.41 - resolution: "@vue/reactivity@npm:3.2.41" +"@vue/reactivity@npm:3.2.45, @vue/reactivity@npm:^3.2.40": + version: 3.2.45 + resolution: "@vue/reactivity@npm:3.2.45" dependencies: - "@vue/shared": 3.2.41 - checksum: f76b7e3f12c441ff018ea1cb8c080365d135d87ddc075a10c87ea440a2c95e5d5ac04bb83dda0ce1f498fb390afff5d3d0c06d0a0fb46ca535df70c66dc3be90 + "@vue/shared": 3.2.45 + checksum: 5a9906292709fc27e48f44ada181be214788d56978efde433aa834bdb05240023fab2aa8b886398a01f3e515c27cd3758f3253d44382064d5c077b89d617719f languageName: node linkType: hard @@ -9849,13 +9850,13 @@ __metadata: languageName: node linkType: hard -"@vue/runtime-core@npm:3.2.41": - version: 3.2.41 - resolution: "@vue/runtime-core@npm:3.2.41" +"@vue/runtime-core@npm:3.2.45": + version: 3.2.45 + resolution: "@vue/runtime-core@npm:3.2.45" dependencies: - "@vue/reactivity": 3.2.41 - "@vue/shared": 3.2.41 - checksum: 9c21632c5a3330283649a9175ae03cebe27776a7615d10b9e8f2a98e4002951a9913be7b2810623c06d6481cb56b62e2f5e6f9a5d29d79f75d66ec10b528cdc2 + "@vue/reactivity": 3.2.45 + "@vue/shared": 3.2.45 + checksum: 29d79e31a9463ab58e33667003aed43b8601942b1df66c451c096ed6f62b3483e94324c5412b6ed2f1154dfec89121d8a40103aac79c10377f34143bf9a8b94a languageName: node linkType: hard @@ -9870,26 +9871,26 @@ __metadata: languageName: node linkType: hard -"@vue/runtime-dom@npm:3.2.41": - version: 3.2.41 - resolution: "@vue/runtime-dom@npm:3.2.41" +"@vue/runtime-dom@npm:3.2.45": + version: 3.2.45 + resolution: "@vue/runtime-dom@npm:3.2.45" dependencies: - "@vue/runtime-core": 3.2.41 - "@vue/shared": 3.2.41 + "@vue/runtime-core": 3.2.45 + "@vue/shared": 3.2.45 csstype: ^2.6.8 - checksum: 744d50eb98b5a00b31ef6c318a04b9d9786f35d9f255689aba7c15e7be927c14f4d4379b704cde97f0ba467b3f36c46efcc7d0b119c9bde3419a966a21081f78 + checksum: fef0d3052f4e8ce573e7dccbaf018dbc7a1485bcc9d7640608e4d4371fd505eeb187ccc47723fd560cec3bf0e2ca1dc998ec5f0d9db2e2f7c2277accc614f9a1 languageName: node linkType: hard -"@vue/server-renderer@npm:3.2.41": - version: 3.2.41 - resolution: "@vue/server-renderer@npm:3.2.41" +"@vue/server-renderer@npm:3.2.45": + version: 3.2.45 + resolution: "@vue/server-renderer@npm:3.2.45" dependencies: - "@vue/compiler-ssr": 3.2.41 - "@vue/shared": 3.2.41 + "@vue/compiler-ssr": 3.2.45 + "@vue/shared": 3.2.45 peerDependencies: - vue: 3.2.41 - checksum: 3aa31b70e46e0171e2c07562aa09bc1e75ccc6c876c146c3d25b4674d9394de46ba9ff338105ae81d7ff679763c9ecfe48e6d7382d52de163319481132cfc55a + vue: 3.2.45 + checksum: 5c0a80e1d5405ea1e83652088a3b30f6763483da3d8df28d140f7578028f96bfbecf4a1761cb6af742b8494fe071f97813c44e7f2b6711a5b82955bba8124f1b languageName: node linkType: hard @@ -9900,10 +9901,10 @@ __metadata: languageName: node linkType: hard -"@vue/shared@npm:3.2.41, @vue/shared@npm:^3.2.40": - version: 3.2.41 - resolution: "@vue/shared@npm:3.2.41" - checksum: bc46bf36e856a10646639561b346a76594e8a1afa992e3394056a6e0b534c6c71b1330e13960ba9788bb36265a5e761ac4c562daad0d168265d496fc3e7d6575 +"@vue/shared@npm:3.2.45, @vue/shared@npm:^3.2.40": + version: 3.2.45 + resolution: "@vue/shared@npm:3.2.45" + checksum: ce80448852705badcd481a93e7701344d3302485e3127e2fa2e69f7a28818bd419326c351d521f882dfaa7ecf711944867e34b1230b7fcc3810ada9c99f014c7 languageName: node linkType: hard @@ -10447,14 +10448,14 @@ __metadata: linkType: hard "ajv@npm:^8.0.0, ajv@npm:^8.2.0, ajv@npm:^8.8.0": - version: 8.11.0 - resolution: "ajv@npm:8.11.0" + version: 8.11.2 + resolution: "ajv@npm:8.11.2" dependencies: fast-deep-equal: ^3.1.1 json-schema-traverse: ^1.0.0 require-from-string: ^2.0.2 uri-js: ^4.2.2 - checksum: 8a4b1b639a53d52169b94dd1cdd03716fe7bbc1fc676006957ba82497e764f4bd44b92f75e37c8804ea3176ee3c224322e22779d071fb01cd89aefaaa42c9414 + checksum: 152450e03f45e6ff09dab02d9647340e7bf7bcffbe88047b1c5ad7518cc278aa812f1f41606958772a93861b06b8abc91ddb9e124626aab253a9efef875d8e2c languageName: node linkType: hard @@ -11199,10 +11200,10 @@ __metadata: languageName: node linkType: hard -"axe-core@npm:^4.2.0, axe-core@npm:^4.4.3, axe-core@npm:^4.5.0": - version: 4.5.1 - resolution: "axe-core@npm:4.5.1" - checksum: 9b8ecb90329d73d34faea3a6bf3132b9070cc7a8d3fb12e1bf02ded29e4c938276d3435e83d59d844ea62b7069caebf18ec78a6b99754d7f9bbec7eea379bec0 +"axe-core@npm:^4.2.0, axe-core@npm:^4.4.3, axe-core@npm:^4.5.1": + version: 4.5.2 + resolution: "axe-core@npm:4.5.2" + checksum: 8f6e12fe08daacb875d471a6860eaf93dcac0e08bd26438b0c52751b826c130288f03b18b1e71ed6e15a9318df6d7a7e9522501ea50433c85a383b1e4dc9cdbc languageName: node linkType: hard @@ -12932,9 +12933,9 @@ __metadata: linkType: hard "ci-info@npm:^3.2.0": - version: 3.5.0 - resolution: "ci-info@npm:3.5.0" - checksum: 96491dffabccce7dfcad83569eb306669bf9a25af978e823042ec87d4821d20663e17f18b6da7f42f85a8f7f8c0ae7f41673f3a649c94a260f9ac1d6349690be + version: 3.6.1 + resolution: "ci-info@npm:3.6.1" + checksum: 7d5147d627590157b340a795e97b23e20b9633ea34ccc943ef4dfae4ab5cc50b9a83b7e6c513b99f864dc5cca60b4d5fdbfc063381a02730b2bf6cd514af3949 languageName: node linkType: hard @@ -13311,9 +13312,9 @@ __metadata: linkType: hard "comma-separated-tokens@npm:^2.0.0": - version: 2.0.2 - resolution: "comma-separated-tokens@npm:2.0.2" - checksum: 5884b75fa52cb47c5d55f22401ca590db3e37a46e9b2ad7c7dc26fea17cca55c5c1a4db3247af1ce292eaf69241af213d7c44fc7c2e83a4b64f852014335c22b + version: 2.0.3 + resolution: "comma-separated-tokens@npm:2.0.3" + checksum: 91f90f1aae320f1755d6957ef0b864fe4f54737f3313bd95e0802686ee2ca38bff1dd381964d00ae5db42912dd1f4ae5c2709644e82706ffc6f6842a813cdd67 languageName: node linkType: hard @@ -13758,11 +13759,11 @@ __metadata: linkType: hard "copy-to-clipboard@npm:^3.3.1": - version: 3.3.2 - resolution: "copy-to-clipboard@npm:3.3.2" + version: 3.3.3 + resolution: "copy-to-clipboard@npm:3.3.3" dependencies: toggle-selection: ^1.0.6 - checksum: 295b987e47d3e89a421db4a6060276167bee0f14245e0e447613c060a9af806610a2958a0b9bc4512c7329a1d38fb4baf903979b443c63b03d2bc9968ce66ab6 + checksum: 3ebf5e8ee00601f8c440b83ec08d838e8eabb068c1fae94a9cda6b42f288f7e1b552f3463635f419af44bf7675afc8d0390d30876cf5c2d5d35f86d9c56a3e5f languageName: node linkType: hard @@ -13783,18 +13784,18 @@ __metadata: linkType: hard "core-js-compat@npm:^3.20.2, core-js-compat@npm:^3.21.0, core-js-compat@npm:^3.25.1": - version: 3.26.0 - resolution: "core-js-compat@npm:3.26.0" + version: 3.26.1 + resolution: "core-js-compat@npm:3.26.1" dependencies: browserslist: ^4.21.4 - checksum: c93684da7bda013e5f356f59472f76a6d5976b7ce1ae7a781ab922949db2995040bb81bd41b6a15e2b7da09870485a05854abee2ace29aaf9c1b92c57e3461b7 + checksum: 2d798049758900a7fd83958e02d1d46d35157dbaa6f916c358f735bfe3095cdf5b54dc999363e654445a94417005eb548b9acc47e1d18eda3d1a43cf05b350a5 languageName: node linkType: hard "core-js-pure@npm:^3.23.3, core-js-pure@npm:^3.25.1": - version: 3.26.0 - resolution: "core-js-pure@npm:3.26.0" - checksum: d2fd6f787903c77d9ea4f3c961bd79e4632e12ae2ddf55ecba0bbb186d31e46b0649e98f9d9a8def2a5127ad2272f31650f54e84f80b833dd822291730c6dd77 + version: 3.26.1 + resolution: "core-js-pure@npm:3.26.1" + checksum: a58ec9bfc88b87d39a31c099a4701cb44a2b0856b182630341fe12a9170e60c087345e566b52479f5111349ae6eb52a74926bfee5d6553dfd15cb5a161470e57 languageName: node linkType: hard @@ -13813,9 +13814,9 @@ __metadata: linkType: hard "core-js@npm:^3.0.4, core-js@npm:^3.6.5, core-js@npm:^3.8.2": - version: 3.26.0 - resolution: "core-js@npm:3.26.0" - checksum: 5b61da1cccea18b42e64dafe7270b3a12e31f6fca97f7bbebd565b89acd71c2bbb45605ceb164f5b0aa7e41843f6ae8ecc16d4833a081ac269969220c50fd8d6 + version: 3.26.1 + resolution: "core-js@npm:3.26.1" + checksum: 82d36c6f54fc0349998fa7fc67d200ba272f1cd1674c6786dc17f9d259d6555fc05662044528eae73ad6e90f71d503ab5c060ad4745492ef804308209f9aec13 languageName: node linkType: hard @@ -13863,15 +13864,15 @@ __metadata: linkType: hard "cosmiconfig@npm:^7.0.0, cosmiconfig@npm:^7.0.1": - version: 7.0.1 - resolution: "cosmiconfig@npm:7.0.1" + version: 7.1.0 + resolution: "cosmiconfig@npm:7.1.0" dependencies: "@types/parse-json": ^4.0.0 import-fresh: ^3.2.1 parse-json: ^5.0.0 path-type: ^4.0.0 yaml: ^1.10.0 - checksum: 3cd38525ba22e13da0ef9f4be131df226c94f5b96fb50f6297eb17baeedefe15cf5819f8c73cde69f71cc5034e712c86bd20c7756883dd8094087680ecc25932 + checksum: b923ff6af581638128e5f074a5450ba12c0300b71302398ea38dbeabd33bbcaa0245ca9adbedfcf284a07da50f99ede5658c80bb3e39e2ce770a99d28a21ef03 languageName: node linkType: hard @@ -13993,20 +13994,20 @@ __metadata: linkType: hard "css-loader@npm:^6.7.1": - version: 6.7.1 - resolution: "css-loader@npm:6.7.1" + version: 6.7.2 + resolution: "css-loader@npm:6.7.2" dependencies: icss-utils: ^5.1.0 - postcss: ^8.4.7 + postcss: ^8.4.18 postcss-modules-extract-imports: ^3.0.0 postcss-modules-local-by-default: ^4.0.0 postcss-modules-scope: ^3.0.0 postcss-modules-values: ^4.0.0 postcss-value-parser: ^4.2.0 - semver: ^7.3.5 + semver: ^7.3.8 peerDependencies: webpack: ^5.0.0 - checksum: c9e900e2a6012a988ab36cf87598fa1e74cd570ab25dbcc8a5d7f10a91a0f9549ff3656b9bbb2bf26b9f5a39f76b9b4b148513c4085c23b73c9c1d5cc2f7de12 + checksum: 41e8246c7ccc9507ace5bdfed902c4d0b6db59038b933f70d477d2b010827da3e78ec58a44444d8ad22c46470f188194c7aeaf9fb9afb21e881bd704ce8f605a languageName: node linkType: hard @@ -14517,9 +14518,9 @@ __metadata: linkType: hard "deep-object-diff@npm:^1.1.0": - version: 1.1.7 - resolution: "deep-object-diff@npm:1.1.7" - checksum: 49a9d24de19c1355e253d1399209c60fc8696d8e7fc57346ac4bcb295ca0e944f004d4a96a24e9627bcb58a858cb4b05194f6da845b0157be6a65a2f248e05f3 + version: 1.1.9 + resolution: "deep-object-diff@npm:1.1.9" + checksum: 12cfd1b000d16c9192fc649923c972f8aac2ddca4f71a292f8f2c1e2d5cf3c9c16c85e73ab3e7d8a89a5ec6918d6460677d0b05bd160f7bd50bb4816d496dc24 languageName: node linkType: hard @@ -14803,10 +14804,10 @@ __metadata: languageName: node linkType: hard -"diff-sequences@npm:^29.2.0": - version: 29.2.0 - resolution: "diff-sequences@npm:29.2.0" - checksum: 4b83cda386c251f772c6983e3dfbe36d6d563c6b223e8845c98469417d2f2e35839dc4cf23dbabc3ccecaf30bf8e188481fee6f1660cb3e8fbfa9a27506790ef +"diff-sequences@npm:^29.3.1": + version: 29.3.1 + resolution: "diff-sequences@npm:29.3.1" + checksum: adbacc8d56c42f73c12a90e253c2b7024d2cd52c30bd81a3960a9cfd35164f8ecd3d8dd82ded38b0e48585923b56bd28f9aae942e6d1b23f444213b9d786b925 languageName: node linkType: hard @@ -15049,9 +15050,9 @@ __metadata: linkType: hard "dompurify@npm:^2.2.6": - version: 2.4.0 - resolution: "dompurify@npm:2.4.0" - checksum: b091e8f1a5106a7bcfc9947ea654a91e1c7fc28c9264578c0ccca3527d62f4ec9b6df8cfd91b3c21696d5182950a37b1b79e3c5d669256c7730107cb6d9c64f1 + version: 2.4.1 + resolution: "dompurify@npm:2.4.1" + checksum: 4563459e959f01748d2499bf6afc9e7fd47721df42d93e6f2c04857b7685c112ecafc741877185423b04c1a77b3951c7c8e6c60d9bc283ff55abd7afef36ea48 languageName: node linkType: hard @@ -16096,11 +16097,13 @@ __metadata: linkType: hard "esbuild-register@npm:^3.3.3": - version: 3.3.3 - resolution: "esbuild-register@npm:3.3.3" + version: 3.4.1 + resolution: "esbuild-register@npm:3.4.1" + dependencies: + debug: ^4.3.4 peerDependencies: esbuild: ">=0.12 <1" - checksum: b99e094646e6de94afafd201794e5d2e0250377cabd544cc3d7da5ccf879f38174e26a6530ecd1fa20494842f4af50360769510dbcf57ff1ce4ba6d0e84ae273 + checksum: 6364c96f83fc4720d907d6342605f5891986c2a30fbc0a249047195ea5b02c0f7e4e698aa262875b37088f44ca741331d35c026d2606778d114fe082d560957d languageName: node linkType: hard @@ -16121,11 +16124,11 @@ __metadata: linkType: hard "esbuild-wasm@npm:>=0.13.8": - version: 0.15.13 - resolution: "esbuild-wasm@npm:0.15.13" + version: 0.15.14 + resolution: "esbuild-wasm@npm:0.15.14" bin: esbuild: bin/esbuild - checksum: 9bedcb95a11003467f1bd2192348c2fa796e247adc3eb36207f1d416a9d466f905ff675aeee97c554606a384e96d32a898f92124319816d45a3f4fd0a838a42d + checksum: 174eaa1c598bbddef045965dba60181dccb3f2ac90098da6e4994e315371bce227c688d866e292621385c9a31ba8a0b756386aa0ca197b0158fda37a28d52ff0 languageName: node linkType: hard @@ -17163,15 +17166,15 @@ __metadata: linkType: hard "expect@npm:^29.0.0": - version: 29.3.0 - resolution: "expect@npm:29.3.0" + version: 29.3.1 + resolution: "expect@npm:29.3.1" dependencies: - "@jest/expect-utils": ^29.2.2 + "@jest/expect-utils": ^29.3.1 jest-get-type: ^29.2.0 - jest-matcher-utils: ^29.2.2 - jest-message-util: ^29.2.1 - jest-util: ^29.2.1 - checksum: b18ecfffc9b49afa1702d8ab54cccc63a5a1e2e410afc92c9a104978e397065df00af87a59d0c136e462362f3e6174e963b4a2ff1e7e1efc8217923305c449fc + jest-matcher-utils: ^29.3.1 + jest-message-util: ^29.3.1 + jest-util: ^29.3.1 + checksum: 0662836949648b65ea80c0fc4777818bd384c00d2ad3d442ec1bea69a604097f94673a432245ae750b09bc8d292f381a31dcc59cf0433a9b2adfba501e257d63 languageName: node linkType: hard @@ -17836,9 +17839,9 @@ __metadata: linkType: hard "flow-parser@npm:0.*": - version: 0.192.0 - resolution: "flow-parser@npm:0.192.0" - checksum: 99cd6096b119f8afb02abab7ac82cb6da1500fd7e5c16c66b212c266903087330c8a9da8d8d4ef321e3a56762510014e54ec0924ae84e082b77a3a39e8f9b10c + version: 0.193.0 + resolution: "flow-parser@npm:0.193.0" + checksum: 25b2770c00a4c7ee7596fa4c2a4d5e422c6bbac96162778a37523fddbf4bf49942efd45984c6156f9b515dbad45c0927e78792ab11543b0b31b654427920858c languageName: node linkType: hard @@ -21028,9 +21031,9 @@ __metadata: linkType: hard "is-yarn-global@npm:^0.4.0": - version: 0.4.0 - resolution: "is-yarn-global@npm:0.4.0" - checksum: 7fb759bb20439fa37c8e3214c56bc7c2f0608ae68b885c206db1043cfa91e9507ef3a1b564b810762c424a4459fd74a06ff12a39a7f9e2eab11279aa883f9dd8 + version: 0.4.1 + resolution: "is-yarn-global@npm:0.4.1" + checksum: 8ff66f33454614f8e913ad91cc4de0d88d519a46c1ed41b3f589da79504ed0fcfa304064fe3096dda9360c5f35aa210cb8e978fd36798f3118cb66a4de64d365 languageName: node linkType: hard @@ -21488,15 +21491,15 @@ __metadata: languageName: node linkType: hard -"jest-diff@npm:^29.2.1": - version: 29.2.1 - resolution: "jest-diff@npm:29.2.1" +"jest-diff@npm:^29.3.1": + version: 29.3.1 + resolution: "jest-diff@npm:29.3.1" dependencies: chalk: ^4.0.0 - diff-sequences: ^29.2.0 + diff-sequences: ^29.3.1 jest-get-type: ^29.2.0 - pretty-format: ^29.2.1 - checksum: ce76f24f1ed026cf501c920675a783356e92c5ec69795d3b505c7b2ff09aa3271111524dd24bc185178ce8d7e992f2947a2f3e932efd2bef60215f7cbf9e552e + pretty-format: ^29.3.1 + checksum: 6bbe1fc91f9e7351e995f725029d984392fd0fe2374e64953c2b38a8d857f93b845fcf5d9421cccf2be077f651374f6b7ca6c5970687b2b6521452c15c1e3286 languageName: node linkType: hard @@ -21977,15 +21980,15 @@ __metadata: languageName: node linkType: hard -"jest-matcher-utils@npm:^29.2.2": - version: 29.2.2 - resolution: "jest-matcher-utils@npm:29.2.2" +"jest-matcher-utils@npm:^29.3.1": + version: 29.3.1 + resolution: "jest-matcher-utils@npm:29.3.1" dependencies: chalk: ^4.0.0 - jest-diff: ^29.2.1 + jest-diff: ^29.3.1 jest-get-type: ^29.2.0 - pretty-format: ^29.2.1 - checksum: a554e683bcd18cc11e1e018597771051e88cb3bf79cdbb5896f7550bd4c787e473ba4727336db2049fea6149e21546c8f1cde4b78a76eb595199cfeaba6450b1 + pretty-format: ^29.3.1 + checksum: 4efdcc2fa33a403285e26521f795c9c7ad537a30e5b4183a8d97fd9f05251107ef2ef1397dbb420a2517fa91606655cb1103a0c60a52b1f003d928dbea3963e3 languageName: node linkType: hard @@ -22056,20 +22059,20 @@ __metadata: languageName: node linkType: hard -"jest-message-util@npm:^29.2.1": - version: 29.2.1 - resolution: "jest-message-util@npm:29.2.1" +"jest-message-util@npm:^29.3.1": + version: 29.3.1 + resolution: "jest-message-util@npm:29.3.1" dependencies: "@babel/code-frame": ^7.12.13 - "@jest/types": ^29.2.1 + "@jest/types": ^29.3.1 "@types/stack-utils": ^2.0.0 chalk: ^4.0.0 graceful-fs: ^4.2.9 micromatch: ^4.0.4 - pretty-format: ^29.2.1 + pretty-format: ^29.3.1 slash: ^3.0.0 stack-utils: ^2.0.3 - checksum: 1931a6666b7e650b69f1ee702c8680e7e57becba8be0cb7ac06b35c5a12778338a6702295a39022d975c87a10cc3c7c53f4f3d76b14065ead4a0d4f01ce1f22c + checksum: 09291af22383d14a6ac0e4faea6382e07e38a89b67985ac48fd4604037572c847021d471f11f1866fd696875218996740a10a176acc26fbe072e4394d52129e0 languageName: node linkType: hard @@ -22696,17 +22699,17 @@ __metadata: languageName: node linkType: hard -"jest-util@npm:^29.2.1": - version: 29.2.1 - resolution: "jest-util@npm:29.2.1" +"jest-util@npm:^29.3.1": + version: 29.3.1 + resolution: "jest-util@npm:29.3.1" dependencies: - "@jest/types": ^29.2.1 + "@jest/types": ^29.3.1 "@types/node": "*" chalk: ^4.0.0 ci-info: ^3.2.0 graceful-fs: ^4.2.9 picomatch: ^2.2.3 - checksum: 678ae6089b460156882c0c2f94f46dfcbf9e00d147edee0eb7101a1b38ef36c7a5e7b7c7d8d3aa089a8fa08b2930bf3392c5bb527d229b70a5fd0d48fd091be0 + checksum: c03606c389cf6f454962e4670fcb5d346e0cef166d71a6d70cde2ffaff9a0744fbf7b0651a01ac07e5ade790e95937bcaa604601ebb4c8dbf3e4c641027e61d0 languageName: node linkType: hard @@ -23284,11 +23287,11 @@ __metadata: linkType: hard "json-stable-stringify@npm:^1.0.1": - version: 1.0.1 - resolution: "json-stable-stringify@npm:1.0.1" + version: 1.0.2 + resolution: "json-stable-stringify@npm:1.0.2" dependencies: - jsonify: ~0.0.0 - checksum: 3127db54f6507096645411ad9e15abd6091b8a94d675321d5c28ecefe3ddabd07a255d12f27e140dd8af3eb07198c81e4d9a29a14f1f9342546a3e94881bb4f6 + jsonify: ^0.0.1 + checksum: 502d021c3c59c09587faa40d7693d77c00460fd6c68bae95d6e35804909ec8c4aec71b136d3a09df61a7ebf803eb6e820f23ede76b77e74b8b02c76afb2ada8c languageName: node linkType: hard @@ -23367,7 +23370,7 @@ __metadata: languageName: node linkType: hard -"jsonify@npm:~0.0.0": +"jsonify@npm:^0.0.1": version: 0.0.1 resolution: "jsonify@npm:0.0.1" checksum: 7f5499cdd59a0967ed35bda48b7cec43d850bbc8fb955cdd3a1717bb0efadbe300724d5646de765bb7a99fc1c3ab06eb80d93503c6faaf99b4ff50a3326692f6 @@ -24010,7 +24013,7 @@ __metadata: languageName: node linkType: hard -"loader-utils@npm:3.2.0, loader-utils@npm:^3.2.0": +"loader-utils@npm:3.2.0": version: 3.2.0 resolution: "loader-utils@npm:3.2.0" checksum: 573f7059f283b24b2b68cd230d9f0ba87315da8ecc7885734ea5f108fc83c7882e4eb8f8feab65f7db1661ab540f5aea778f48d18b7aadc24c37be77b2ff70a0 @@ -24018,24 +24021,31 @@ __metadata: linkType: hard "loader-utils@npm:^1.0.2, loader-utils@npm:^1.1.0, loader-utils@npm:^1.2.3": - version: 1.4.1 - resolution: "loader-utils@npm:1.4.1" + version: 1.4.2 + resolution: "loader-utils@npm:1.4.2" dependencies: big.js: ^5.2.2 emojis-list: ^3.0.0 json5: ^1.0.1 - checksum: 38096fc9fba3160eb7b7408eb88658a854a992fed2106fe3972d144035688dc4fcb3767cf353f85513ac0e654efbf1001735bd5a8d8bb5429fdb5a6b0712ce92 + checksum: 2b726088b5526f7605615e3e28043ae9bbd2453f4a85898e1151f3c39dbf7a2b65d09f3996bc588d92ac7e717ded529d3e1ea3ea42c433393be84a58234a2f53 languageName: node linkType: hard -"loader-utils@npm:^2.0.0": - version: 2.0.3 - resolution: "loader-utils@npm:2.0.3" +"loader-utils@npm:^2.0.0, loader-utils@npm:^2.0.3": + version: 2.0.4 + resolution: "loader-utils@npm:2.0.4" dependencies: big.js: ^5.2.2 emojis-list: ^3.0.0 json5: ^2.1.2 - checksum: 6a674996d134ebc267b0bf4b846e99b4b0d53cebc15ecc971ef2ac5977570aae3e6b7d61f4809e135dca76f5e0b29084856e8723b1599762bffd4301e4a28b95 + checksum: d5654a77f9d339ec2a03d88221a5a695f337bf71eb8dea031b3223420bb818964ba8ed0069145c19b095f6c8b8fd386e602a3fc7ca987042bd8bb1dcc90d7100 + languageName: node + linkType: hard + +"loader-utils@npm:^3.2.0": + version: 3.2.1 + resolution: "loader-utils@npm:3.2.1" + checksum: d3e1f217d160e8e894a0385a33500d4ce14065e8ffb250f5a81ae65bc2c3baa50625ec34182ba4417b46b4ac6725aed64429e1104d6401e074af2aa1dd018394 languageName: node linkType: hard @@ -24405,9 +24415,9 @@ __metadata: linkType: hard "loglevel@npm:^1.8.0": - version: 1.8.0 - resolution: "loglevel@npm:1.8.0" - checksum: e67645b38062e73ef72b37664f0cd43e9deea2e9e4a161d67998578f5b758c47740ec976e9dca7d2d05b23414df8004ded8955da50b6ad1dc9628739f645e905 + version: 1.8.1 + resolution: "loglevel@npm:1.8.1" + checksum: 21069436c97448a1801b154a77d19ada212225c513d94f0471bfe299c981ffd4dc0d21e6211f9250bd6209ba9837bfe0d40d9295c673d73e3c543ec6b1c5d9ef languageName: node linkType: hard @@ -25044,11 +25054,11 @@ __metadata: linkType: hard "memfs@npm:^3.2.2, memfs@npm:^3.4.1, memfs@npm:^3.4.3": - version: 3.4.10 - resolution: "memfs@npm:3.4.10" + version: 3.4.11 + resolution: "memfs@npm:3.4.11" dependencies: fs-monkey: ^1.0.3 - checksum: 7bf17f35dbf787019266cb55b9488f82fd8f33cae32272df0a86979c99ee028f03b98a165c219abbc3c47f47d1b09ce8d4d0fbd73237fee70e62aec9c933f7bc + checksum: 31792e27e6622d63e44aafccf9650d432ba51bcdfddf6ebefcf5fe7c5279da8a3d5481b1597bd21331e68f37c2040a496066c972cc66f18a5022d265c800d395 languageName: node linkType: hard @@ -26237,23 +26247,23 @@ __metadata: linkType: hard "next@npm:^12.2.4": - version: 12.3.2 - resolution: "next@npm:12.3.2" - dependencies: - "@next/env": 12.3.2 - "@next/swc-android-arm-eabi": 12.3.2 - "@next/swc-android-arm64": 12.3.2 - "@next/swc-darwin-arm64": 12.3.2 - "@next/swc-darwin-x64": 12.3.2 - "@next/swc-freebsd-x64": 12.3.2 - "@next/swc-linux-arm-gnueabihf": 12.3.2 - "@next/swc-linux-arm64-gnu": 12.3.2 - "@next/swc-linux-arm64-musl": 12.3.2 - "@next/swc-linux-x64-gnu": 12.3.2 - "@next/swc-linux-x64-musl": 12.3.2 - "@next/swc-win32-arm64-msvc": 12.3.2 - "@next/swc-win32-ia32-msvc": 12.3.2 - "@next/swc-win32-x64-msvc": 12.3.2 + version: 12.3.3 + resolution: "next@npm:12.3.3" + dependencies: + "@next/env": 12.3.3 + "@next/swc-android-arm-eabi": 12.3.3 + "@next/swc-android-arm64": 12.3.3 + "@next/swc-darwin-arm64": 12.3.3 + "@next/swc-darwin-x64": 12.3.3 + "@next/swc-freebsd-x64": 12.3.3 + "@next/swc-linux-arm-gnueabihf": 12.3.3 + "@next/swc-linux-arm64-gnu": 12.3.3 + "@next/swc-linux-arm64-musl": 12.3.3 + "@next/swc-linux-x64-gnu": 12.3.3 + "@next/swc-linux-x64-musl": 12.3.3 + "@next/swc-win32-arm64-msvc": 12.3.3 + "@next/swc-win32-ia32-msvc": 12.3.3 + "@next/swc-win32-x64-msvc": 12.3.3 "@swc/helpers": 0.4.11 caniuse-lite: ^1.0.30001406 postcss: 8.4.14 @@ -26301,7 +26311,7 @@ __metadata: optional: true bin: next: dist/bin/next - checksum: fb55616937867599e257766669eee37119ebb30df3d16a533ea7b7213e80bf403157852d0e189fe027b3dc4dd40fc3eec7866c2b3823214901f3ebbf60a4dd72 + checksum: 7af340ca49cf270e4b37cdd372c16a7ba1a3cadb1124f0a7a65a49d6fe8b4786070b31064c8e0baa1d4fd765788ed5249d6b31d4455962ab9e5657857f5bd15b languageName: node linkType: hard @@ -28672,14 +28682,14 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.1.10, postcss@npm:^8.2.14, postcss@npm:^8.2.15, postcss@npm:^8.3.7, postcss@npm:^8.4.14, postcss@npm:^8.4.18, postcss@npm:^8.4.7": - version: 8.4.18 - resolution: "postcss@npm:8.4.18" +"postcss@npm:^8.1.10, postcss@npm:^8.2.14, postcss@npm:^8.2.15, postcss@npm:^8.3.7, postcss@npm:^8.4.14, postcss@npm:^8.4.18": + version: 8.4.19 + resolution: "postcss@npm:8.4.19" dependencies: nanoid: ^3.3.4 picocolors: ^1.0.0 source-map-js: ^1.0.2 - checksum: df38b43e0cd79b115305fb787f4586d376b38c515692ef7429785af84d00ebe86f2276b98071d3f62848daf8639ee4ef6057618b34c292196dc6af072eeede5e + checksum: f33594fa0a2b629043deada34171744891054255baa49150d77f08f68edec1fa7eb9740e64c3a32e6f476c16e9e592af942fcf55f93051673dd208c0aee1d60b languageName: node linkType: hard @@ -28695,9 +28705,9 @@ __metadata: linkType: hard "preact@npm:^10.5.13": - version: 10.11.2 - resolution: "preact@npm:10.11.2" - checksum: ae370a7ef997bc3c4d4e3057ee9b78ced8b078bd96139388e815a5221bdd1e16bf2b62a957b59fb8afdd8eb40e07445bd1c10dbe21b28ec0f6e163829efa475a + version: 10.11.3 + resolution: "preact@npm:10.11.3" + checksum: 44f342de226a89b53a7156fad0d4192bfc8233a5cc3eb46162f53d3c0c1c2956222d997927c7dff20f52c3592f112cefec5adac64f0477cbd8370fb39126ef7b languageName: node linkType: hard @@ -28785,14 +28795,14 @@ __metadata: languageName: node linkType: hard -"pretty-format@npm:^29.0.0, pretty-format@npm:^29.2.1": - version: 29.2.1 - resolution: "pretty-format@npm:29.2.1" +"pretty-format@npm:^29.0.0, pretty-format@npm:^29.3.1": + version: 29.3.1 + resolution: "pretty-format@npm:29.3.1" dependencies: "@jest/schemas": ^29.0.0 ansi-styles: ^5.0.0 react-is: ^18.0.0 - checksum: 35d275a65379fdd52cbf2d984432bca91ca4ebecc6c3459e5d96f653a2855b9aab8147fe303b68435c3d18ec8b80bdbe425ed3b9fc8e4ff112f552f4b949108d + checksum: 8c0b27a7f31c678a382de70217c524b752b14c6aaf56f94098b04208d91965e4b4f92c268e6c1124c20c3cf8de146dd4ba6a4d1f1033ae67c0dcccd4de23e98b languageName: node linkType: hard @@ -29780,15 +29790,15 @@ __metadata: linkType: hard "react-textarea-autosize@npm:^8.3.0": - version: 8.3.4 - resolution: "react-textarea-autosize@npm:8.3.4" + version: 8.4.0 + resolution: "react-textarea-autosize@npm:8.4.0" dependencies: "@babel/runtime": ^7.10.2 use-composed-ref: ^1.3.0 use-latest: ^1.2.1 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 02dd38f6c40c4dd88b6c35370eaddc385c0a417c614b5ecb50d1121e99905da26fea9d5c05b580404b7f8a7d9a4964a8613654882be03963c36005779b96cca5 + checksum: cef5cc06e353c50db19689f4c61260572fea6a48a4b3d7600a1e0b69f20b33b5899db15f272c402c649c999d76834ad11de63f0053c1edab5ae72b05661e22c8 languageName: node linkType: hard @@ -30184,18 +30194,18 @@ __metadata: linkType: hard "regenerator-runtime@npm:^0.13.10, regenerator-runtime@npm:^0.13.2, regenerator-runtime@npm:^0.13.4, regenerator-runtime@npm:^0.13.7": - version: 0.13.10 - resolution: "regenerator-runtime@npm:0.13.10" - checksum: 2990a7a998ff6bf5caf5597c5671751f447560c5060ae5628469620a7ce640131bf0744c506d63c2166783121535da4ed782c3383371f945fb9a37481598a761 + version: 0.13.11 + resolution: "regenerator-runtime@npm:0.13.11" + checksum: 12b069dc774001fbb0014f6a28f11c09ebfe3c0d984d88c9bced77fdb6fedbacbca434d24da9ae9371bfbf23f754869307fb51a4c98a8b8b18e5ef748677ca24 languageName: node linkType: hard "regenerator-transform@npm:^0.15.0": - version: 0.15.0 - resolution: "regenerator-transform@npm:0.15.0" + version: 0.15.1 + resolution: "regenerator-transform@npm:0.15.1" dependencies: "@babel/runtime": ^7.8.4 - checksum: c825d84f580441a3c592ea25668c491e0a1bd3ad55a992ce6b83b34bfc6e811d0b676af4e70f12e2c93834835d6c9181f75f13c8be181844b01e397a7d9df06b + checksum: 6588e0c454e92ed6c2b3ed7ab24f61270aef47ae7052eceb5367cc15658948a2e84fdd6849f7c96e561d1f8a7474dc4c292166792e07498fdde226299b9ff374 languageName: node linkType: hard @@ -30235,16 +30245,16 @@ __metadata: linkType: hard "regexpu-core@npm:^5.1.0": - version: 5.2.1 - resolution: "regexpu-core@npm:5.2.1" + version: 5.2.2 + resolution: "regexpu-core@npm:5.2.2" dependencies: regenerate: ^1.4.2 regenerate-unicode-properties: ^10.1.0 regjsgen: ^0.7.1 regjsparser: ^0.9.1 unicode-match-property-ecmascript: ^2.0.0 - unicode-match-property-value-ecmascript: ^2.0.0 - checksum: 6bbad97524fad1bf9ded80cf3b2f3ebc6aac0b56ac857a69ba15728ae7948800f79da3a5e946924365e241fcfaf90984861567d25ef2887b1905059531b490f0 + unicode-match-property-value-ecmascript: ^2.1.0 + checksum: 1d025e2144ee7207db424125a81f5989bd337f56cddc23c0c83c1051679eee33d8c65c0e1e23fa494c2d8c9f0b19c47df0315a924445ad40e733c8aad4286f83 languageName: node linkType: hard @@ -31273,8 +31283,8 @@ __metadata: linkType: hard "rollup@npm:^3.2.5": - version: 3.2.5 - resolution: "rollup@npm:3.2.5" + version: 3.3.0 + resolution: "rollup@npm:3.3.0" dependencies: fsevents: ~2.3.2 dependenciesMeta: @@ -31282,7 +31292,7 @@ __metadata: optional: true bin: rollup: dist/bin/rollup - checksum: f9332142d6f9298cc634a472ba913205edec518f165c6f1d31934585df5d4d6582c20d3ab88ca98a4325ee9a150597c3a548e3ed904180485cd60e0f813dd66f + checksum: f799a8319ee107f48abafac3e5fb99b63af7e01b50acf3c48e0e3d4fc1a638c0ac09788e4b7ec4590efc74a0a7fce125237743e354c452b314bc207a12aae272 languageName: node linkType: hard @@ -31694,7 +31704,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.x, semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7": +"semver@npm:7.x, semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8": version: 7.3.8 resolution: "semver@npm:7.3.8" dependencies: @@ -32367,9 +32377,9 @@ __metadata: linkType: hard "space-separated-tokens@npm:^2.0.0": - version: 2.0.1 - resolution: "space-separated-tokens@npm:2.0.1" - checksum: 7a3c91fc643586792effda74a40eec795fb68ff82e7d83c6936668693b0caa3ad29756b1d1e5af6c87e305b5c80f00f97b98f14f40b76da5a3e12b47efdf9cee + version: 2.0.2 + resolution: "space-separated-tokens@npm:2.0.2" + checksum: 6173e1d903dca41dcab6a2deed8b4caf61bd13b6d7af8374713500570aa929ff9414ae09a0519f4f8772df993300305a395d4871f35bc4ca72b6db57e1f30af8 languageName: node linkType: hard @@ -32581,11 +32591,11 @@ __metadata: linkType: hard "stack-utils@npm:^2.0.2, stack-utils@npm:^2.0.3": - version: 2.0.5 - resolution: "stack-utils@npm:2.0.5" + version: 2.0.6 + resolution: "stack-utils@npm:2.0.6" dependencies: escape-string-regexp: ^2.0.0 - checksum: 059f828eed5b03b963e8200529c27bd92b105f2cac9dffc9edcbc739ea8fa108e4ec45d0da257d8e0f7b5ac98db5643a0787e5c25ceab1396f7123e1ee15a086 + checksum: 651c9f87667e077584bbe848acaecc6049bc71979f1e9a46c7b920cad4431c388df0f51b8ad7cfd6eed3db97a2878d0fc8b3122979439ea8bac29c61c95eec8a languageName: node linkType: hard @@ -33244,25 +33254,25 @@ __metadata: languageName: node linkType: hard -"svelte-hmr@npm:^0.15.0": - version: 0.15.0 - resolution: "svelte-hmr@npm:0.15.0" +"svelte-hmr@npm:^0.15.1": + version: 0.15.1 + resolution: "svelte-hmr@npm:0.15.1" peerDependencies: svelte: ">=3.19.0" - checksum: 531d6c17e8eccef64dacf849947431b5fcc366b405767b54d74c14a5d270beeb41d851d2f26b57f626aaf01f943e0229b8f52c356698cbdedf2c3ed693b7ce64 + checksum: e792d5ee326e68a3fde434923a15915534b4fe2ec74ee4ff4d3fa5ac7d05e1bf839b8df0add107d9017a3990bb421de92d69345346000aed1093b2f605c62f1e languageName: node linkType: hard "svelte-loader@npm:^3.1.2": - version: 3.1.3 - resolution: "svelte-loader@npm:3.1.3" + version: 3.1.4 + resolution: "svelte-loader@npm:3.1.4" dependencies: - loader-utils: ^2.0.0 + loader-utils: ^2.0.3 svelte-dev-helper: ^1.1.9 svelte-hmr: ^0.14.2 peerDependencies: svelte: ">3.0.0" - checksum: 5c4f91fdfb7760eea29974c11743f73654049cdada16ad2fdca127493f739082c9d5b1cac8438cae2345409b238cc516983e00b96b77b7f10c25150e21bb8884 + checksum: f3f21291c56129a722d686c39e475c1d033868f769fbc01edc2c26cf367c85b5d715fa4358b0e953f4ff00532e10b2dc50c9ed153329123844a0940dffce33f2 languageName: node linkType: hard @@ -33316,9 +33326,9 @@ __metadata: linkType: hard "svelte@npm:^3.0.0, svelte@npm:^3.31.2, svelte@npm:^3.48.0": - version: 3.52.0 - resolution: "svelte@npm:3.52.0" - checksum: 98446c71e598ad5ae2cfdb68e1c8a6c69af36eb89f970bbcfe478f127dbbffb2acf882986c368a81ae5cdf4044c3f4bf0876abe0dd7e66c75707618d8fe70ff9 + version: 3.53.1 + resolution: "svelte@npm:3.53.1" + checksum: 4e0d389acbf4805f5247380f22311151a194532bd1d9742c418d981928a12cd9450220778a563c7c1cae9ef59b05ff0c960d20dae7f73b7057b7d5bd203202fe languageName: node linkType: hard @@ -34280,8 +34290,8 @@ __metadata: linkType: hard "tsup@npm:^6.2.2": - version: 6.4.0 - resolution: "tsup@npm:6.4.0" + version: 6.5.0 + resolution: "tsup@npm:6.5.0" dependencies: bundle-require: ^3.1.2 cac: ^6.7.12 @@ -34311,7 +34321,7 @@ __metadata: bin: tsup: dist/cli-default.js tsup-node: dist/cli-node.js - checksum: fd745b8669ad56eb96fe76afd482afab01020ee8c9f6f12b7796627862d98e9c0ed1b19cfdac3a5127afc1421ef5495f80f688f76dfb136f2b136ba23b9fe8a3 + checksum: 6372a480db2dca02bb10ff27b888114d4347ce4c635ae95a7d558be0e5e23ff81373389bcce98c3086136527b63590b02f3000e266d0cb8be0fcdca6119e716e languageName: node linkType: hard @@ -34579,10 +34589,10 @@ __metadata: languageName: node linkType: hard -"unicode-match-property-value-ecmascript@npm:^2.0.0": - version: 2.0.0 - resolution: "unicode-match-property-value-ecmascript@npm:2.0.0" - checksum: 01de52b5ab875a695e0ff7b87671197e39dcca497ef3c11f1c04d958933352a91d56c280e3908a76a1a0468d37d0227e5450a7956073591ce157d52603b45953 +"unicode-match-property-value-ecmascript@npm:^2.1.0": + version: 2.1.0 + resolution: "unicode-match-property-value-ecmascript@npm:2.1.0" + checksum: f5b9499b9e0ffdc6027b744d528f17ec27dd7c15da03254ed06851feec47e0531f20d410910c8a49af4a6a190f4978413794c8d75ce112950b56d583b5d5c7f2 languageName: node linkType: hard @@ -35555,6 +35565,18 @@ __metadata: languageName: node linkType: hard +"vitefu@npm:^0.2.1": + version: 0.2.1 + resolution: "vitefu@npm:0.2.1" + peerDependencies: + vite: ^3.0.0 + peerDependenciesMeta: + vite: + optional: true + checksum: 0258962eecf8261129ad8b6323b96a87f1d9c088715a9c8ecc1fbacdc5539d7b0f1d37548c1bb120c01dd8d49d450524bbfdd97b2fe4b115e04f1c4aecd20a66 + languageName: node + linkType: hard + "void-elements@npm:^3.1.0": version: 3.1.0 resolution: "void-elements@npm:3.1.0" @@ -35716,8 +35738,8 @@ __metadata: linkType: hard "vue-loader@npm:^15.7.0": - version: 15.10.0 - resolution: "vue-loader@npm:15.10.0" + version: 15.10.1 + resolution: "vue-loader@npm:15.10.1" dependencies: "@vue/component-compiler-utils": ^3.1.0 hash-sum: ^1.0.2 @@ -35732,7 +35754,7 @@ __metadata: optional: true vue-template-compiler: optional: true - checksum: a7c95b1cac38a8d6e2c5d10abd812c52299bbf70e3c95a98b0b5142c24e469bd116c0bfb1f088fab2d191ce0efa39b15bb45b7f86520b07bdb8e6a7bda80ebfe + checksum: 8754b3b1363ce83c9246c3576a0b7693d72bb557f5a7ab88f725c15d3590401609266bbab2882dccb6ad62a5cd19d0fdbf7aefeb3df955a8ef05e02543e5e1af languageName: node linkType: hard @@ -35769,12 +35791,12 @@ __metadata: linkType: hard "vue-template-compiler@npm:^2.6.14, vue-template-compiler@npm:^2.7.10": - version: 2.7.13 - resolution: "vue-template-compiler@npm:2.7.13" + version: 2.7.14 + resolution: "vue-template-compiler@npm:2.7.14" dependencies: de-indent: ^1.0.2 he: ^1.2.0 - checksum: 6f1b54e74cc5b2a97ccda5335123fc2e9d1b63b934efe67552fbe7a4041ac55fc24b802e5715e7509696c6bcf5d1c6e0c69e4cd0ba85b3e32384df66b452ae82 + checksum: 7f261b40d088c76ce9c66dde29220d0e5df43f974895a0aee97347ac48ed0958c21272dcdf8b163dcc2b9688eca528c1d72d12b3b8b1dcae1dde6a306d7cbb20 languageName: node linkType: hard @@ -35818,25 +35840,25 @@ __metadata: linkType: hard "vue@npm:^2.6.12, vue@npm:^2.7.10": - version: 2.7.13 - resolution: "vue@npm:2.7.13" + version: 2.7.14 + resolution: "vue@npm:2.7.14" dependencies: - "@vue/compiler-sfc": 2.7.13 + "@vue/compiler-sfc": 2.7.14 csstype: ^3.1.0 - checksum: 71ed60ac28721e5e170202ac143bb23332c0cc4223c55b53d7cdb21215c6b98cab6b8e19cf812fac0d4f3a2c0bbdce23c3abaf19d5185d142ebf2c3528be8845 + checksum: 8eb326718c445eb5900d08e2f5a2d86b493d475d3a79f49695066092afa3176d2aad4db98682b3c5432f6fffb92719a124b7e137264e71d5b9be14d5193222c6 languageName: node linkType: hard "vue@npm:^3.2.33, vue@npm:^3.2.41": - version: 3.2.41 - resolution: "vue@npm:3.2.41" + version: 3.2.45 + resolution: "vue@npm:3.2.45" dependencies: - "@vue/compiler-dom": 3.2.41 - "@vue/compiler-sfc": 3.2.41 - "@vue/runtime-dom": 3.2.41 - "@vue/server-renderer": 3.2.41 - "@vue/shared": 3.2.41 - checksum: fac4f47b5ecec8b7b7366eccb6b35866712e11887a12df0f04f989134578de27b69364c1ea1377384b38d048a0c4f604fd096500647f30c0b45cc68cff421d8d + "@vue/compiler-dom": 3.2.45 + "@vue/compiler-sfc": 3.2.45 + "@vue/runtime-dom": 3.2.45 + "@vue/server-renderer": 3.2.45 + "@vue/shared": 3.2.45 + checksum: e00a38edc313faacc7e9269b40c28b77b333869991b1e8095b38a1edae93199168073b3141e9750162a75fdbe259012494ce91e66627cc4ed1b9697324d35a52 languageName: node linkType: hard @@ -36104,13 +36126,13 @@ __metadata: linkType: hard "webpack-hot-middleware@npm:^2.25.1": - version: 2.25.2 - resolution: "webpack-hot-middleware@npm:2.25.2" + version: 2.25.3 + resolution: "webpack-hot-middleware@npm:2.25.3" dependencies: ansi-html-community: 0.0.8 html-entities: ^2.1.0 strip-ansi: ^6.0.0 - checksum: dc7cef3b3b06aeeaa925a3514a8f5ab110ec42c7a423d9f2c3fd31d96ac54e2837647f01f9169e1fddbda64c3ff962bb8b6eda184a53f2d09cd7deaa03c6f422 + checksum: dca26d6d32eb684469830b4074dcd11c298036fe3ec8276ea5a69bc14bc8a53aab2494e02871ada146ec0881965d7018d559683cbcc73bcafcfa4da1184e92b5 languageName: node linkType: hard @@ -36164,8 +36186,8 @@ __metadata: linkType: hard "webpack@npm:5": - version: 5.74.0 - resolution: "webpack@npm:5.74.0" + version: 5.75.0 + resolution: "webpack@npm:5.75.0" dependencies: "@types/eslint-scope": ^3.7.3 "@types/estree": ^0.0.51 @@ -36196,7 +36218,7 @@ __metadata: optional: true bin: webpack: bin/webpack.js - checksum: a5f9eeb36edfa3fe1fc31950706080521fe2ada9706ce8205b817164ab3f6b207cc42023fb61e09687e7f0f252871c6c1a8b0f1a638a4a065c30f6bc460c68f9 + checksum: 0160331d6255bdb8027f2589458514709a4a6555e2868adb6356a309d3f7b2212cb129a00f343fe0f94f54a31b4677507a3adf9ae73badc1216105ac548681ea languageName: node linkType: hard @@ -36968,9 +36990,9 @@ __metadata: linkType: hard "zwitch@npm:^2.0.0": - version: 2.0.2 - resolution: "zwitch@npm:2.0.2" - checksum: 9424cade91458ceb4288cc9cbc76d9d055686de3cd5aa13bf447aed2d1ebd98ebb517c9d871e9f9bd92a44e0d63a0491d560adb0bd7e4d0de42c99320d9e04a4 + version: 2.0.3 + resolution: "zwitch@npm:2.0.3" + checksum: a9db84df2919cdb3e5b019e893bb574f7d65977373c4fdfe29b2e8776b513dac970bfb0def8592693b0d25446bf52ff67e21056c9efa897d6245e7670cb705a0 languageName: node linkType: hard From 1059a820bd17eebac7d65ddb2df1bd9ce8b43cf9 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 15 Nov 2022 13:12:12 +0100 Subject: [PATCH 18/42] perf improvements --- .../builder-manager/templates/template.ejs | 2 + .../builder-webpack5/templates/preview.ejs | 4 + code/lib/core-common/src/presets.ts | 4 - code/lib/core-server/src/build-dev.ts | 15 +- code/lib/core-server/src/dev-server.ts | 183 +++++++++++------- .../lib/core-server/src/utils/get-builders.ts | 4 +- .../core-server/src/utils/open-in-browser.ts | 2 +- 7 files changed, 129 insertions(+), 85 deletions(-) diff --git a/code/lib/builder-manager/templates/template.ejs b/code/lib/builder-manager/templates/template.ejs index d513ace5dd3f..f831340fbd6c 100644 --- a/code/lib/builder-manager/templates/template.ejs +++ b/code/lib/builder-manager/templates/template.ejs @@ -8,6 +8,8 @@ + + <% if (typeof head !== 'undefined') { %> <%- head %> <% } %>