From a5c35e1b3e163a22de85a62d33225cf69c20aba0 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 6 Jul 2022 00:07:40 +0200 Subject: [PATCH 1/2] improvements to setup --- .circleci/config.yml | 2 +- addons/a11y/package.json | 4 +- addons/a11y/src/index.ts | 2 +- addons/actions/package.json | 4 +- addons/actions/src/preview/decorateAction.ts | 2 +- addons/actions/src/preview/withActions.ts | 5 +- addons/backgrounds/package.json | 4 + addons/backgrounds/src/decorators/withGrid.ts | 2 +- addons/backgrounds/src/helpers/index.ts | 2 +- addons/controls/package.json | 1 + addons/docs/blocks.js | 2 +- addons/docs/package.json | 4 +- addons/essentials/package.json | 4 +- addons/highlight/package.json | 4 +- addons/interactions/package.json | 4 +- addons/jest/package.json | 4 + addons/links/package.json | 4 + addons/links/src/index.ts | 2 +- addons/measure/package.json | 4 + addons/outline/package.json | 4 + addons/outline/src/outlineCSS.ts | 2 +- .../src/Stories2SnapsConverter.ts | 2 +- .../src/api/integrityTestTemplate.ts | 2 +- addons/storysource/package.json | 4 +- addons/toolbars/package.json | 4 + addons/viewport/package.json | 4 + .../common/component-story-mdx-dedent.mdx.mdx | 2 +- .../component-story-mdx-description.mdx.mdx | 2 +- frameworks/angular/package.json | 1 + .../utils/build-standalone-errors-handler.ts | 2 +- .../client/angular-beta/StorybookModule.ts | 2 +- .../server/framework-preset-angular-cli.ts | 2 +- frameworks/ember/package.json | 4 + frameworks/ember/src/client/preview/render.ts | 2 +- frameworks/html-webpack5/package.json | 15 +- frameworks/preact-webpack5/package.json | 15 +- frameworks/react-webpack5/package.json | 15 +- frameworks/server-webpack5/package.json | 15 +- frameworks/svelte-webpack5/package.json | 15 +- .../templates/PreviewRender.svelte | 2 +- frameworks/vue-webpack5/package.json | 13 +- frameworks/vue3-webpack5/package.json | 13 +- .../web-components-webpack5/package.json | 15 +- lib/addons/package.json | 1 + lib/api/package.json | 4 +- lib/api/src/lib/stories.ts | 2 +- lib/api/src/modules/addons.ts | 2 +- lib/api/src/modules/layout.ts | 2 +- lib/api/src/modules/refs.ts | 6 +- lib/api/src/modules/url.ts | 2 +- lib/blocks/package.json | 8 +- lib/blocks/src/blocks/DocsContainer.tsx | 2 +- lib/blocks/src/blocks/DocsStory.tsx | 2 +- lib/blocks/src/blocks/Preview.tsx | 2 +- lib/blocks/src/blocks/Props.tsx | 2 +- lib/blocks/src/controls/options/Options.tsx | 2 +- .../react-editable-json-tree/utils/parse.ts | 2 +- lib/builder-webpack5/package.json | 4 +- .../src/presets/custom-webpack-preset.ts | 2 +- .../src/preview/iframe-webpack.config.ts | 2 +- lib/channel-postmessage/package.json | 4 + lib/channel-websocket/package.json | 4 + lib/channels/package.json | 4 + lib/channels/src/index.ts | 2 +- lib/cli-sb/package.json | 4 + lib/cli-storybook/package.json | 4 + lib/cli/package.json | 2 + lib/cli/src/automigrate/fixes/angular12.ts | 2 +- lib/cli/src/automigrate/fixes/builder-vite.ts | 2 +- lib/cli/src/automigrate/fixes/cra5.ts | 2 +- .../automigrate/fixes/eslint-plugin.test.ts | 2 +- .../src/automigrate/fixes/eslint-plugin.ts | 2 +- .../src/automigrate/fixes/mainjsFramework.ts | 2 +- lib/cli/src/automigrate/fixes/npm7.ts | 2 +- lib/cli/src/automigrate/fixes/vue3.ts | 2 +- lib/cli/src/automigrate/fixes/webpack5.ts | 2 +- lib/cli/src/dev.ts | 2 +- lib/cli/src/generators/baseGenerator.ts | 2 +- lib/cli/src/generators/configure.ts | 2 +- lib/cli/src/repro.ts | 2 +- lib/client-api/package.json | 4 + lib/client-api/src/ClientApi.ts | 2 +- lib/client-api/src/StoryStoreFacade.ts | 2 +- lib/client-logger/package.json | 4 + lib/codemod/package.json | 4 +- .../transforms/__tests__/csf-2-to-3.test.ts | 2 +- lib/codemod/src/transforms/csf-to-mdx.js | 2 +- lib/components/package.json | 15 +- lib/components/src/html.tsx | 2 +- .../src/syntaxhighlighter/formatter.test.ts | 2 +- .../src/syntaxhighlighter/formatter.ts | 2 +- lib/core-client/package.json | 4 + lib/core-common/package.json | 13 +- lib/core-common/src/presets.ts | 2 +- lib/core-common/src/types.ts | 15 +- .../utils/__tests__/normalize-stories.test.ts | 2 +- .../src/utils/load-manager-or-addons-file.ts | 2 +- .../src/utils/load-preview-or-config-file.ts | 2 +- .../src/utils/normalize-stories.ts | 2 +- .../src/utils/validate-configuration-files.ts | 2 +- lib/core-events/package.json | 4 + lib/core-server/package.json | 4 +- lib/core-server/src/build-static.ts | 28 +- lib/core-server/src/utils/metadata.ts | 4 +- lib/core-server/src/utils/open-in-browser.ts | 2 +- .../src/utils/output-startup-information.ts | 2 +- lib/core-server/src/utils/server-statics.ts | 2 +- lib/core-server/src/utils/stories-json.ts | 4 +- lib/core-server/src/utils/update-check.ts | 2 +- lib/core-webpack/package.json | 4 + lib/core-webpack/src/check-webpack-version.ts | 2 +- lib/core-webpack/src/to-importFn.ts | 2 +- lib/csf-tools/package.json | 4 +- lib/csf-tools/src/ConfigFile.test.ts | 2 +- lib/csf-tools/src/ConfigFile.ts | 2 +- lib/csf-tools/src/CsfFile.test.ts | 2 +- lib/csf-tools/src/CsfFile.ts | 2 +- .../src/getStorySortParameter.test.ts | 2 +- lib/csf-tools/src/getStorySortParameter.ts | 6 +- lib/docs-tools/package.json | 4 +- lib/instrumenter/package.json | 4 + lib/manager-webpack5/src/manager-config.ts | 2 +- lib/node-logger/package.json | 4 +- lib/postinstall/package.json | 4 +- lib/preview-web/package.json | 4 + lib/preview-web/src/Preview.tsx | 2 +- lib/preview-web/src/PreviewWeb.tsx | 2 +- lib/preview-web/src/WebView.ts | 2 +- lib/preview-web/src/parseArgsParam.ts | 2 +- lib/router/package.json | 4 +- lib/router/src/utils.ts | 2 +- lib/source-loader/package.json | 4 + lib/store/package.json | 4 + lib/store/src/GlobalsStore.ts | 2 +- lib/store/src/StoryIndexStore.ts | 2 +- lib/store/src/args.ts | 2 +- lib/store/src/autoTitle.ts | 2 +- lib/store/src/csf/normalizeStory.ts | 2 +- lib/store/src/csf/prepareStory.ts | 2 +- lib/store/src/inferArgTypes.ts | 2 +- lib/store/src/sortStories.ts | 2 +- lib/telemetry/package.json | 4 + lib/theming/package.json | 27 +- lib/theming/src/ensure.ts | 2 +- lib/ui/package.json | 4 +- package.json | 8 +- presets/html-webpack/package.json | 13 +- presets/preact-webpack/package.json | 13 +- presets/react-webpack/package.json | 21 +- presets/server-webpack/package.json | 13 +- .../src/lib/compiler/stringifier.ts | 2 +- presets/svelte-webpack/package.json | 19 +- .../src/svelte-docgen-loader.ts | 2 +- presets/vue-webpack/package.json | 15 +- presets/vue3-webpack/package.json | 15 +- presets/web-components-webpack/package.json | 13 +- renderers/html/package.json | 15 +- renderers/html/src/docs/sourceDecorator.ts | 2 +- renderers/html/src/render.ts | 2 +- renderers/preact/package.json | 15 +- renderers/preact/src/render.tsx | 2 +- renderers/react/package.json | 15 +- renderers/react/src/docs/jsxDecorator.tsx | 2 +- renderers/react/src/docs/lib/generateCode.ts | 2 +- renderers/server/package.json | 15 +- renderers/server/src/render.ts | 2 +- renderers/svelte/package.json | 15 +- .../svelte/templates/PreviewRender.svelte | 2 +- renderers/vue/package.json | 13 +- renderers/vue/src/render.ts | 2 +- renderers/vue3/package.json | 13 +- renderers/vue3/src/render.ts | 2 +- renderers/web-components/package.json | 15 +- renderers/web-components/src/render.ts | 2 +- scripts/build-storybooks.js | 3 +- scripts/check-package.js | 119 ++++ scripts/prepare/bundle.ts | 115 ++- scripts/run-registry.ts | 2 +- yarn.lock | 672 +++++++++--------- 179 files changed, 1120 insertions(+), 637 deletions(-) create mode 100644 scripts/check-package.js diff --git a/.circleci/config.yml b/.circleci/config.yml index 71913fcb4d72..7257828fb90c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -269,7 +269,7 @@ jobs: name: Run @storybook/bench on repro command: | cd ../cra-bench - npx @storybook/bench@1.0.0--canary.12.22336b6.0 'echo noop' --label cra + npx @storybook/bench@1.0.0--canary.11.52d1ee7.1 'echo noop' --label cra e2e-tests-pnp: executor: class: medium diff --git a/addons/a11y/package.json b/addons/a11y/package.json index d120b998df21..0f2318b4d5fc 100644 --- a/addons/a11y/package.json +++ b/addons/a11y/package.json @@ -35,6 +35,7 @@ "*.d.ts" ], "scripts": { + "check": "tsc --noEmit", "prepare": "node ../../scripts/prepare.js" }, "dependencies": { @@ -56,7 +57,8 @@ "util-deprecate": "^1.0.2" }, "devDependencies": { - "@testing-library/react": "^11.2.2" + "@testing-library/react": "^11.2.2", + "typescript": "~4.6.3" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0", diff --git a/addons/a11y/src/index.ts b/addons/a11y/src/index.ts index 6bb2d2d21dcd..1563fe0c340a 100644 --- a/addons/a11y/src/index.ts +++ b/addons/a11y/src/index.ts @@ -1,6 +1,6 @@ import type { AnyFramework, DecoratorFunction } from '@storybook/csf'; import deprecate from 'util-deprecate'; -import dedent from 'ts-dedent'; +import { dedent } from 'ts-dedent'; export { PARAM_KEY } from './constants'; export * from './params'; diff --git a/addons/actions/package.json b/addons/actions/package.json index 24bfdb953557..8acd4e17a862 100644 --- a/addons/actions/package.json +++ b/addons/actions/package.json @@ -31,6 +31,7 @@ "*.d.ts" ], "scripts": { + "check": "tsc --noEmit", "prepare": "node ../../scripts/prepare.js" }, "dependencies": { @@ -54,7 +55,8 @@ "uuid-browser": "^3.1.0" }, "devDependencies": { - "@types/lodash": "^4.14.167" + "@types/lodash": "^4.14.167", + "typescript": "~4.6.3" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0", diff --git a/addons/actions/src/preview/decorateAction.ts b/addons/actions/src/preview/decorateAction.ts index b84f49bdb20a..67306c1c5c10 100644 --- a/addons/actions/src/preview/decorateAction.ts +++ b/addons/actions/src/preview/decorateAction.ts @@ -1,5 +1,5 @@ import deprecate from 'util-deprecate'; -import dedent from 'ts-dedent'; +import { dedent } from 'ts-dedent'; import { DecoratorFunction } from '../models'; diff --git a/addons/actions/src/preview/withActions.ts b/addons/actions/src/preview/withActions.ts index d48ded13eae7..c6e2c265a911 100644 --- a/addons/actions/src/preview/withActions.ts +++ b/addons/actions/src/preview/withActions.ts @@ -2,7 +2,7 @@ import global from 'global'; import { useEffect, makeDecorator } from '@storybook/addons'; import deprecate from 'util-deprecate'; -import dedent from 'ts-dedent'; +import { dedent } from 'ts-dedent'; import { actions } from './actions'; @@ -15,8 +15,6 @@ const delegateEventSplitter = /^(\S+)\s*(.*)$/; const isIE = Element != null && !Element.prototype.matches; const matchesMethod = isIE ? 'msMatchesSelector' : 'matches'; -const root = document && document.getElementById('root'); - const hasMatchInAncestry = (element: any, selector: any): boolean => { if (element[matchesMethod](selector)) { return true; @@ -45,6 +43,7 @@ const createHandlers = (actionsFn: (...arg: any[]) => object, ...handles: any[]) const applyEventHandlers = deprecate( (actionsFn: any, ...handles: any[]) => { + const root = document && document.getElementById('root'); useEffect(() => { if (root != null) { const handlers = createHandlers(actionsFn, ...handles); diff --git a/addons/backgrounds/package.json b/addons/backgrounds/package.json index 92ac4b6e3622..e46dd7ffd73a 100644 --- a/addons/backgrounds/package.json +++ b/addons/backgrounds/package.json @@ -35,6 +35,7 @@ "*.d.ts" ], "scripts": { + "check": "tsc --noEmit", "prepare": "node ../../scripts/prepare.js" }, "dependencies": { @@ -51,6 +52,9 @@ "ts-dedent": "^2.0.0", "util-deprecate": "^1.0.2" }, + "devDependencies": { + "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" diff --git a/addons/backgrounds/src/decorators/withGrid.ts b/addons/backgrounds/src/decorators/withGrid.ts index 35ba05383ffc..7634c221d4e9 100644 --- a/addons/backgrounds/src/decorators/withGrid.ts +++ b/addons/backgrounds/src/decorators/withGrid.ts @@ -1,4 +1,4 @@ -import dedent from 'ts-dedent'; +import { dedent } from 'ts-dedent'; import deprecate from 'util-deprecate'; import { useMemo, useEffect } from '@storybook/addons'; import type { AnyFramework, PartialStoryFn as StoryFunction, StoryContext } from '@storybook/csf'; diff --git a/addons/backgrounds/src/helpers/index.ts b/addons/backgrounds/src/helpers/index.ts index 9b35c8acea87..464cb0d7c024 100644 --- a/addons/backgrounds/src/helpers/index.ts +++ b/addons/backgrounds/src/helpers/index.ts @@ -1,5 +1,5 @@ import global from 'global'; -import dedent from 'ts-dedent'; +import { dedent } from 'ts-dedent'; import { logger } from '@storybook/client-logger'; diff --git a/addons/controls/package.json b/addons/controls/package.json index de85677d2c20..3c48775a9627 100644 --- a/addons/controls/package.json +++ b/addons/controls/package.json @@ -35,6 +35,7 @@ "*.d.ts" ], "scripts": { + "check": "tsc --noEmit", "prepare": "node ../../scripts/prepare.js" }, "dependencies": { diff --git a/addons/docs/blocks.js b/addons/docs/blocks.js index e29483b319c4..f329c6d615af 100644 --- a/addons/docs/blocks.js +++ b/addons/docs/blocks.js @@ -1,5 +1,5 @@ import deprecate from 'util-deprecate'; -import dedent from 'ts-dedent'; +import { dedent } from 'ts-dedent'; const warnBlocksImport = deprecate( () => {}, diff --git a/addons/docs/package.json b/addons/docs/package.json index 5478cffc8eb7..ca90d5abb2b7 100644 --- a/addons/docs/package.json +++ b/addons/docs/package.json @@ -45,6 +45,7 @@ "!__testfixtures__" ], "scripts": { + "check": "tsc --noEmit", "prepare": "node ../../scripts/prepare.js" }, "dependencies": { @@ -81,7 +82,8 @@ "devDependencies": { "@babel/core": "^7.12.10", "@storybook/mdx2-csf": "^0.0.3", - "@types/util-deprecate": "^1.0.0" + "@types/util-deprecate": "^1.0.0", + "typescript": "~4.6.3" }, "peerDependencies": { "@storybook/mdx2-csf": "^0.0.3", diff --git a/addons/essentials/package.json b/addons/essentials/package.json index 7601d485c2ff..a5704b623136 100644 --- a/addons/essentials/package.json +++ b/addons/essentials/package.json @@ -29,6 +29,7 @@ "README.md" ], "scripts": { + "check": "tsc --noEmit", "prepare": "node ../../scripts/prepare.js" }, "dependencies": { @@ -51,7 +52,8 @@ "devDependencies": { "@babel/core": "^7.12.10", "@storybook/vue": "7.0.0-alpha.10", - "@types/jest": "^26.0.16" + "@types/jest": "^26.0.16", + "typescript": "~4.6.3" }, "peerDependencies": { "@babel/core": "^7.9.6" diff --git a/addons/highlight/package.json b/addons/highlight/package.json index ba054d3c3e69..47d2098356f2 100644 --- a/addons/highlight/package.json +++ b/addons/highlight/package.json @@ -33,6 +33,7 @@ "*.d.ts" ], "scripts": { + "check": "tsc --noEmit", "prepare": "node ../../scripts/prepare.js" }, "dependencies": { @@ -42,7 +43,8 @@ "global": "^4.4.0" }, "devDependencies": { - "@types/webpack-env": "^1.16.0" + "@types/webpack-env": "^1.16.0", + "typescript": "~4.6.3" }, "publishConfig": { "access": "public" diff --git a/addons/interactions/package.json b/addons/interactions/package.json index 3ddc91ce8823..41c3376f966c 100644 --- a/addons/interactions/package.json +++ b/addons/interactions/package.json @@ -31,6 +31,7 @@ "*.d.ts" ], "scripts": { + "check": "tsc --noEmit", "prepare": "node ../../scripts/prepare.js" }, "dependencies": { @@ -53,7 +54,8 @@ "devDependencies": { "@storybook/jest": "^0.0.5", "@storybook/testing-library": "0.0.14-next.0", - "formik": "^2.2.9" + "formik": "^2.2.9", + "typescript": "~4.6.3" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0", diff --git a/addons/jest/package.json b/addons/jest/package.json index 29b9d24984a5..dc03543956b5 100644 --- a/addons/jest/package.json +++ b/addons/jest/package.json @@ -37,6 +37,7 @@ "*.d.ts" ], "scripts": { + "check": "tsc --noEmit", "prepare": "node ../../scripts/prepare.js" }, "dependencies": { @@ -51,6 +52,9 @@ "react-sizeme": "^3.0.1", "upath": "^1.2.0" }, + "devDependencies": { + "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" diff --git a/addons/links/package.json b/addons/links/package.json index 95b65ddb9470..4afb9e3ef133 100644 --- a/addons/links/package.json +++ b/addons/links/package.json @@ -31,6 +31,7 @@ "*.d.ts" ], "scripts": { + "check": "tsc --noEmit", "prepare": "node ../../scripts/prepare.js" }, "dependencies": { @@ -44,6 +45,9 @@ "prop-types": "^15.7.2", "ts-dedent": "^2.0.0" }, + "devDependencies": { + "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" diff --git a/addons/links/src/index.ts b/addons/links/src/index.ts index a41227513de1..e9c50d0217c8 100644 --- a/addons/links/src/index.ts +++ b/addons/links/src/index.ts @@ -1,4 +1,4 @@ -import dedent from 'ts-dedent'; +import { dedent } from 'ts-dedent'; let hasWarned = false; diff --git a/addons/measure/package.json b/addons/measure/package.json index f9f23969bb84..90795e6726de 100644 --- a/addons/measure/package.json +++ b/addons/measure/package.json @@ -34,6 +34,7 @@ "*.d.ts" ], "scripts": { + "check": "tsc --noEmit", "prepare": "node ../../scripts/prepare.js" }, "dependencies": { @@ -46,6 +47,9 @@ "core-js": "^3.8.2", "global": "^4.4.0" }, + "devDependencies": { + "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" diff --git a/addons/outline/package.json b/addons/outline/package.json index 23612157f10c..99bbd3a53af8 100644 --- a/addons/outline/package.json +++ b/addons/outline/package.json @@ -37,6 +37,7 @@ "*.d.ts" ], "scripts": { + "check": "tsc --noEmit", "prepare": "node ../../scripts/prepare.js" }, "dependencies": { @@ -50,6 +51,9 @@ "global": "^4.4.0", "ts-dedent": "^2.0.0" }, + "devDependencies": { + "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" diff --git a/addons/outline/src/outlineCSS.ts b/addons/outline/src/outlineCSS.ts index 94bbeee73570..502ecd884b8c 100644 --- a/addons/outline/src/outlineCSS.ts +++ b/addons/outline/src/outlineCSS.ts @@ -1,4 +1,4 @@ -import dedent from 'ts-dedent'; +import { dedent } from 'ts-dedent'; /* From pesticide v1.3.0 . @mrmrs . MIT diff --git a/addons/storyshots/storyshots-core/src/Stories2SnapsConverter.ts b/addons/storyshots/storyshots-core/src/Stories2SnapsConverter.ts index 85425bae4d72..527a946847c8 100644 --- a/addons/storyshots/storyshots-core/src/Stories2SnapsConverter.ts +++ b/addons/storyshots/storyshots-core/src/Stories2SnapsConverter.ts @@ -1,5 +1,5 @@ import path from 'path'; -import dedent from 'ts-dedent'; +import { dedent } from 'ts-dedent'; const defaultOptions: Stories2SnapsConverterOptions = { snapshotsDirName: '__snapshots__', diff --git a/addons/storyshots/storyshots-core/src/api/integrityTestTemplate.ts b/addons/storyshots/storyshots-core/src/api/integrityTestTemplate.ts index 3a8c0d1c10b1..d2b13d5e9589 100644 --- a/addons/storyshots/storyshots-core/src/api/integrityTestTemplate.ts +++ b/addons/storyshots/storyshots-core/src/api/integrityTestTemplate.ts @@ -2,7 +2,7 @@ import fs from 'fs'; import glob from 'glob'; import global from 'global'; -import dedent from 'ts-dedent'; +import { dedent } from 'ts-dedent'; const { describe, it } = global; diff --git a/addons/storysource/package.json b/addons/storysource/package.json index f71023df2c4e..18c4d2a75e90 100644 --- a/addons/storysource/package.json +++ b/addons/storysource/package.json @@ -31,6 +31,7 @@ "*.d.ts" ], "scripts": { + "check": "tsc --noEmit", "prepare": "node ../../scripts/prepare.js" }, "dependencies": { @@ -48,7 +49,8 @@ }, "devDependencies": { "@types/react": "^16.14.23", - "@types/react-syntax-highlighter": "11.0.5" + "@types/react-syntax-highlighter": "11.0.5", + "typescript": "~4.6.3" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0", diff --git a/addons/toolbars/package.json b/addons/toolbars/package.json index fd87440461e0..5cbb0c34f8ee 100644 --- a/addons/toolbars/package.json +++ b/addons/toolbars/package.json @@ -35,6 +35,7 @@ "*.d.ts" ], "scripts": { + "check": "tsc --noEmit", "prepare": "node ../../scripts/prepare.js" }, "dependencies": { @@ -45,6 +46,9 @@ "@storybook/theming": "7.0.0-alpha.10", "core-js": "^3.8.2" }, + "devDependencies": { + "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" diff --git a/addons/viewport/package.json b/addons/viewport/package.json index abb28430ff11..f1eaafce295a 100644 --- a/addons/viewport/package.json +++ b/addons/viewport/package.json @@ -32,6 +32,7 @@ "*.d.ts" ], "scripts": { + "check": "tsc --noEmit", "prepare": "node ../../scripts/prepare.js" }, "dependencies": { @@ -46,6 +47,9 @@ "memoizerific": "^1.11.3", "prop-types": "^15.7.2" }, + "devDependencies": { + "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" diff --git a/docs/snippets/common/component-story-mdx-dedent.mdx.mdx b/docs/snippets/common/component-story-mdx-dedent.mdx.mdx index d66d3d240e56..9a1df24185ba 100644 --- a/docs/snippets/common/component-story-mdx-dedent.mdx.mdx +++ b/docs/snippets/common/component-story-mdx-dedent.mdx.mdx @@ -3,7 +3,7 @@ import { Source } from '@storybook/addon-docs'; -import dedent from 'ts-dedent'; +import { dedent } from 'ts-dedent'; ## With code snippet diff --git a/docs/snippets/common/component-story-mdx-description.mdx.mdx b/docs/snippets/common/component-story-mdx-description.mdx.mdx index 4df1230a41fe..94495306e2df 100644 --- a/docs/snippets/common/component-story-mdx-description.mdx.mdx +++ b/docs/snippets/common/component-story-mdx-description.mdx.mdx @@ -3,7 +3,7 @@ import { Description } from '@storybook/addon-docs'; -import dedent from 'ts-dedent'; +import { dedent } from 'ts-dedent'; import { Button } from './Button'; diff --git a/frameworks/angular/package.json b/frameworks/angular/package.json index 4b8ea11c0013..05e50bbef226 100644 --- a/frameworks/angular/package.json +++ b/frameworks/angular/package.json @@ -30,6 +30,7 @@ "*.d.ts" ], "scripts": { + "check": "tsc --noEmit", "prepare": "node ../../scripts/prepare.js" }, "dependencies": { diff --git a/frameworks/angular/src/builders/utils/build-standalone-errors-handler.ts b/frameworks/angular/src/builders/utils/build-standalone-errors-handler.ts index 126ad4836c26..639927540d9a 100644 --- a/frameworks/angular/src/builders/utils/build-standalone-errors-handler.ts +++ b/frameworks/angular/src/builders/utils/build-standalone-errors-handler.ts @@ -1,5 +1,5 @@ import { logger, instance as npmLog } from '@storybook/node-logger'; -import dedent from 'ts-dedent'; +import { dedent } from 'ts-dedent'; export const buildStandaloneErrorHandler = (error: any): any => { // Duplicate code for Standalone error handling diff --git a/frameworks/angular/src/client/angular-beta/StorybookModule.ts b/frameworks/angular/src/client/angular-beta/StorybookModule.ts index cebbb992938f..ab98bc7fb370 100644 --- a/frameworks/angular/src/client/angular-beta/StorybookModule.ts +++ b/frameworks/angular/src/client/angular-beta/StorybookModule.ts @@ -1,6 +1,6 @@ import { NgModule, Type } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; -import dedent from 'ts-dedent'; +import { dedent } from 'ts-dedent'; import { Subject } from 'rxjs'; import deprecate from 'util-deprecate'; diff --git a/frameworks/angular/src/server/framework-preset-angular-cli.ts b/frameworks/angular/src/server/framework-preset-angular-cli.ts index 73ec00afd42e..584b86074820 100644 --- a/frameworks/angular/src/server/framework-preset-angular-cli.ts +++ b/frameworks/angular/src/server/framework-preset-angular-cli.ts @@ -4,7 +4,7 @@ import { logger } from '@storybook/node-logger'; import { targetFromTargetString, BuilderContext, Target } from '@angular-devkit/architect'; import { sync as findUpSync } from 'find-up'; import semver from '@storybook/semver'; -import dedent from 'ts-dedent'; +import { dedent } from 'ts-dedent'; import { logging, JsonObject } from '@angular-devkit/core'; import { moduleIsAvailable } from './utils/module-is-available'; diff --git a/frameworks/ember/package.json b/frameworks/ember/package.json index 02fdf5bcc070..836c4e512002 100644 --- a/frameworks/ember/package.json +++ b/frameworks/ember/package.json @@ -26,6 +26,7 @@ "*.d.ts" ], "scripts": { + "check": "tsc --noEmit", "prepare": "node ../../scripts/prepare.js" }, "dependencies": { @@ -41,6 +42,9 @@ "read-pkg-up": "^7.0.1", "ts-dedent": "^2.0.0" }, + "devDependencies": { + "typescript": "~4.6.3" + }, "peerDependencies": { "@babel/core": "*", "babel-plugin-ember-modules-api-polyfill": "^2.12.0", diff --git a/frameworks/ember/src/client/preview/render.ts b/frameworks/ember/src/client/preview/render.ts index 77dda1b3d5f4..6f0318f4259a 100644 --- a/frameworks/ember/src/client/preview/render.ts +++ b/frameworks/ember/src/client/preview/render.ts @@ -1,5 +1,5 @@ import global from 'global'; -import dedent from 'ts-dedent'; +import { dedent } from 'ts-dedent'; import { RenderContext } from '@storybook/store'; import { OptionsArgs, EmberFramework } from './types'; diff --git a/frameworks/html-webpack5/package.json b/frameworks/html-webpack5/package.json index 65c65be254ac..a9fa322d8942 100644 --- a/frameworks/html-webpack5/package.json +++ b/frameworks/html-webpack5/package.json @@ -46,6 +46,7 @@ "*.d.ts" ], "scripts": { + "check": "tsc --noEmit", "prepare": "esrun ../../scripts/prepare/bundle.ts" }, "dependencies": { @@ -60,7 +61,8 @@ "react-dom": "16.14.0" }, "devDependencies": { - "@digitak/esrun": "^3.2.2" + "@digitak/esrun": "^3.2.2", + "typescript": "~4.6.3" }, "peerDependencies": { "@babel/core": "*" @@ -71,9 +73,12 @@ "publishConfig": { "access": "public" }, - "bundlerEntrypoint": [ - "./src/index.ts", - "./src/preset.ts" - ], + "bundler": { + "entries": [ + "./src/index.ts", + "./src/preset.ts" + ], + "platform": "node" + }, "gitHead": "b13dd8fb52819d73d4983148af8ffc5d683e8b75" } diff --git a/frameworks/preact-webpack5/package.json b/frameworks/preact-webpack5/package.json index d30507a9f9fc..ad68efed1735 100644 --- a/frameworks/preact-webpack5/package.json +++ b/frameworks/preact-webpack5/package.json @@ -46,6 +46,7 @@ "*.d.ts" ], "scripts": { + "check": "tsc --noEmit", "prepare": "esrun ../../scripts/prepare/bundle.ts" }, "dependencies": { @@ -60,7 +61,8 @@ }, "devDependencies": { "@digitak/esrun": "^3.2.2", - "preact": "^10.5.13" + "preact": "^10.5.13", + "typescript": "~4.6.3" }, "peerDependencies": { "@babel/core": "*", @@ -72,9 +74,12 @@ "publishConfig": { "access": "public" }, - "bundlerEntrypoint": [ - "./src/index.ts", - "./src/preset.ts" - ], + "bundler": { + "entries": [ + "./src/index.ts", + "./src/preset.ts" + ], + "platform": "node" + }, "gitHead": "b13dd8fb52819d73d4983148af8ffc5d683e8b75" } diff --git a/frameworks/react-webpack5/package.json b/frameworks/react-webpack5/package.json index 964df8482b2a..8cb9a638dcea 100644 --- a/frameworks/react-webpack5/package.json +++ b/frameworks/react-webpack5/package.json @@ -47,6 +47,7 @@ "*.d.ts" ], "scripts": { + "check": "tsc --noEmit", "prepare": "esrun ../../scripts/prepare/bundle.ts" }, "dependencies": { @@ -58,7 +59,8 @@ }, "devDependencies": { "@digitak/esrun": "^3.2.2", - "jest-specific-snapshot": "^4.0.0" + "jest-specific-snapshot": "^4.0.0", + "typescript": "~4.6.3" }, "peerDependencies": { "@babel/core": "^7.11.5", @@ -79,9 +81,12 @@ "publishConfig": { "access": "public" }, - "bundlerEntrypoint": [ - "./src/index.ts", - "./src/preset.ts" - ], + "bundler": { + "entries": [ + "./src/index.ts", + "./src/preset.ts" + ], + "platform": "node" + }, "gitHead": "b13dd8fb52819d73d4983148af8ffc5d683e8b75" } diff --git a/frameworks/server-webpack5/package.json b/frameworks/server-webpack5/package.json index 49ac8b625699..7147b5714d73 100644 --- a/frameworks/server-webpack5/package.json +++ b/frameworks/server-webpack5/package.json @@ -46,6 +46,7 @@ "*.d.ts" ], "scripts": { + "check": "tsc --noEmit", "prepare": "esrun ../../scripts/prepare/bundle.ts" }, "dependencies": { @@ -59,7 +60,8 @@ "react-dom": "16.14.0" }, "devDependencies": { - "@digitak/esrun": "^3.2.2" + "@digitak/esrun": "^3.2.2", + "typescript": "~4.6.3" }, "engines": { "node": ">=10.13.0" @@ -67,9 +69,12 @@ "publishConfig": { "access": "public" }, - "bundlerEntrypoint": [ - "./src/index.ts", - "./src/preset.ts" - ], + "bundler": { + "entries": [ + "./src/index.ts", + "./src/preset.ts" + ], + "platform": "node" + }, "gitHead": "b13dd8fb52819d73d4983148af8ffc5d683e8b75" } diff --git a/frameworks/svelte-webpack5/package.json b/frameworks/svelte-webpack5/package.json index 039798b20546..842225168924 100644 --- a/frameworks/svelte-webpack5/package.json +++ b/frameworks/svelte-webpack5/package.json @@ -47,6 +47,7 @@ "*.d.ts" ], "scripts": { + "check": "tsc --noEmit", "prepare": "esrun ../../scripts/prepare/bundle.ts" }, "dependencies": { @@ -61,7 +62,8 @@ "devDependencies": { "@digitak/esrun": "^3.2.2", "svelte": "^3.48.0", - "svelte-loader": "^3.1.2" + "svelte-loader": "^3.1.2", + "typescript": "~4.6.3" }, "peerDependencies": { "@babel/core": "*", @@ -74,9 +76,12 @@ "publishConfig": { "access": "public" }, - "bundlerEntrypoint": [ - "./src/index.ts", - "./src/preset.ts" - ], + "bundler": { + "entries": [ + "./src/index.ts", + "./src/preset.ts" + ], + "platform": "node" + }, "gitHead": "b13dd8fb52819d73d4983148af8ffc5d683e8b75" } diff --git a/frameworks/svelte-webpack5/templates/PreviewRender.svelte b/frameworks/svelte-webpack5/templates/PreviewRender.svelte index 40c027d6c803..84fe3707a426 100644 --- a/frameworks/svelte-webpack5/templates/PreviewRender.svelte +++ b/frameworks/svelte-webpack5/templates/PreviewRender.svelte @@ -1,6 +1,6 @@