fix error messages for readonly

Catch readonly write errors more cleanly
Fail more cleanly when run from a readonly files system without setting readOnly true.
2025-03-01 10:36:34 +00:00 · 2018-08-30 09:32:50 +01:00 · 2018-08-26 10:49:53 +01:00
1084 changed files with 39612 additions and 83953 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +0,0 @@
-/packages/node_modules/** linguist-generated=false
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -28,8 +28,7 @@ To help us understand the issue, please fill-in as much of the following informa
 ### Please tell us about your environment:

 - [ ] Node-RED version:
- [ ] Node.js version:
+- [ ] node.js version:
 - [ ] npm version:
 - [ ] Platform/OS:
 - [ ] Browser:
- [ ] running in Docker:
--- a/.github/ISSUE_TEMPLATE/--bug_report.md
+++ b/.github/ISSUE_TEMPLATE/--bug_report.md
@@ -1,39 +0,0 @@
---
-name: Bug report
-about: Reproducible software issues in the core of Node-RED
-title: ''
-labels: ''
-assignees: ''
-
---
-
-<!--
-This issue tracker is for problems with the Node-RED runtime, the editor or the core nodes.
-
-If your issue is:
-  - a general 'how-to' type question,
-  - a feature request or suggestion for a change,
-  - or problems with 3rd party (`node-red-contrib-`) nodes
-
-please use the [Node-RED Forum](https://discourse.nodered.org) or [slack team](https://nodered.org/slack).
-
-You could also consider asking a question on [Stack Overflow](https://stackoverflow.com/questions/tagged/node-red) and tag it `node-red`.
-
-That way the whole Node-RED user community can help, rather than rely on the core development team.
-
-To help us understand the issue, please fill-in as much of the following information as you can:
-->
-
-### What are the steps to reproduce?
-
-### What happens?
-
-### What do you expect to happen?
-
-### Please tell us about your environment:
-
- [ ] Node-RED version:
- [ ] Node.js version:
- [ ] npm version:
- [ ] Platform/OS:
- [ ] Browser:
--- a/.github/ISSUE_TEMPLATE/-anything-else.md
+++ b/.github/ISSUE_TEMPLATE/-anything-else.md
@@ -1,17 +0,0 @@
---
-name: Anything Else
-about: Something that is not a bug report
-title: ''
-labels: ''
-assignees: ''
-
---
-
-Please DO NOT raise an issue.
-
-We DO NOT use the issue tracker for general support or feature requests. Only bug reports should be raised here using the 'Bug report' template.
-
-For general support, please use the [Node-RED Forum](https://discourse.nodered.org) or [slack team](https://nodered.org/slack). You could also consider asking a question on [Stack Overflow](https://stackoverflow.com/questions/tagged/node-red) and tag it `node-red`. 
-That way the whole Node-RED user community can help, rather than rely on the core development team.
-
-For feature requests, please use the Node-RED Forum](https://discourse.nodered.org). Many ideas have already been discussed there and you should search that for your request before starting a new discussion.
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -29,6 +29,6 @@ the [forum](https://discourse.nodered.org) or
 <!-- Put an `x` in the boxes that apply -->

 - [ ] I have read the [contribution guidelines](https://github.com/node-red/node-red/blob/master/CONTRIBUTING.md)
- [ ] For non-bugfix PRs, I have discussed this change on the forum/slack team.
+- [ ] For non-bugfix PRs, I have discussed this change on the mailing list/slack team.
 - [ ] I have run `grunt` to verify the unit tests pass
 - [ ] I have added suitable unit tests to cover the new/changed functionality
--- a/.gitignore
+++ b/.gitignore
@@ -17,9 +17,3 @@ node_modules
 public
 locales/zz-ZZ
 nodes/core/locales/zz-ZZ
-!packages/node_modules
-packages/node_modules/@node-red/editor-client/public
-!test/**/node_modules
-docs
-!packages/node_modules/**/docs
-.vscode
--- a/.nodemonignore
+++ b/.nodemonignore
@@ -1,4 +1,5 @@
 /Gruntfile.js
 /.git/*
+/lib/*
 *.backup
 /public/*
--- a/.npmignore
+++ b/.npmignore
@@ -0,0 +1,7 @@
+.settings
+.jshintignore
+.jshintrc
+.project
+.tern-project
+.travis.yml
+.git
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,12 @@
 sudo: false
-addons:
-  chrome: stable
 language: node_js
 matrix:
  include:
-    - node_js: "14"
-    - node_js: "12"
    - node_js: "10"
      script:
        - ./node_modules/.bin/grunt && istanbul report text && ( cat coverage/lcov.info | $(npm get prefix)/bin/coveralls || true ) && rm -rf coverage
-        - scripts/install-ui-test-dependencies.sh && grunt test-ui
      before_script:
        - npm install -g istanbul coveralls
    - node_js: "8"
+    - node_js: "6"
+    - node_js: "4"
--- a/API.md
+++ b/API.md
@@ -1,15 +0,0 @@
-Node-RED Modules
---
-
-Node-RED provides a set of node modules that implement different parts of the
-application.
-
-Module | Description
-------|-------
-[node-red](node-red.html) | the main module that pulls together all of the internal modules and provides the executable version of Node-RED
-[@node-red/editor-api](@node-red_editor-api.html) | an Express application that serves the Node-RED editor and provides the Admin HTTP API
-[@node-red/runtime](@node-red_runtime.html) | the core runtime of Node-RED
-[@node-red/util](@node-red_util.html) | common utilities for the Node-RED runtime and editor modules
-@node-red/registry | the internal node registry
-@node-red/nodes | the default set of core nodes
-@node-red/editor-client | the client-side resources of the Node-RED editor application
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -26,7 +26,7 @@ relevant nodes, press Ctrl-E and copy the flow data from the Export dialog.
 At a minimum, please include:

 - Version of Node-RED - either release number if you downloaded a zip, or the first few lines of `git log` if you are cloning the repository directly.
- - Version of Node.js - what does `node -v` say?
+ - Version of node.js - what does `node -v` say?

 ## Feature requests

--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -15,8 +15,6 @@
 **/

 var path = require("path");
-var fs = require("fs-extra");
-var sass = require("node-sass");

 module.exports = function(grunt) {

@@ -26,13 +24,9 @@ module.exports = function(grunt) {
        nodemonArgs.push(flowFile);
    }

-    var browserstack = grunt.option('browserstack');
-    if (browserstack) {
-        process.env.BROWSERSTACK = true;
-    }
    var nonHeadless = grunt.option('non-headless');
    if (nonHeadless) {
-        process.env.NODE_RED_NON_HEADLESS = true;
+        process.env.NODE_RED_NON_HEADLESS = 'true';
    }
    grunt.initConfig({
        pkg: grunt.file.readJSON('package.json'),
@@ -48,7 +42,7 @@ module.exports = function(grunt) {
                reporter: 'spec'
            },
            all: { src: ['test/**/*_spec.js'] },
-            core: { src: ["test/_spec.js","test/unit/**/*_spec.js"]},
+            core: { src: ["test/_spec.js","test/red/**/*_spec.js"]},
            nodes: { src: ["test/nodes/**/*_spec.js"]}
        },
        webdriver: {
@@ -63,11 +57,10 @@ module.exports = function(grunt) {
                ignoreLeaks: false,
                ui: 'bdd',
                reportFormats: ['lcov','html'],
-                print: 'both',
-                istanbulOptions: ['--no-default-excludes', '-i','**/packages/node_modules/**']
+                print: 'both'
            },
-            all: { src: ["test/unit/_spec.js","test/unit/**/*_spec.js","test/nodes/**/*_spec.js"] },
-            core: { src: ["test/unit/_spec.js","test/unit/**/*_spec.js"]},
+            all: { src: ["test/_spec.js","test/red/**/*_spec.js","test/nodes/**/*_spec.js"] },
+            core: { src: ["test/_spec.js","test/red/**/*_spec.js"]},
            nodes: { src: ["test/nodes/**/*_spec.js"]}
        },
        jshint: {
@@ -84,20 +77,22 @@ module.exports = function(grunt) {
                //"loopfunc": true, // allow functions to be defined in loops
                //"sub": true       // don't warn that foo['bar'] should be written as foo.bar
            },
-            // all: [
-            //     'Gruntfile.js',
-            //     'red.js',
-            //     'packages/**/*.js'
-            // ],
-            // core: {
-            //     files: {
-            //         src: [
-            //             'Gruntfile.js',
-            //             'red.js',
-            //             'packages/**/*.js',
-            //         ]
-            //     }
-            // },
+            all: [
+                'Gruntfile.js',
+                'red.js',
+                'red/**/*.js',
+                'nodes/core/*/*.js',
+                'editor/js/**/*.js'
+            ],
+            core: {
+                files: {
+                    src: [
+                        'Gruntfile.js',
+                        'red.js',
+                        'red/**/*.js'
+                    ]
+                }
+            },
            nodes: {
                files: {
                    src: [ 'nodes/core/*/*.js' ]
@@ -105,7 +100,7 @@ module.exports = function(grunt) {
            },
            editor: {
                files: {
-                    src: [ 'packages/node_modules/@node-red/editor-client/src/js/**/*.js' ]
+                    src: [ 'editor/js/**/*.js' ]
                }
            },
            tests: {
@@ -125,95 +120,81 @@ module.exports = function(grunt) {
                src: [
                    // Ensure editor source files are concatenated in
                    // the right order
-                    "packages/node_modules/@node-red/editor-client/src/js/polyfills.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/jquery-addons.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/red.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/events.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/i18n.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/settings.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/user.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/comms.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/text/bidi.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/text/format.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/state.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/nodes.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/font-awesome.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/history.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/validators.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/utils.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/checkboxSet.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/menu.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/panels.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/popover.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/searchBox.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/stack.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/toggleButton.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/common/colorPicker.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/actions.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/diff.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/statusBar.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/view.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/view-navigator.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/sidebar.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/palette.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/tab-context.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/editor.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/editors/*.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/event-log.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/tray.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/library.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/notifications.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/search.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/actionList.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/group.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/userSettings.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectUserSettings.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/projects/tab-versionControl.js",
-                    "packages/node_modules/@node-red/editor-client/src/js/ui/touch/radialMenu.js"
+                    "editor/js/red.js",
+                    "editor/js/events.js",
+                    "editor/js/i18n.js",
+                    "editor/js/settings.js",
+                    "editor/js/user.js",
+                    "editor/js/comms.js",
+                    "editor/js/text/bidi.js",
+                    "editor/js/text/format.js",
+                    "editor/js/ui/state.js",
+                    "editor/js/nodes.js",
+                    "editor/js/history.js",
+                    "editor/js/validators.js",
+                    "editor/js/ui/utils.js",
+                    "editor/js/ui/common/editableList.js",
+                    "editor/js/ui/common/checkboxSet.js",
+                    "editor/js/ui/common/menu.js",
+                    "editor/js/ui/common/panels.js",
+                    "editor/js/ui/common/popover.js",
+                    "editor/js/ui/common/searchBox.js",
+                    "editor/js/ui/common/tabs.js",
+                    "editor/js/ui/common/stack.js",
+                    "editor/js/ui/common/typedInput.js",
+                    "editor/js/ui/actions.js",
+                    "editor/js/ui/deploy.js",
+                    "editor/js/ui/diff.js",
+                    "editor/js/ui/keyboard.js",
+                    "editor/js/ui/workspaces.js",
+                    "editor/js/ui/view.js",
+                    "editor/js/ui/view-navigator.js",
+                    "editor/js/ui/sidebar.js",
+                    "editor/js/ui/palette.js",
+                    "editor/js/ui/tab-info.js",
+                    "editor/js/ui/tab-config.js",
+                    "editor/js/ui/tab-context.js",
+                    "editor/js/ui/palette-editor.js",
+                    "editor/js/ui/editor.js",
+                    "editor/js/ui/editors/*.js",
+                    "editor/js/ui/tray.js",
+                    "editor/js/ui/clipboard.js",
+                    "editor/js/ui/library.js",
+                    "editor/js/ui/notifications.js",
+                    "editor/js/ui/search.js",
+                    "editor/js/ui/typeSearch.js",
+                    "editor/js/ui/subflow.js",
+                    "editor/js/ui/userSettings.js",
+                    "editor/js/ui/projects/projects.js",
+                    "editor/js/ui/projects/projectSettings.js",
+                    "editor/js/ui/projects/projectUserSettings.js",
+                    "editor/js/ui/projects/tab-versionControl.js",
+                    "editor/js/ui/touch/radialMenu.js"
                ],
-                dest: "packages/node_modules/@node-red/editor-client/public/red/red.js"
+                dest: "public/red/red.js"
            },
            vendor: {
                files: {
-                    "packages/node_modules/@node-red/editor-client/public/vendor/vendor.js": [
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-3.5.1.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-migrate-3.3.0.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-ui.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery.ui.touch-punch.min.js",
-                        "node_modules/marked/marked.min.js",
-                        "node_modules/dompurify/dist/purify.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/d3/d3.v3.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/i18next/i18next.min.js",
-                        "node_modules/jsonata/jsonata-es5.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/ace/ace.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/ace/ext-language_tools.js",
+                    "public/vendor/vendor.js": [
+                        "editor/vendor/jquery/js/jquery-1.11.3.min.js",
+                        "editor/vendor/bootstrap/js/bootstrap.min.js",
+                        "editor/vendor/jquery/js/jquery-ui-1.10.3.custom.min.js",
+                        "editor/vendor/jquery/js/jquery.ui.touch-punch.min.js",
+                        "editor/vendor/marked/marked.min.js",
+                        "editor/vendor/d3/d3.v3.min.js",
+                        "editor/vendor/i18next/i18next.min.js"
                    ],
-                    // "packages/node_modules/@node-red/editor-client/public/vendor/vendor.css": [
-                    //     // TODO: resolve relative resource paths in
-                    //     //       bootstrap/FA/jquery
-                    // ],
-                    "packages/node_modules/@node-red/editor-client/public/vendor/ace/worker-jsonata.js": [
+                    "public/vendor/vendor.css": [
+                        // TODO: resolve relative resource paths in
+                        //       bootstrap/FA/jquery
+                    ],
+                    "public/vendor/jsonata/jsonata.min.js": [
                        "node_modules/jsonata/jsonata-es5.min.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/jsonata/worker-jsonata.js"
+                        "editor/vendor/jsonata/formatter.js"
+                    ],
+                    "public/vendor/ace/worker-jsonata.js": [
+                        "node_modules/jsonata/jsonata-es5.min.js",
+                        "editor/vendor/jsonata/worker-jsonata.js"
                    ]
                }
            }
@@ -221,60 +202,63 @@ module.exports = function(grunt) {
        uglify: {
            build: {
                files: {
-                    'packages/node_modules/@node-red/editor-client/public/red/red.min.js': 'packages/node_modules/@node-red/editor-client/public/red/red.js',
-                    'packages/node_modules/@node-red/editor-client/public/red/main.min.js': 'packages/node_modules/@node-red/editor-client/public/red/main.js',
-                    'packages/node_modules/@node-red/editor-client/public/vendor/ace/mode-jsonata.js': 'packages/node_modules/@node-red/editor-client/src/vendor/jsonata/mode-jsonata.js',
-                    'packages/node_modules/@node-red/editor-client/public/vendor/ace/snippets/jsonata.js': 'packages/node_modules/@node-red/editor-client/src/vendor/jsonata/snippets-jsonata.js'
+                    'public/red/red.min.js': 'public/red/red.js',
+                    'public/red/main.min.js': 'public/red/main.js',
+                    'public/vendor/ace/mode-jsonata.js': 'editor/vendor/jsonata/mode-jsonata.js',
+                    'public/vendor/ace/snippets/jsonata.js': 'editor/vendor/jsonata/snippets-jsonata.js'
                }
            }
        },
        sass: {
            build: {
                options: {
-                    implementation: sass,
                    outputStyle: 'compressed'
                },
                files: [{
-                    dest: 'packages/node_modules/@node-red/editor-client/public/red/style.min.css',
-                    src: 'packages/node_modules/@node-red/editor-client/src/sass/style.scss'
+                    dest: 'public/red/style.min.css',
+                    src: 'editor/sass/style.scss'
+                },
+                {
+                    dest: 'public/vendor/bootstrap/css/bootstrap.min.css',
+                    src: 'editor/vendor/bootstrap/css/bootstrap.css'
                }]
            }
        },
        jsonlint: {
            messages: {
                src: [
-                    'packages/node_modules/@node-red/nodes/locales/**/*.json',
-                    'packages/node_modules/@node-red/editor-client/locales/**/*.json',
-                    'packages/node_modules/@node-red/runtime/locales/**/*.json'
+                    'nodes/core/locales/en-US/messages.json',
+                    'red/api/locales/en-US/editor.json',
+                    'red/runtime/locales/en-US/runtime.json'
                ]
            },
            keymaps: {
                src: [
-                    'packages/node_modules/@node-red/editor-client/src/js/keymap.json'
+                    'editor/js/keymap.json'
                ]
            }
        },
        attachCopyright: {
            js: {
                src: [
-                    'packages/node_modules/@node-red/editor-client/public/red/red.min.js',
-                    'packages/node_modules/@node-red/editor-client/public/red/main.min.js'
+                    'public/red/red.min.js',
+                    'public/red/main.min.js'
                ]
            },
            css: {
                src: [
-                    'packages/node_modules/@node-red/editor-client/public/red/style.min.css'
+                    'public/red/style.min.css'
                ]
            }
        },
        clean: {
            build: {
                src: [
-                    "packages/node_modules/@node-red/editor-client/public/red",
-                    "packages/node_modules/@node-red/editor-client/public/index.html",
-                    "packages/node_modules/@node-red/editor-client/public/favicon.ico",
-                    "packages/node_modules/@node-red/editor-client/public/icons",
-                    "packages/node_modules/@node-red/editor-client/public/vendor"
+                    "public/red",
+                    "public/index.html",
+                    "public/favicon.ico",
+                    "public/icons",
+                    "public/vendor"
                ]
            },
            release: {
@@ -286,27 +270,27 @@ module.exports = function(grunt) {
        watch: {
            js: {
                files: [
-                    'packages/node_modules/@node-red/editor-client/src/js/**/*.js'
+                    'editor/js/**/*.js'
                ],
-                tasks: ['copy:build','concat',/*'uglify',*/ 'attachCopyright:js']
+                tasks: ['copy:build','concat','uglify','attachCopyright:js']
            },
            sass: {
                files: [
-                    'packages/node_modules/@node-red/editor-client/src/sass/**/*.scss'
+                    'editor/sass/**/*.scss'
                ],
                tasks: ['sass','attachCopyright:css']
            },
            json: {
                files: [
-                    'packages/node_modules/@node-red/nodes/locales/**/*.json',
-                    'packages/node_modules/@node-red/editor-client/locales/**/*.json',
-                    'packages/node_modules/@node-red/runtime/locales/**/*.json'
+                    'nodes/core/locales/en-US/messages.json',
+                    'red/api/locales/en-US/editor.json',
+                    'red/runtime/locales/en-US/runtime.json'
                ],
                tasks: ['jsonlint:messages']
            },
            keymaps: {
                files: [
-                    'packages/node_modules/@node-red/editor-client/src/js/keymap.json'
+                    'editor/js/keymap.json'
                ],
                tasks: ['jsonlint:keymaps','copy:build']
            },
@@ -321,13 +305,12 @@ module.exports = function(grunt) {
        nodemon: {
            /* uses .nodemonignore */
            dev: {
-                script: 'packages/node_modules/node-red/red.js',
+                script: 'red.js',
                options: {
                    args: nodemonArgs,
                    ext: 'js,html,json',
                    watch: [
-                        'packages/node_modules',
-                        '!packages/node_modules/@node-red/editor-client'
+                        'red','nodes'
                    ]
                }
            }
@@ -346,56 +329,69 @@ module.exports = function(grunt) {
            build: {
                files:[
                    {
-                        src: 'packages/node_modules/@node-red/editor-client/src/js/main.js',
-                        dest: 'packages/node_modules/@node-red/editor-client/public/red/main.js'
+                        src: 'editor/js/main.js',
+                        dest: 'public/red/main.js'
                    },
                    {
-                        src: 'packages/node_modules/@node-red/editor-client/src/js/keymap.json',
-                        dest: 'packages/node_modules/@node-red/editor-client/public/red/keymap.json'
+                        src: 'editor/js/keymap.json',
+                        dest: 'public/red/keymap.json'
                    },
                    {
-                        cwd: 'packages/node_modules/@node-red/editor-client/src/images',
+                        cwd: 'editor/images',
                        src: '**',
                        expand: true,
-                        dest: 'packages/node_modules/@node-red/editor-client/public/red/images/'
+                        dest: 'public/red/images/'
                    },
                    {
-                        cwd: 'packages/node_modules/@node-red/editor-client/src/vendor',
+                        cwd: 'editor/vendor',
                        src: [
                            'ace/**',
-                            'jquery/css/base/**',
+                            //'bootstrap/css/**',
+                            'bootstrap/img/**',
+                            'jquery/css/**',
                            'font-awesome/**'
                        ],
                        expand: true,
-                        dest: 'packages/node_modules/@node-red/editor-client/public/vendor/'
+                        dest: 'public/vendor/'
                    },
                    {
-                        cwd: 'packages/node_modules/@node-red/editor-client/src/icons',
+                        cwd: 'editor/icons',
                        src: '**',
                        expand: true,
-                        dest: 'packages/node_modules/@node-red/editor-client/public/icons/'
+                        dest: 'public/icons/'
                    },
                    {
                        expand: true,
-                        src: ['packages/node_modules/@node-red/editor-client/src/index.html','packages/node_modules/@node-red/editor-client/src/favicon.ico'],
-                        dest: 'packages/node_modules/@node-red/editor-client/public/',
+                        src: ['editor/index.html','editor/favicon.ico'],
+                        dest: 'public/',
                        flatten: true
                    },
                    {
                        src: 'CHANGELOG.md',
-                        dest: 'packages/node_modules/@node-red/editor-client/public/red/about'
-                    },
-                    {
-                        src: 'CHANGELOG.md',
-                        dest: 'packages/node_modules/node-red/'
-                    },
-                    {
-                        cwd: 'packages/node_modules/@node-red/editor-client/src/ace/bin/',
-                        src: '**',
-                        expand: true,
-                        dest: 'packages/node_modules/@node-red/editor-client/public/vendor/ace/'
+                        dest: 'public/red/about'
                    }
                ]
+            },
+            release: {
+                files: [{
+                    mode: true,
+                    expand: true,
+                    src: [
+                        '*.md',
+                        'LICENSE',
+                        'package.json',
+                        'settings.js',
+                        'red.js',
+                        'lib/.gitignore',
+                        'nodes/*.demo',
+                        'nodes/core/**',
+                        'red/**',
+                        'public/**',
+                        'editor/templates/**',
+                        'bin/**'
+                    ],
+                    dest: path.resolve('<%= paths.dist %>/node-red-<%= pkg.version %>')
+                }]
            }
        },
        chmod: {
@@ -404,92 +400,19 @@ module.exports = function(grunt) {
            },
            release: {
                src: [
-                    "packages/node_modules/@node-red/nodes/core/hardware/nrgpio",
-                    "packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/node-red-*sh"
+                    path.resolve('<%= paths.dist %>/node-red-<%= pkg.version %>/nodes/core/hardware/nrgpio*'),
+                    path.resolve('<%= paths.dist %>/node-red-<%= pkg.version %>/red/runtime/storage/localfilesystem/projects/git/node-red-*sh')
                ]
            }
        },
-        'npm-command': {
-            options: {
-                cmd: "pack",
-                cwd: "<%= paths.dist %>/modules"
-            },
-            'node-red': { options: { args: [__dirname+'/packages/node_modules/node-red'] } },
-            '@node-red/editor-api': { options: { args: [__dirname+'/packages/node_modules/@node-red/editor-api'] } },
-            '@node-red/editor-client': { options: { args: [__dirname+'/packages/node_modules/@node-red/editor-client'] } },
-            '@node-red/nodes': { options: { args: [__dirname+'/packages/node_modules/@node-red/nodes'] } },
-            '@node-red/registry': { options: { args: [__dirname+'/packages/node_modules/@node-red/registry'] } },
-            '@node-red/runtime': { options: { args: [__dirname+'/packages/node_modules/@node-red/runtime'] } },
-            '@node-red/util': { options: { args: [__dirname+'/packages/node_modules/@node-red/util'] } }
-
-
-        },
-        mkdir: {
-            release: {
-                options: {
-                    create: ['<%= paths.dist %>/modules']
-                },
-            },
-        },
        compress: {
            release: {
                options: {
                    archive: '<%= paths.dist %>/node-red-<%= pkg.version %>.zip'
                },
                expand: true,
-                cwd: 'packages/node_modules/',
-                src: [
-                    '**',
-                    '!@node-red/editor-client/src/**'
-                ]
-            }
-        },
-        jsdoc : {
-            modules: {
-                src: [
-                    'API.md',
-                    'packages/node_modules/node-red/lib/red.js',
-                    'packages/node_modules/@node-red/runtime/lib/index.js',
-                    'packages/node_modules/@node-red/runtime/lib/api/*.js',
-                    'packages/node_modules/@node-red/runtime/lib/events.js',
-                    'packages/node_modules/@node-red/util/**/*.js',
-                    'packages/node_modules/@node-red/editor-api/lib/index.js',
-                    'packages/node_modules/@node-red/editor-api/lib/auth/index.js'
-                ],
-                options: {
-                    destination: 'docs',
-                    configure: './jsdoc.json'
-                }
-            },
-            _editor: {
-                src: [
-                    'packages/node_modules/@node-red/editor-client/src/js'
-                    ],
-                options: {
-                    destination: 'packages/node_modules/@node-red/editor-client/docs',
-                    configure: './jsdoc.json'
-                }
-            }
-
-        },
-        jsdoc2md: {
-            runtimeAPI: {
-                options: {
-                    separators: true
-                },
-                src: [
-                    'packages/node_modules/@node-red/runtime/lib/index.js',
-                    'packages/node_modules/@node-red/runtime/lib/api/*.js',
-                    'packages/node_modules/@node-red/runtime/lib/events.js'
-                ],
-                dest: 'packages/node_modules/@node-red/runtime/docs/api.md'
-            },
-            nodeREDUtil: {
-                options: {
-                    separators: true
-                },
-                src: 'packages/node_modules/@node-red/util/**/*.js',
-                dest: 'packages/node_modules/@node-red/util/docs/api.md'
+                cwd: '<%= paths.dist %>/',
+                src: ['node-red-<%= pkg.version %>/**']
            }
        }
    });
@@ -508,13 +431,7 @@ module.exports = function(grunt) {
    grunt.loadNpmTasks('grunt-chmod');
    grunt.loadNpmTasks('grunt-jsonlint');
    grunt.loadNpmTasks('grunt-mocha-istanbul');
-    if (fs.existsSync(path.join("node_modules", "grunt-webdriver"))) {
-        grunt.loadNpmTasks('grunt-webdriver');
-    }
-    grunt.loadNpmTasks('grunt-jsdoc');
-    grunt.loadNpmTasks('grunt-jsdoc-to-markdown');
-    grunt.loadNpmTasks('grunt-npm-command');
-    grunt.loadNpmTasks('grunt-mkdir');
+    grunt.loadNpmTasks('grunt-webdriver');

    grunt.registerMultiTask('attachCopyright', function() {
        var files = this.data.src;
@@ -556,38 +473,6 @@ module.exports = function(grunt) {
        }
    });

-    grunt.registerTask('verifyPackageDependencies', function() {
-        var done = this.async();
-        var verifyDependencies = require("./scripts/verify-package-dependencies.js");
-        verifyDependencies().then(function(failures) {
-            if (failures.length > 0) {
-                failures.forEach(f => grunt.log.error(f));
-                grunt.fail.fatal("Failed to verify package dependencies");
-            }
-            done();
-        });
-    });
-
-    grunt.registerTask('verifyUiTestDependencies', function() {
-        if (!fs.existsSync(path.join("node_modules", "grunt-webdriver"))) {
-            grunt.fail.fatal('You need to install the UI test dependencies first.\nUse the script in "scripts/install-ui-test-dependencies.sh"');
-            return false;
-        }
-    });
-    grunt.registerTask('generatePublishScript',
-        'Generates a script to publish build output to npm',
-            function () {
-                const done = this.async();
-                const generatePublishScript = require("./scripts/generate-publish-script.js");
-                generatePublishScript().then(function(output) {
-                    grunt.log.writeln(output);
-
-                    const filePath = path.join(grunt.config.get('paths.dist'),"modules","publish.sh");
-                    grunt.file.write(filePath,output);
-
-                    done();
-                });
-            });
    grunt.registerTask('setDevEnv',
        'Sets NODE_ENV=development so non-minified assets are used',
            function () {
@@ -596,7 +481,7 @@ module.exports = function(grunt) {

    grunt.registerTask('default',
        'Builds editor content then runs code style checks and unit tests on all components',
-        ['build','verifyPackageDependencies','jshint:editor','mocha_istanbul:all']);
+        ['build','jshint:editor','mocha_istanbul:all']);

    grunt.registerTask('test-core',
        'Runs code style check and unit tests on core runtime code',
@@ -606,15 +491,9 @@ module.exports = function(grunt) {
        'Runs code style check on editor code',
        ['jshint:editor']);

-    if (!fs.existsSync(path.join("node_modules", "grunt-webdriver"))) {
-        grunt.registerTask('test-ui',
-            'Builds editor content then runs unit tests on editor ui',
-            ['verifyUiTestDependencies']);
-    } else {
-        grunt.registerTask('test-ui',
-            'Builds editor content then runs unit tests on editor ui',
-            ['verifyUiTestDependencies','build','jshint:editor','webdriver:all']);
-    }
+    grunt.registerTask('test-ui',
+        'Builds editor content then runs unit tests on editor ui',
+        ['build','jshint:editor','webdriver:all']);

    grunt.registerTask('test-nodes',
        'Runs unit tests on core nodes',
@@ -630,18 +509,9 @@ module.exports = function(grunt) {

    grunt.registerTask('release',
        'Create distribution zip file',
-        ['build','verifyPackageDependencies','clean:release','mkdir:release','chmod:release','compress:release','pack-modules','generatePublishScript']);
-
-    grunt.registerTask('pack-modules',
-        'Create module pack files for release',
-        ['mkdir:release','npm-command']);
-
+        ['build','clean:release','copy:release','chmod:release','compress:release']);

    grunt.registerTask('coverage',
        'Run Istanbul code test coverage task',
        ['build','mocha_istanbul:all']);
-
-    grunt.registerTask('docs',
-        'Generates API documentation',
-        ['jsdoc']);
 };
--- a/README.md
+++ b/README.md
@@ -2,12 +2,12 @@

 http://nodered.org

-[![Build Status](https://travis-ci.org/node-red/node-red.svg?branch=master)](https://travis-ci.org/node-red/node-red)
+[![Build Status](https://travis-ci.org/node-red/node-red.svg)](https://travis-ci.org/node-red/node-red)
 [![Coverage Status](https://coveralls.io/repos/node-red/node-red/badge.svg?branch=master)](https://coveralls.io/r/node-red/node-red?branch=master)

-Low-code programming for event-driven applications.
+A visual tool for wiring the Internet of Things.

-![Node-RED: Low-code programming for event-driven applications](http://nodered.org/images/node-red-screenshot.png)
+![Node-RED: A visual tool for wiring the Internet of Things](http://nodered.org/images/node-red-screenshot.png)

 ## Quick Start

@@ -44,6 +44,9 @@ If you want to run the latest code from git, here's how to get started:
 4. Run

        npm start
+   or
+
+        node red.js

 ## Contributing

@@ -56,7 +59,7 @@ This project adheres to the [Contributor Covenant 1.4](http://contributor-covena

 ## Authors

-Node-RED is a project of the [OpenJS Foundation](https://openjsf.org).
+Node-RED is a project of the [JS Foundation](http://js.foundation).

 It was created by [IBM Emerging Technology](https://www.ibm.com/blogs/emerging-technology/).

@@ -67,4 +70,4 @@ It was created by [IBM Emerging Technology](https://www.ibm.com/blogs/emerging-t

 ## Copyright and license

-Copyright JS Foundation and other contributors, https://openjsf.org under [the Apache 2.0 license](LICENSE).
+Copyright JS Foundation and other contributors, http://js.foundation under [the Apache 2.0 license](LICENSE).
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,13 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 1.0.0   | :white_check_mark: |
-| 0.20.x  | :white_check_mark: |
-
-
-## Reporting a Vulnerability
-
-Please report any potential security issues to `team@nodered.org`. This will notify the core project team who will respond accordingly.
--- a/packages/node_modules/node-red/bin/node-red-pi
+++ b/packages/node_modules/node-red/bin/node-red-pi
--- a/packages/node_modules/@node-red/editor-client/src/favicon.ico
+++ b/packages/node_modules/@node-red/editor-client/src/favicon.ico
--- a/editor/icons/alert.png
+++ b/editor/icons/alert.png
--- a/packages/node_modules/@node-red/nodes/icons/arduino.png
+++ b/packages/node_modules/@node-red/nodes/icons/arduino.png
--- a/test/unit/@node-red/registry/lib/resources/local/NestedDirectoryNode/NestedNode/icons/arrow-in.png
+++ b/test/unit/@node-red/registry/lib/resources/local/NestedDirectoryNode/NestedNode/icons/arrow-in.png
--- a/editor/icons/batch.png
+++ b/editor/icons/batch.png
--- a/packages/node_modules/@node-red/nodes/icons/bluetooth.png
+++ b/packages/node_modules/@node-red/nodes/icons/bluetooth.png
--- a/editor/icons/bridge-dash.png
+++ b/editor/icons/bridge-dash.png
--- a/editor/icons/bridge.png
+++ b/editor/icons/bridge.png
--- a/editor/icons/cog.png
+++ b/editor/icons/cog.png
--- a/editor/icons/comment.png
+++ b/editor/icons/comment.png
--- a/editor/icons/db.png
+++ b/editor/icons/db.png
--- a/editor/icons/debug.png
+++ b/editor/icons/debug.png
--- a/editor/icons/envelope.png
+++ b/editor/icons/envelope.png
--- a/editor/icons/feed.png
+++ b/editor/icons/feed.png
--- a/editor/icons/file-in.png
+++ b/editor/icons/file-in.png
--- a/editor/icons/file-out.png
+++ b/editor/icons/file-out.png
--- a/editor/icons/file.png
+++ b/editor/icons/file.png
--- a/editor/icons/function.png
+++ b/editor/icons/function.png
--- a/editor/icons/hash.png
+++ b/editor/icons/hash.png
--- a/editor/icons/inject.png
+++ b/editor/icons/inject.png
--- a/editor/icons/join.png
+++ b/editor/icons/join.png
--- a/packages/node_modules/@node-red/nodes/icons/leveldb.png
+++ b/packages/node_modules/@node-red/nodes/icons/leveldb.png
--- a/editor/icons/light.png
+++ b/editor/icons/light.png
--- a/editor/icons/link-out.png
+++ b/editor/icons/link-out.png
--- a/packages/node_modules/@node-red/nodes/icons/mongodb.png
+++ b/packages/node_modules/@node-red/nodes/icons/mongodb.png
--- a/packages/node_modules/@node-red/nodes/icons/mouse.png
+++ b/packages/node_modules/@node-red/nodes/icons/mouse.png
--- a/editor/icons/node-changed.png
+++ b/editor/icons/node-changed.png
--- a/editor/icons/node-error.png
+++ b/editor/icons/node-error.png
--- a/editor/icons/parser-csv.png
+++ b/editor/icons/parser-csv.png
--- a/editor/icons/parser-html.png
+++ b/editor/icons/parser-html.png
--- a/editor/icons/parser-json.png
+++ b/editor/icons/parser-json.png
--- a/editor/icons/parser-xml.png
+++ b/editor/icons/parser-xml.png
--- a/editor/icons/parser-yaml.png
+++ b/editor/icons/parser-yaml.png
--- a/editor/icons/range.png
+++ b/editor/icons/range.png
--- a/packages/node_modules/@node-red/nodes/icons/redis.png
+++ b/packages/node_modules/@node-red/nodes/icons/redis.png
--- a/editor/icons/rpi.png
+++ b/editor/icons/rpi.png
--- a/editor/icons/serial.png
+++ b/editor/icons/serial.png
--- a/editor/icons/sort.png
+++ b/editor/icons/sort.png
--- a/editor/icons/split.png
+++ b/editor/icons/split.png
--- a/editor/icons/subflow.png
+++ b/editor/icons/subflow.png
--- a/editor/icons/swap.png
+++ b/editor/icons/swap.png
--- a/editor/icons/switch.png
+++ b/editor/icons/switch.png
--- a/editor/icons/template.png
+++ b/editor/icons/template.png
--- a/editor/icons/timer.png
+++ b/editor/icons/timer.png
--- a/editor/icons/trigger.png
+++ b/editor/icons/trigger.png
--- a/editor/icons/twitter.png
+++ b/editor/icons/twitter.png
--- a/editor/icons/watch.png
+++ b/editor/icons/watch.png
--- a/editor/icons/white-globe.png
+++ b/editor/icons/white-globe.png
--- a/editor/images/deploy-flows-o.png
+++ b/editor/images/deploy-flows-o.png
--- a/editor/images/deploy-flows.png
+++ b/editor/images/deploy-flows.png
--- a/editor/images/deploy-full-o.png
+++ b/editor/images/deploy-full-o.png
--- a/editor/images/deploy-full.png
+++ b/editor/images/deploy-full.png
--- a/editor/images/deploy-nodes-o.png
+++ b/editor/images/deploy-nodes-o.png
--- a/editor/images/deploy-nodes.png
+++ b/editor/images/deploy-nodes.png
--- a/packages/node_modules/@node-red/editor-client/src/images/grip.png
+++ b/packages/node_modules/@node-red/editor-client/src/images/grip.png
--- a/packages/node_modules/@node-red/editor-client/src/images/node-red-256.png
+++ b/packages/node_modules/@node-red/editor-client/src/images/node-red-256.png
--- a/packages/node_modules/@node-red/editor-client/src/images/node-red-icon-black.svg
+++ b/packages/node_modules/@node-red/editor-client/src/images/node-red-icon-black.svg
--- a/packages/node_modules/@node-red/editor-client/src/images/node-red-icon.svg
+++ b/packages/node_modules/@node-red/editor-client/src/images/node-red-icon.svg
--- a/editor/images/node-red.png
+++ b/editor/images/node-red.png
--- a/editor/images/pw_maze_white.png
+++ b/editor/images/pw_maze_white.png
--- a/packages/node_modules/@node-red/editor-client/src/images/spin.svg
+++ b/packages/node_modules/@node-red/editor-client/src/images/spin.svg
--- a/editor/images/subflow_tab.png
+++ b/editor/images/subflow_tab.png
--- a/editor/images/typedInput/09.png
+++ b/editor/images/typedInput/09.png
--- a/editor/images/typedInput/az.png
+++ b/editor/images/typedInput/az.png
--- a/editor/images/typedInput/bin.png
+++ b/editor/images/typedInput/bin.png
--- a/editor/images/typedInput/bool.png
+++ b/editor/images/typedInput/bool.png
--- a/editor/images/typedInput/env.png
+++ b/editor/images/typedInput/env.png
--- a/editor/images/typedInput/expr.png
+++ b/editor/images/typedInput/expr.png
--- a/editor/images/typedInput/json.png
+++ b/editor/images/typedInput/json.png
--- a/editor/images/typedInput/re.png
+++ b/editor/images/typedInput/re.png
--- a/packages/node_modules/@node-red/editor-client/src/js/comms.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/comms.js
@@ -28,24 +28,14 @@ RED.comms = (function() {

    function connectWS() {
        active = true;
-        var wspath;
-
-        if (RED.settings.apiRootUrl) {
-            var m = /^(https?):\/\/(.*)$/.exec(RED.settings.apiRootUrl);
-            if (m) {
-                console.log(m);
-                wspath = "ws"+(m[1]==="https"?"s":"")+"://"+m[2]+"comms";
-            }
-        } else {
-            var path = location.hostname;
-            var port = location.port;
-            if (port.length !== 0) {
-                path = path+":"+port;
-            }
-            path = path+document.location.pathname;
-            path = path+(path.slice(-1) == "/"?"":"/")+"comms";
-            wspath = "ws"+(document.location.protocol=="https:"?"s":"")+"://"+path;
+        var path = location.hostname;
+        var port = location.port;
+        if (port.length !== 0) {
+            path = path+":"+port;
        }
+        path = path+document.location.pathname;
+        path = path+(path.slice(-1) == "/"?"":"/")+"comms";
+        path = "ws"+(document.location.protocol=="https:"?"s":"")+"://"+path;

        var auth_tokens = RED.settings.get("auth-tokens");
        pendingAuth = (auth_tokens!=null);
@@ -58,7 +48,7 @@ RED.comms = (function() {
            }
        }

-        ws = new WebSocket(wspath);
+        ws = new WebSocket(path);
        ws.onopen = function() {
            reconnectAttempts = 0;
            if (errornotification) {
@@ -75,39 +65,29 @@ RED.comms = (function() {
        }
        ws.onmessage = function(event) {
            var message = JSON.parse(event.data);
-            if (message.auth) {
-                if (pendingAuth) {
-                    if (message.auth === "ok") {
+            for (var m = 0; m < message.length; m++) {
+                var msg = message[m];
+                if (pendingAuth && msg.auth) {
+                    if (msg.auth === "ok") {
                        pendingAuth = false;
                        completeConnection();
-                    } else if (message.auth === "fail") {
+                    } else if (msg.auth === "fail") {
                        // anything else is an error...
                        active = false;
                        RED.user.login({updateMenu:true},function() {
                            connectWS();
                        })
                    }
-                } else if (message.auth === "fail") {
-                    // Our current session has expired
-                    active = false;
-                    RED.user.login({updateMenu:true},function() {
-                        connectWS();
-                    })
                }
-            } else {
-                // Otherwise, 'message' is an array of actual comms messages
-                for (var m = 0; m < message.length; m++) {
-                    var msg = message[m];
-                    if (msg.topic) {
-                        for (var t in subscriptions) {
-                            if (subscriptions.hasOwnProperty(t)) {
-                                var re = new RegExp("^"+t.replace(/([\[\]\?\(\)\\\\$\^\*\.|])/g,"\\$1").replace(/\+/g,"[^/]+").replace(/\/#$/,"(\/.*)?")+"$");
-                                if (re.test(msg.topic)) {
-                                    var subscribers = subscriptions[t];
-                                    if (subscribers) {
-                                        for (var i=0;i<subscribers.length;i++) {
-                                            subscribers[i](msg.topic,msg.data);
-                                        }
+                else if (msg.topic) {
+                    for (var t in subscriptions) {
+                        if (subscriptions.hasOwnProperty(t)) {
+                            var re = new RegExp("^"+t.replace(/([\[\]\?\(\)\\\\$\^\*\.|])/g,"\\$1").replace(/\+/g,"[^/]+").replace(/\/#$/,"(\/.*)?")+"$");
+                            if (re.test(msg.topic)) {
+                                var subscribers = subscriptions[t];
+                                if (subscribers) {
+                                    for (var i=0;i<subscribers.length;i++) {
+                                        subscribers[i](msg.topic,msg.data);
                                    }
                                }
                            }
@@ -142,10 +122,10 @@ RED.comms = (function() {
                        connectWS();
                    } else {
                        var msg = RED._("notification.errors.lostConnectionReconnect",{time: connectCountdown})+' <a href="#">'+ RED._("notification.errors.lostConnectionTry")+'</a>';
-                        errornotification.update(msg,{silent:true});
-                        $(errornotification).find("a").on("click", function(e) {
+                        errornotification.update(msg);
+                        $(errornotification).find("a").click(function(e) {
                            e.preventDefault();
-                            errornotification.update(RED._("notification.errors.lostConnection"),{silent:true});
+                            errornotification.update(RED._("notification.errors.lostConnection"));
                            clearInterval(connectCountdownTimer);
                            connectWS();
                        })
--- a/packages/node_modules/@node-red/editor-client/src/js/events.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/events.js
@@ -32,19 +32,14 @@
             }
         }
     }
-     function emit() {
-         var evt = arguments[0]
-         var args = Array.prototype.slice.call(arguments,1);
-         if (RED.events.DEBUG) {
-             console.warn(evt,args);
-         }
+     function emit(evt,arg) {
         if (handlers[evt]) {
             for (var i=0;i<handlers[evt].length;i++) {
                 try {
-                     handlers[evt][i].apply(null, args);
+                     handlers[evt][i](arg);
                 } catch(err) {
-                     console.warn("RED.events.emit error: ["+evt+"] "+(err.toString()));
-                     console.warn(err);
+                     console.log("RED.events.emit error: ["+evt+"] "+(err.toString()));
+                     console.log(err);
                 }
             }

--- a/editor/js/history.js
+++ b/editor/js/history.js
@@ -0,0 +1,332 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+RED.history = (function() {
+    var undo_history = [];
+
+    function undoEvent(ev) {
+        var i;
+        var len;
+        var node;
+        var subflow;
+        var modifiedTabs = {};
+        if (ev) {
+            if (ev.t == 'multi') {
+                len = ev.events.length;
+                for (i=len-1;i>=0;i--) {
+                    undoEvent(ev.events[i]);
+                }
+            } else if (ev.t == 'replace') {
+                RED.nodes.clear();
+                var imported = RED.nodes.import(ev.config);
+                imported[0].forEach(function(n) {
+                    if (ev.changed[n.id]) {
+                        n.changed = true;
+                    }
+                })
+
+                RED.nodes.version(ev.rev);
+            } else if (ev.t == 'add') {
+                if (ev.nodes) {
+                    for (i=0;i<ev.nodes.length;i++) {
+                        node = RED.nodes.node(ev.nodes[i]);
+                        if (node.z) {
+                            modifiedTabs[node.z] = true;
+                        }
+                        RED.nodes.remove(ev.nodes[i]);
+                    }
+                }
+                if (ev.links) {
+                    for (i=0;i<ev.links.length;i++) {
+                        RED.nodes.removeLink(ev.links[i]);
+                    }
+                }
+                if (ev.workspaces) {
+                    for (i=0;i<ev.workspaces.length;i++) {
+                        RED.nodes.removeWorkspace(ev.workspaces[i].id);
+                        RED.workspaces.remove(ev.workspaces[i]);
+                    }
+                }
+                if (ev.subflows) {
+                    for (i=0;i<ev.subflows.length;i++) {
+                        RED.nodes.removeSubflow(ev.subflows[i]);
+                        RED.workspaces.remove(ev.subflows[i]);
+                    }
+                }
+                if (ev.subflow) {
+                    if (ev.subflow.instances) {
+                        ev.subflow.instances.forEach(function(n) {
+                            var node = RED.nodes.node(n.id);
+                            if (node) {
+                                node.changed = n.changed;
+                                node.dirty = true;
+                            }
+                        });
+                    }
+                    if (ev.subflow.hasOwnProperty('changed')) {
+                        subflow = RED.nodes.subflow(ev.subflow.id);
+                        if (subflow) {
+                            subflow.changed = ev.subflow.changed;
+                        }
+                    }
+                }
+                if (ev.removedLinks) {
+                    for (i=0;i<ev.removedLinks.length;i++) {
+                        RED.nodes.addLink(ev.removedLinks[i]);
+                    }
+                }
+
+            } else if (ev.t == "delete") {
+                if (ev.workspaces) {
+                    for (i=0;i<ev.workspaces.length;i++) {
+                        RED.nodes.addWorkspace(ev.workspaces[i]);
+                        RED.workspaces.add(ev.workspaces[i]);
+                    }
+                }
+                if (ev.subflow && ev.subflow.subflow) {
+                    RED.nodes.addSubflow(ev.subflow.subflow);
+                }
+                if (ev.subflowInputs && ev.subflowInputs.length > 0) {
+                    subflow = RED.nodes.subflow(ev.subflowInputs[0].z);
+                    subflow.in.push(ev.subflowInputs[0]);
+                    subflow.in[0].dirty = true;
+                }
+                if (ev.subflowOutputs && ev.subflowOutputs.length > 0) {
+                    subflow = RED.nodes.subflow(ev.subflowOutputs[0].z);
+                    ev.subflowOutputs.sort(function(a,b) { return a.i-b.i});
+                    for (i=0;i<ev.subflowOutputs.length;i++) {
+                        var output = ev.subflowOutputs[i];
+                        subflow.out.splice(output.i,0,output);
+                        for (var j=output.i+1;j<subflow.out.length;j++) {
+                            subflow.out[j].i++;
+                            subflow.out[j].dirty = true;
+                        }
+                        RED.nodes.eachLink(function(l) {
+                            if (l.source.type == "subflow:"+subflow.id) {
+                                if (l.sourcePort >= output.i) {
+                                    l.sourcePort++;
+                                }
+                            }
+                        });
+                    }
+                }
+                if (ev.subflow && ev.subflow.hasOwnProperty('instances')) {
+                    ev.subflow.instances.forEach(function(n) {
+                        var node = RED.nodes.node(n.id);
+                        if (node) {
+                            node.changed = n.changed;
+                            node.dirty = true;
+                        }
+                    });
+                }
+                if (subflow) {
+                    RED.nodes.filterNodes({type:"subflow:"+subflow.id}).forEach(function(n) {
+                        n.inputs = subflow.in.length;
+                        n.outputs = subflow.out.length;
+                        while (n.outputs > n.ports.length) {
+                            n.ports.push(n.ports.length);
+                        }
+                        n.resize = true;
+                        n.dirty = true;
+                    });
+                }
+                if (ev.nodes) {
+                    for (i=0;i<ev.nodes.length;i++) {
+                        RED.nodes.add(ev.nodes[i]);
+                        modifiedTabs[ev.nodes[i].z] = true;
+                    }
+                }
+                if (ev.links) {
+                    for (i=0;i<ev.links.length;i++) {
+                        RED.nodes.addLink(ev.links[i]);
+                    }
+                }
+                if (ev.changes) {
+                    for (i in ev.changes) {
+                        if (ev.changes.hasOwnProperty(i)) {
+                            node = RED.nodes.node(i);
+                            if (node) {
+                                for (var d in ev.changes[i]) {
+                                    if (ev.changes[i].hasOwnProperty(d)) {
+                                        node[d] = ev.changes[i][d];
+                                    }
+                                }
+                                node.dirty = true;
+                            }
+                        }
+                    }
+
+                }
+            } else if (ev.t == "move") {
+                for (i=0;i<ev.nodes.length;i++) {
+                    var n = ev.nodes[i];
+                    n.n.x = n.ox;
+                    n.n.y = n.oy;
+                    n.n.dirty = true;
+                    n.n.moved = n.moved;
+                }
+                // A move could have caused a link splice
+                if (ev.links) {
+                    for (i=0;i<ev.links.length;i++) {
+                        RED.nodes.removeLink(ev.links[i]);
+                    }
+                }
+                if (ev.removedLinks) {
+                    for (i=0;i<ev.removedLinks.length;i++) {
+                        RED.nodes.addLink(ev.removedLinks[i]);
+                    }
+                }
+            } else if (ev.t == "edit") {
+                for (i in ev.changes) {
+                    if (ev.changes.hasOwnProperty(i)) {
+                        if (ev.node._def.defaults && ev.node._def.defaults[i] && ev.node._def.defaults[i].type) {
+                            // This is a config node property
+                            var currentConfigNode = RED.nodes.node(ev.node[i]);
+                            if (currentConfigNode) {
+                                currentConfigNode.users.splice(currentConfigNode.users.indexOf(ev.node),1);
+                            }
+                            var newConfigNode = RED.nodes.node(ev.changes[i]);
+                            if (newConfigNode) {
+                                newConfigNode.users.push(ev.node);
+                            }
+                        }
+                        ev.node[i] = ev.changes[i];
+                    }
+                }
+                if (ev.subflow) {
+                    if (ev.subflow.hasOwnProperty('inputCount')) {
+                        if (ev.node.in.length > ev.subflow.inputCount) {
+                            ev.node.in.splice(ev.subflow.inputCount);
+                        } else if (ev.subflow.inputs.length > 0) {
+                            ev.node.in = ev.node.in.concat(ev.subflow.inputs);
+                        }
+                    }
+                    if (ev.subflow.hasOwnProperty('outputCount')) {
+                        if (ev.node.out.length > ev.subflow.outputCount) {
+                            ev.node.out.splice(ev.subflow.outputCount);
+                        } else if (ev.subflow.outputs.length > 0) {
+                            ev.node.out = ev.node.out.concat(ev.subflow.outputs);
+                        }
+                    }
+                    if (ev.subflow.hasOwnProperty('instances')) {
+                        ev.subflow.instances.forEach(function(n) {
+                            var node = RED.nodes.node(n.id);
+                            if (node) {
+                                node.changed = n.changed;
+                                node.dirty = true;
+                            }
+                        });
+                    }
+                    RED.editor.validateNode(ev.node);
+                    RED.nodes.filterNodes({type:"subflow:"+ev.node.id}).forEach(function(n) {
+                        n.inputs = ev.node.in.length;
+                        n.outputs = ev.node.out.length;
+                        RED.editor.updateNodeProperties(n);
+                        RED.editor.validateNode(n);
+                    });
+                } else {
+                    var outputMap;
+                    if (ev.outputMap) {
+                        outputMap = {};
+                        for (var port in ev.outputMap) {
+                            if (ev.outputMap.hasOwnProperty(port) && ev.outputMap[port] !== "-1") {
+                                outputMap[ev.outputMap[port]] = port;
+                            }
+                        }
+                    }
+                    RED.editor.updateNodeProperties(ev.node,outputMap);
+                    RED.editor.validateNode(ev.node);
+                }
+                if (ev.links) {
+                    for (i=0;i<ev.links.length;i++) {
+                        RED.nodes.addLink(ev.links[i]);
+                    }
+                }
+                ev.node.dirty = true;
+                ev.node.changed = ev.changed;
+            } else if (ev.t == "createSubflow") {
+                if (ev.nodes) {
+                    RED.nodes.filterNodes({z:ev.subflow.subflow.id}).forEach(function(n) {
+                        n.z = ev.activeWorkspace;
+                        n.dirty = true;
+                    });
+                    for (i=0;i<ev.nodes.length;i++) {
+                        RED.nodes.remove(ev.nodes[i]);
+                    }
+                }
+                if (ev.links) {
+                    for (i=0;i<ev.links.length;i++) {
+                        RED.nodes.removeLink(ev.links[i]);
+                    }
+                }
+
+                RED.nodes.removeSubflow(ev.subflow.subflow);
+                RED.workspaces.remove(ev.subflow.subflow);
+
+                if (ev.removedLinks) {
+                    for (i=0;i<ev.removedLinks.length;i++) {
+                        RED.nodes.addLink(ev.removedLinks[i]);
+                    }
+                }
+            } else if (ev.t == "reorder") {
+                if (ev.order) {
+                    RED.workspaces.order(ev.order);
+                }
+            }
+            Object.keys(modifiedTabs).forEach(function(id) {
+                var subflow = RED.nodes.subflow(id);
+                if (subflow) {
+                    RED.editor.validateNode(subflow);
+                }
+            });
+
+            RED.nodes.dirty(ev.dirty);
+            RED.view.redraw(true);
+            RED.palette.refresh();
+            RED.workspaces.refresh();
+            RED.sidebar.config.refresh();
+        }
+
+    }
+
+    return {
+        //TODO: this function is a placeholder until there is a 'save' event that can be listened to
+        markAllDirty: function() {
+            for (var i=0;i<undo_history.length;i++) {
+                undo_history[i].dirty = true;
+            }
+        },
+        list: function() {
+            return undo_history
+        },
+        depth: function() {
+            return undo_history.length;
+        },
+        push: function(ev) {
+            undo_history.push(ev);
+        },
+        pop: function() {
+            var ev = undo_history.pop();
+            undoEvent(ev);
+        },
+        peek: function() {
+            return undo_history[undo_history.length-1];
+        },
+        clear: function() {
+            undo_history = [];
+        }
+    }
+
+})();
--- a/packages/node_modules/@node-red/editor-client/src/js/i18n.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/i18n.js
@@ -16,14 +16,10 @@

 RED.i18n = (function() {

-    var apiRootUrl;
-
    return {
-        init: function(options, done) {
-            apiRootUrl = options.apiRootUrl||"";
-            var preferredLanguage = localStorage.getItem("editor-language");
-            var opts = {
-                resGetPath: apiRootUrl+'locales/__ns__?lng=__lng__',
+        init: function(done) {
+            i18n.init({
+                resGetPath: 'locales/__ns__?lng=__lng__',
                dynamicLoad: false,
                load:'current',
                ns: {
@@ -31,40 +27,17 @@ RED.i18n = (function() {
                    defaultNs: "editor"
                },
                fallbackLng: ['en-US'],
-                useCookie: false,
-                returnObjectTrees: true
-            };
-            if (preferredLanguage) {
-                opts.lng = preferredLanguage;
-            }
-            i18n.init(opts,function() {
+                useCookie: false
+            },function() {
                done();
            });
            RED["_"] = function() {
-                var v = i18n.t.apply(null,arguments);
-                if (typeof v === 'string') {
-                    return v;
-                } else {
-                    return arguments[0];
-                }
+                return i18n.t.apply(null,arguments);
            }

        },
-        lang: function() {
-            // Gets the active message catalog language. This is based on what
-            // locale the editor is using and what languages are available.
-            //
-            var preferredLangs = i18n.functions.toLanguages(localStorage.getItem("editor-language")||i18n.detectLanguage());
-            var knownLangs = RED.settings.theme("languages")||["en-US"];
-            for (var i=0;i<preferredLangs.length;i++) {
-                if (knownLangs.indexOf(preferredLangs[i]) > -1) {
-                    return preferredLangs[i]
-                }
-            }
-            return 'end-US'
-        },
-        loadNodeCatalog: function(namespace,done) {
-            var languageList = i18n.functions.toLanguages(localStorage.getItem("editor-language")||i18n.detectLanguage());
+        loadCatalog: function(namespace,done) {
+            var languageList = i18n.functions.toLanguages(i18n.detectLanguage());
            var toLoad = languageList.length;
            languageList.forEach(function(lang) {
                $.ajax({
@@ -72,7 +45,7 @@ RED.i18n = (function() {
                        "Accept":"application/json"
                    },
                    cache: false,
-                    url: apiRootUrl+'nodes/'+namespace+'/messages?lng='+lang,
+                    url: 'locales/'+namespace+'?lng='+lang,
                    success: function(data) {
                        i18n.addResourceBundle(lang,namespace,data);
                        toLoad--;
@@ -86,7 +59,7 @@ RED.i18n = (function() {
        },

        loadNodeCatalogs: function(done) {
-            var languageList = i18n.functions.toLanguages(localStorage.getItem("editor-language")||i18n.detectLanguage());
+            var languageList = i18n.functions.toLanguages(i18n.detectLanguage());
            var toLoad = languageList.length;

            languageList.forEach(function(lang) {
@@ -95,7 +68,7 @@ RED.i18n = (function() {
                        "Accept":"application/json"
                    },
                    cache: false,
-                    url: apiRootUrl+'nodes/messages?lng='+lang,
+                    url: 'locales/nodes?lng='+lang,
                    success: function(data) {
                        var namespaces = Object.keys(data);
                        namespaces.forEach(function(ns) {
--- a/packages/node_modules/@node-red/editor-client/src/js/keymap.json
+++ b/packages/node_modules/@node-red/editor-client/src/js/keymap.json
@@ -1,14 +1,12 @@
 {
    "*": {
-        "alt-shift-p":"core:manage-palette",
+        "ctrl-shift-p":"core:manage-palette",
        "ctrl-f": "core:search",
-        "ctrl-shift-f": "core:list-flows",
        "ctrl-=": "core:zoom-in",
        "ctrl--": "core:zoom-out",
        "ctrl-0": "core:zoom-reset",
        "ctrl-enter": "core:confirm-edit-tray",
        "ctrl-escape": "core:cancel-edit-tray",
-        "ctrl-d": "core:deploy-flows",
        "ctrl-g i": "core:show-info-tab",
        "ctrl-g d": "core:show-debug-tab",
        "ctrl-g c": "core:show-config-tab",
@@ -16,24 +14,13 @@
        "ctrl-e": "core:show-export-dialog",
        "ctrl-i": "core:show-import-dialog",
        "ctrl-space": "core:toggle-sidebar",
-        "ctrl-p": "core:toggle-palette",
        "ctrl-,": "core:show-user-settings",
-        "ctrl-alt-l": "core:clear-debug-messages",
        "ctrl-alt-r": "core:show-remote-diff",
        "ctrl-alt-n": "core:new-project",
        "ctrl-alt-o": "core:open-project",
-        "ctrl-g v": "core:show-version-control-tab",
-        "ctrl-shift-l": "core:show-event-log",
-        "ctrl-shift-p":"core:show-action-list"
+        "ctrl-g v": "core:show-version-control-tab"
    },
-    "red-ui-sidebar-node-config": {
-        "backspace": "core:delete-config-selection",
-        "delete": "core:delete-config-selection",
-        "ctrl-a": "core:select-all-config-nodes",
-        "ctrl-z": "core:undo",
-        "ctrl-y": "core:redo"
-    },
-    "red-ui-workspace": {
+    "workspace": {
        "backspace": "core:delete-selection",
        "delete": "core:delete-selection",
        "enter": "core:edit-selected-node",
@@ -41,17 +28,8 @@
        "ctrl-x": "core:cut-selection-to-internal-clipboard",
        "ctrl-v": "core:paste-from-internal-clipboard",
        "ctrl-z": "core:undo",
-        "ctrl-y": "core:redo",
        "ctrl-a": "core:select-all-nodes",
        "shift-?": "core:show-help",
-        "w": "core:scroll-view-up",
-        "d": "core:scroll-view-right",
-        "s": "core:scroll-view-down",
-        "a": "core:scroll-view-left",
-        "shift-w": "core:step-view-up",
-        "shift-d": "core:step-view-right",
-        "shift-s": "core:step-view-down",
-        "shift-a": "core:step-view-left",
        "up": "core:move-selection-up",
        "right": "core:move-selection-right",
        "down": "core:move-selection-down",
@@ -61,10 +39,6 @@
        "shift-down": "core:step-selection-down",
        "shift-left": "core:step-selection-left",
        "ctrl-shift-j": "core:show-previous-tab",
-        "ctrl-shift-k": "core:show-next-tab",
-        "ctrl-shift-g": "core:group-selection",
-        "ctrl-shift-u": "core:ungroup-selection",
-        "ctrl-shift-c": "core:copy-group-style",
-        "ctrl-shift-v": "core:paste-group-style"
+        "ctrl-shift-k": "core:show-next-tab"
     }
 }
--- a/packages/node_modules/@node-red/editor-client/src/js/red.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/red.js
@@ -13,10 +13,9 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 **/
-var RED = (function() {
+(function() {

-    function appendNodeConfig(nodeConfig,done) {
-        done = done || function(){};
+    function appendNodeConfig(nodeConfig) {
        var m = /<!-- --- \[red-module:(\S+)\] --- -->/.exec(nodeConfig.trim());
        var moduleId;
        if (m) {
@@ -25,57 +24,17 @@ var RED = (function() {
            moduleId = "unknown";
        }
        try {
-            var hasDeferred = false;
-
-            var nodeConfigEls = $("<div>"+nodeConfig+"</div>");
-            var scripts = nodeConfigEls.find("script");
-            var scriptCount = scripts.length;
-            scripts.each(function(i,el) {
-                var srcUrl = $(el).attr('src');
-                if (srcUrl && !/^\s*(https?:|\/|\.)/.test(srcUrl)) {
-                    $(el).remove();
-                    var newScript = document.createElement("script");
-                    newScript.onload = function() {
-                        scriptCount--;
-                        if (scriptCount === 0) {
-                            $("#red-ui-editor-node-configs").append(nodeConfigEls);
-                            done()
-                        }
-                    }
-                    if ($(el).attr('type') === "module") {
-                        newScript.type = "module";
-                    }
-                    $("#red-ui-editor-node-configs").append(newScript);
-                    newScript.src = RED.settings.apiRootUrl+srcUrl;
-                    hasDeferred = true;
-                } else {
-                    if (/\/ace.js$/.test(srcUrl) || /\/ext-language_tools.js$/.test(srcUrl)) {
-                        // Block any attempts to load ace.js from a CDN - this will
-                        // break the version of ace included in the editor.
-                        // At the time of commit, the contrib-python nodes did this.
-                        // This is a crude fix until the python nodes are fixed.
-                        console.warn("Blocked attempt to load",srcUrl,"by",moduleId)
-                        $(el).remove();
-                    }
-                    scriptCount--;
-                }
-            })
-            if (!hasDeferred) {
-                $("#red-ui-editor-node-configs").append(nodeConfigEls);
-                done();
-            }
+            $("body").append(nodeConfig);
        } catch(err) {
            RED.notify(RED._("notification.errors.failedToAppendNode",{module:moduleId, error:err.toString()}),{
                type: "error",
                timeout: 10000
            });
            console.log("["+moduleId+"] "+err.toString());
-            done();
        }
    }

    function loadNodeList() {
-        loader.reportProgress(RED._("event.loadPalette"), 20)
        $.ajax({
            headers: {
                "Accept":"application/json"
@@ -84,7 +43,6 @@ var RED = (function() {
            url: 'nodes',
            success: function(data) {
                RED.nodes.setNodeList(data);
-                loader.reportProgress(RED._("event.loadNodeCatalogs"), 25)
                RED.i18n.loadNodeCatalogs(function() {
                    loadIconList(loadNodes);
                });
@@ -109,64 +67,49 @@ var RED = (function() {
    }

    function loadNodes() {
-        loader.reportProgress(RED._("event.loadNodes",{count:""}), 30)
-        var lang = localStorage.getItem("editor-language")||i18n.detectLanguage();
-
        $.ajax({
            headers: {
-                "Accept":"text/html",
-                "Accept-Language": lang
+                "Accept":"text/html"
            },
            cache: false,
            url: 'nodes',
            success: function(data) {
                var configs = data.trim().split(/(?=<!-- --- \[red-module:\S+\] --- -->)/);
-                var totalCount = configs.length;
+                configs.forEach(function(data) {
+                    appendNodeConfig(data);
+                });

-                var stepConfig = function() {
-                    loader.reportProgress(RED._("event.loadNodes",{count:(totalCount-configs.length)+"/"+totalCount}), 30 + ((totalCount-configs.length)/totalCount)*40 )
-
-                    if (configs.length === 0) {
-                        $("#red-ui-editor").i18n();
-                        $("#red-ui-palette > .red-ui-palette-spinner").hide();
-                        $(".red-ui-palette-scroll").removeClass("hide");
-                        $("#red-ui-palette-search").removeClass("hide");
-                        if (RED.settings.theme("projects.enabled",false)) {
-                            RED.projects.refresh(function(activeProject) {
-                                loadFlows(function() {
-                                    RED.sidebar.info.refresh()
-                                    if (!activeProject) {
-                                        // Projects enabled but no active project
-                                        RED.menu.setDisabled('menu-item-projects-open',true);
-                                        RED.menu.setDisabled('menu-item-projects-settings',true);
-                                        if (activeProject === false) {
-                                            // User previously decline the migration to projects.
-                                        } else { // null/undefined
-                                            RED.projects.showStartup();
-                                        }
-                                    }
-                                    completeLoad();
-                                });
-                            });
-                        } else {
-                            loadFlows(function() {
-                                // Projects disabled by the user
-                                RED.sidebar.info.refresh()
-                                completeLoad();
-                            });
-                        }
+                $("body").i18n();
+                $("#palette > .palette-spinner").hide();
+                $(".palette-scroll").removeClass("hide");
+                $("#palette-search").removeClass("hide");
+                loadFlows(function() {
+                    if (RED.settings.theme("projects.enabled",false)) {
+                        RED.projects.refresh(function(activeProject) {
+                            RED.sidebar.info.refresh()
+                            if (!activeProject) {
+                                // Projects enabled but no active project
+                                RED.menu.setDisabled('menu-item-projects-open',true);
+                                RED.menu.setDisabled('menu-item-projects-settings',true);
+                                if (activeProject === false) {
+                                    // User previously decline the migration to projects.
+                                } else { // null/undefined
+                                    RED.projects.showStartup();
+                                }
+                            }
+                            completeLoad();
+                        });
                    } else {
-                        var config = configs.shift();
-                        appendNodeConfig(config,stepConfig);
+                        // Projects disabled by the user
+                        RED.sidebar.info.refresh()
+                        completeLoad();
                    }
-                }
-                stepConfig();
+                });
            }
        });
    }

    function loadFlows(done) {
-        loader.reportProgress(RED._("event.loadFlows"),80 )
        $.ajax({
            headers: {
                "Accept":"application/json",
@@ -177,7 +120,6 @@ var RED = (function() {
                if (nodes) {
                    var currentHash = window.location.hash;
                    RED.nodes.version(nodes.rev);
-                    loader.reportProgress(RED._("event.importFlows"),90 )
                    RED.nodes.import(nodes.flows);
                    RED.nodes.dirty(false);
                    RED.view.redraw(true);
@@ -204,7 +146,6 @@ var RED = (function() {
                return;
            }
            if (notificationId === "project-update") {
-                loader.start("Loading project",0)
                RED.nodes.clear();
                RED.history.clear();
                RED.view.redraw(true);
@@ -220,7 +161,6 @@ var RED = (function() {
                            "revert": RED._("notification.project.revert", {project: msg.project}),
                            "merge-complete": RED._("notification.project.merge-complete")
                        }[msg.action];
-                        loader.end()
                        RED.notify("<p>"+message+"</p>");
                        RED.sidebar.info.refresh()
                    });
@@ -238,17 +178,8 @@ var RED = (function() {
                    id: notificationId
                }
                if (notificationId === "runtime-state") {
-                    if (msg.error === "safe-mode") {
-                        options.buttons = [
-                            {
-                                text: RED._("common.label.close"),
-                                click: function() {
-                                    persistentNotifications[notificationId].hideNotification();
-                                }
-                            }
-                        ]
-                    } else if (msg.error === "missing-types") {
-                        text+="<ul><li>"+msg.types.map(RED.utils.sanitize).join("</li><li>")+"</li></ul>";
+                    if (msg.error === "missing-types") {
+                        text+="<ul><li>"+msg.types.join("</li><li>")+"</li></ul>";
                        if (!!RED.projects.getActiveProject()) {
                            options.buttons = [
                                {
@@ -259,7 +190,7 @@ var RED = (function() {
                                    }
                                }
                            ]
-                            // } else if (RED.settings.theme('palette.editable') !== false) {
+                        // } else if (RED.settings.theme('palette.editable') !== false) {
                        } else {
                            options.buttons = [
                                {
@@ -276,7 +207,7 @@ var RED = (function() {
                            if (RED.user.hasPermission("projects.write")) {
                                options.buttons = [
                                    {
-                                        text: RED._("notification.project.setupCredentials"),
+                                        text: RED._("notification.label.setup-cred"),
                                        click: function() {
                                            persistentNotifications[notificationId].hideNotification();
                                            RED.projects.showCredentialsPrompt();
@@ -298,7 +229,7 @@ var RED = (function() {
                        if (RED.user.hasPermission("projects.write")) {
                            options.buttons = [
                                {
-                                    text: RED._("notification.project.setupProjectFiles"),
+                                    text: RED._("notification.label.setup-project"),
                                    click: function() {
                                        persistentNotifications[notificationId].hideNotification();
                                        RED.projects.showFilesPrompt();
@@ -310,10 +241,10 @@ var RED = (function() {
                        if (RED.user.hasPermission("projects.write")) {
                            options.buttons = [
                                {
-                                    text: RED._("notification.project.setupProjectFiles"),
+                                    text: RED._("notification.label.create-default-package"),
                                    click: function() {
                                        persistentNotifications[notificationId].hideNotification();
-                                        RED.projects.showFilesPrompt();
+                                        RED.projects.createDefaultPackageFile();
                                    }
                                }
                            ]
@@ -322,13 +253,13 @@ var RED = (function() {
                        if (RED.user.hasPermission("projects.write")) {
                            options.buttons = [
                                {
-                                    text: RED._("notification.project.no"),
+                                    text: RED._("notification.label.no-thanks"),
                                    click: function() {
                                        persistentNotifications[notificationId].hideNotification();
                                    }
                                },
                                {
-                                    text: RED._("notification.project.createDefault"),
+                                    text: RED._("notification.label.create-default-project"),
                                    click: function() {
                                        persistentNotifications[notificationId].hideNotification();
                                        RED.projects.createDefaultFileSet();
@@ -342,7 +273,7 @@ var RED = (function() {
                        if (RED.user.hasPermission("projects.write")) {
                            options.buttons = [
                                {
-                                    text: RED._("notification.project.mergeConflict"),
+                                    text: RED._("notification.label.show-merge-conflicts"),
                                    click: function() {
                                        persistentNotifications[notificationId].hideNotification();
                                        RED.sidebar.versionControl.showLocalChanges();
@@ -366,11 +297,12 @@ var RED = (function() {
            var parts = topic.split("/");
            var node = RED.nodes.node(parts[1]);
            if (node) {
-                if (msg.hasOwnProperty("text") && msg.text !== null && /^[a-zA-Z]/.test(msg.text)) {
-                    msg.text = node._(msg.text.toString(),{defaultValue:msg.text.toString()});
+                if (msg.hasOwnProperty("text")) {
+                    if (msg.text[0] !== ".") {
+                        msg.text = node._(msg.text.toString(),{defaultValue:msg.text.toString()});
+                    }
                }
                node.status = msg;
-                node.dirtyStatus = true;
                node.dirty = true;
                RED.view.redraw();
            }
@@ -385,7 +317,7 @@ var RED = (function() {
                    var id = m.id;
                    RED.nodes.addNodeSet(m);
                    addedTypes = addedTypes.concat(m.types);
-                    RED.i18n.loadNodeCatalog(id, function() {
+                    RED.i18n.loadCatalog(id, function() {
                        $.get('nodes/'+id, function(data) {
                            appendNodeConfig(data);
                        });
@@ -427,34 +359,27 @@ var RED = (function() {
                    typeList = "<ul><li>"+msg.types.join("</li><li>")+"</li></ul>";
                    RED.notify(RED._("palette.event.nodeDisabled", {count:msg.types.length})+typeList,"success");
                }
-            } else if (topic == "notification/node/upgraded") {
+            } else if (topic == "node/upgraded") {
                RED.notify(RED._("palette.event.nodeUpgraded", {module:msg.module,version:msg.version}),"success");
                RED.nodes.registry.setModulePendingUpdated(msg.module,msg.version);
            }
+            // Refresh flow library to ensure any examples are updated
+            RED.library.loadFlowLibrary();
        });
-        RED.comms.subscribe("event-log/#", function(topic,payload) {
-            var id = topic.substring(9);
-            RED.eventLog.log(id,payload);
-        });
-
-        $(".red-ui-header-toolbar").show();
-
-        setTimeout(function() {
-            loader.end();
-        },100);
    }

    function showAbout() {
        $.get('red/about', function(data) {
            var aboutHeader = '<div style="text-align:center;">'+
-            '<img width="50px" src="red/images/node-red-icon.svg" />'+
-            '</div>';
+                                '<img width="50px" src="red/images/node-red-icon.svg" />'+
+                              '</div>';

-            RED.sidebar.help.set(aboutHeader+RED.utils.renderMarkdown(data));
+            RED.sidebar.info.set(aboutHeader+marked(data));
+            RED.sidebar.info.show();
        });
    }

-    function buildMainMenu() {
+    function loadEditor() {
        var menuOptions = [];
        if (RED.settings.theme("projects.enabled",false)) {
            menuOptions.push({id:"menu-item-projects-menu",label:RED._("menu.label.projects"),options:[
@@ -463,20 +388,32 @@ var RED = (function() {
                {id:"menu-item-projects-settings",label:RED._("menu.label.projects-settings"),disabled:false,onselect:"core:show-project-settings"}
            ]});
        }
+
+
        menuOptions.push({id:"menu-item-view-menu",label:RED._("menu.label.view.view"),options:[
-            {id:"menu-item-palette",label:RED._("menu.label.palette.show"),toggle:true,onselect:"core:toggle-palette", selected: true},
+            // {id:"menu-item-view-show-grid",setting:"view-show-grid",label:RED._("menu.label.view.showGrid"),toggle:true,onselect:"core:toggle-show-grid"},
+            // {id:"menu-item-view-snap-grid",setting:"view-snap-grid",label:RED._("menu.label.view.snapGrid"),toggle:true,onselect:"core:toggle-snap-grid"},
+            // {id:"menu-item-status",setting:"node-show-status",label:RED._("menu.label.displayStatus"),toggle:true,onselect:"core:toggle-status", selected: true},
+            //null,
+            // {id:"menu-item-bidi",label:RED._("menu.label.view.textDir"),options:[
+            //     {id:"menu-item-bidi-default",toggle:"text-direction",label:RED._("menu.label.view.defaultDir"),selected: true, onselect:function(s) { if(s){RED.text.bidi.setTextDirection("")}}},
+            //     {id:"menu-item-bidi-ltr",toggle:"text-direction",label:RED._("menu.label.view.ltr"), onselect:function(s) { if(s){RED.text.bidi.setTextDirection("ltr")}}},
+            //     {id:"menu-item-bidi-rtl",toggle:"text-direction",label:RED._("menu.label.view.rtl"), onselect:function(s) { if(s){RED.text.bidi.setTextDirection("rtl")}}},
+            //     {id:"menu-item-bidi-auto",toggle:"text-direction",label:RED._("menu.label.view.auto"), onselect:function(s) { if(s){RED.text.bidi.setTextDirection("auto")}}}
+            // ]},
+            // null,
            {id:"menu-item-sidebar",label:RED._("menu.label.sidebar.show"),toggle:true,onselect:"core:toggle-sidebar", selected: true},
-            {id:"menu-item-event-log",label:RED._("eventLog.title"),onselect:"core:show-event-log"},
-            {id:"menu-item-action-list",label:RED._("keyboard.actionList"),onselect:"core:show-action-list"},
            null
        ]});
        menuOptions.push(null);
-        if (RED.settings.theme("menu.menu-item-import-library", true)) {
-            menuOptions.push({id: "menu-item-import", label: RED._("menu.label.import"), onselect: "core:show-import-dialog"});
-        }
-        if (RED.settings.theme("menu.menu-item-export-library", true)) {
-            menuOptions.push({id: "menu-item-export", label: RED._("menu.label.export"), onselect: "core:show-export-dialog"});
-        }
+        menuOptions.push({id:"menu-item-import",label:RED._("menu.label.import"),options:[
+            {id:"menu-item-import-clipboard",label:RED._("menu.label.clipboard"),onselect:"core:show-import-dialog"},
+            {id:"menu-item-import-library",label:RED._("menu.label.library"),options:[]}
+        ]});
+        menuOptions.push({id:"menu-item-export",label:RED._("menu.label.export"),options:[
+            {id:"menu-item-export-clipboard",label:RED._("menu.label.clipboard"),onselect:"core:show-export-dialog"},
+            {id:"menu-item-export-library",label:RED._("menu.label.library"),disabled:true,onselect:"core:library-export"}
+        ]});
        menuOptions.push(null);
        menuOptions.push({id:"menu-item-search",label:RED._("menu.label.search"),onselect:"core:search"});
        menuOptions.push(null);
@@ -490,14 +427,6 @@ var RED = (function() {
            {id:"menu-item-subflow-create",label:RED._("menu.label.createSubflow"),onselect:"core:create-subflow"},
            {id:"menu-item-subflow-convert",label:RED._("menu.label.selectionToSubflow"),disabled:true,onselect:"core:convert-to-subflow"},
        ]});
-        menuOptions.push({id:"menu-item-group",label:RED._("menu.label.groups"), options: [
-            {id:"menu-item-group-group",label:RED._("menu.label.groupSelection"),disabled:true,onselect:"core:group-selection"},
-            {id:"menu-item-group-ungroup",label:RED._("menu.label.ungroupSelection"),disabled:true,onselect:"core:ungroup-selection"},
-            null,
-            {id:"menu-item-group-merge",label:RED._("menu.label.groupMergeSelection"),disabled:true,onselect:"core:merge-selection-to-group"},
-            {id:"menu-item-group-remove",label:RED._("menu.label.groupRemoveSelection"),disabled:true,onselect:"core:remove-selection-from-group"}
-        ]});
-
        menuOptions.push(null);
        if (RED.settings.theme('palette.editable') !== false) {
            menuOptions.push({id:"menu-item-edit-palette",label:RED._("menu.label.editPalette"),onselect:"core:manage-palette"});
@@ -507,9 +436,7 @@ var RED = (function() {
        menuOptions.push({id:"menu-item-user-settings",label:RED._("menu.label.settings"),onselect:"core:show-user-settings"});
        menuOptions.push(null);

-        if (RED.settings.theme("menu.menu-item-keyboard-shortcuts", true)) {
-            menuOptions.push({id: "menu-item-keyboard-shortcuts", label: RED._("menu.label.keyboardShortcuts"), onselect: "core:show-help"});
-        }
+        menuOptions.push({id:"menu-item-keyboard-shortcuts",label:RED._("menu.label.keyboardShortcuts"),onselect:"core:show-help"});
        menuOptions.push({id:"menu-item-help",
            label: RED.settings.theme("menu.menu-item-help.label",RED._("menu.label.help")),
            href: RED.settings.theme("menu.menu-item-help.url","http://nodered.org/docs")
@@ -517,23 +444,12 @@ var RED = (function() {
        menuOptions.push({id:"menu-item-node-red-version", label:"v"+RED.settings.version, onselect: "core:show-about" });


-        $('<li><a id="red-ui-header-button-sidemenu" class="button" href="#"><i class="fa fa-bars"></i></a></li>').appendTo(".red-ui-header-toolbar")
-        RED.menu.init({id:"red-ui-header-button-sidemenu",options: menuOptions});
-
-    }
-
-    function loadEditor() {
-        RED.workspaces.init();
-        RED.statusBar.init();
        RED.view.init();
        RED.userSettings.init();
        RED.user.init();
-        RED.notifications.init();
        RED.library.init();
        RED.keyboard.init();
        RED.palette.init();
-        RED.eventLog.init();
-
        if (RED.settings.theme('palette.editable') !== false) {
            RED.palette.editor.init();
        } else {
@@ -549,113 +465,37 @@ var RED = (function() {
        }

        RED.subflow.init();
-        RED.group.init();
+        RED.workspaces.init();
        RED.clipboard.init();
        RED.search.init();
-        RED.actionList.init();
        RED.editor.init();
        RED.diff.init();

+        RED.menu.init({id:"btn-sidemenu",options: menuOptions});

        RED.deploy.init(RED.settings.theme("deployButton",null));
+        RED.notifications.init();

-        buildMainMenu();
-
+        RED.actions.add("core:show-about", showAbout);
        RED.nodes.init();
        RED.comms.connect();

-        $("#red-ui-main-container").show();
-
-
-        RED.actions.add("core:show-about", showAbout);
+        $("#main-container").show();
+        $(".header-toolbar").show();

        loadNodeList();
    }

+    $(function() {

-    function buildEditor(options) {
-        var header = $('<div id="red-ui-header"></div>').appendTo(options.target);
-        var logo = $('<span class="red-ui-header-logo"></span>').appendTo(header);
-        $('<ul class="red-ui-header-toolbar hide"></ul>').appendTo(header);
-        $('<div id="red-ui-header-shade" class="hide"></div>').appendTo(header);
-        $('<div id="red-ui-main-container" class="red-ui-sidebar-closed hide">'+
-            '<div id="red-ui-workspace"></div>'+
-            '<div id="red-ui-editor-stack"></div>'+
-            '<div id="red-ui-palette"></div>'+
-            '<div id="red-ui-sidebar"></div>'+
-            '<div id="red-ui-sidebar-separator"></div>'+
-        '</div>').appendTo(options.target);
-        $('<div id="red-ui-editor-node-configs"></div>').appendTo(options.target);
-        $('<div id="red-ui-full-shade" class="hide"></div>').appendTo(options.target);
-
-        loader.init().appendTo("#red-ui-main-container");
-        loader.start("...",0);
-
-        $.getJSON(options.apiRootUrl+"theme", function(theme) {
-            if (theme.header) {
-                if (theme.header.url) {
-                    logo = $("<a>",{href:theme.header.url}).appendTo(logo);
-                }
-                if (theme.header.image) {
-                    $('<img>',{src:theme.header.image}).appendTo(logo);
-                }
-                if (theme.header.title) {
-                    $('<span>').html(theme.header.title).appendTo(logo);
-                }
-            }
-        });
-    }
-
-    var initialised = false;
-
-    function init(options) {
-        if (initialised) {
-            throw new Error("RED already initialised");
+        if ((window.location.hostname !== "localhost") && (window.location.hostname !== "127.0.0.1")) {
+            document.title = document.title+" : "+window.location.hostname;
        }
-        initialised = true;
+
        ace.require("ace/ext/language_tools");
-        options = options || {};
-        options.apiRootUrl = options.apiRootUrl || "";
-        if (options.apiRootUrl && !/\/$/.test(options.apiRootUrl)) {
-            options.apiRootUrl = options.apiRootUrl+"/";
-        }
-        options.target = $("#red-ui-editor");
-        options.target.addClass("red-ui-editor");

-        buildEditor(options);
-
-        RED.i18n.init(options, function() {
-            RED.settings.init(options, loadEditor);
+        RED.i18n.init(function() {
+            RED.settings.init(loadEditor);
        })
-    }
-
-    var loader = {
-        init: function() {
-            var wrapper = $('<div id="red-ui-loading-progress"></div>').hide();
-            var container = $('<div>').appendTo(wrapper);
-            var label = $('<div>',{class:"red-ui-loading-bar-label"}).appendTo(container);
-            var bar = $('<div>',{class:"red-ui-loading-bar"}).appendTo(container);
-            var fill =$('<span>').appendTo(bar);
-            return wrapper;
-        },
-        start: function(text, prcnt) {
-            if (text) {
-                loader.reportProgress(text,prcnt)
-            }
-            $("#red-ui-loading-progress").show();
-        },
-        reportProgress: function(text, prcnt) {
-            $(".red-ui-loading-bar-label").text(text);
-            $(".red-ui-loading-bar span").width(prcnt+"%")
-        },
-        end: function() {
-            $("#red-ui-loading-progress").hide();
-            loader.reportProgress("",0);
-        }
-    }
-
-    return {
-        init: init,
-        loader: loader
-    }
+    });
 })();
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
--- a/packages/node_modules/@node-red/editor-client/index.js
+++ b/packages/node_modules/@node-red/editor-client/index.js
@@ -13,5 +13,4 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 **/
-
-module.exports = false
+var RED = {};
--- a/packages/node_modules/@node-red/editor-client/src/js/settings.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/settings.js
@@ -37,7 +37,7 @@ RED.settings = (function () {
        if (key === "auth-tokens") {
            localStorage.setItem(key, JSON.stringify(value));
        } else {
-            RED.utils.setMessageProperty(userSettings,key,value);
+            userSettings[key] = value;
            saveUserSettings();
        }
    };
@@ -46,26 +46,16 @@ RED.settings = (function () {
     * If the key is not set in the localStorage it returns <i>undefined</i>
     * Else return the JSON parsed value
     * @param key
-     * @param defaultIfUndefined
     * @returns {*}
     */
-    var get = function (key,defaultIfUndefined) {
+    var get = function (key) {
        if (!hasLocalStorage()) {
            return undefined;
        }
        if (key === "auth-tokens") {
            return JSON.parse(localStorage.getItem(key));
        } else {
-            var v;
-            try {
-                v = RED.utils.getMessageProperty(userSettings,key);
-                if (v === undefined) {
-                    v = defaultIfUndefined;
-                }
-            } catch(err) {
-                v = defaultIfUndefined;
-            }
-            return v;
+            return userSettings[key];
        }
    };

@@ -99,22 +89,18 @@ RED.settings = (function () {
        userSettings = data;
    }

-    var init = function (options, done) {
+    var init = function (done) {
        var accessTokenMatch = /[?&]access_token=(.*?)(?:$|&)/.exec(window.location.search);
        if (accessTokenMatch) {
            var accessToken = accessTokenMatch[1];
            RED.settings.set("auth-tokens",{access_token: accessToken});
            window.location.search = "";
        }
-        RED.settings.apiRootUrl = options.apiRootUrl;

        $.ajaxSetup({
            beforeSend: function(jqXHR,settings) {
                // Only attach auth header for requests to relative paths
                if (!/^\s*(https?:|\/|\.)/.test(settings.url)) {
-                    if (options.apiRootUrl) {
-                        settings.url = options.apiRootUrl+settings.url;
-                    }
                    var auth_tokens = RED.settings.get("auth-tokens");
                    if (auth_tokens) {
                        jqXHR.setRequestHeader("Authorization","Bearer "+auth_tokens.access_token);
@@ -141,12 +127,6 @@ RED.settings = (function () {
                    RED.settings.remove("auth-tokens");
                }
                console.log("Node-RED: " + data.version);
-                console.groupCollapsed("Versions");
-                console.log("jQuery",$().jquery)
-                console.log("jQuery UI",$.ui.version);
-                console.log("ACE",ace.version);
-                console.log("D3",d3.version);
-                console.groupEnd();
                loadUserSettings(done);
            },
            error: function(jqXHR,textStatus,errorThrown) {
--- a/packages/node_modules/@node-red/editor-client/src/js/text/bidi.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/text/bidi.js
@@ -97,14 +97,14 @@ RED.text.bidi = (function() {
    }

    /**
-     * Enforces the text direction for all the spans with style red-ui-text-bidi-aware under
+     * Enforces the text direction for all the spans with style bidiAware under
     * workspace or sidebar div
     */
    function enforceTextDirectionOnPage() {
-        $("#red-ui-workspace").find('span.red-ui-text-bidi-aware').each(function() {
+        $("#workspace").find('span.bidiAware').each(function() {
            $(this).attr("dir", resolveBaseTextDir($(this).html()));
        });
-        $("#red-ui-sidebar").find('span.red-ui-text-bidi-aware').each(function() {
+        $("#sidebar").find('span.bidiAware').each(function() {
            $(this).attr("dir", resolveBaseTextDir($(this).text()));
        });
    }
--- a/packages/node_modules/@node-red/editor-client/src/js/text/format.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/text/format.js
@@ -1242,7 +1242,7 @@ RED.text.format = (function() {
            element.dispatchEvent(event);
            return;
        }
-
+        
        var range = selection.getRangeAt(0);
        var tempRange = range.cloneRange(), startNode, startOffset;
        startNode = range.startContainer;
@@ -1304,7 +1304,7 @@ RED.text.format = (function() {
    }

    return {
-        /*!
+        /**
        * Returns the HTML representation of a given structured text
        * @param text - the structured text
        * @param type - could be one of filepath, url, email
@@ -1315,7 +1315,7 @@ RED.text.format = (function() {
        getHtml: function (text, type, args, isRtl, locale) {
            return getHandler(type).format(text, args, isRtl, true, locale);
        },
-        /*!
+        /**
        * Handle Structured text correct display for a given HTML element.
        * @param element - the element  : should be of type div contenteditable=true
        * @param type - could be one of filepath, url, email
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/actions.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/actions.js
@@ -12,9 +12,9 @@ RED.actions = (function() {
    function getAction(name) {
        return actions[name];
    }
-    function invokeAction(name,args) {
+    function invokeAction(name) {
        if (actions.hasOwnProperty(name)) {
-            actions[name](args);
+            actions[name]();
        }
    }
    function listActions() {
--- a/editor/js/ui/clipboard.js
+++ b/editor/js/ui/clipboard.js
@@ -0,0 +1,379 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+
+RED.clipboard = (function() {
+
+    var dialog;
+    var dialogContainer;
+    var exportNodesDialog;
+    var importNodesDialog;
+    var disabled = false;
+
+    function setupDialogs() {
+        dialog = $('<div id="clipboard-dialog" class="hide node-red-dialog"><form class="dialog-form form-horizontal"></form></div>')
+            .appendTo("body")
+            .dialog({
+                modal: true,
+                autoOpen: false,
+                width: 500,
+                resizable: false,
+                buttons: [
+                    {
+                        id: "clipboard-dialog-cancel",
+                        text: RED._("common.label.cancel"),
+                        click: function() {
+                            $( this ).dialog( "close" );
+                        }
+                    },
+                    {
+                        id: "clipboard-dialog-close",
+                        class: "primary",
+                        text: RED._("common.label.close"),
+                        click: function() {
+                            $( this ).dialog( "close" );
+                        }
+                    },
+                    {
+                        id: "clipboard-dialog-copy",
+                        class: "primary",
+                        text: RED._("clipboard.export.copy"),
+                        click: function() {
+                            $("#clipboard-export").select();
+                            document.execCommand("copy");
+                            document.getSelection().removeAllRanges();
+                            RED.notify(RED._("clipboard.nodesExported"));
+                            $( this ).dialog( "close" );
+                        }
+                    },
+                    {
+                        id: "clipboard-dialog-ok",
+                        class: "primary",
+                        text: RED._("common.label.import"),
+                        click: function() {
+                            RED.view.importNodes($("#clipboard-import").val(),$("#import-tab > a.selected").attr('id') === 'import-tab-new');
+                            $( this ).dialog( "close" );
+                        }
+                    }
+                ],
+                open: function(e) {
+                    $(this).parent().find(".ui-dialog-titlebar-close").hide();
+                },
+                close: function(e) {
+                }
+            });
+
+        dialogContainer = dialog.children(".dialog-form");
+
+        exportNodesDialog =
+            '<div class="form-row">'+
+                '<label style="width:auto;margin-right: 10px;" data-i18n="clipboard.export.copy"></label>'+
+                '<span id="export-range-group" class="button-group">'+
+                    '<a id="export-range-selected" class="editor-button toggle" href="#" data-i18n="clipboard.export.selected"></a>'+
+                    '<a id="export-range-flow" class="editor-button toggle" href="#" data-i18n="clipboard.export.current"></a>'+
+                    '<a id="export-range-full" class="editor-button toggle" href="#" data-i18n="clipboard.export.all"></a>'+
+                '</span>'+
+                '</div>'+
+            '<div class="form-row">'+
+                '<textarea readonly style="resize: none; width: 100%; border-radius: 4px;font-family: monospace; font-size: 12px; background:#f3f3f3; padding-left: 0.5em; box-sizing:border-box;" id="clipboard-export" rows="5"></textarea>'+
+            '</div>'+
+            '<div class="form-row" style="text-align: right;">'+
+                '<span id="export-format-group" class="button-group">'+
+                    '<a id="export-format-mini" class="editor-button editor-button-small toggle" href="#" data-i18n="clipboard.export.compact"></a>'+
+                    '<a id="export-format-full" class="editor-button editor-button-small toggle" href="#" data-i18n="clipboard.export.formatted"></a>'+
+                '</span>'+
+            '</div>';
+
+        importNodesDialog = '<div class="form-row">'+
+            '<textarea style="resize: none; width: 100%; border-radius: 0px;font-family: monospace; font-size: 12px; background:#eee; padding-left: 0.5em; box-sizing:border-box;" id="clipboard-import" rows="5" placeholder="'+
+            RED._("clipboard.pasteNodes")+
+            '"></textarea>'+
+            '</div>'+
+            '<div class="form-row">'+
+            '<label style="width:auto;margin-right: 10px;" data-i18n="clipboard.import.import"></label>'+
+            '<span id="import-tab" class="button-group">'+
+                '<a id="import-tab-current" class="editor-button toggle selected" href="#" data-i18n="clipboard.export.current"></a>'+
+                '<a id="import-tab-new" class="editor-button toggle" href="#" data-i18n="clipboard.import.newFlow"></a>'+
+            '</span>'+
+            '</div>';
+    }
+
+    function validateImport() {
+        var importInput = $("#clipboard-import");
+        var v = importInput.val();
+        v = v.substring(v.indexOf('['),v.lastIndexOf(']')+1);
+        try {
+            JSON.parse(v);
+            importInput.removeClass("input-error");
+            importInput.val(v);
+            $("#clipboard-dialog-ok").button("enable");
+        } catch(err) {
+            if (v !== "") {
+                importInput.addClass("input-error");
+            }
+            $("#clipboard-dialog-ok").button("disable");
+        }
+    }
+
+    function importNodes() {
+        if (disabled) {
+            return;
+        }
+        dialogContainer.empty();
+        dialogContainer.append($(importNodesDialog));
+        dialogContainer.i18n();
+
+        $("#clipboard-dialog-ok").show();
+        $("#clipboard-dialog-cancel").show();
+        $("#clipboard-dialog-close").hide();
+        $("#clipboard-dialog-copy").hide();
+        $("#clipboard-dialog-ok").button("disable");
+        $("#clipboard-import").keyup(validateImport);
+        $("#clipboard-import").on('paste',function() { setTimeout(validateImport,10)});
+
+        $("#import-tab > a").click(function(evt) {
+            evt.preventDefault();
+            if ($(this).hasClass('disabled') || $(this).hasClass('selected')) {
+                return;
+            }
+            $(this).parent().children().removeClass('selected');
+            $(this).addClass('selected');
+        });
+
+        dialog.dialog("option","title",RED._("clipboard.importNodes")).dialog("open");
+    }
+
+    function exportNodes() {
+        if (disabled) {
+            return;
+        }
+
+        dialogContainer.empty();
+        dialogContainer.append($(exportNodesDialog));
+        dialogContainer.i18n();
+        var format = RED.settings.flowFilePretty ? "export-format-full" : "export-format-mini";
+
+        $("#export-format-group > a").click(function(evt) {
+            evt.preventDefault();
+            if ($(this).hasClass('disabled') || $(this).hasClass('selected')) {
+                $("#clipboard-export").focus();
+                return;
+            }
+            $(this).parent().children().removeClass('selected');
+            $(this).addClass('selected');
+
+            var flow = $("#clipboard-export").val();
+            if (flow.length > 0) {
+                var nodes = JSON.parse(flow);
+
+                format = $(this).attr('id');
+                if (format === 'export-format-full') {
+                    flow = JSON.stringify(nodes,null,4);
+                } else {
+                    flow = JSON.stringify(nodes);
+                }
+                $("#clipboard-export").val(flow);
+                $("#clipboard-export").focus();
+            }
+        });
+
+        $("#export-range-group > a").click(function(evt) {
+            evt.preventDefault();
+            if ($(this).hasClass('disabled') || $(this).hasClass('selected')) {
+                $("#clipboard-export").focus();
+                return;
+            }
+            $(this).parent().children().removeClass('selected');
+            $(this).addClass('selected');
+            var type = $(this).attr('id');
+            var flow = "";
+            var nodes = null;
+            if (type === 'export-range-selected') {
+                var selection = RED.view.selection();
+                // Don't include the subflow meta-port nodes in the exported selection
+                nodes = RED.nodes.createExportableNodeSet(selection.nodes.filter(function(n) { return n.type !== 'subflow'}));
+            } else if (type === 'export-range-flow') {
+                var activeWorkspace = RED.workspaces.active();
+                nodes = RED.nodes.filterNodes({z:activeWorkspace});
+                var parentNode = RED.nodes.workspace(activeWorkspace)||RED.nodes.subflow(activeWorkspace);
+                nodes.unshift(parentNode);
+                nodes = RED.nodes.createExportableNodeSet(nodes);
+            } else if (type === 'export-range-full') {
+                nodes = RED.nodes.createCompleteNodeSet(false);
+            }
+            if (nodes !== null) {
+                if (format === "export-format-full") {
+                    flow = JSON.stringify(nodes,null,4);
+                } else {
+                    flow = JSON.stringify(nodes);
+                }
+            }
+            if (flow.length > 0) {
+                $("#export-copy").removeClass('disabled');
+            } else {
+                $("#export-copy").addClass('disabled');
+            }
+            $("#clipboard-export").val(flow);
+            $("#clipboard-export").focus();
+        })
+
+        $("#clipboard-dialog-ok").hide();
+        $("#clipboard-dialog-cancel").hide();
+        $("#clipboard-dialog-copy").hide();
+        $("#clipboard-dialog-close").hide();
+        var selection = RED.view.selection();
+        if (selection.nodes) {
+            $("#export-range-selected").click();
+        } else {
+            $("#export-range-selected").addClass('disabled').removeClass('selected');
+            $("#export-range-flow").click();
+        }
+        if (format === "export-format-full") {
+            $("#export-format-full").click();
+        } else {
+            $("#export-format-mini").click();
+        }
+        $("#clipboard-export")
+            .focus(function() {
+                var textarea = $(this);
+                textarea.select();
+                textarea.mouseup(function() {
+                    textarea.unbind("mouseup");
+                    return false;
+                })
+            });
+        dialog.dialog("option","title",RED._("clipboard.exportNodes")).dialog( "open" );
+
+        $("#clipboard-export").focus();
+        if (!document.queryCommandSupported("copy")) {
+            $("#clipboard-dialog-cancel").hide();
+            $("#clipboard-dialog-close").show();
+        } else {
+            $("#clipboard-dialog-cancel").show();
+            $("#clipboard-dialog-copy").show();
+        }
+    }
+
+    function hideDropTarget() {
+        $("#dropTarget").hide();
+        RED.keyboard.remove("escape");
+    }
+    function copyText(value,element,msg) {
+        var truncated = false;
+        if (typeof value !== "string" ) {
+            value = JSON.stringify(value, function(key,value) {
+                if (value !== null && typeof value === 'object') {
+                    if (value.__enc__) {
+                        if (value.hasOwnProperty('data') && value.hasOwnProperty('length')) {
+                            truncated = value.data.length !== value.length;
+                            return value.data;
+                        }
+                        if (value.type === 'function' || value.type === 'internal') {
+                            return undefined
+                        }
+                        if (value.type === 'number') {
+                            // Handle NaN and Infinity - they are not permitted
+                            // in JSON. We can either substitute with a String
+                            // representation or null
+                            return null;
+                        }
+                    }
+                }
+                return value;
+            });
+        }
+        if (truncated) {
+            msg += "_truncated";
+        }
+        $("#clipboard-hidden").val(value).select();
+        var result =  document.execCommand("copy");
+        if (result && element) {
+            var popover = RED.popover.create({
+                target: element,
+                direction: 'left',
+                size: 'small',
+                content: RED._(msg)
+            });
+            setTimeout(function() {
+                popover.close();
+            },1000);
+            popover.open();
+        }
+        return result;
+    }
+    return {
+        init: function() {
+            setupDialogs();
+
+            $('<input type="text" id="clipboard-hidden">').appendTo("body");
+
+            RED.actions.add("core:show-export-dialog",exportNodes);
+            RED.actions.add("core:show-import-dialog",importNodes);
+
+
+            RED.events.on("editor:open",function() { disabled = true; });
+            RED.events.on("editor:close",function() { disabled = false; });
+            RED.events.on("search:open",function() { disabled = true; });
+            RED.events.on("search:close",function() { disabled = false; });
+            RED.events.on("type-search:open",function() { disabled = true; });
+            RED.events.on("type-search:close",function() { disabled = false; });
+
+
+            $('#chart').on("dragenter",function(event) {
+                if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1 ||
+                     $.inArray("Files",event.originalEvent.dataTransfer.types) != -1) {
+                    $("#dropTarget").css({display:'table'});
+                    RED.keyboard.add("*", "escape" ,hideDropTarget);
+                }
+            });
+
+            $('#dropTarget').on("dragover",function(event) {
+                if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1 ||
+                     $.inArray("Files",event.originalEvent.dataTransfer.types) != -1) {
+                    event.preventDefault();
+                }
+            })
+            .on("dragleave",function(event) {
+                hideDropTarget();
+            })
+            .on("drop",function(event) {
+                if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1) {
+                    var data = event.originalEvent.dataTransfer.getData("text/plain");
+                    data = data.substring(data.indexOf('['),data.lastIndexOf(']')+1);
+                    RED.view.importNodes(data);
+                } else if ($.inArray("Files",event.originalEvent.dataTransfer.types) != -1) {
+                    var files = event.originalEvent.dataTransfer.files;
+                    if (files.length === 1) {
+                        var file = files[0];
+                        var reader = new FileReader();
+                        reader.onload = (function(theFile) {
+                            return function(e) {
+                                RED.view.importNodes(e.target.result);
+                            };
+                        })(file);
+                        reader.readAsText(file);
+                    }
+                }
+                hideDropTarget();
+                event.preventDefault();
+            });
+
+        },
+        import: importNodes,
+        export: exportNodes,
+        copyText: copyText
+    }
+})();
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/checkboxSet.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/checkboxSet.js
@@ -38,7 +38,7 @@
                this.options[0].show();
            }

-            this.element.on("change", function() {
+            this.element.change(function() {
                if (this.checked) {
                    that.options[0].hide();
                    that.options[1].show();
@@ -53,7 +53,7 @@
                    child.checkboxSet('state',isChecked,false,true);
                })
            })
-            this.uiElement.on("click", function(e) {
+            this.uiElement.click(function(e) {
                e.stopPropagation();
                // state returns null for a partial state. Clicking on that should
                // result in false.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dave Conway-Jones	376db60acc	fix error messages for readonly	2018-08-30 09:32:50 +01:00
Dave Conway-Jones	ffa65afbb2	Catch readonly write errors more cleanly Fail more cleanly when run from a readonly files system without setting readOnly true.	2018-08-26 10:49:53 +01:00
				`@@ -1 +0,0 @@`
				`/packages/node_modules/** linguist-generated=false`