GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-04 21:41:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

SWITCH to babel-plugin-paths

Browse Source
This commit is contained in:
Norbert de Langen 2018-01-23 15:08:27 +01:00
parent 73a1cb548b
commit b8450c179d
No known key found for this signature in database
GPG Key ID: 976651DA156C2825
12 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/angular/package.json
View File

@ -36,7 +36,7 @@
"babel-core": "^6.26.0",
"babel-loader": "^7.0.0",
"babel-plugin-macros": "^2.0.0",
"babel-plugin-preval": "^1.6.3",
"babel-plugin-paths": "^1.0.0",
"babel-plugin-react-docgen": "^1.8.2",
"babel-preset-env": "^1.6.0",
"babel-preset-react": "^6.24.1",

2
app/polymer/package.json
View File

@ -34,7 +34,7 @@
"babel-core": "^6.26.0",
"babel-loader": "^7.1.2",
"babel-plugin-macros": "^2.0.0",
"babel-plugin-preval": "^1.6.3",
"babel-plugin-paths": "^1.0.0",
"babel-plugin-react-docgen": "^1.8.2",
"babel-plugin-transform-regenerator": "^6.26.0",
"babel-plugin-transform-runtime": "^6.23.0",

2
app/react-native/package.json
View File

@ -34,7 +34,7 @@
"autoprefixer": "^7.2.5",
"babel-loader": "^7.1.2",
"babel-plugin-macros": "^2.0.0",
"babel-plugin-preval": "^1.6.3",
"babel-plugin-paths": "^1.0.0",
"babel-plugin-syntax-async-functions": "^6.13.0",
"babel-plugin-syntax-trailing-function-commas": "^6.22.0",
"babel-plugin-transform-class-properties": "^6.24.1",

2
app/react/package.json
View File

@ -35,7 +35,7 @@
"autoprefixer": "^7.2.5",
"babel-loader": "^7.1.2",
"babel-plugin-macros": "^2.0.0",
"babel-plugin-preval": "^1.6.3",
"babel-plugin-paths": "^1.0.0",
"babel-plugin-react-docgen": "^1.8.2",
"babel-plugin-transform-regenerator": "^6.26.0",
"babel-plugin-transform-runtime": "^6.23.0",

2
app/vue/package.json
View File

@ -33,7 +33,7 @@
"autoprefixer": "^7.2.5",
"babel-loader": "^7.1.2",
"babel-plugin-macros": "^2.0.0",
"babel-plugin-preval": "^1.6.3",
"babel-plugin-paths": "^1.0.0",
"babel-plugin-react-docgen": "^1.8.2",
"babel-plugin-transform-regenerator": "^6.26.0",
"babel-plugin-transform-runtime": "^6.23.0",

8
docs/src/pages/basics/writing-stories/index.md
View File

@ -147,23 +147,21 @@ storiesOf('My App/Buttons/Emoji', module)
The name is just a javascript string, by using a template literal, you can easily interpolate data.
One example would be to use `__dirname` combined with `babel-plugin-preval`:
One example would be to use `base` from [`babel-plugin-paths`](https://github.com/storybooks/babel-plugin-paths):
```js
import React from 'react';
import preval from 'babel-plugin-preval/macro';
import base from 'babel-plugin-paths/macro';
import { storiesOf } from '@storybook/react';
import BaseButton from '../components/BaseButton';
const base = preval`module.exports = __dirname.replace(process.cwd() + '/', '')`;
storiesOf(`Other|${base}/Dirname Example`, module)
.add('story 1', () => <BaseButton label="Story 1" />)
.add('story 2', () => <BaseButton label="Story 2" />);
```
*This uses [babel-plugin-macros](https://github.com/kentcdodds/babel-plugin-macros) & [babel-plugin-preval](https://github.com/kentcdodds/babel-plugin-preval)*.
*This uses [babel-plugin-macros](https://github.com/kentcdodds/babel-plugin-macros)*.
## Run multiple storybooks

2
examples/official-storybook/package.json
View File

@ -26,7 +26,7 @@
"@storybook/components": "^3.4.0-alpha.5",
"@storybook/react": "^3.4.0-alpha.5",
"babel-jest": "^21.2.0",
"babel-plugin-preval": "^1.6.3",
"babel-plugin-paths": "^1.0.0",
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "^1.1.0",
"enzyme-to-json": "^3.2.2",

8
examples/official-storybook/stories/__snapshots__/other-dirname.stories.storyshot
View File

@ -1,24 +1,24 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Storyshots Other|/examples/official-storybook/stories/Dirname Example story 1 1`] = `
exports[`Storyshots Other|/stories//Dirname Example story 1 1`] = `
<button>
Story 1
</button>
`;
exports[`Storyshots Other|/examples/official-storybook/stories/Dirname Example story 2 1`] = `
exports[`Storyshots Other|/stories//Dirname Example story 2 1`] = `
<button>
Story 2
</button>
`;
exports[`Storyshots Other|examples/official-storybook/stories/Dirname Example story 1 1`] = `
exports[`Storyshots Other|/stories/Dirname Example story 1 1`] = `
<button>
Story 1
</button>
`;
exports[`Storyshots Other|examples/official-storybook/stories/Dirname Example story 2 1`] = `
exports[`Storyshots Other|/stories/Dirname Example story 2 1`] = `
<button>
Story 2
</button>

4
examples/official-storybook/stories/other-dirname.stories.js
View File

@ -1,12 +1,10 @@
import React from 'react';
import preval from 'babel-plugin-preval/macro';
import base from 'babel-plugin-paths/macro';
import { storiesOf } from '@storybook/react';
import BaseButton from '../components/BaseButton';
const base = preval`module.exports = __dirname.replace(process.cwd() + '/', '')`;
storiesOf(`Other|${base}/Dirname Example`, module)
.add('story 1', () => <BaseButton label="Story 1" />)
.add('story 2', () => <BaseButton label="Story 2" />);

2
lib/ui/src/modules/ui/libs/hierarchy.js
View File

@ -105,7 +105,7 @@ export function resolveStoryHierarchy(storyName = '', hierarchySeparator) {
return [storyName];
}
return storyName.split(new RegExp(hierarchySeparator));
return storyName.split(new RegExp(hierarchySeparator)).filter(segment => !!segment);
}
export function prepareStoriesForHierarchy(stories, hierarchySeparator, hierarchyRootSeparator) {

2
package.json
View File

@ -43,7 +43,7 @@
"babel-polyfill": "^6.26.0",
"babel-preset-env": "^1.6.1",
"babel-plugin-macros": "^2.0.0",
"babel-plugin-preval": "^1.6.3",
"babel-plugin-paths": "^1.0.0",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-0": "^6.24.1",
"chalk": "^2.3.0",

21
yarn.lock
View File

@ -1185,6 +1185,12 @@ babel-loader@7.1.2, babel-loader@^7.0.0, babel-loader@^7.1.2:
loader-utils "^1.0.2"
mkdirp "^0.5.1"
babel-macros@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/babel-macros/-/babel-macros-1.2.0.tgz#39e47ed6d286d4a98f1948d8bab45dac17e4e2d4"
dependencies:
cosmiconfig "3.1.0"
babel-messages@^6.23.0:
version "6.23.0"
resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
@ -1318,14 +1324,13 @@ babel-plugin-minify-type-constructors@^0.2.0:
dependencies:
babel-helper-is-void-0 "^0.2.0"
babel-plugin-preval@^1.6.3:
version "1.6.3"
resolved "https://registry.yarnpkg.com/babel-plugin-preval/-/babel-plugin-preval-1.6.3.tgz#df784357410a9762f01bf0c5705e2c070eac3ccb"
babel-plugin-paths@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/babel-plugin-paths/-/babel-plugin-paths-1.0.0.tgz#01b2988dcbb98eabf1785aaa144cebd0ecda44b1"
dependencies:
babel-macros "^1.2.0"
babel-plugin-macros "^2.0.0"
babel-register "^6.26.0"
babylon "^6.18.0"
require-from-string "^2.0.1"
find-root "^1.1.0"
babel-plugin-react-docgen@^1.8.2:
version "1.8.2"
@ -5605,6 +5610,10 @@ find-parent-dir@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
find-root@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
find-up@^1.0.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"