Skip to content

Commit b51e2cc

Browse files
authored
Merge pull request #79 from OneNoteDev/bug/package-hardening
Update all of the packages to the latest versions
2 parents 325ca3e + 7867544 commit b51e2cc

File tree

2 files changed

+59
-59
lines changed

2 files changed

+59
-59
lines changed

gulpfile.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,13 @@ gulp.task("preCompileInternal", function (callback) {
162162
});
163163

164164
gulp.task("compileTypeScript", ["copyStrings", "mergeSettings", "preCompileInternal"], function () {
165+
var tsProject = ts.createProject("./tsconfig.json", {
166+
typescript: require('typescript'),
167+
noEmitOnError: true
168+
})
169+
165170
return gulp.src([PATHS.SRC.ROOT + "**/*.+(ts|tsx)"])
166-
.pipe(ts(ts.createProject("./tsconfig.json", { typescript: require('typescript') })))
171+
.pipe(tsProject())
167172
.pipe(gulp.dest(PATHS.BUILDROOT));
168173
});
169174

@@ -185,11 +190,6 @@ gulp.task("compile", function(callback) {
185190
////////////////////////////////////////
186191
//The actual task to run
187192
gulp.task("tslint", function() {
188-
var tsErrorReport = tslint.report("prose", {
189-
emitError: false,
190-
reportLimit: 50
191-
});
192-
193193
var tsFiles = [
194194
PATHS.SRC.ROOT + "**/*.ts",
195195
PATHS.SRC.ROOT + "**/*.tsx",
@@ -198,8 +198,10 @@ gulp.task("tslint", function() {
198198

199199
return gulp.src(tsFiles)
200200
.pipe(plumber())
201-
.pipe(tslint())
202-
.pipe(tsErrorReport);
201+
.pipe(tslint({
202+
formatter: "verbose"
203+
}))
204+
.pipe(tslint.report())
203205
});
204206

205207
////////////////////////////////////////

package.json

Lines changed: 49 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -11,62 +11,60 @@
1111
"url": "git+https://github.com/OneNoteDev/WebClipper.git"
1212
},
1313
"devDependencies": {
14-
"@types/chrome": "0.0.33",
14+
"@types/chrome": "0.0.34",
1515
"@types/es6-promise": "0.0.32",
16-
"@types/jquery": "^2.0.32",
16+
"@types/jquery": "2.0.32",
1717
"@types/mithril": "0.0.31",
1818
"@types/pdf": "0.0.31",
19-
"@types/qunit": "^1.16.30",
19+
"@types/qunit": "1.16.30",
2020
"@types/rangy": "0.0.27",
2121
"@types/safari-extension": "0.0.27",
22-
"@types/sanitize-html": "^1.13.31",
23-
"@types/sinon": "^1.16.30",
24-
"@types/urijs": "^1.15.30",
25-
"@types/velocity-animate": "^1.2.27",
26-
"browserify": "^13.0.0",
27-
"del": "^2.0.2",
28-
"es5-shim": "^4.5.8",
29-
"es6-promise": "^3.0.2",
30-
"file-exists": "^1.0.0",
31-
"forever": "^0.15.1",
32-
"globby": "^4.0.0",
33-
"gulp": "^3.9.0",
34-
"gulp-concat": "^2.6.0",
35-
"gulp-cssnano": "^2.1.1",
36-
"gulp-less": "^3.0.3",
37-
"gulp-merge-json": "^0.4.0",
38-
"gulp-msx": "^0.4.0",
39-
"gulp-open": "^2.0.0",
40-
"gulp-plumber": "^1.0.1",
41-
"gulp-rename": "^1.2.2",
42-
"gulp-rtlcss": "^1.0.0",
43-
"gulp-shell": "^0.5.1",
44-
"gulp-tslint": "^5.0.0",
45-
"gulp-typescript": "^2.13.6",
46-
"gulp-uglify": "^1.5.3",
47-
"gulp-zip": "^3.2.0",
48-
"json3": "^3.3.2",
49-
"merge-stream": "^1.0.0",
50-
"mithril": "^0.2.4",
51-
"node-qunit-phantomjs": "^1.4.0",
52-
"node-static": "^0.7.7",
53-
"onenoteapi": "^1.0.4",
54-
"onenotepicker": "^1.0.4",
55-
"pdfjs-dist": "^1.5.260",
56-
"qunitjs": "^1.20.0",
57-
"rangy": "^1.3.0",
58-
"run-sequence": "^1.1.4",
22+
"@types/sanitize-html": "1.13.31",
23+
"@types/sinon": "1.16.31",
24+
"@types/urijs": "1.15.30",
25+
"@types/velocity-animate": "1.2.27",
26+
"browserify": "13.1.0",
27+
"del": "2.2.2",
28+
"es5-shim": "4.5.9",
29+
"es6-promise": "4.0.5",
30+
"file-exists": "2.0.0",
31+
"forever": "0.15.2",
32+
"globby": "4.0.0",
33+
"gulp": "3.9.1",
34+
"gulp-concat": "2.6.0",
35+
"gulp-cssnano": "2.1.2",
36+
"gulp-less": "3.1.0",
37+
"gulp-merge-json": "0.6.0",
38+
"gulp-msx": "0.4.0",
39+
"gulp-open": "2.0.0",
40+
"gulp-plumber": "1.1.0",
41+
"gulp-rename": "1.2.2",
42+
"gulp-rtlcss": "1.0.0",
43+
"gulp-shell": "0.5.2",
44+
"gulp-tslint": "6.1.2",
45+
"gulp-typescript": "3.0.2",
46+
"gulp-uglify": "2.0.0",
47+
"gulp-zip": "3.2.0",
48+
"json3": "3.3.2",
49+
"merge-stream": "1.0.0",
50+
"mithril": "0.2.5",
51+
"node-qunit-phantomjs": "1.4.0",
52+
"node-static": "0.7.9",
53+
"onenoteapi": "1.0.4",
54+
"onenotepicker": "1.0.5",
55+
"pdfjs-dist": "1.6.214",
56+
"qunitjs": "1.20.0",
57+
"rangy": "1.3.0",
58+
"run-sequence": "1.2.2",
59+
"sanitize-html": "1.13.0",
5960
"sinon": "1.17.3",
60-
"sinon-qunit": "^2.0.0",
61-
"ssl-root-cas": "^1.1.10",
62-
"tslint": "^3.9.0",
63-
"typescript": "^2.0.3",
64-
"urijs": "^1.18.1",
65-
"velocity-animate": "^1.2.3",
66-
"vinyl-source-stream": "^1.1.0",
67-
"yargs": "^4.3.1"
68-
},
69-
"dependencies": {
70-
"sanitize-html": "^1.13.0"
61+
"sinon-qunit": "2.0.0",
62+
"ssl-root-cas": "1.2.2",
63+
"tslint": "3.15.1",
64+
"typescript": "2.0.3",
65+
"urijs": "1.18.2",
66+
"velocity-animate": "1.2.3",
67+
"vinyl-source-stream": "1.1.0",
68+
"yargs": "6.0.0"
7169
}
7270
}

0 commit comments

Comments
 (0)