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,22 +31,22 @@
"flow"
],
"dependencies": {
"@node-red/editor-api": "0.21.0-alpha.0",
"@node-red/runtime": "0.21.0-alpha.0",
"@node-red/util": "0.21.0-alpha.0",
"@node-red/nodes": "0.21.0-alpha.0",
"@node-red/editor-api": "1.0.0-beta.2",
"@node-red/runtime": "1.0.0-beta.2",
"@node-red/util": "1.0.0-beta.2",
"@node-red/nodes": "1.0.0-beta.2",
"basic-auth": "2.0.1",
"bcryptjs": "2.4.3",
"express": "4.16.4",
"fs-extra": "7.0.1",
"express": "4.17.1",
"fs-extra": "8.1.0",
"node-red-node-rbe": "^0.2.4",
"node-red-node-sentiment": "^0.1.3",
"node-red-node-tail": "^0.0.2",
"nopt": "4.0.1",
"semver": "6.0.0"
"semver": "6.2.0"
},
"optionalDependencies": {
"bcrypt": "3.0.5"
"bcrypt": "3.0.6"
},
"engines": {
"node": ">=8"