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

Commit87c8d8b

Browse files
committed
Merge branch 'hotfix/2.1.4'
2 parentsc7b497a +63dedc2 commit87c8d8b

File tree

13 files changed

+421
-499
lines changed

13 files changed

+421
-499
lines changed

‎.babelrc‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,6 @@
44
"transform-class-properties",
55
"transform-react-constant-elements",
66
"transform-react-inline-elements",
7-
"transform-react-remove-prop-types",
8-
["module-resolver", {
9-
"alias": {
10-
"react-router-dom":"react-router-dom/umd/react-router-dom.min.js",
11-
"redux":"redux/dist/redux.min.js",
12-
"react-redux":"react-redux/dist/react-redux.min.js"
13-
}
14-
}]
7+
"transform-react-remove-prop-types"
158
]
169
}

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ To install "meteor yarn" : ```meteor npm i -g yarn```
1313
meteor yarn add react react-dom react-router-dom@4.0.0-beta.3 express helmet \
1414
react-helmet winston logatim receptacle useragent redux react-redux moment \
1515
i18next i18next-node-remote-backend i18next-xhr-backend react-i18next \
16-
i18next-express-middleware serialize-javascript lodash actual
16+
i18next-express-middleware serialize-javascript lodash actual is-retina
1717
meteor add ssrwpo:ssr
1818
```
1919

‎demo/.meteor/.finished-upgraders‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ notices-for-facebook-graph-api-2
1313
1.3.0-split-minifiers-package
1414
1.4.0-remove-old-dev-bundle-link
1515
1.4.1-add-shell-server-package
16+
1.4.3-split-account-service-packages

‎demo/.meteor/packages‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
# 'meteor add' and 'meteor remove' will edit this file for you,
55
# but you can also edit it by hand.
66

7-
ecmascript
8-
meteor
9-
hot-code-push
10-
ddp
11-
mongo
12-
tracker
7+
ecmascript@0.6.3
8+
meteor@1.6.1
9+
hot-code-push@1.0.4
10+
ddp@1.2.5
11+
mongo@1.1.15
12+
tracker@1.1.2
1313

14-
stylus
14+
stylus@2.513.9
1515
juliancwirko:postcss
1616

17-
shell-server
17+
shell-server@0.2.2
1818

19-
webapp
20-
ejson
19+
webapp@1.3.13
20+
ejson@1.0.13
2121
ssrwpo:ssr
2222

2323
ssrwpo:uglifyjs2

‎demo/.meteor/release‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
METEOR@1.4.2.6
1+
METEOR@1.4.3.1

‎demo/.meteor/versions‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ blaze-tools@1.0.10
99
boilerplate-generator@1.0.11
1010
caching-compiler@1.1.9
1111
callback-hook@1.0.10
12-
check@1.2.4
12+
check@1.2.5
1313
ddp@1.2.5
1414
ddp-client@1.3.3
1515
ddp-common@1.2.8
@@ -51,7 +51,7 @@ shell-server@0.2.2
5151
spacebars@1.0.13
5252
spacebars-compiler@1.1.0
5353
ssrwpo:ssr@2.1.3
54-
ssrwpo:uglifyjs2@0.4.0
54+
ssrwpo:uglifyjs2@0.5.0
5555
stylus@2.513.9
5656
tmeasday:check-npm-versions@0.3.1
5757
tracker@1.1.2

‎demo/package.json‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
},
88
"devDependencies": {
99
"babel-eslint":"^7.1.1",
10-
"eslint":"^3.15.0",
10+
"eslint":"^3.16.1",
1111
"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",
1515
"eslint-plugin-jsx-a11y":"^4.0.0",
1616
"eslint-plugin-meteor":"^4.0.1",
17-
"eslint-plugin-react":"^6.9.0",
17+
"eslint-plugin-react":"^6.10.0",
1818
"react-addons-perf":"^15.4.2"
1919
},
2020
"dependencies": {
@@ -27,17 +27,18 @@
2727
"babel-preset-es2015":"^6.22.0",
2828
"babel-preset-meteor":"^6.22.0",
2929
"babel-preset-stage-0":"^6.22.0",
30-
"babel-runtime":"^6.22.0",
30+
"babel-runtime":"^6.23.0",
3131
"bcrypt":"^1.0.2",
3232
"cssnano":"^3.10.0",
3333
"express":"^4.14.1",
34-
"faker":"^3.1.0",
35-
"helmet":"^3.4.0",
34+
"faker":"^4.1.0",
35+
"helmet":"^3.4.1",
3636
"history":"^4.5.1",
37-
"i18next":"^7.0.0",
37+
"i18next":"^7.1.0",
3838
"i18next-express-middleware":"^1.0.2",
3939
"i18next-node-remote-backend":"0.0.4",
4040
"i18next-xhr-backend":"^1.3.0",
41+
"is-retina":"^1.0.3",
4142
"lodash":"^4.17.4",
4243
"logatim":"^0.9.0",
4344
"meteor-node-stubs":"~0.2.5",
@@ -48,7 +49,7 @@
4849
"react-dom":"^15.4.2",
4950
"react-helmet":"^4.0.0",
5051
"react-i18next":"^2.2.0",
51-
"react-redux":"^5.0.2",
52+
"react-redux":"^5.0.3",
5253
"react-router-dom":"4.0.0-beta.6",
5354
"receptacle":"^1.1.0",
5455
"redux":"^3.6.0",

0 commit comments

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