Merge branch 'dev' into pr_2165

This commit is contained in:
Nick O'Leary
2019-07-10 09:30:48 +01:00
282 changed files with 4009 additions and 1538 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "node-red",
"version": "0.21.0-alpha.0",
"version": "1.0.0-beta.2",
"description": "A visual tool for wiring the Internet of Things",
"homepage": "http://nodered.org",
"license": "Apache-2.0",
@@ -31,25 +31,26 @@
"cheerio": "0.22.0",
"clone": "2.1.2",
"content-type": "1.0.4",
"cookie": "0.3.1",
"cookie": "0.4.0",
"cookie-parser": "1.4.4",
"cors": "2.8.5",
"cron": "1.7.1",
"denque": "1.4.1",
"express": "4.16.4",
"express-session": "1.16.1",
"fs-extra": "7.0.1",
"express": "4.17.1",
"express-session": "1.16.2",
"fs-extra": "8.1.0",
"fs.notify": "0.0.4",
"hash-sum": "1.0.2",
"hash-sum": "2.0.0",
"https-proxy-agent": "2.2.1",
"i18next": "15.1.0",
"iconv-lite": "0.4.24",
"i18next": "15.1.2",
"iconv-lite": "0.5.0",
"is-utf8": "0.2.1",
"js-yaml": "3.13.1",
"json-stringify-safe": "5.0.1",
"jsonata": "1.6.4",
"jsonata": "1.6.5",
"media-typer": "1.1.0",
"memorystore": "1.6.1",
"mime": "2.4.2",
"mime": "2.4.4",
"mqtt": "2.18.8",
"multer": "1.4.1",
"mustache": "3.0.1",
@@ -62,19 +63,19 @@
"passport": "0.4.0",
"passport-http-bearer": "1.0.1",
"passport-oauth2-client-password": "0.1.2",
"raw-body": "2.4.0",
"raw-body": "2.4.1",
"request": "2.88.0",
"semver": "6.0.0",
"uglify-js": "3.5.9",
"semver": "6.2.0",
"uglify-js": "3.6.0",
"when": "3.7.8",
"ws": "6.2.1",
"xml2js": "0.4.19"
},
"optionalDependencies": {
"bcrypt": "3.0.5"
"bcrypt": "3.0.6"
},
"devDependencies": {
"grunt": "~1.0.3",
"grunt": "~1.0.4",
"grunt-chmod": "~1.1.1",
"grunt-cli": "~1.3.2",
"grunt-concurrent": "~2.3.1",
@@ -108,7 +109,7 @@
"wdio-mocha-framework": "^0.6.4",
"wdio-spec-reporter": "^0.1.5",
"webdriverio": "^4.14.1",
"node-red-node-test-helper": "^0.2.2",
"node-red-node-test-helper": "^0.2.3",
"jsdoc-nr-template": "node-red/jsdoc-nr-template"
},
"engines": {