From 21c3eb9895853a6175654479a60512faec776907 Mon Sep 17 00:00:00 2001 From: Tobias Gurtzick Date: Tue, 20 Mar 2018 11:19:21 +0100 Subject: [PATCH 1/2] fix(ci): add ignores for backported features Signed-off-by: Tobias Gurtzick --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2dde1658..55155416 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ test: - @node node_modules/lab/bin/lab -I verbose,dryRun --coverage-exclude lib/interface --coverage-exclude lib/transitions + @node node_modules/lab/bin/lab -I verbose,dryRun,SharedArrayBuffer,Atomics --coverage-exclude lib/interface --coverage-exclude lib/transitions test-cov: - @node node_modules/lab/bin/lab -t 66 -I verbose,dryRun --coverage-exclude lib/interface --coverage-exclude lib/transitions + @node node_modules/lab/bin/lab -t 66 -I verbose,dryRun,SharedArrayBuffer,Atomics --coverage-exclude lib/interface --coverage-exclude lib/transitions test-cov-html: - @node node_modules/lab/bin/lab -r html -o coverage.html -I verbose,dryRun --coverage-exclude lib/interface --coverage-exclude lib/transitions + @node node_modules/lab/bin/lab -r html -o coverage.html -I verbose,dryRun,SharedArrayBuffer,Atomics --coverage-exclude lib/interface --coverage-exclude lib/transitions .PHONY: test test-cov test-cov-html From 93afd7d3a8898eba51a66c46fc85039c60629bef Mon Sep 17 00:00:00 2001 From: Tobias Gurtzick Date: Tue, 20 Mar 2018 11:24:33 +0100 Subject: [PATCH 2/2] chore: update dependencies Signed-off-by: Tobias Gurtzick --- package-lock.json | 19 ++++++++++++------- package.json | 4 ++-- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5c3247ae..6ca19125 100644 --- a/package-lock.json +++ b/package-lock.json @@ -411,7 +411,7 @@ "requires": { "bluebird": "3.5.1", "db-migrate-base": "1.5.3", - "moment": "2.19.2", + "moment": "2.21.0", "mysql": "2.15.0" } }, @@ -452,9 +452,9 @@ "integrity": "sha1-hLdFiW80xoTpjyzg5Cq69Du6AX0=" }, "deep-extend": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", - "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=" + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.0.tgz", + "integrity": "sha1-bvSgmwX5iw41jW2T1Mo8rsZnKAM=" }, "deep-is": { "version": "0.1.3", @@ -1526,9 +1526,9 @@ "dev": true }, "moment": { - "version": "2.19.2", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.2.tgz", - "integrity": "sha512-Rf6jiHPEfxp9+dlzxPTmRHbvoFXsh2L/U8hOupUMpnuecHQmI6cF6lUbJl3QqKPko1u6ujO+FxtcajLVfLpAtA==", + "version": "2.21.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.21.0.tgz", + "integrity": "sha512-TCZ36BjURTeFTM/CwRcViQlfkMvL1/vFISuNLO5GkcVm1+QHfbSiNqZuWeMFjj1/3+uAjXswgRk30j1kkLYJBQ==", "dev": true }, "mongodb-uri": { @@ -1870,6 +1870,11 @@ "strip-json-comments": "2.0.1" }, "dependencies": { + "deep-extend": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", + "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=" + }, "minimist": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", diff --git a/package.json b/package.json index a1808ea0..8b29e88b 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "balanced-match": "^0.4.2", "bluebird": "^3.1.1", "db-migrate-shared": "^1.1.2", - "deep-extend": "^0.4.1", + "deep-extend": "^0.5.0", "dotenv": "^2.0.0", "final-fs": "^1.6.0", "inflection": "^1.10.0", @@ -64,7 +64,7 @@ "devDependencies": { "code": "^4.1.0", "db-migrate-base": "^1.2.5", - "db-migrate-mysql": "^1.1.7", + "db-migrate-mysql": "^1.1.10", "db-migrate-sqlite3": "^0.2.1", "eslint": "^4.10.0", "eslint-config-standard": "^10.2.1",