Skip to content

Commit

Permalink
Merge pull request #1699 from SelfKeyFoundation/release
Browse files Browse the repository at this point in the history
Release 1.3.0
  • Loading branch information
sk91 authored Oct 8, 2019
2 parents 845567a + fdfd344 commit ec9843d
Show file tree
Hide file tree
Showing 243 changed files with 167,211 additions and 3,891 deletions.
4 changes: 1 addition & 3 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,5 @@
],
"@babel/preset-react"
],
"plugins": [
"@babel/plugin-proposal-class-properties"
]
"plugins": ["@babel/plugin-proposal-class-properties", "@babel/plugin-syntax-dynamic-import"]
}
6 changes: 4 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"sourceType": "module",
"ecmaFeatures": {
"jsx": true
}
},
"allowImportExportEverywhere": true
},
"parser": "babel-eslint",
"env": {
Expand All @@ -24,7 +25,8 @@
}
],
"react/prop-types": 0,
"import/no-named-as-default": 0
"import/no-named-as-default": 0,
"import/first": 0
},
"settings": {
"react": {
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ dist/
src/renderer/angular/app.templates.js
static/stylesheets/css/main.css
static/stylesheets/css/*
storybook-static/

client-secret.json
**/.env
Expand Down
23 changes: 23 additions & 0 deletions .storybook/.babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"presets": [
[
"@babel/preset-env",
{
"targets": {
"node": "current"
}
}
],
"@babel/preset-react"
],
"plugins": [
"@babel/plugin-proposal-class-properties",
[
"@babel/plugin-transform-runtime",
{
"regenerator": true
}
],
"@babel/plugin-syntax-dynamic-import"
]
}
23 changes: 18 additions & 5 deletions .storybook/config.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,25 @@
import React from 'react';
import { configure, addDecorator } from '@storybook/react';
import { SelfkeyDarkTheme } from 'selfkey-ui';
import { MemoryRouter } from 'react-router';
import { Provider } from 'react-redux';
import { createStore } from 'redux';
import dummyState from './store-data.json';

addDecorator(storyFn => (
<SelfkeyDarkTheme>
<div style={{ width: '1450px', padding: '20px' }}>{storyFn()}</div>
</SelfkeyDarkTheme>
));
const configureStore = () => createStore((state = dummyState) => state);

addDecorator(storyFn => {
const store = configureStore();
return (
<SelfkeyDarkTheme>
<Provider store={store}>
<MemoryRouter>
<div style={{ width: '1450px', padding: '20px' }}>{storyFn()}</div>
</MemoryRouter>
</Provider>
</SelfkeyDarkTheme>
);
});

// automatically import all files ending in *.stories.js
const req = require.context('../stories', true, /\.stories\.jsx?$/);
Expand Down
Loading

0 comments on commit ec9843d

Please sign in to comment.