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

Commit39d55f5

Browse files
committed
Merge branch 'hotfix/2.4.0'
2 parents05494db +3378c76 commit39d55f5

File tree

8 files changed

+58
-70
lines changed

8 files changed

+58
-70
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#2.4.0 cordova friendly
2+
3+
* Avoid analyzing cordova's hot code push URL:`/__cordova/`.
4+
15
#2.3.0 react-helmet 5.x, sitemap.js & humans.txt
26

37
* react-helmet: 5.X API.

‎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.3
5151
spacebars@1.0.15
5252
spacebars-compiler@1.1.2
53-
ssrwpo:ssr@2.3.0
53+
ssrwpo:ssr@2.4.0
5454
ssrwpo:uglifyjs2@0.5.0
5555
stylus@2.513.9
5656
tmeasday:check-npm-versions@0.3.1

‎demo/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
"dependencies": {
2121
"actual":"^0.4.0",
22-
"babel-plugin-module-resolver":"^2.5.0",
22+
"babel-plugin-module-resolver":"^2.7.0",
2323
"babel-plugin-transform-class-properties":"^6.23.0",
2424
"babel-plugin-transform-react-constant-elements":"^6.23.0",
2525
"babel-plugin-transform-react-inline-elements":"^6.22.0",
@@ -44,23 +44,23 @@
4444
"meteor-node-stubs":"^0.2.6",
4545
"moment":"^2.18.1",
4646
"normalize.css":"^6.0.0",
47-
"pino":"^4.2.2",
47+
"pino":"^4.2.4",
4848
"postcss-flexbugs-fixes":"^2.1.0",
4949
"react":"^15.4.2",
5050
"react-dom":"^15.4.2",
51-
"react-helmet":"^5.0.1",
52-
"react-i18next":"^2.2.1",
51+
"react-helmet":"^5.0.2",
52+
"react-i18next":"^2.2.3",
5353
"react-redux":"^5.0.3",
5454
"react-router-dom":"^4.0.0",
5555
"receptacle":"^1.1.0",
5656
"redux":"^3.6.0",
57-
"redux-logger":"^3.0.0",
57+
"redux-logger":"^3.0.1",
5858
"redux-promise":"^0.5.3",
5959
"redux-thunk":"^2.2.0",
6060
"serialize-javascript":"^1.3.0",
6161
"simpl-schema":"^0.2.3",
6262
"sitemap":"^1.11.1",
63-
"useragent":"^2.1.12"
63+
"useragent":"^2.1.13"
6464
},
6565
"postcss": {
6666
"plugins": {

‎demo/yarn.lock‎

Lines changed: 24 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,6 @@ async@^1.4.0:
164164
version "1.5.2"
165165
resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
166166

167-
async@~0.2.6:
168-
version "0.2.10"
169-
resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
170-
171167
asynckit@^0.4.0:
172168
version "0.4.0"
173169
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -380,9 +376,9 @@ babel-plugin-check-es2015-constants@^6.22.0:
380376
dependencies:
381377
babel-runtime "^6.22.0"
382378

383-
babel-plugin-module-resolver@^2.5.0:
384-
version "2.5.0"
385-
resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-2.5.0.tgz#a1204b4aeada066e8afb9b9f9c43e238d73d41bb"
379+
babel-plugin-module-resolver@^2.7.0:
380+
version "2.7.0"
381+
resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-2.7.0.tgz#9c1cb2fcf2a1bdb45e91c6c985b96311123797f9"
386382
dependencies:
387383
find-babel-config "^1.0.1"
388384
glob "^7.1.1"
@@ -3076,16 +3072,16 @@ pinkie@^2.0.0:
30763072
version "2.0.4"
30773073
resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
30783074

3079-
pino@^4.2.2:
3080-
version "4.2.2"
3081-
resolved "https://registry.yarnpkg.com/pino/-/pino-4.2.2.tgz#80f382ad29d7ce9aaf3ad964fc870a98c46703f8"
3075+
pino@^4.2.4:
3076+
version "4.2.4"
3077+
resolved "https://registry.yarnpkg.com/pino/-/pino-4.2.4.tgz#e893cc31446402574aa976816e5c373e869106fa"
30823078
dependencies:
30833079
chalk "^1.1.1"
30843080
fast-json-parse "^1.0.0"
30853081
fast-safe-stringify "^1.1.11"
30863082
flatstr "^1.0.4"
30873083
pump "^1.0.2"
3088-
quick-format-unescaped "^1.0.0"
3084+
quick-format-unescaped "^1.1.1"
30893085
split2 "^2.0.1"
30903086

30913087
pkg-dir@^1.0.0:
@@ -3414,9 +3410,9 @@ querystring@0.2.0:
34143410
version "0.2.0"
34153411
resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
34163412

3417-
quick-format-unescaped@^1.0.0:
3418-
version "1.1.0"
3419-
resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-1.1.0.tgz#9b6f3e200a83ff572966ce110372edbabe1c660c"
3413+
quick-format-unescaped@^1.1.1:
3414+
version "1.1.1"
3415+
resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-1.1.1.tgz#e77555ef3e66e105d4039e13ef79201284fee916"
34203416
dependencies:
34213417
fast-safe-stringify "^1.0.8"
34223418

@@ -3460,17 +3456,17 @@ react-dom@^15.4.2:
34603456
loose-envify "^1.1.0"
34613457
object-assign "^4.1.0"
34623458

3463-
react-helmet@^5.0.1:
3464-
version "5.0.1"
3465-
resolved "https://registry.yarnpkg.com/react-helmet/-/react-helmet-5.0.1.tgz#ffaf4553bb47c68a65edc53782d7fc6706796343"
3459+
react-helmet@^5.0.2:
3460+
version "5.0.2"
3461+
resolved "https://registry.yarnpkg.com/react-helmet/-/react-helmet-5.0.2.tgz#2905f9e174650b74c26983d75dc45f3ebf561890"
34663462
dependencies:
34673463
deep-equal "^1.0.1"
34683464
object-assign "^4.1.1"
34693465
react-side-effect "^1.1.0"
34703466

3471-
react-i18next@^2.2.1:
3472-
version "2.2.1"
3473-
resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-2.2.1.tgz#ef7bd032061206cd574ebdf40fcb9a168c33c839"
3467+
react-i18next@^2.2.3:
3468+
version "2.2.3"
3469+
resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-2.2.3.tgz#cb6ae3ed11f5327fb691a9de277e9c31a8c50d4a"
34743470
dependencies:
34753471
hoist-non-react-statics "1.2.0"
34763472

@@ -3574,9 +3570,9 @@ reduce-function-call@^1.0.1:
35743570
dependencies:
35753571
balanced-match "^0.4.2"
35763572

3577-
redux-logger@^3.0.0:
3578-
version "3.0.0"
3579-
resolved "https://registry.yarnpkg.com/redux-logger/-/redux-logger-3.0.0.tgz#f552052d8992d058cfcdb42b5c654fa5f7beb9cc"
3573+
redux-logger@^3.0.1:
3574+
version "3.0.1"
3575+
resolved "https://registry.yarnpkg.com/redux-logger/-/redux-logger-3.0.1.tgz#ae8ae4c3c55ed3dd7aa31509f0856c5d3751057a"
35803576
dependencies:
35813577
deep-diff "0.3.4"
35823578

@@ -4088,7 +4084,7 @@ ua-parser-js@^0.7.9:
40884084
version "0.7.12"
40894085
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"
40904086

4091-
uglify-js@2.8.x:
4087+
uglify-js@2.8.x, uglify-js@^2.6:
40924088
version "2.8.16"
40934089
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.16.tgz#d286190b6eefc6fd65eb0ecac6551e0b0e8839a4"
40944090
dependencies:
@@ -4097,15 +4093,6 @@ uglify-js@2.8.x:
40974093
optionalDependencies:
40984094
uglify-to-browserify "~1.0.0"
40994095

4100-
uglify-js@^2.6:
4101-
version "2.7.5"
4102-
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8"
4103-
dependencies:
4104-
async "~0.2.6"
4105-
source-map "~0.5.1"
4106-
uglify-to-browserify "~1.0.0"
4107-
yargs "~3.10.0"
4108-
41094096
uglify-to-browserify@~1.0.0:
41104097
version "1.0.2"
41114098
resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
@@ -4161,9 +4148,9 @@ user-home@^2.0.0:
41614148
dependencies:
41624149
os-homedir "^1.0.0"
41634150

4164-
useragent@^2.1.12:
4165-
version "2.1.12"
4166-
resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.1.12.tgz#aa7da6cdc48bdc37ba86790871a7321d64edbaa2"
4151+
useragent@^2.1.13:
4152+
version "2.1.13"
4153+
resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.1.13.tgz#bba43e8aa24d5ceb83c2937473e102e21df74c10"
41674154
dependencies:
41684155
lru-cache "2.2.x"
41694156
tmp "0.0.x"
@@ -4238,14 +4225,10 @@ window-size@0.1.0:
42384225
version "0.1.0"
42394226
resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
42404227

4241-
wordwrap@0.0.2:
4228+
wordwrap@0.0.2, wordwrap@~0.0.2:
42424229
version "0.0.2"
42434230
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
42444231

4245-
wordwrap@~0.0.2:
4246-
version "0.0.3"
4247-
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
4248-
42494232
wordwrap@~1.0.0:
42504233
version "1.0.0"
42514234
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name":"ssr",
3-
"version":"2.3.0",
3+
"version":"2.4.0",
44
"description":"Server side rendering with Express, react-router-4 & redux for Meteor.",
55
"main":"ssr.js",
66
"scripts": {
77
"test":"jest",
8-
"test.watch":"jest --watch --notify",
8+
"test.watch":"jest --watch",
99
"lint":"./scripts/eslint.sh; exit 0"
1010
},
1111
"repository": {
@@ -22,7 +22,7 @@
2222
"actual":"^0.4.0",
2323
"babel-eslint":"^7.2.1",
2424
"babel-jest":"^19.0.0",
25-
"babel-plugin-module-resolver":"^2.5.0",
25+
"babel-plugin-module-resolver":"^2.7.0",
2626
"babel-plugin-transform-class-properties":"^6.23.0",
2727
"babel-plugin-transform-react-constant-elements":"^6.23.0",
2828
"babel-plugin-transform-react-inline-elements":"^6.22.0",
@@ -31,7 +31,7 @@
3131
"babel-preset-es2015":"^6.23.0",
3232
"babel-preset-meteor":"^6.25.0",
3333
"babel-runtime":"^6.23.0",
34-
"benchmark":"^2.1.3",
34+
"benchmark":"^2.1.4",
3535
"chai":"^3.5.0",
3636
"dirty-chai":"^1.2.2",
3737
"eslint":"^3.18.0",
@@ -50,7 +50,7 @@
5050
"receptacle":"^1.1.0",
5151
"redux":"^3.6.0",
5252
"serialize-javascript":"^1.3.0",
53-
"useragent":"^2.1.12"
53+
"useragent":"^2.1.13"
5454
},
5555
"jest": {
5656
"verbose":true,

‎src/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.3.0',
6+
version:'2.4.0',
77
summary:'SSR - Router with SSR for Node & Meteor',
88
git:'https://github.com/ssr-server/ssr',
99
documentation:'README.md',

‎src/server/createRouter.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ let debugLastResponse = null;
2828

2929
// URL pattern covered by Express
3030
//@NOTE URLs that:
31-
// * doesn't start with "/api/"
32-
// * contains no dot
33-
constEXPRESS_COVERED_URL=/^\/(?!api\/)[^.]*$/;
31+
// * doesn't start with `/api/`
32+
// * doesn't start with `/__cordova/`
33+
// * contains no `.`
34+
constEXPRESS_COVERED_URL=/^\/(?!api\/)(?!__cordova\/)[^.]*$/;
3435

3536
/* eslint-disable no-param-reassign */
3637
constcreateRouter=({

‎yarn.lock‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ acorn-jsx@^3.0.0, acorn-jsx@^3.0.1:
1818
dependencies:
1919
acorn "^3.0.4"
2020

21-
acorn@4.0.4, acorn@^4.0.4:
21+
acorn@4.0.4:
2222
version "4.0.4"
2323
resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a"
2424

2525
acorn@^3.0.4:
2626
version "3.3.0"
2727
resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
2828

29-
acorn@~4.0.5:
29+
acorn@^4.0.4, acorn@~4.0.5:
3030
version "4.0.11"
3131
resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0"
3232

@@ -349,9 +349,9 @@ babel-plugin-jest-hoist@^19.0.0:
349349
version "19.0.0"
350350
resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-19.0.0.tgz#4ae2a04ea612a6e73651f3fde52c178991304bea"
351351

352-
babel-plugin-module-resolver@^2.5.0:
353-
version "2.5.0"
354-
resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-2.5.0.tgz#a1204b4aeada066e8afb9b9f9c43e238d73d41bb"
352+
babel-plugin-module-resolver@^2.7.0:
353+
version "2.7.0"
354+
resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-2.7.0.tgz#9c1cb2fcf2a1bdb45e91c6c985b96311123797f9"
355355
dependencies:
356356
find-babel-config "^1.0.1"
357357
glob "^7.1.1"
@@ -780,11 +780,11 @@ bcrypt-pbkdf@^1.0.0:
780780
dependencies:
781781
tweetnacl "^0.14.3"
782782

783-
benchmark@^2.1.3:
784-
version "2.1.3"
785-
resolved "https://registry.yarnpkg.com/benchmark/-/benchmark-2.1.3.tgz#e10e40e4d53d0e1c9d77a834fde593994dca7f0c"
783+
benchmark@^2.1.4:
784+
version "2.1.4"
785+
resolved "https://registry.yarnpkg.com/benchmark/-/benchmark-2.1.4.tgz#09f3de31c916425d498cc2ee565a0ebf3c2a5629"
786786
dependencies:
787-
lodash "^4.17.3"
787+
lodash "^4.17.4"
788788
platform "^1.3.3"
789789

790790
bindings@1.2.x:
@@ -2353,7 +2353,7 @@ lodash.memoize@4.1.2:
23532353
version "4.1.2"
23542354
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
23552355

2356-
lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0:
2356+
lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0:
23572357
version "4.17.4"
23582358
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
23592359

@@ -3233,9 +3233,9 @@ user-home@^2.0.0:
32333233
dependencies:
32343234
os-homedir "^1.0.0"
32353235

3236-
useragent@^2.1.12:
3237-
version "2.1.12"
3238-
resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.1.12.tgz#aa7da6cdc48bdc37ba86790871a7321d64edbaa2"
3236+
useragent@^2.1.13:
3237+
version "2.1.13"
3238+
resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.1.13.tgz#bba43e8aa24d5ceb83c2937473e102e21df74c10"
32393239
dependencies:
32403240
lru-cache "2.2.x"
32413241
tmp "0.0.x"

0 commit comments

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