Skip to content

Commit

Permalink
chore(deps): update to storybook 6.4
Browse files Browse the repository at this point in the history
  • Loading branch information
stevensacks committed Dec 22, 2021
1 parent 5a936d8 commit 1341a9a
Show file tree
Hide file tree
Showing 13 changed files with 2,637 additions and 2,704 deletions.
32 changes: 16 additions & 16 deletions .babelrc.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
module.exports = {
presets: [
"@babel/preset-env",
"@babel/preset-typescript",
"@babel/preset-react",
],
env: {
esm: {
presets: [
[
"@babel/preset-env",
{
modules: false,
},
],
],
presets: [
'@babel/preset-env',
'@babel/preset-typescript',
'@babel/preset-react',
],
env: {
esm: {
presets: [
[
'@babel/preset-env',
{
modules: false,
},
],
],
},
},
},
};
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ build-storybook.log
.DS_Store
.env
.idea

6 changes: 5 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
{}
{
"bracketSpacing": false,
"singleQuote": true,
"tabWidth": 4
}
10 changes: 5 additions & 5 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
stories: [
"../stories/**/*.stories.mdx",
"../stories/**/*.stories.@(js|jsx|ts|tsx)",
],
addons: ["../preset.js", "@storybook/addon-essentials"],
stories: [
'../stories/**/*.stories.mdx',
'../stories/**/*.stories.@(js|jsx|ts|tsx)',
],
addons: ['../preset.js', '@storybook/addon-essentials'],
};
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "storybook-react-intl",
"version": "0.9.2",
"version": "1.0.0",
"description": "Add react-intl support to Storybook",
"keywords": [
"storybook-addons",
Expand Down Expand Up @@ -43,29 +43,29 @@
"eject-ts": "zx scripts/eject-typescript.mjs"
},
"dependencies": {
"react-intl": "^5.20.4",
"storybook-i18n": "^1.0.3"
"react-intl": "^5.24.0",
"storybook-i18n": "^1.0.7"
},
"devDependencies": {
"@babel/cli": "^7.12.1",
"@babel/core": "^7.12.3",
"@babel/preset-env": "^7.12.1",
"@babel/preset-react": "^7.12.5",
"@babel/preset-typescript": "^7.13.0",
"@storybook/addon-essentials": "^6.2.9",
"@storybook/react": "^6.2.9",
"auto": "^10.3.0",
"babel-loader": "^8.1.0",
"boxen": "^5.0.1",
"concurrently": "^6.2.0",
"@babel/cli": "^7.16.0",
"@babel/core": "^7.16.5",
"@babel/preset-env": "^7.16.5",
"@babel/preset-react": "^7.16.5",
"@babel/preset-typescript": "^7.16.5",
"@storybook/addon-essentials": "^6.4.9",
"@storybook/react": "^6.4.9",
"auto": "^10.32.5",
"babel-loader": "^8.2.3",
"boxen": "^5.1.2",
"concurrently": "^6.5.1",
"dedent": "^0.7.0",
"prettier": "^2.3.1",
"prettier": "^2.5.1",
"prop-types": "^15.7.2",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"rimraf": "^3.0.2",
"typescript": "^4.2.4",
"zx": "^1.14.1"
"typescript": "^4.5.4",
"zx": "1.14.1"
},
"peerDependencies": {
"@storybook/addons": "^6.2.9",
Expand Down
16 changes: 8 additions & 8 deletions preset.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
function config(entry = []) {
return [
...entry,
require.resolve('storybook-i18n/preview'),
require.resolve('./dist/esm/preset/preview'),
];
return [
...entry,
require.resolve('storybook-i18n/preview'),
require.resolve('./dist/esm/preset/preview'),
];
}

function managerEntries(entry = []) {
return [...entry, require.resolve('storybook-i18n/manager')];
return [...entry, require.resolve('storybook-i18n/manager')];
}

module.exports = {
config,
managerEntries,
config,
managerEntries,
};
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
if (module && module.hot && module.hot.decline) {
module.hot.decline();
module.hot.decline();
}

// make it work with --isolatedModules
Expand Down
3 changes: 3 additions & 0 deletions src/preset/preview.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import {withReactIntl} from '../withReactIntl';

export const decorators = [withReactIntl];
34 changes: 0 additions & 34 deletions src/preset/preview.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion src/typings.d.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
declare module "global";
declare module 'global';
38 changes: 38 additions & 0 deletions src/withReactIntl.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import React from 'react';
import {
AnyFramework,
PartialStoryFn as StoryFunction,
StoryContext,
} from '@storybook/csf';
import {IntlProvider} from 'react-intl';
import {useGlobals} from '@storybook/client-api';

export const withReactIntl = (
story: StoryFunction<AnyFramework>,
context: StoryContext
) => {
const [{locale}] = useGlobals();
const {
parameters: {reactIntl, locale: defaultLocale},
} = context;
const currentLocale = locale || defaultLocale;

if (currentLocale && reactIntl) {
const {formats, messages} = reactIntl;
const safeFormats = formats ? formats[currentLocale] : undefined;
if (messages) {
return (
<IntlProvider
key={locale}
formats={safeFormats}
messages={messages[currentLocale]}
locale={currentLocale}
defaultLocale={defaultLocale}
>
{story(context)}
</IntlProvider>
);
}
}
return story(context);
};
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
"include": [
"src/**/*"
],
}
}
Loading

0 comments on commit 1341a9a

Please sign in to comment.