From 80e2ea46e54b395324184e47695fe2e4fb968b41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= Date: Fri, 17 Feb 2017 17:56:10 -0500 Subject: [PATCH 1/3] bump dev deps --- package.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 6496482fa12..100948feff6 100644 --- a/package.json +++ b/package.json @@ -94,26 +94,26 @@ }, "devDependencies": { "brfs": "^1.4.3", - "browserify": "^13.3.0", + "browserify": "^14.1.0", "browserify-transform-tools": "^1.7.0", "deep-equal": "^1.0.1", "ecstatic": "^2.1.0", - "eslint": "^3.13.0", + "eslint": "^3.15.0", "falafel": "^2.0.0", - "fs-extra": "^1.0.0", + "fs-extra": "^2.0.0", "fuse.js": "^2.6.1", "glob": "^7.0.0", "gzip-size": "^3.0.0", "image-size": "^0.5.1", "jasmine-core": "^2.4.1", - "karma": "^1.1.0", - "karma-browserify": "^5.0.1", + "karma": "^1.4.1", + "karma-browserify": "^5.1.1", "karma-chrome-launcher": "^2.0.0", "karma-coverage": "^1.0.0", "karma-firefox-launcher": "^1.0.0", "karma-jasmine": "^1.1.0", - "madge": "^1.4.4", - "node-sass": "^4.1.1", + "madge": "^1.6.0", + "node-sass": "^4.5.0", "npm-link-check": "^1.2.0", "open": "0.0.5", "prepend-file": "^1.3.1", @@ -121,7 +121,7 @@ "requirejs": "^2.3.1", "through2": "^2.0.3", "uglify-js": "^2.7.5", - "watchify": "^3.8.0", + "watchify": "^3.9.0", "xml2js": "^0.4.16" } } From 2998a0a75c15496439b3a55b9a981faec244da64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= Date: Fri, 17 Feb 2017 17:57:12 -0500 Subject: [PATCH 2/3] throw error on process exit, to not let madge Promise eat up the test circular dep error. --- tasks/test_syntax.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/tasks/test_syntax.js b/tasks/test_syntax.js index 6561bd24ff9..04f5ff109e2 100644 --- a/tasks/test_syntax.js +++ b/tasks/test_syntax.js @@ -11,6 +11,8 @@ var libGlob = path.join(constants.pathToLib, '**/*.js'); var testGlob = path.join(constants.pathToJasmineTests, '**/*.js'); var bundleTestGlob = path.join(constants.pathToJasmineBundleTests, '**/*.js'); +var EXIT_CODE = 0; + // main assertJasmineSuites(); assertSrcContents(); @@ -133,9 +135,15 @@ function combineGlobs(arr) { function log(name, logs) { if(logs.length) { - console.error('test-syntax error [' + name + ']\n'); - throw new Error('\n' + logs.join('\n') + '\n'); + console.error('test-syntax error [' + name + ']'); + EXIT_CODE = 1; + } else { + console.log('ok ' + name); } - - console.log('ok ' + name); } + +process.on('exit', function() { + if(EXIT_CODE) { + throw new Error('test syntax failed.'); + } +}); From 2b57297c0d5659764d3c4ec60551e3e9f59e0d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89tienne=20T=C3=A9treault-Pinard?= Date: Fri, 17 Feb 2017 17:57:41 -0500 Subject: [PATCH 3/3] bump MAX_ALLOWED_CIRCULAR_DEPS to 18 - see https://github.com/plotly/plotly.js/issues/236#issuecomment-280789028 --- tasks/test_syntax.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/test_syntax.js b/tasks/test_syntax.js index 04f5ff109e2..66a31a33472 100644 --- a/tasks/test_syntax.js +++ b/tasks/test_syntax.js @@ -119,7 +119,7 @@ function assertCircularDeps() { // as of v1.17.0 - 2016/09/08 // see https://github.com/plotly/plotly.js/milestone/9 // for more details - var MAX_ALLOWED_CIRCULAR_DEPS = 17; + var MAX_ALLOWED_CIRCULAR_DEPS = 18; if(circularDeps.length > MAX_ALLOWED_CIRCULAR_DEPS) { logs.push('some new circular dependencies were added to src/');