diff --git a/.circleci/config.yml b/.circleci/config.yml index 9f6b618ddb8..fcef34d0d0a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -321,29 +321,6 @@ jobs: - run: name: Upload coverage command: yarn coverage - cli-test: - <<: *defaults - environment: - BASH_ENV: ~/.bashrc - steps: - - checkout - - attach_workspace: - at: . - - run: - name: Test - command: yarn test --cli - no_output_timeout: 1800 - cli-test-latest-cra: - <<: *defaults - environment: - BASH_ENV: ~/.bashrc - steps: - - checkout - - attach_workspace: - at: . - - run: - name: Test CLI with latest CR(N)A - command: yarn test-latest-cra workflows: version: 2 build_test_deploy: @@ -373,12 +350,6 @@ workflows: - coverage: requires: - test - - cli-test: - requires: - - build - - cli-test-latest-cra: - requires: - - build - chromatic: requires: - examples diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000000..fcdcddbc9ff --- /dev/null +++ b/.travis.yml @@ -0,0 +1,17 @@ +language: node_js +node_js: + - "8" + +cache: + yarn: true + +install: + - yarn install + - yarn bootstrap --core + +script: + +jobs: + include: + - script: yarn test --cli + - script: yarn test-latest-cra \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 2029a7d0485..a3df974ba39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,48 @@ +## 5.2.0-alpha.40 (July 10, 2019) + +### Bug Fixes + +* Addon-knobs: Revert entrypoint deletion ([#7369](https://github.com/storybookjs/storybook/pull/7369)) +* Typescript: Fix types in api package ([#7072](https://github.com/storybookjs/storybook/pull/7072)) +* UI: Fix settings page route (about, shortcuts) ([#7241](https://github.com/storybookjs/storybook/pull/7241)) + +### Maintenance + +* Linting: ADD an ignore for an eslint error about a missing dependency (puppeteer) ([#7239](https://github.com/storybookjs/storybook/pull/7239)) +* CI: ADD travis ([#7252](https://github.com/storybookjs/storybook/pull/7252)) +* Typescript: Migrate @storybook/angular ([#6570](https://github.com/storybookjs/storybook/pull/6570)) + +### Dependency Upgrades + +* Bump express-graphql from 0.7.1 to 0.8.0 ([#7345](https://github.com/storybookjs/storybook/pull/7345)) +* Bump react-native-modal-datetime-picker from 6.1.0 to 7.4.2 ([#6844](https://github.com/storybookjs/storybook/pull/6844)) + +## 5.2.0-alpha.39 (July 10, 2019) + +### Bug Fixes + +* UI: Fix Sidebar input refresh on 'Enter' ([#7342](https://github.com/storybookjs/storybook/pull/7342)) +* Addon-knobs: Fix select options types to allow string[] and null ([#7356](https://github.com/storybookjs/storybook/pull/7356)) + +### Maintenance + +* Typescript: Migrate @storybook/react ([#7054](https://github.com/storybookjs/storybook/pull/7054)) +* Build: delete tests & snapshots from dist ([#7358](https://github.com/storybookjs/storybook/pull/7358)) + +## 5.2.0-alpha.38 (July 9, 2019) + +### Bug Fixes + +* Addon-storysource: Replace loader with source-loader ([#7272](https://github.com/storybookjs/storybook/pull/7272)) + +### Maintenance + +* Typescript: Migrate @storybook/addon-knobs ([#7180](https://github.com/storybookjs/storybook/pull/7180)) + +### Dependency Upgrades + +* Upgrade all dependencies ([#7329](https://github.com/storybookjs/storybook/pull/7329)) + ## 5.2.0-alpha.37 (July 8, 2019) ### Bug Fixes @@ -458,7 +503,7 @@ Publish failed - Addon-docs: Docs page bugfix - Addon-docs: Fix source block for legacy stories -NOTE: use `@storybook/addon-storysource/loader` with option `injectParameters: true` for legacy source +NOTE: use `@storybook/source-loader` with option `injectParameters: true` for legacy source ## 5.2.0-alpha.6 (May 14, 2019) diff --git a/addons/a11y/package.json b/addons/a11y/package.json index 89ff8217c20..276256be8cd 100644 --- a/addons/a11y/package.json +++ b/addons/a11y/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-a11y", - "version": "5.2.0-alpha.37", + "version": "5.2.0-alpha.40", "description": "a11y addon for storybook", "keywords": [ "a11y", @@ -26,12 +26,12 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-alpha.37", - "@storybook/api": "5.2.0-alpha.37", - "@storybook/client-logger": "5.2.0-alpha.37", - "@storybook/components": "5.2.0-alpha.37", - "@storybook/core-events": "5.2.0-alpha.37", - "@storybook/theming": "5.2.0-alpha.37", + "@storybook/addons": "5.2.0-alpha.40", + "@storybook/api": "5.2.0-alpha.40", + "@storybook/client-logger": "5.2.0-alpha.40", + "@storybook/components": "5.2.0-alpha.40", + "@storybook/core-events": "5.2.0-alpha.40", + "@storybook/theming": "5.2.0-alpha.40", "axe-core": "^3.2.2", "common-tags": "^1.8.0", "core-js": "^3.0.1", diff --git a/addons/a11y/src/components/A11YPanel.tsx b/addons/a11y/src/components/A11YPanel.tsx index 1c5ee4e8480..5f0c1fffb61 100644 --- a/addons/a11y/src/components/A11YPanel.tsx +++ b/addons/a11y/src/components/A11YPanel.tsx @@ -34,15 +34,15 @@ const Icon = styled(Icons)( : {} ); -const Passes = styled.span(({ theme }) => ({ +const Passes = styled.span<{}>(({ theme }) => ({ color: theme.color.positive, })); -const Violations = styled.span(({ theme }) => ({ +const Violations = styled.span<{}>(({ theme }) => ({ color: theme.color.negative, })); -const Incomplete = styled.span(({ theme }) => ({ +const Incomplete = styled.span<{}>(({ theme }) => ({ color: theme.color.warning, })); diff --git a/addons/a11y/src/components/Report/Elements.tsx b/addons/a11y/src/components/Report/Elements.tsx index a2b1c0576ca..ce713ec948a 100644 --- a/addons/a11y/src/components/Report/Elements.tsx +++ b/addons/a11y/src/components/Report/Elements.tsx @@ -11,7 +11,7 @@ const Item = styled.li({ fontWeight: 600, }); -const ItemTitle = styled.span(({ theme }) => ({ +const ItemTitle = styled.span<{}>(({ theme }) => ({ borderBottom: `1px solid ${theme.appBorderColor}`, width: '100%', display: 'flex', diff --git a/addons/a11y/src/components/Report/HighlightToggle.tsx b/addons/a11y/src/components/Report/HighlightToggle.tsx index 260a4d85926..bb58a5afb28 100644 --- a/addons/a11y/src/components/Report/HighlightToggle.tsx +++ b/addons/a11y/src/components/Report/HighlightToggle.tsx @@ -31,7 +31,7 @@ enum CheckBoxStates { INDETERMINATE, } -const Checkbox = styled.input(({ disabled }) => ({ +const Checkbox = styled.input<{ disabled: boolean }>(({ disabled }) => ({ cursor: disabled ? 'not-allowed' : 'pointer', })); diff --git a/addons/a11y/src/components/Report/Item.tsx b/addons/a11y/src/components/Report/Item.tsx index d1303153439..9dce767928b 100644 --- a/addons/a11y/src/components/Report/Item.tsx +++ b/addons/a11y/src/components/Report/Item.tsx @@ -10,7 +10,7 @@ import { Tags } from './Tags'; import { RuleType } from '../A11YPanel'; import HighlightToggle from './HighlightToggle'; -const Wrapper = styled.div(({ theme }) => ({ +const Wrapper = styled.div<{}>(({ theme }) => ({ display: 'flex', width: '100%', borderBottom: `1px solid ${theme.appBorderColor}`, @@ -30,7 +30,7 @@ const Icon = styled(Icons)(({ theme }) => ({ display: 'inline-flex', })); -const HeaderBar = styled.div(({ theme }) => ({ +const HeaderBar = styled.div<{}>(({ theme }) => ({ padding: theme.layoutMargin, paddingLeft: theme.layoutMargin - 3, background: 'none', diff --git a/addons/a11y/src/components/Report/Tags.tsx b/addons/a11y/src/components/Report/Tags.tsx index 559a31ee79f..62968af6aa3 100644 --- a/addons/a11y/src/components/Report/Tags.tsx +++ b/addons/a11y/src/components/Report/Tags.tsx @@ -9,7 +9,7 @@ const Wrapper = styled.div({ margin: '12px 0', }); -const Item = styled.div(({ theme }) => ({ +const Item = styled.div<{}>(({ theme }) => ({ margin: '0 6px', padding: '5px', border: `1px solid ${theme.appBorderColor}`, diff --git a/addons/a11y/src/components/Report/__snapshots__/HighlightToggle.test.js.snap b/addons/a11y/src/components/Report/__snapshots__/HighlightToggle.test.js.snap index 55b405353d8..870f33c87f5 100644 --- a/addons/a11y/src/components/Report/__snapshots__/HighlightToggle.test.js.snap +++ b/addons/a11y/src/components/Report/__snapshots__/HighlightToggle.test.js.snap @@ -321,7 +321,7 @@ exports[`HighlightToggle component should match snapshot 1`] = ` } } > - + - + diff --git a/addons/a11y/src/components/Tabs.tsx b/addons/a11y/src/components/Tabs.tsx index c89a68ef161..4ebeac7c490 100644 --- a/addons/a11y/src/components/Tabs.tsx +++ b/addons/a11y/src/components/Tabs.tsx @@ -15,7 +15,7 @@ const Container = styled.div({ minHeight: '100%', }); -const HighlightToggleLabel = styled.label(({ theme }) => ({ +const HighlightToggleLabel = styled.label<{}>(({ theme }) => ({ cursor: 'pointer', userSelect: 'none', marginBottom: '3px', @@ -77,7 +77,7 @@ const Item = styled.button( const TabsWrapper = styled.div({}); -const List = styled.div(({ theme }) => ({ +const List = styled.div<{}>(({ theme }) => ({ boxShadow: `${theme.appBorderColor} 0 -1px 0 0 inset`, background: 'rgba(0, 0, 0, .05)', display: 'flex', diff --git a/addons/actions/package.json b/addons/actions/package.json index 33d85000c68..e2bfaabb467 100644 --- a/addons/actions/package.json +++ b/addons/actions/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-actions", - "version": "5.2.0-alpha.37", + "version": "5.2.0-alpha.40", "description": "Action Logger addon for storybook", "keywords": [ "storybook" @@ -21,11 +21,11 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-alpha.37", - "@storybook/api": "5.2.0-alpha.37", - "@storybook/components": "5.2.0-alpha.37", - "@storybook/core-events": "5.2.0-alpha.37", - "@storybook/theming": "5.2.0-alpha.37", + "@storybook/addons": "5.2.0-alpha.40", + "@storybook/api": "5.2.0-alpha.40", + "@storybook/components": "5.2.0-alpha.40", + "@storybook/core-events": "5.2.0-alpha.40", + "@storybook/theming": "5.2.0-alpha.40", "core-js": "^3.0.1", "fast-deep-equal": "^2.0.1", "global": "^4.3.2", diff --git a/addons/actions/src/components/ActionLogger/style.tsx b/addons/actions/src/components/ActionLogger/style.tsx index 6fb7d0d3498..54abfbec156 100644 --- a/addons/actions/src/components/ActionLogger/style.tsx +++ b/addons/actions/src/components/ActionLogger/style.tsx @@ -10,7 +10,7 @@ export const Action = styled.div({ alignItems: 'flex-start', }); -export const Counter = styled.div(({ theme }) => ({ +export const Counter = styled.div<{}>(({ theme }) => ({ backgroundColor: opacify(0.5, theme.appBorderColor), color: theme.color.inverseText, fontSize: theme.typography.size.s1, diff --git a/addons/backgrounds/package.json b/addons/backgrounds/package.json index 45d35041ce8..0afda33d5bd 100644 --- a/addons/backgrounds/package.json +++ b/addons/backgrounds/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-backgrounds", - "version": "5.2.0-alpha.37", + "version": "5.2.0-alpha.40", "description": "A storybook addon to show different backgrounds for your preview", "keywords": [ "addon", @@ -25,12 +25,12 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-alpha.37", - "@storybook/api": "5.2.0-alpha.37", - "@storybook/client-logger": "5.2.0-alpha.37", - "@storybook/components": "5.2.0-alpha.37", - "@storybook/core-events": "5.2.0-alpha.37", - "@storybook/theming": "5.2.0-alpha.37", + "@storybook/addons": "5.2.0-alpha.40", + "@storybook/api": "5.2.0-alpha.40", + "@storybook/client-logger": "5.2.0-alpha.40", + "@storybook/components": "5.2.0-alpha.40", + "@storybook/core-events": "5.2.0-alpha.40", + "@storybook/theming": "5.2.0-alpha.40", "core-js": "^3.0.1", "memoizerific": "^1.11.3", "react": "^16.8.3", diff --git a/addons/centered/angular.d.ts b/addons/centered/angular.d.ts index 202fdd65725..9864b1d2b81 100644 --- a/addons/centered/angular.d.ts +++ b/addons/centered/angular.d.ts @@ -1,3 +1,5 @@ +import { StoryFn } from "@storybook/addons"; + export interface ICollection { [p: string]: any; } @@ -11,11 +13,13 @@ export interface NgModuleMetadata { } export interface IStory { - props?: ICollection; - moduleMetadata?: Partial; component?: any; + props?: ICollection; + propsMeta?: ICollection; + moduleMetadata?: NgModuleMetadata; template?: string; + styles?: string[]; } declare module '@storybook/addon-centered/angular' { - export function centered(story: IStory): IStory; + export function centered(story: StoryFn): IStory; } diff --git a/addons/centered/package.json b/addons/centered/package.json index e10ce184e6e..f58976c5a78 100644 --- a/addons/centered/package.json +++ b/addons/centered/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-centered", - "version": "5.2.0-alpha.37", + "version": "5.2.0-alpha.40", "description": "Storybook decorator to center components", "keywords": [ "addon", @@ -23,6 +23,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { + "@storybook/addons": "5.2.0-alpha.40", "core-js": "^3.0.1", "global": "^4.3.2", "util-deprecate": "^1.0.2" diff --git a/addons/centered/src/angular.ts b/addons/centered/src/angular.ts index da930cd17e2..124edcc4490 100644 --- a/addons/centered/src/angular.ts +++ b/addons/centered/src/angular.ts @@ -1,3 +1,5 @@ +import { StoryFn } from '@storybook/addons'; +import { IStory } from '../angular.d'; import styles from './styles'; function getComponentSelector(component: any) { @@ -43,7 +45,7 @@ function getModuleMetadata(metadata: any) { return moduleMetadata; } -export default function(metadataFn: any) { +export default function(metadataFn: StoryFn) { const metadata = metadataFn(); return { diff --git a/addons/contexts/package.json b/addons/contexts/package.json index a1593cdf293..02a26350c98 100644 --- a/addons/contexts/package.json +++ b/addons/contexts/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-contexts", - "version": "5.2.0-alpha.37", + "version": "5.2.0-alpha.40", "description": "Storybook Addon Contexts", "keywords": [ "storybook", @@ -28,10 +28,10 @@ "dev:check-types": "tsc --noEmit" }, "dependencies": { - "@storybook/addons": "5.2.0-alpha.37", - "@storybook/api": "5.2.0-alpha.37", - "@storybook/components": "5.2.0-alpha.37", - "@storybook/core-events": "5.2.0-alpha.37", + "@storybook/addons": "5.2.0-alpha.40", + "@storybook/api": "5.2.0-alpha.40", + "@storybook/components": "5.2.0-alpha.40", + "@storybook/core-events": "5.2.0-alpha.40", "core-js": "^3.0.1" }, "peerDependencies": { diff --git a/addons/cssresources/package.json b/addons/cssresources/package.json index 6d344263814..93bfb76d097 100644 --- a/addons/cssresources/package.json +++ b/addons/cssresources/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-cssresources", - "version": "5.2.0-alpha.37", + "version": "5.2.0-alpha.40", "description": "A storybook addon to switch between css resources at runtime for your story", "keywords": [ "addon", @@ -25,10 +25,10 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-alpha.37", - "@storybook/api": "5.2.0-alpha.37", - "@storybook/components": "5.2.0-alpha.37", - "@storybook/core-events": "5.2.0-alpha.37", + "@storybook/addons": "5.2.0-alpha.40", + "@storybook/api": "5.2.0-alpha.40", + "@storybook/components": "5.2.0-alpha.40", + "@storybook/core-events": "5.2.0-alpha.40", "core-js": "^3.0.1", "global": "^4.3.2", "react": "^16.8.3" diff --git a/addons/design-assets/package.json b/addons/design-assets/package.json index a69c6a9a110..4f60cd0926c 100644 --- a/addons/design-assets/package.json +++ b/addons/design-assets/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-design-assets", - "version": "5.2.0-alpha.37", + "version": "5.2.0-alpha.40", "description": "Design asset preview for storybook", "keywords": [ "addon", @@ -27,12 +27,12 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-alpha.37", - "@storybook/api": "5.2.0-alpha.37", - "@storybook/client-logger": "5.2.0-alpha.37", - "@storybook/components": "5.2.0-alpha.37", - "@storybook/core-events": "5.2.0-alpha.37", - "@storybook/theming": "5.2.0-alpha.37", + "@storybook/addons": "5.2.0-alpha.40", + "@storybook/api": "5.2.0-alpha.40", + "@storybook/client-logger": "5.2.0-alpha.40", + "@storybook/components": "5.2.0-alpha.40", + "@storybook/core-events": "5.2.0-alpha.40", + "@storybook/theming": "5.2.0-alpha.40", "common-tags": "^1.8.0", "core-js": "^3.0.1", "global": "^4.3.2", diff --git a/addons/docs/package.json b/addons/docs/package.json index b52f2ac75cf..0bc9cd95fd9 100644 --- a/addons/docs/package.json +++ b/addons/docs/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-docs", - "version": "5.2.0-alpha.37", + "version": "5.2.0-alpha.40", "description": "Superior documentation for your components", "keywords": [ "addon", @@ -28,11 +28,11 @@ "@mdx-js/loader": "^1.0.0", "@mdx-js/mdx": "^1.0.0", "@mdx-js/react": "^1.0.16", - "@storybook/addons": "5.2.0-alpha.37", - "@storybook/api": "5.2.0-alpha.37", - "@storybook/components": "5.2.0-alpha.37", - "@storybook/router": "5.2.0-alpha.37", - "@storybook/theming": "5.2.0-alpha.37", + "@storybook/addons": "5.2.0-alpha.40", + "@storybook/api": "5.2.0-alpha.40", + "@storybook/components": "5.2.0-alpha.40", + "@storybook/router": "5.2.0-alpha.40", + "@storybook/theming": "5.2.0-alpha.40", "core-js": "^3.0.1", "global": "^4.3.2", "lodash": "^4.17.11", diff --git a/addons/events/package.json b/addons/events/package.json index 9ff84bc70b2..92af0187c28 100644 --- a/addons/events/package.json +++ b/addons/events/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-events", - "version": "5.2.0-alpha.37", + "version": "5.2.0-alpha.40", "description": "Add events to your Storybook stories.", "keywords": [ "addon", @@ -24,10 +24,10 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/addons": "5.2.0-alpha.37", - "@storybook/api": "5.2.0-alpha.37", - "@storybook/core-events": "5.2.0-alpha.37", - "@storybook/theming": "5.2.0-alpha.37", + "@storybook/addons": "5.2.0-alpha.40", + "@storybook/api": "5.2.0-alpha.40", + "@storybook/core-events": "5.2.0-alpha.40", + "@storybook/theming": "5.2.0-alpha.40", "core-js": "^3.0.1", "format-json": "^1.0.3", "lodash": "^4.17.11", diff --git a/addons/events/src/components/Event.tsx b/addons/events/src/components/Event.tsx index fec6b93aae8..6ccaba9d6bc 100644 --- a/addons/events/src/components/Event.tsx +++ b/addons/events/src/components/Event.tsx @@ -17,7 +17,7 @@ interface StyledTextareaProps { const StyledTextarea = styled(({ shown, failed, ...rest }: StyledTextareaProps) => ( ); - -storiesOf('Addons|Info.GitHub issues', module).add( - '#1814', - withInfo('Allow Duplicate DisplayNames for HOC #1814')(() => ( -
- - ); - -storiesOf('Addons|Info.GitHub issues', module).addDecorator(withStorySource(__STORY__, __ADDS_MAP__)).add( - '#1814', - withInfo('Allow Duplicate DisplayNames for HOC #1814')(() => ( -
- - ); -storiesOf('Addons|Info.GitHub issues', module).addDecorator(withSourceLoader(__STORY__, __ADDS_MAP__,__MAIN_FILE_LOCATION__,__MODULE_DEPENDENCIES__,__LOCAL_DEPENDENCIES__,__SOURCE_PREFIX__,__IDS_TO_FRAMEWORKS__)).add( +storiesOf('Addons|Info.GitHub issues', module).addParameters({ storySource: { source: __STORY__, locationsMap: __ADDS_MAP__ } }).addDecorator(withSourceLoader(__STORY__, __ADDS_MAP__,__MAIN_FILE_LOCATION__,__MODULE_DEPENDENCIES__,__LOCAL_DEPENDENCIES__,__SOURCE_PREFIX__,__IDS_TO_FRAMEWORKS__)).add( '#1814', withInfo('Allow Duplicate DisplayNames for HOC #1814')(() => (
@@ -866,7 +866,7 @@ storiesOf('Foo', module) `; exports[`inject-decorator will not change the source when there are no "storiesOf" functions 1`] = ` -"var addSourceDecorator = require(\\"@storybook/source-loader\\").addSource; +"var addSourceDecorator = require(\\"@storybook/source-loader/dist/preview\\").addSource; while(true) { console.log(\\"it's a kind of magic\\"); }" diff --git a/lib/source-loader/src/abstract-syntax-tree/generate-helpers.js b/lib/source-loader/src/abstract-syntax-tree/generate-helpers.js index a79e96fec7d..6ca55dbe944 100644 --- a/lib/source-loader/src/abstract-syntax-tree/generate-helpers.js +++ b/lib/source-loader/src/abstract-syntax-tree/generate-helpers.js @@ -68,7 +68,7 @@ const STORY_DECORATOR_STATEMENT = const ADD_PARAMETERS_STATEMENT = '.addParameters({ storySource: { source: __STORY__, locationsMap: __ADDS_MAP__ } })'; const IMPORT_DECLARATION_FOR_EXPORTED_STORIES_DECORATOR = - 'var addSourceDecorator = require("@storybook/source-loader").addSource;\n'; + 'var addSourceDecorator = require("@storybook/source-loader/dist/preview").addSource;\n'; const applyExportDecoratorStatement = part => ` addSourceDecorator(${part}, {__STORY__, __ADDS_MAP__,__MAIN_FILE_LOCATION__,__MODULE_DEPENDENCIES__,__LOCAL_DEPENDENCIES__,__SOURCE_PREFIX__,__IDS_TO_FRAMEWORKS__});`; diff --git a/lib/source-loader/src/abstract-syntax-tree/inject-decorator.js b/lib/source-loader/src/abstract-syntax-tree/inject-decorator.js index 9cd8008f9f1..d944398ca49 100644 --- a/lib/source-loader/src/abstract-syntax-tree/inject-decorator.js +++ b/lib/source-loader/src/abstract-syntax-tree/inject-decorator.js @@ -21,7 +21,7 @@ function extendOptions(source, comments, filepath, options) { } function inject(source, filepath, options = {}, log = message => {}) { - const { injectDecorator = true, inspectDependencies } = options; + const { injectDecorator = true, injectParameters = true, inspectDependencies } = options; const obviouslyNotCode = ['md', 'txt', 'json'].includes(options.parser); let parser = null; try { @@ -43,7 +43,7 @@ function inject(source, filepath, options = {}, log = message => {}) { const { changed, source: cleanedSource, comments, exportTokenFound } = injectDecorator === true - ? generateSourceWithDecorators(source, ast, options.injectParameters) + ? generateSourceWithDecorators(source, ast, injectParameters) : generateSourceWithoutDecorators(source, ast); const storySource = generateStorySource(extendOptions(source, comments, filepath, options)); diff --git a/lib/source-loader/src/abstract-syntax-tree/traverse-helpers.js b/lib/source-loader/src/abstract-syntax-tree/traverse-helpers.js index 8dd3b1a2061..4edda95f55f 100644 --- a/lib/source-loader/src/abstract-syntax-tree/traverse-helpers.js +++ b/lib/source-loader/src/abstract-syntax-tree/traverse-helpers.js @@ -75,7 +75,7 @@ export function findAddsMap(ast, storiesOfIdentifiers) { // Handle cases like: // export const withText = () =>