Merge remote-tracking branch 'upstream/master' into stop-start-flows

This commit is contained in:
Steve-Mcl
2022-06-27 13:03:52 +01:00
90 changed files with 1886 additions and 698 deletions

View File

@@ -91,7 +91,7 @@ var api = module.exports = {
safeSettings.context = runtime.nodes.listContextStores();
if (runtime.settings.editorTheme && runtime.settings.editorTheme.codeEditor) {
safeSettings.codeEditor = runtime.settings.editorTheme.codeEditor || {};
safeSettings.codeEditor.lib = safeSettings.codeEditor.lib || "ace";
safeSettings.codeEditor.lib = safeSettings.codeEditor.lib || "monaco";
safeSettings.codeEditor.options = safeSettings.codeEditor.options || {};
}
safeSettings.libraries = runtime.library.getLibraries();

View File

@@ -8,7 +8,6 @@
"httpStatic": "HTTP Static : __path__"
}
},
"server": {
"loading": "Loading palette nodes",
"palette-editor": {
@@ -61,7 +60,6 @@
"function-required": "httpsRefreshInterval requires https property to be a function"
}
},
"api": {
"flows": {
"error-save": "Error saving flows: __message__",
@@ -79,18 +77,16 @@
"error-enable": "Failed to enable node:"
}
},
"comms": {
"error": "Communication channel error: __message__",
"error-server": "Communication server error: __message__",
"error-send": "Communication send error: __message__"
},
"settings": {
"user-not-available": "Cannot save user settings: __message__",
"not-available": "Settings not available",
"property-read-only": "Property '__prop__' is read-only",
"readonly-mode" : "Runtime in read-only mode. Changes will not be saved."
"readonly-mode": "Runtime in read-only mode. Changes will not be saved."
},
"library": {
"unknownLibrary": "Unknown library: __library__",
@@ -101,12 +97,12 @@
},
"nodes": {
"credentials": {
"error":"Error loading credentials: __message__",
"error-saving":"Error saving credentials: __message__",
"error": "Error loading credentials: __message__",
"error-saving": "Error saving credentials: __message__",
"not-registered": "Credential type '__type__' is not registered",
"system-key-warning": "\n\n---------------------------------------------------------------------\nYour flow credentials file is encrypted using a system-generated key.\n\nIf the system-generated key is lost for any reason, your credentials\nfile will not be recoverable, you will have to delete it and re-enter\nyour credentials.\n\nYou should set your own key using the 'credentialSecret' option in\nyour settings file. Node-RED will then re-encrypt your credentials\nfile using your chosen key the next time you deploy a change.\n---------------------------------------------------------------------\n",
"unencrypted" : "Using unencrypted credentials",
"encryptedNotFound" : "Encrypted credentials not found"
"unencrypted": "Using unencrypted credentials",
"encryptedNotFound": "Encrypted credentials not found"
},
"flows": {
"safe-mode": "Flows stopped in safe mode. Deploy to start.",
@@ -150,7 +146,6 @@
}
}
},
"storage": {
"index": {
"forbidden-flow-name": "forbidden flow name"
@@ -180,7 +175,6 @@
}
}
},
"context": {
"log-store-init": "Context store : '__name__' [__info__]",
"error-loading-module": "Error loading context store: __message__",
@@ -195,5 +189,4 @@
"error-write": "Error writing context: __message__"
}
}
}

View File

@@ -1,6 +1,6 @@
{
"name": "@node-red/runtime",
"version": "3.0.0-beta.2",
"version": "3.0.0-beta.3",
"license": "Apache-2.0",
"main": "./lib/index.js",
"repository": {
@@ -16,8 +16,8 @@
}
],
"dependencies": {
"@node-red/registry": "3.0.0-beta.2",
"@node-red/util": "3.0.0-beta.2",
"@node-red/registry": "3.0.0-beta.3",
"@node-red/util": "3.0.0-beta.3",
"async-mutex": "0.3.2",
"clone": "2.1.2",
"express": "4.18.1",