Skip to content

Commit

Permalink
Merge d6c1766 into a992338
Browse files Browse the repository at this point in the history
  • Loading branch information
on3iro committed Mar 12, 2018
2 parents a992338 + d6c1766 commit a1eb601
Show file tree
Hide file tree
Showing 10 changed files with 3,514 additions and 1,709 deletions.
2 changes: 1 addition & 1 deletion .flowconfig
@@ -1,7 +1,7 @@
[ignore]
.*/__tests__/.*
.*/.+\.test.js
.*/node_modules/.*
.*/node_modules/config-chain/.*

[include]

Expand Down
2 changes: 1 addition & 1 deletion docs/iframe.html
Expand Up @@ -16,5 +16,5 @@
<body>
<div id="root"></div>
<div id="error-display"></div>
<script type="text/javascript" src="static/preview.9e3a40bab6d81d902e43.bundle.js"></script></body>
<script type="text/javascript" src="static/preview.353deb5b2411f386fb0d.bundle.js"></script></body>
</html>
6 changes: 3 additions & 3 deletions docs/index.html
@@ -1,9 +1,9 @@
<!DOCTYPE html>
<html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="storybook-version" content="3.3.10">
<meta name="storybook-version" content="3.3.15">
<meta content="IE=edge" http-equiv="X-UA-Compatible" />
<title>Storybook</title>
<style>
Expand Down Expand Up @@ -40,5 +40,5 @@
</head>
<body style="margin: 0;">
<div id="root"></div>
<script type="text/javascript" src="static/manager.a509b1cc51764840267a.bundle.js"></script></body>
<script type="text/javascript" src="static/manager.7a9c63e3d4725d362fce.bundle.js"></script></body>
</html>
1 change: 1 addition & 0 deletions docs/static/manager.7a9c63e3d4725d362fce.bundle.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion docs/static/manager.a509b1cc51764840267a.bundle.js

This file was deleted.

1 change: 1 addition & 0 deletions docs/static/preview.353deb5b2411f386fb0d.bundle.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion docs/static/preview.9e3a40bab6d81d902e43.bundle.js

This file was deleted.

5,176 changes: 3,491 additions & 1,685 deletions package-lock.json

Large diffs are not rendered by default.

31 changes: 15 additions & 16 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "@4so-fourseasons/react-hoc-spinners",
"version": "1.0.1",
"version": "1.0.2",
"main": "lib/index.js",
"module": "es/index.js",
"jsnext:main": "es/index.js",
Expand All @@ -26,6 +26,7 @@
"build:commonjs": "cross-env BABEL_ENV=commonjs babel src --out-dir lib",
"build:es": "cross-env BABEL_ENV=es babel src --out-dir es",
"storybook": "cross-env BABEL_ENV=es start-storybook -p 9001 -c .storybook",
"start": "npm run storybook",
"flow": "flow",
"lint": "standard --parser babel-eslint",
"lint:fix": "standard --parser babel-eslint --fix",
Expand All @@ -48,11 +49,11 @@
],
"testPathIgnorePatterns": [
"/node_modules/",
".*\/\\w*.stories.js(x)?$"
".*/\\w*.stories.js(x)?$"
],
"coveragePathIgnorePatterns": [
"/node_modules/",
".*\/\\w*.stories.js(x)?$"
".*/\\w*.stories.js(x)?$"
],
"collectCoverageFrom": [
"**/src/**/*.{js,jsx}"
Expand Down Expand Up @@ -99,35 +100,33 @@
},
"dependencies": {
"recompose": "^0.26.0",
"styled-components": "^2.3.0"
"styled-components": "^3.2.1"
},
"devDependencies": {
"@storybook/react": "^3.3.10",
"@storybook/react": "^3.3.15",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.0",
"babel-eslint": "8.0.3",
"babel-jest": "22.0.4",
"babel-eslint": "8.2.2",
"babel-jest": "22.4.1",
"babel-plugin-external-helpers": "6.22.0",
"babel-plugin-styled-components": "^1.3.0",
"babel-plugin-styled-components": "^1.5.1",
"babel-polyfill": "6.26.0",
"babel-preset-env": "1.6.1",
"babel-preset-flow": "6.23.0",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-3": "6.24.1",
"coveralls": "3.0.0",
"cross-env": "5.1.3",
"cross-env": "5.1.4",
"enzyme": "^3.2.0",
"enzyme-adapter-react-16": "^1.1.1",
"eslint-plugin-flowtype": "2.41.0",
"flow-bin": "^0.63.1",
"jest": "22.0.5",
"eslint-plugin-flowtype": "2.46.1",
"flow-bin": "^0.67.1",
"jest": "22.4.2",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"recompose": "^0.26.0",
"rimraf": "2.6.2",
"standard": "10.0.3",
"standard": "11.0.0",
"storybook-addon-jsx": "^5.3.0",
"storybook-readme": "^3.2.0",
"styled-components": "^2.3.0"
"storybook-readme": "^3.2.1"
}
}
2 changes: 1 addition & 1 deletion src/HOCS/stories.jsx
Expand Up @@ -57,7 +57,7 @@ storiesOf('HOCS/makeWithLoadingIndicator', module)
.add('Specify custom component as spinner', () => {
const CustomComponent = (props) => (
<h1>Custom Component</h1>
)
)

const WithLoadingIndicator = makeWithLoadingIndicator({
condition: () => true,
Expand Down

0 comments on commit a1eb601

Please sign in to comment.