Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
/ssrPublic

Commitb92d289

Browse files
committed
Merge branch 'hotfix/2.1.2'
2 parents77e11a2 +7c9f3bc commitb92d289

File tree

8 files changed

+311
-222
lines changed

8 files changed

+311
-222
lines changed

‎.versions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ reactive-var@1.0.10
2626
routepolicy@1.0.12
2727
spacebars@1.0.12
2828
spacebars-compiler@1.0.13
29-
ssrwpo:ssr@2.1.1
29+
ssrwpo:ssr@2.1.2
3030
tmeasday:check-npm-versions@0.3.1
3131
tracker@1.1.1
3232
ui@1.0.11

‎demo/.meteor/versions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ routepolicy@1.0.12
5050
shell-server@0.2.1
5151
spacebars@1.0.13
5252
spacebars-compiler@1.0.13
53-
ssrwpo:ssr@2.1.1
53+
ssrwpo:ssr@2.1.2
5454
ssrwpo:uglifyjs2@0.2.0
5555
stylus@2.513.8
5656
tmeasday:check-npm-versions@0.3.1

‎demo/package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@
77
},
88
"devDependencies": {
99
"babel-eslint":"^7.1.1",
10-
"eslint":"^3.14.1",
11-
"eslint-config-airbnb":"^14.0.0",
10+
"eslint":"^3.15.0",
11+
"eslint-config-airbnb":"^14.1.0",
1212
"eslint-import-resolver-meteor":"^0.3.4",
1313
"eslint-plugin-class-property":"^1.0.3",
1414
"eslint-plugin-import":"^2.2.0",
15-
"eslint-plugin-jsx-a11y":"^3.0.2",
15+
"eslint-plugin-jsx-a11y":"^4.0.0",
1616
"eslint-plugin-meteor":"^4.0.1",
1717
"eslint-plugin-react":"^6.9.0",
1818
"react-addons-perf":"^15.4.2"
1919
},
2020
"dependencies": {
2121
"actual":"^0.4.0",
22-
"babel-plugin-module-resolver":"^2.4.0",
22+
"babel-plugin-module-resolver":"^2.5.0",
2323
"babel-plugin-transform-class-properties":"^6.22.0",
2424
"babel-plugin-transform-dead-code-elimination":"^2.2.2",
2525
"babel-plugin-transform-inline-environment-variables":"^0.0.2",
2626
"babel-plugin-transform-react-constant-elements":"^6.22.0",
2727
"babel-plugin-transform-react-inline-elements":"^6.22.0",
28-
"babel-plugin-transform-react-remove-prop-types":"^0.2.11",
28+
"babel-plugin-transform-react-remove-prop-types":"^0.3.1",
2929
"babel-preset-es2015":"^6.22.0",
30-
"babel-preset-meteor":"^6.14.0",
30+
"babel-preset-meteor":"^6.22.0",
3131
"babel-preset-stage-0":"^6.22.0",
3232
"babel-runtime":"^6.22.0",
3333
"bcrypt":"^1.0.2",
@@ -36,7 +36,7 @@
3636
"faker":"^3.1.0",
3737
"helmet":"^3.4.0",
3838
"history":"^4.5.1",
39-
"i18next":"^6.1.2",
39+
"i18next":"^7.0.0",
4040
"i18next-express-middleware":"^1.0.2",
4141
"i18next-node-remote-backend":"0.0.4",
4242
"i18next-xhr-backend":"^1.3.0",
@@ -51,15 +51,15 @@
5151
"react-helmet":"^4.0.0",
5252
"react-i18next":"^2.1.0",
5353
"react-redux":"^5.0.2",
54-
"react-router-dom":"4.0.0-beta.3",
54+
"react-router-dom":"4.0.0-beta.5",
5555
"receptacle":"^1.1.0",
5656
"redux":"^3.6.0",
57-
"redux-logger":"^2.8.0",
57+
"redux-logger":"^2.8.1",
5858
"redux-promise":"^0.5.3",
5959
"redux-thunk":"^2.2.0",
6060
"serialize-javascript":"^1.3.0",
6161
"simpl-schema":"^0.1.0",
62-
"useragent":"^2.1.11",
62+
"useragent":"^2.1.12",
6363
"winston":"^2.3.1"
6464
},
6565
"postcss": {

‎demo/yarn.lock‎

Lines changed: 133 additions & 114 deletions
Large diffs are not rendered by default.

‎package.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
constname='ssrwpo:ssr';
44
Package.describe({
55
name,
6-
version:'2.1.1',
6+
version:'2.1.2',
77
summary:'SSR - Router with SSR for Node & Meteor',
88
git:'https://github.com/ssr-server/ssr',
99
documentation:'README.md',

‎package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name":"ssr",
3-
"version":"2.1.1",
3+
"version":"2.1.2",
44
"description":"Server side rendering with Express, react-router-4 & redux for Meteor.",
55
"main":"ssr.js",
66
"scripts": {
@@ -21,27 +21,27 @@
2121
"actual":"^0.4.0",
2222
"babel-eslint":"^7.1.1",
2323
"babel-jest":"^18.0.0",
24-
"babel-plugin-module-resolver":"^2.4.0",
24+
"babel-plugin-module-resolver":"^2.5.0",
2525
"babel-plugin-transform-class-properties":"^6.22.0",
2626
"babel-plugin-transform-dead-code-elimination":"^2.2.2",
2727
"babel-plugin-transform-inline-environment-variables":"^0.0.2",
2828
"babel-plugin-transform-react-constant-elements":"^6.22.0",
2929
"babel-plugin-transform-react-inline-elements":"^6.22.0",
30-
"babel-plugin-transform-react-remove-prop-types":"^0.2.11",
30+
"babel-plugin-transform-react-remove-prop-types":"^0.3.1",
3131
"babel-polyfill":"^6.22.0",
3232
"babel-preset-es2015":"^6.22.0",
33-
"babel-preset-meteor":"^6.14.0",
33+
"babel-preset-meteor":"^6.22.0",
3434
"babel-preset-react":"^6.22.0",
3535
"babel-runtime":"^6.22.0",
3636
"benchmark":"^2.1.3",
3737
"chai":"^3.5.0",
3838
"dirty-chai":"^1.2.2",
39-
"eslint":"^3.14.1",
40-
"eslint-config-airbnb":"^14.0.0",
39+
"eslint":"^3.15.0",
40+
"eslint-config-airbnb":"^14.1.0",
4141
"eslint-import-resolver-meteor":"^0.3.4",
4242
"eslint-plugin-class-property":"^1.0.3",
4343
"eslint-plugin-import":"^2.2.0",
44-
"eslint-plugin-jsx-a11y":"^3.0.2",
44+
"eslint-plugin-jsx-a11y":"^4.0.0",
4545
"eslint-plugin-meteor":"^4.0.1",
4646
"eslint-plugin-react":"^6.9.0",
4747
"immutable":"^3.8.1",
@@ -51,7 +51,7 @@
5151
"receptacle":"^1.1.0",
5252
"redux":"^3.6.0",
5353
"serialize-javascript":"^1.3.0",
54-
"useragent":"^2.1.11"
54+
"useragent":"^2.1.12"
5555
},
5656
"jest": {
5757
"verbose":true,

‎server/utils/peerDependencies.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ checkNpmVersions({
44
actual:'0.x',
55
express:'4.x',
66
helmet:'3.x',
7-
i18next:'6.x',
7+
i18next:'7.x',
88
'i18next-express-middleware':'1.x',
99
'i18next-node-remote-backend':'0.0.x',
1010
'i18next-xhr-backend':'1.3.x',
@@ -15,7 +15,7 @@ checkNpmVersions({
1515
'react-helmet':'4.x',
1616
'react-i18next':'2.x',
1717
'react-redux':'5.x',
18-
'react-router-dom':'4.0.0-beta.3',
18+
'react-router-dom':'4.0.0-beta.5',
1919
receptacle:'1.x',
2020
redux:'3.x',
2121
'serialize-javascript':'1.x',

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp