Skip to content

Commit 2698c25

Browse files
authoredJul 14, 2019
Merge pull request #28 from skateman/ext-update-packages
Update development dependencies in the browser extension folder
2 parents 9e570f8 + ce3610f commit 2698c25

File tree

3 files changed

+26
-24
lines changed

3 files changed

+26
-24
lines changed
 

‎.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ addons:
1111
env:
1212
matrix:
1313
- SUITE=server RUBY_VERSION=2.3.1
14-
- SUITE=extension NODE_VERSION=6.1 BROWSER=chrome
15-
- SUITE=extension NODE_VERSION=6.1 BROWSER=firefox
14+
- SUITE=extension NODE_VERSION=10 BROWSER=chrome
15+
- SUITE=extension NODE_VERSION=10 BROWSER=firefox
1616
before_install: source ci/before_install
1717
before_script: ci/before_script
1818
install: ci/install

‎extension/gulpfile.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,11 @@ const icons = (platform, main, page) => {
3232
};
3333

3434
gulp.task('help', tasks);
35-
gulp.task('default', ['help']);
35+
gulp.task('default', gulp.series('help'));
3636
gulp.task('lint', () =>
3737
gulp.src('src/*.js').pipe(eslint()).pipe(eslint.format())
3838
);
3939

40-
gulp.task('build', ['lint', 'build:firefox', 'build:chrome']);
41-
gulp.task('pack', ['pack:chrome', 'pack:firefox']);
4240
gulp.task('clean', () => gulp.src(['tmp', 'dist'], { read: false }).pipe(clean()));
4341
gulp.task('watch', () => gulp.watch(['src/*.js', 'test/*.js'], ['test', 'build']));
4442

@@ -72,11 +70,14 @@ gulp.task('build:chrome', () => {
7270
});
7371

7472
['chrome', 'firefox'].forEach((browser) => {
75-
gulp.task(`pack:${browser}`, [`build:${browser}`], () => {
73+
gulp.task(`pack:${browser}`, gulp.series(`build:${browser}`), () => {
7674
var files = [`tmp/${browser}/**`];
7775
if (browser == 'chrome' && fs.existsSync('key.pem')) {
7876
files.push('key.pem');
7977
}
8078
gulp.src(files).pipe(zip(`purr-${browser}.zip`)).pipe(gulp.dest('dist/'));
8179
});
8280
});
81+
82+
gulp.task('build', gulp.series('lint', gulp.parallel('build:firefox', 'build:chrome')));
83+
gulp.task('pack', gulp.parallel('pack:chrome', 'pack:firefox'));

‎extension/package.json

+19-18
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
22
"name": "purr-extension",
3-
"version": "0.1.2",
3+
"version": "0.2.0",
44
"description": "Smuggle TCP connections through HTTP",
55
"main": "background.js",
66
"scripts": {
7+
"gulp": "gulp",
78
"test": "karma start",
89
"test:firefox": "karma start --browsers Firefox",
910
"test:chrome": "karma start --browsers Chrome",
@@ -30,25 +31,25 @@
3031
},
3132
"homepage": "https://github.com/skateman/purr#readme",
3233
"devDependencies": {
33-
"chai": "^3.5.0",
34-
"codecov": "^1.0.1",
35-
"eslint": "^3.12.2",
36-
"gulp": "^3.9.1",
37-
"gulp-clean": "^0.3.2",
38-
"gulp-eslint": "^3.0.1",
39-
"gulp-image-resize": "^0.11.0",
40-
"gulp-json-editor": "^2.2.1",
41-
"gulp-rename": "^1.2.2",
42-
"gulp-task-listing": "^1.0.1",
43-
"gulp-zip": "^3.2.0",
44-
"karma": "^1.3.0",
34+
"chai": "^4.2.0",
35+
"codecov": "^3.5.0",
36+
"eslint": "^6.0.1",
37+
"gulp": "^4.0.2",
38+
"gulp-clean": "^0.4.0",
39+
"gulp-eslint": "^6.0.0",
40+
"gulp-image-resize": "^0.13.0",
41+
"gulp-json-editor": "^2.5.2",
42+
"gulp-rename": "^1.4.0",
43+
"gulp-task-listing": "^1.1.0",
44+
"gulp-zip": "^5.0.0",
45+
"karma": "^4.2.0",
4546
"karma-chai": "^0.1.0",
46-
"karma-chrome-launcher": "^2.0.0",
47-
"karma-coverage": "^1.1.1",
48-
"karma-firefox-launcher": "^1.0.0",
47+
"karma-chrome-launcher": "^3.0.0",
48+
"karma-coverage": "^1.1.2",
49+
"karma-firefox-launcher": "^1.1.0",
4950
"karma-mocha": "^1.3.0",
5051
"karma-sinon": "^1.0.5",
51-
"mocha": "^3.2.0",
52-
"sinon": "^1.17.6"
52+
"mocha": "^6.1.4",
53+
"sinon": "^7.3.2"
5354
}
5455
}

0 commit comments

Comments
 (0)