Skip to content

Commit 96620ce

Browse files
mythzmythz
authored
Merge pull request #2 from ServiceStack/update-deps
Update deps
2 parents 49c7731 + e3ded19 commit 96620ce

File tree

5 files changed

+30
-63
lines changed

5 files changed

+30
-63
lines changed

‎src/Gistlyn/config.js

Lines changed: 9 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ System.config({
2222
"react-ga": "npm:[email protected]",
2323
"react-redux": "npm:[email protected]",
2424
"redux": "npm:[email protected]",
25-
"servicestack-client": "npm:[email protected].8",
25+
"servicestack-client": "npm:[email protected].10",
2626
"github:jspm/[email protected]": {
2727
"assert": "npm:[email protected]"
2828
},
@@ -69,7 +69,7 @@ System.config({
6969
"path-browserify": "npm:[email protected]"
7070
},
7171
"github:jspm/[email protected]": {
72-
"process": "npm:[email protected].6"
72+
"process": "npm:[email protected].7"
7373
},
7474
"github:jspm/[email protected]": {
7575
"punycode": "npm:[email protected]"
@@ -386,15 +386,12 @@ System.config({
386386
"buffer": "github:jspm/[email protected]",
387387
"pako": "npm:[email protected]",
388388
"process": "github:jspm/[email protected]",
389-
"readable-stream": "npm:readable-stream@2.1.4",
389+
"readable-stream": "npm:readable-stream@2.0.6",
390390
"util": "github:jspm/[email protected]"
391391
},
392392
"npm:[email protected]": {
393393
"buffer": "github:jspm/[email protected]"
394394
},
395-
"npm:[email protected]": {
396-
"buffer": "github:jspm/[email protected]"
397-
},
398395
"npm:[email protected]": {
399396
"buffer": "github:jspm/[email protected]",
400397
"systemjs-json": "github:systemjs/[email protected]"
@@ -918,7 +915,7 @@ System.config({
918915
"process": "github:jspm/[email protected]"
919916
},
920917
"npm:[email protected]": {
921-
"node-fetch": "npm:node-fetch@1.5.3",
918+
"node-fetch": "npm:node-fetch@1.6.0",
922919
"whatwg-fetch": "npm:[email protected]"
923920
},
924921
"npm:[email protected]": {
@@ -1097,7 +1094,7 @@ System.config({
10971094
"path": "github:jspm/[email protected]",
10981095
"process": "github:jspm/[email protected]"
10991096
},
1100-
"npm:node-fetch@1.5.3": {
1097+
"npm:node-fetch@1.6.0": {
11011098
"buffer": "github:jspm/[email protected]",
11021099
"encoding": "npm:[email protected]",
11031100
"http": "github:jspm/[email protected]",
@@ -1187,12 +1184,7 @@ System.config({
11871184
"npm:[email protected]": {
11881185
"process": "github:jspm/[email protected]"
11891186
},
1190-
"npm:[email protected]": {
1191-
"assert": "github:jspm/[email protected]",
1192-
"fs": "github:jspm/[email protected]",
1193-
"vm": "github:jspm/[email protected]"
1194-
},
1195-
"npm:[email protected]": {
1187+
"npm:[email protected]": {
11961188
"assert": "github:jspm/[email protected]",
11971189
"fs": "github:jspm/[email protected]",
11981190
"vm": "github:jspm/[email protected]"
@@ -1266,16 +1258,6 @@ System.config({
12661258
"stream-browserify": "npm:[email protected]",
12671259
"string_decoder": "npm:[email protected]"
12681260
},
1269-
"npm:[email protected]": {
1270-
"buffer": "github:jspm/[email protected]",
1271-
"core-util-is": "npm:[email protected]",
1272-
"events": "github:jspm/[email protected]",
1273-
"inherits": "npm:[email protected]",
1274-
"isarray": "npm:[email protected]",
1275-
"process": "github:jspm/[email protected]",
1276-
"stream-browserify": "npm:[email protected]",
1277-
"string_decoder": "npm:[email protected]"
1278-
},
12791261
"npm:[email protected]": {
12801262
"buffer": "github:jspm/[email protected]",
12811263
"core-util-is": "npm:[email protected]",
@@ -1287,18 +1269,6 @@ System.config({
12871269
"string_decoder": "npm:[email protected]",
12881270
"util-deprecate": "npm:[email protected]"
12891271
},
1290-
"npm:[email protected]": {
1291-
"buffer": "github:jspm/[email protected]",
1292-
"buffer-shims": "npm:[email protected]",
1293-
"core-util-is": "npm:[email protected]",
1294-
"events": "github:jspm/[email protected]",
1295-
"inherits": "npm:[email protected]",
1296-
"isarray": "npm:[email protected]",
1297-
"process": "github:jspm/[email protected]",
1298-
"process-nextick-args": "npm:[email protected]",
1299-
"string_decoder": "npm:[email protected]",
1300-
"util-deprecate": "npm:[email protected]"
1301-
},
13021272
"npm:[email protected]": {
13031273
"path": "github:jspm/[email protected]",
13041274
"resolve": "npm:[email protected]"
@@ -1461,7 +1431,7 @@ System.config({
14611431
"npm:[email protected]": {
14621432
"process": "github:jspm/[email protected]"
14631433
},
1464-
"npm:[email protected].8": {
1434+
"npm:[email protected].10": {
14651435
"es6-shim": "npm:[email protected]",
14661436
"isomorphic-fetch": "npm:[email protected]"
14671437
},
@@ -1526,7 +1496,7 @@ System.config({
15261496
"npm:[email protected]": {
15271497
"events": "github:jspm/[email protected]",
15281498
"inherits": "npm:[email protected]",
1529-
"readable-stream": "npm:readable-stream@1.1.14"
1499+
"readable-stream": "npm:readable-stream@1.0.34"
15301500
},
15311501
"npm:[email protected]": {
15321502
"buffer": "github:jspm/[email protected]"
@@ -1599,7 +1569,7 @@ System.config({
15991569
"systemjs-json": "github:systemjs/[email protected]"
16001570
},
16011571
"npm:[email protected]": {
1602-
"process": "npm:[email protected].5"
1572+
"process": "npm:[email protected].7"
16031573
},
16041574
"npm:[email protected]": {
16051575
"net": "github:jspm/[email protected]",

‎src/Gistlyn/gulpfile.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130

131131
var hosts = [WEB, NATIVE];
132132
if (copy.host) {
133-
hosts = typeof copy.host == 'string'
133+
hosts = typeof copy.host === 'string'
134134
? [copy.host]
135135
: copy.host;
136136
}
@@ -160,14 +160,11 @@
160160
}
161161
});
162162
gulp.task('www-bundle-html', function () {
163-
var assets = useref.assets({ searchPath: './' });
164163
return gulp.src('./default.html')
165-
.pipe(assets)
166-
.pipe(gulpif('*.css', minifyCss()))
167-
.pipe(assets.restore())
168164
.pipe(useref())
165+
.pipe(gulpif('*.css', minifyCss()))
169166
.pipe(htmlBuild({
170-
appbundle: function(block) {
167+
appbundle: function (block) {
171168
pipeTemplate(block, '<script src="/app.js"></script>'); // file generated by 'www-jspm-build' task below
172169
}
173170
}))

‎src/Gistlyn/package.json

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,38 +20,34 @@
2020
"react-ga": "^2.1.1",
2121
"react-redux": "^4.4.5",
2222
"redux": "^3.5.2",
23-
"servicestack-client": "^0.0.8"
23+
"servicestack-client": "^0.0.10"
2424
},
2525
"devDependencies": {
2626
"jspm": "^0.16.31"
2727
}
2828
},
2929
"devDependencies": {
3030
"del": "~1.1.1",
31-
"event-stream": "~3.3.1",
32-
"globule": "^1.0.0",
33-
"grunt": "~0.4.5",
34-
"grunt-exec": "~0.4.6",
35-
"grunt-gulp": "~0.1.0",
36-
"grunt-msbuild": "~0.2.2",
37-
"grunt-nuget": "0.1.3",
38-
"gulp": "~3.8.7",
39-
"gulp-grunt": "~0.5.2",
40-
"gulp-header": "~1.7.1",
31+
"event-stream": "~3.3.2",
32+
"globule": "~0.2.0",
33+
"gulp": "~3.9.1",
4134
"gulp-htmlbuild": "~0.4.1",
4235
"gulp-if": "~1.2.4",
43-
"gulp-minify-css": "~0.3.8",
44-
"gulp-newer": "~0.3.0",
45-
"gulp-nuget-pack": "0.0.7",
46-
"gulp-react": "~2.0.0",
36+
"gulp-jspm": "^0.5.8",
37+
"gulp-clean-css": "~2.0.6",
38+
"gulp-msbuild": "^0.2.21",
39+
"gulp-msdeploy": "^0.0.4",
40+
"gulp-newer": "~1.1.0",
41+
"gulp-nuget-restore": "^0.3.1",
42+
"gulp-nuget-pack": "^0.0.7",
43+
"gulp-rename": "^1.2.2",
4744
"gulp-replace": "~0.4.0",
48-
"gulp-uglify": "~1.0.1",
49-
"gulp-useref": "~1.0.1",
45+
"gulp-uglify": "~1.5.3",
46+
"gulp-useref": "~3.0.8",
5047
"gulp-util": "^3.0.7",
5148
"jspm": "^0.16.31",
5249
"requirejs": "~2.1.15",
5350
"run-sequence": "^1.1.5",
54-
"ssvs-utils": "~0.1.1",
5551
"yargs": "^4.2.0"
5652
},
5753
"dependencies": {

‎src/Gistlyn/tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"experimentalDecorators": true
1212
},
1313
"exclude": [
14+
"jspm_packages",
1415
"typings",
1516
"node_modules",
1617
"wwwroot"

‎src/Gistlyn/typings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,8 @@
1010
"react-ga": "registry:dt/react-ga#1.4.1+20160524135221",
1111
"react-redux": "registry:dt/react-redux#4.4.0+20160501125835",
1212
"redux": "registry:dt/redux#3.3.1+20160326112656"
13+
},
14+
"dependencies": {
15+
"servicestack-client": "registry:npm/servicestack-client#0.0.10+20160803174707"
1316
}
1417
}

0 commit comments

Comments
 (0)