Skip to content

Commit 131ff8a

Browse files
pYr0xJulian Kernbmomberger-bitovi
authored
Use esprima-next (#1163)
* use transpile with esprima-next * Try a different matrix of node versions for ci test * Update testee and other vulnerable dependencies Co-authored-by: Julian Kern <kern.julian@gmx.de> Co-authored-by: Bradley Momberger <brad@bitovi.com>
1 parent be5cf99 commit 131ff8a

File tree

4 files changed

+22
-15
lines changed

4 files changed

+22
-15
lines changed

.travis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
language: node_js
22
node_js:
3-
- 8
4-
- 14.4.0
3+
- 10
4+
- 12
5+
- 14
56
before_script:
67
- npm dedupe
78
sudo: false
89
script:
910
- npm run jshint
1011
- 'npm run test:browser'
1112
- 'npm run coverage:upload'
12-
dist: xenial
13+
dist: focal
1314
services:
1415
- xvfb

lib/bundle/write_bundles.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ var writeBundles = module.exports = function(bundles, configuration) {
4040
addSourceMapUrl(bundle);
4141
sourceCode = bundle.source.code;
4242
sourceMap = bundle.source.map;
43+
44+
if(typeof sourceMap !== 'string') {
45+
// babel-minify returns an ampproject/remapping SourceMapGenerator
46+
// which can be stringified to make the sourcemap.
47+
sourceMap = JSON.stringify(sourceMap);
48+
}
4349
}
4450

4551
// Log the bundles

lib/stream/watch.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ module.exports = function(graphStream){
3737
watchOptions.awaitWriteFinish = true;
3838
}
3939

40-
watcher = chokidar.watch(null, watchOptions);
40+
watcher = chokidar.watch([], watchOptions);
4141
watcher.on("all", changed);
4242

4343
graphStream.on("data", updateWatch);

package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
"babel-minify": "^0.5.0",
1212
"babel-standalone": "^6.23.1",
1313
"bitovi-source-map": "0.4.2-bitovi.2",
14-
"chokidar": "^2.0.0",
14+
"chokidar": "^3.5.3",
1515
"clean-css": "^4.1.9",
16-
"colors": "^1.2.1",
16+
"colors": "1.4.0",
1717
"common-tags": "^1.7.2",
1818
"find-line-column": "^0.5.2",
1919
"fs-extra": "~7.0.0",
2020
"glob": "^7.1.1",
21-
"globby": "^8.0.1",
21+
"globby": "^11.1.0",
2222
"gzip-size": "4.0.0",
2323
"is-appveyor": "^1.0.0",
2424
"lodash": "^4.17.0",
@@ -39,7 +39,7 @@
3939
"through2": "^3.0.0",
4040
"tmp": "0.0.33",
4141
"traceur": "0.0.111",
42-
"transpile": "^2.7.2",
42+
"transpile": "^2.8.0",
4343
"urix": "^0.1.0",
4444
"winston": "^2.2.0",
4545
"ws": "^5.1.1",
@@ -49,13 +49,13 @@
4949
"babel-plugin-steal-test": "0.0.2",
5050
"babel-preset-steal-test": "0.0.1",
5151
"browserify": "~16.1.1",
52-
"comparify": "git://github.com/bitovi/comparify.git#master",
52+
"comparify": "https://github.com/bitovi/comparify.git#master",
5353
"connect": "^3.6.5",
54-
"coveralls-send": "0.0.2",
54+
"coveralls": "^3.1.1",
5555
"cssify": "^1.0.3",
5656
"istanbul": "^0.4.2",
5757
"jquery": "^3.1.1",
58-
"jshint": "~2.9.1",
58+
"jshint": "^2.13.4",
5959
"mocha": "^3.5.3",
6060
"mocha-lcov-reporter": "^1.2.0",
6161
"mock-fs": "4.10.4",
@@ -66,9 +66,9 @@
6666
"steal-css": "^1.3.1",
6767
"steal-less": "^1.3.1",
6868
"steal-qunit": "^1.0.0",
69-
"testee": "^0.9.1",
69+
"testee": "^0.10.0",
7070
"tree-kill": "^1.2.0",
71-
"zombie": "^5.0.6"
71+
"zombie": "^5.0.8"
7272
},
7373
"bin": {
7474
"steal-tools": "bin/steal"
@@ -92,7 +92,7 @@
9292
"mocha": "mocha test/test.js",
9393
"jshint": "jshint lib/ Gruntfile.js --config",
9494
"coverage": "istanbul cover _mocha -- test/test --timeout 600000",
95-
"coverage:upload": "istanbul cover _mocha --report lcovonly -- test/test --timeout 600000 && cat ./coverage/lcov.info | ./node_modules/coveralls-send/bin/coveralls.js",
95+
"coverage:upload": "istanbul cover _mocha --report lcovonly -- test/test --timeout 600000 && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
9696
"preversion": "npm run jshint && npm run test:browser",
9797
"postpublish": "git push --tags && git push",
9898
"release:pre": "npm version prerelease && npm publish --tag pre",
@@ -105,7 +105,7 @@
105105
"test:exports-worker": "node test/exports_worker/exports.js && testee test/exports_worker/worker.html --browsers chrome --reporter Spec"
106106
},
107107
"engines": {
108-
"node": "8.x - 14.x"
108+
"node": "10.x - 14.x"
109109
},
110110
"system": {
111111
"npmDependencies": [

0 commit comments

Comments
 (0)