Skip to content

Commit

Permalink
Merge branch 'ssr' into develop
Browse files Browse the repository at this point in the history
* ssr: (22 commits)
  travis: best config see https://blog.travis-ci.com/first_class_nodejs_support_on_travis_ci
  travis: node matrix
  - cleaning webpack - removed packages - removing sass - simplifying travis
  replacing karma by jest for better perf cleaning dev dependencies port 9002 for testing
  fixing comment + update dist files
  Sorting package.json, removing tags
  updating dist files
  removing proptypes and adding comments
  sorting dependencis
  Addin change logs for v1.14
  fixing Cannot start Firefox Error: GDK_BACKEND does not match available displays
  setting node 10 and fixing pretest
  Fixing travis error ? see https://travis-ci.org/sass/node-sass/jobs/414043587/config
  Fixing travis error ? see nodejs/node-gyp#1420
  Adding index to support SSR
  updating readme
  fixing test
  ignoring soe files in package
  use sources files as main instead of webpack  bundles
  updating dist files
  ...
  • Loading branch information
anis-campos committed Apr 24, 2019
2 parents e56be0f + 719f20f commit d4a02b6
Show file tree
Hide file tree
Showing 29 changed files with 11,415 additions and 9,221 deletions.
7 changes: 7 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"presets": [
"@babel/preset-env",
"@babel/preset-react"
]
}

2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
build
dist
11 changes: 11 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
yarn.lock
webpack.*
karma.config.js
.travis.yml
.gitignore
.eslintignore
.eslintrc.js
.babelrc
test/
node_modules/
examples/
11 changes: 7 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
language: node_js
node_js:
- node
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- "8"
- "9"
- "10"
- "11"
- node


deploy:
provider: npm
email: [email protected]
Expand Down
14 changes: 11 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ A Higher Order Component using react-redux to keep dialog state in a Redux store
## Example

Clone this repo then run:
```javascript
```bash
npm install
npm start
```
Expand Down Expand Up @@ -50,6 +50,7 @@ const store = createStore(reducer);

Decorate your component with reduxDialog.
```js
import {connect} from 'react-redux';
import reduxDialog from 'redux-reactstrap-modal';

const BasicDialog = () => (
Expand All @@ -59,7 +60,7 @@ const BasicDialog = () => (
)

const Dialog = reduxDialog(
store, // [NEW] needed to be compatible with react-redux > 6
connect, // [NEW] needed to be compatible with react-redux > 6
{
name: 'signupDialog' // unique name - you can't have two dialogs with the same name
})(BasicDialog);
Expand Down Expand Up @@ -89,7 +90,7 @@ A data object that will be passed to the modal as a property. Usefull to send da
The content wrapped inside the modal receive the additional props :

#### `toggle`: function ()=>()
This will toggle the dialog. Canbe used for buttons like Dismiss, Cancel, Close, ...
This will toggle the dialog. Can be used for buttons like Dismiss, Cancel, Close, ...


## Example
Expand All @@ -102,8 +103,15 @@ Work in progress

## Change Log

#### **v1.14**
- Fix [issue 5](https://github.com/anis-campos/redux-reactstrap-modal/issues/5) : Incompatible with SSR
- replacing `store` by `connect`
- fixing travis CI
-

#### **v1.13**
- Fix [issue 6](https://github.com/anis-campos/redux-reactstrap-modal/issues/6) : Incompatible with react-redux > 6
- need to pass `store` to create the redux wrapper

#### **v1.12**
- Fix [issue 4](https://github.com/anis-campos/redux-reactstrap-modal/issues/4) : Uncaught TypeError: state.merge is not a function
Expand Down
1 change: 0 additions & 1 deletion build/redux.reactstrap.modal.js.map

This file was deleted.

Loading

0 comments on commit d4a02b6

Please sign in to comment.