From 4b579be93e8ca7f8141ec5d3e8e70a4b9211159c Mon Sep 17 00:00:00 2001 From: Claudius Date: Mon, 13 May 2019 09:41:28 +0200 Subject: Adding the first few lines of user model test Signed-off-by: Claudius --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 980241f3..fdbe6130 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,10 @@ "main": "app.js", "license": "AGPL-3.0", "scripts": { - "test": "npm run-script eslint && npm run-script jsonlint && mocha", + "test": "npm run-script eslint && npm run-script jsonlint && npm run-script mocha-suite", "eslint": "node_modules/.bin/eslint lib public test app.js", "jsonlint": "find . -not -path './node_modules/*' -type f -name '*.json' -o -type f -name '*.json.example' | while read json; do echo $json ; jq . $json; done", + "mocha-suite": "NODE_ENV=test CMD_DB_URL=\"sqlite::memory:\" mocha --exit", "standard": "echo 'standard is no longer being used, use `npm run eslint` instead!' && exit 1", "dev": "webpack --config webpack.dev.js --progress --colors --watch", "heroku-prebuild": "bin/heroku", -- cgit v1.2.3 From 1d403e183d50001bf0f20113d15994007b14696b Mon Sep 17 00:00:00 2001 From: Claudius Date: Mon, 13 May 2019 11:51:05 +0200 Subject: asyncified setting and verifying the password Signed-off-by: Claudius --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index fdbe6130..8cfcfe63 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,6 @@ "jquery-ui": "^1.12.1", "js-cookie": "^2.1.3", "js-sequence-diagrams": "git+https://github.com/codimd/js-sequence-diagrams.git", - "wurl": "^2.5.3", "js-yaml": "^3.13.1", "jsdom-nogyp": "^0.8.3", "keymaster": "^1.6.2", @@ -111,7 +110,7 @@ "readline-sync": "^1.4.7", "request": "^2.88.0", "reveal.js": "~3.7.0", - "@mlink/scrypt": "^6.1.2", + "scrypt-kdf": "^2.0.1", "select2": "^3.5.2-browserify", "sequelize": "^3.28.0", "sequelize-cli": "^2.5.1", @@ -132,6 +131,7 @@ "viz.js": "^1.7.0", "winston": "^3.1.0", "ws": "^6.0.0", + "wurl": "^2.5.3", "xss": "^1.0.3" }, "resolutions": { -- cgit v1.2.3 From 4833f300c527b96cc5d6d16c605df8cf04d06c1d Mon Sep 17 00:00:00 2001 From: Claudius Date: Mon, 13 May 2019 12:55:03 +0200 Subject: polyfilling scrypt for node 8.5+ Signed-off-by: Claudius --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 8cfcfe63..374a047e 100644 --- a/package.json +++ b/package.json @@ -110,6 +110,7 @@ "readline-sync": "^1.4.7", "request": "^2.88.0", "reveal.js": "~3.7.0", + "scrypt-async": "^2.0.1", "scrypt-kdf": "^2.0.1", "select2": "^3.5.2-browserify", "sequelize": "^3.28.0", -- cgit v1.2.3 From 806ebe6e1abea47583ec57b6811b67958a2b3369 Mon Sep 17 00:00:00 2001 From: Claudius Date: Sun, 12 May 2019 10:01:38 +0200 Subject: drop node 6 support We will no longer test on node6 and instead focus on 8+. This won't break node6 immediately, but we will no longer go out of our way supporting a version that does not receive security updates. Signed-off-by: Claudius --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 374a047e..490fe5a0 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ "socket.io": "~2.1.1", "socket.io-client": "~2.1.1", "spin.js": "^2.3.2", - "sqlite3": "^4.0.1", + "sqlite3": "^4.0.7", "store": "^2.0.12", "string": "^3.3.3", "tedious": "^1.14.0", @@ -141,7 +141,7 @@ "**/request": "^2.88.0" }, "engines": { - "node": ">=6.x" + "node": ">=8.x" }, "bugs": "https://github.com/codimd/server/issues", "keywords": [ -- cgit v1.2.3