Skip to content

Commit 3fb0bb2

Browse files
committed
Merge branch 'develop'
# Conflicts: # example/public/build/app.js # example/yarn.lock
2 parents 56e6010 + 7caab3c commit 3fb0bb2

File tree

15 files changed

+27628
-37320
lines changed

15 files changed

+27628
-37320
lines changed

.babelrc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"presets": ["latest", "stage-0", "react"]
3-
}
2+
"presets": ["env","react"],
3+
"plugins": ["transform-object-rest-spread", "transform-runtime"]
4+
}

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: node_js
22
node_js:
3+
- "8"
34
- "7"
45
- "6"
5-
- "4"

example/.babelrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"presets": ["latest", "stage-0", "react"]
3-
}
2+
"presets": ["env", "react"]
3+
}

example/config/default.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ module.exports = {
22
buildPath: "/public/build/",
33
publicPath: "/build/",
44
wdsContentBasePath: "/public/",
5-
webpackDevServerPort: 1937
6-
};
5+
webpackDevServerPort: 1703
6+
};

example/package.json

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,35 @@
11
{
22
"name": "redux-react-i18n-example",
3+
"version": "0.0.1",
34
"description": "exemple for redux-react-i18n",
45
"scripts": {},
56
"author": "derzunov <[email protected]>",
67
"license": "MIT",
78
"dependencies": {
8-
"babel-core": "^6.17.0",
9-
"babel-loader": "^6.2.5",
10-
"babel-preset-es2015": "^6.6.0",
11-
"babel-preset-es2016": "^6.16.0",
12-
"babel-preset-latest": "^6.22.0",
13-
"babel-preset-react": "^6.5.0",
14-
"babel-preset-stage-0": "^6.22.0",
15-
"body-parser": "^1.15.0",
16-
"config": "^1.21.0",
17-
"del": "^2.2.2",
18-
"express": "^4.14.0",
19-
"fuzzysearch": "^1.0.3",
9+
"babel-core": "^6.26.0",
10+
"babel-loader": "^7.1.4",
11+
"babel-preset-env": "^1.6.1",
12+
"babel-preset-react": "^6.24.1",
13+
"body-parser": "^1.18.2",
14+
"config": "^1.30.0",
15+
"del": "^3.0.0",
16+
"express": "^4.16.3",
2017
"gulp": "^3.9.1",
21-
"gulp-load-plugins": "^1.4.0",
22-
"gulp-sequence": "^0.4.6",
18+
"gulp-load-plugins": "^1.5.0",
19+
"gulp-sequence": "^1.0.0",
2320
"open": "0.0.5",
2421
"path": "^0.12.7",
25-
"react": "^15.3.0",
26-
"react-dom": "^15.3.0",
27-
"react-redux": "^4.4.5",
28-
"redux": "^3.5.2",
29-
"redux-form": "^6.2.0",
30-
"redux-react-i18n": "^1.1.0",
31-
"redux-thunk": "^2.0.1",
32-
"run-sequence": "^1.2.2",
22+
"react": "^16.3.1",
23+
"react-dom": "^16.3.1",
24+
"react-redux": "^5.0.7",
25+
"redux": "^3.7.2",
26+
"redux-form": "^7.3.0",
27+
"redux-thunk": "^2.2.0",
28+
"run-sequence": "^2.2.1",
3329
"stream-combiner2": "^1.1.1",
34-
"translatr": "^0.1.6",
3530
"webpack": "^2.2.1",
3631
"webpack-dev-server": "^2.4.1",
37-
"webpack-stream": "^3.2.0"
32+
"webpack-stream": "^3.2.0",
33+
"redux-react-i18n": ">=1.2.0"
3834
}
3935
}

0 commit comments

Comments
 (0)