Redo Delete unused configs button for new dev layout

Delay node - add msg.flush option

.gitattributes

@@ -0,0 +1 @@
+/packages/node_modules/** linguist-generated=false

.gitignore

@@ -17,3 +17,7 @@ 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

.npmignore

@@ -1,7 +0,0 @@
-.settings
-.jshintignore
-.jshintrc
-.project
-.tern-project
-.travis.yml
-.git

.travis.yml

@@ -8,5 +8,3 @@ matrix:
       before_script:
         - npm install -g istanbul coveralls
     - node_js: "8"
-    - node_js: "6"
-    - node_js: "4"

CHANGELOG.md

@@ -1,3 +1,52 @@
+#### 0.19.4: Maintenance Release
+
+ - Fix race condition in non-cache lfs context Fixes #1888
+ - LocalFileSystem Context: Remove extra flush code
+ - Prevent race condition in caching mode of lfs context (#1889)
+ - Allow context store name to be provided in the key
+ - Switch node: only use promises when absolutely necessary
+ - Fix dbl-click handling on webkit-based browsers
+ - Ensure context.flow/global cannot be deleted or enumerated
+ - Handle context.get with multiple levels of unknown key Fixes #1883
+ - Fix global.get("foo.bar") for functionGlobalContext set values
+ - Fix node color bug (#1877)
+ - Merge pull request #1857 from cclauss/patch-1
+ - Define raw_input() in Python 3 & fix time.sleep()
+
+#### 0.19.3: Maintenance Release
+
+ - Split node - fix complete to send msg for k/v object
+ - Remove unused Join node merged object key typed input
+ - Set the JavaScript editor to full-screen
+ - Filter global modules installed locally
+ - Add svg to permitted icon extension list
+ - Debug node - indicate status all the time if selected to do so
+ - pi nodes - increase test coverage slightly
+ - TCP-request node - only write payload
+ - JSON schema: perform validation when obj -> obj or str -> str
+ - JSON schema: add draft-06 support (via $schema keyword)
+ - Mqtt proxy configuration for websocket connection, #1651.
+ - Allows MQTT Shared Subscriptions for MQTT-In core node
+ - Fix use of HTML tag or CSS class specification as icon of typedInput
+
+#### 0.19.2: Maintenance Release
+
+ - Ensure node default colour is used if palette.theme has no match
+ - fix lost messages / properties in TCPRequest Node; closes #1863 (#1864)
+ - Fix typo in template.html
+ - Improve error reporting from context plugin loading
+ - Prevent no-op edit of node marking as changed due to icon
+ - Change node must handle empty rule set
+
+#### 0.19.1: Maintenance Release
+
+ - Pull in latest twitter node
+ - Handle windows paths for context storage
+ - Handle persisting objects with circular refs in context
+ - Ensure js editor can expand to fill available space
+ - Add example localfilesystem contextStorage to settings
+ - Fix template node handling of nested context tags
+
 #### 0.19: Milestone Release
 
 Editor
@@ -59,6 +108,7 @@ Runtime
  - Handle loading empty nodesDir
  - Add 'private' property to userDir generated package.json
  - Add RED.require to allow nodes to access other modules
+ - Ensure add/remove modules are run sequentially
 
 #### 0.18.7: Maintenance Release
 

Gruntfile.js

@@ -42,7 +42,7 @@ module.exports = function(grunt) {
                 reporter: 'spec'
             },
             all: { src: ['test/**/*_spec.js'] },
-            core: { src: ["test/_spec.js","test/red/**/*_spec.js"]},
+            core: { src: ["test/_spec.js","test/unit/**/*_spec.js"]},
             nodes: { src: ["test/nodes/**/*_spec.js"]}
         },
         webdriver: {
@@ -59,8 +59,8 @@ module.exports = function(grunt) {
                 reportFormats: ['lcov','html'],
                 print: 'both'
             },
-            all: { src: ["test/_spec.js","test/red/**/*_spec.js","test/nodes/**/*_spec.js"] },
-            core: { src: ["test/_spec.js","test/red/**/*_spec.js"]},
+            all: { src: ["test/unit/_spec.js","test/unit/**/*_spec.js","test/nodes/**/*_spec.js"] },
+            core: { src: ["test/unit/_spec.js","test/unit/**/*_spec.js"]},
             nodes: { src: ["test/nodes/**/*_spec.js"]}
         },
         jshint: {
@@ -80,16 +80,14 @@ module.exports = function(grunt) {
             all: [
                 'Gruntfile.js',
                 'red.js',
-                'red/**/*.js',
-                'nodes/core/*/*.js',
-                'editor/js/**/*.js'
+                'packages/**/*.js'
             ],
             core: {
                 files: {
                     src: [
                         'Gruntfile.js',
                         'red.js',
-                        'red/**/*.js'
+                        'packages/**/*.js',
                     ]
                 }
             },
@@ -120,81 +118,81 @@ module.exports = function(grunt) {
                 src: [
                     // Ensure editor source files are concatenated in
                     // the right order
-                    "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"
+                    "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/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/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/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/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/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-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/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/typeSearch.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/subflow.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"
                 ],
-                dest: "public/red/red.js"
+                dest: "packages/node_modules/@node-red/editor-client/public/red/red.js"
             },
             vendor: {
                 files: {
-                    "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.js": [
+                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-1.11.3.min.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/bootstrap/js/bootstrap.min.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery-ui-1.10.3.custom.min.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/jquery/js/jquery.ui.touch-punch.min.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/marked/marked.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"
                     ],
-                    "public/vendor/vendor.css": [
+                    "packages/node_modules/@node-red/editor-client/public/vendor/vendor.css": [
                         // TODO: resolve relative resource paths in
                         //       bootstrap/FA/jquery
                     ],
-                    "public/vendor/jsonata/jsonata.min.js": [
+                    "packages/node_modules/@node-red/editor-client/public/vendor/jsonata/jsonata.min.js": [
                         "node_modules/jsonata/jsonata-es5.min.js",
-                        "editor/vendor/jsonata/formatter.js"
+                        "packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js"
                     ],
-                    "public/vendor/ace/worker-jsonata.js": [
+                    "packages/node_modules/@node-red/editor-client/public/vendor/ace/worker-jsonata.js": [
                         "node_modules/jsonata/jsonata-es5.min.js",
-                        "editor/vendor/jsonata/worker-jsonata.js"
+                        "packages/node_modules/@node-red/editor-client/src/vendor/jsonata/worker-jsonata.js"
                     ]
                 }
             }
@@ -202,10 +200,10 @@ module.exports = function(grunt) {
         uglify: {
             build: {
                 files: {
-                    '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'
+                    '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'
                 }
             }
         },
@@ -215,50 +213,50 @@ module.exports = function(grunt) {
                     outputStyle: 'compressed'
                 },
                 files: [{
-                    dest: 'public/red/style.min.css',
-                    src: 'editor/sass/style.scss'
+                    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/vendor/bootstrap/css/bootstrap.min.css',
-                    src: 'editor/vendor/bootstrap/css/bootstrap.css'
+                    dest: 'packages/node_modules/@node-red/editor-client/public/vendor/bootstrap/css/bootstrap.min.css',
+                    src: 'packages/node_modules/@node-red/editor-client/src/vendor/bootstrap/css/bootstrap.css'
                 }]
             }
         },
         jsonlint: {
             messages: {
                 src: [
-                    'nodes/core/locales/en-US/messages.json',
-                    'red/api/locales/en-US/editor.json',
-                    'red/runtime/locales/en-US/runtime.json'
+                    'packages/node_modules/@node-red/nodes/locales/**/*.json',
+                    'packages/node_modules/@node-red/editor-api/lib/editor/locales/**/*.json',
+                    'packages/node_modules/@node-red/runtime/locales/**/*.json'
                 ]
             },
             keymaps: {
                 src: [
-                    'editor/js/keymap.json'
+                    'packages/node_modules/@node-red/editor-client/src/js/keymap.json'
                 ]
             }
         },
         attachCopyright: {
             js: {
                 src: [
-                    'public/red/red.min.js',
-                    'public/red/main.min.js'
+                    'packages/node_modules/@node-red/editor-client/public/red/red.min.js',
+                    'packages/node_modules/@node-red/editor-client/public/red/main.min.js'
                 ]
             },
             css: {
                 src: [
-                    'public/red/style.min.css'
+                    'packages/node_modules/@node-red/editor-client/public/red/style.min.css'
                 ]
             }
         },
         clean: {
             build: {
                 src: [
-                    "public/red",
-                    "public/index.html",
-                    "public/favicon.ico",
-                    "public/icons",
-                    "public/vendor"
+                    "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"
                 ]
             },
             release: {
@@ -270,27 +268,27 @@ module.exports = function(grunt) {
         watch: {
             js: {
                 files: [
-                    'editor/js/**/*.js'
+                    'packages/node_modules/@node-red/editor-client/src/js/**/*.js'
                 ],
                 tasks: ['copy:build','concat','uglify','attachCopyright:js']
             },
             sass: {
                 files: [
-                    'editor/sass/**/*.scss'
+                    'packages/node_modules/@node-red/editor-client/src/sass/**/*.scss'
                 ],
                 tasks: ['sass','attachCopyright:css']
             },
             json: {
                 files: [
-                    'nodes/core/locales/en-US/messages.json',
-                    'red/api/locales/en-US/editor.json',
-                    'red/runtime/locales/en-US/runtime.json'
+                    'packages/node_modules/@node-red/nodes/locales/**/*.json',
+                    'packages/node_modules/@node-red/editor-api/lib/editor/locales/**/*.json',
+                    'packages/node_modules/@node-red/runtime/locales/**/*.json'
                 ],
                 tasks: ['jsonlint:messages']
             },
             keymaps: {
                 files: [
-                    'editor/js/keymap.json'
+                    'packages/node_modules/@node-red/editor-client/src/js/keymap.json'
                 ],
                 tasks: ['jsonlint:keymaps','copy:build']
             },
@@ -305,12 +303,13 @@ module.exports = function(grunt) {
         nodemon: {
             /* uses .nodemonignore */
             dev: {
-                script: 'red.js',
+                script: 'packages/node_modules/node-red/red.js',
                 options: {
                     args: nodemonArgs,
                     ext: 'js,html,json',
                     watch: [
-                        'red','nodes'
+                        'packages/node_modules',
+                        '!packages/node_modules/@node-red/editor-client'
                     ]
                 }
             }
@@ -329,21 +328,21 @@ module.exports = function(grunt) {
             build: {
                 files:[
                     {
-                        src: 'editor/js/main.js',
-                        dest: 'public/red/main.js'
+                        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/keymap.json',
-                        dest: 'public/red/keymap.json'
+                        src: 'packages/node_modules/@node-red/editor-client/src/js/keymap.json',
+                        dest: 'packages/node_modules/@node-red/editor-client/public/red/keymap.json'
                     },
                     {
-                        cwd: 'editor/images',
+                        cwd: 'packages/node_modules/@node-red/editor-client/src/images',
                         src: '**',
                         expand: true,
-                        dest: 'public/red/images/'
+                        dest: 'packages/node_modules/@node-red/editor-client/public/red/images/'
                     },
                     {
-                        cwd: 'editor/vendor',
+                        cwd: 'packages/node_modules/@node-red/editor-client/src/vendor',
                         src: [
                             'ace/**',
                             //'bootstrap/css/**',
@@ -352,46 +351,25 @@ module.exports = function(grunt) {
                             'font-awesome/**'
                         ],
                         expand: true,
-                        dest: 'public/vendor/'
+                        dest: 'packages/node_modules/@node-red/editor-client/public/vendor/'
                     },
                     {
-                        cwd: 'editor/icons',
+                        cwd: 'packages/node_modules/@node-red/editor-client/src/icons',
                         src: '**',
                         expand: true,
-                        dest: 'public/icons/'
+                        dest: 'packages/node_modules/@node-red/editor-client/public/icons/'
                     },
                     {
                         expand: true,
-                        src: ['editor/index.html','editor/favicon.ico'],
-                        dest: 'public/',
+                        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/',
                         flatten: true
                     },
                     {
                         src: 'CHANGELOG.md',
-                        dest: 'public/red/about'
+                        dest: 'packages/node_modules/@node-red/editor-client/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: {
@@ -400,8 +378,8 @@ module.exports = function(grunt) {
             },
             release: {
                 src: [
-                    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')
+                    "packages/node_modules/@node-red/nodes/core/hardware/nrgpio",
+                    "packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/git/node-red-*sh"
                 ]
             }
         },
@@ -411,17 +389,27 @@ module.exports = function(grunt) {
                     archive: '<%= paths.dist %>/node-red-<%= pkg.version %>.zip'
                 },
                 expand: true,
-                cwd: '<%= paths.dist %>/',
-                src: ['node-red-<%= pkg.version %>/**']
+                cwd: 'packages/node_modules/',
+                src: [
+                    '**',
+                    '!@node-red/editor-client/src/**'
+                ]
             }
         },
         jsdoc : {
             runtimeAPI: {
-                src: 'red/runtime-api/*.js',
+                src: 'packages/node_modules/@node-red/runtime/lib/api/*.js',
                 options: {
                     destination: 'docs',
                     configure: './jsdoc.json'
                 }
+            },
+            nodeREDUtil: {
+                src: 'packages/node_modules/@node-red/util/**/*.js',
+                options: {
+                    destination: 'packages/node_modules/@node-red/util/docs',
+                    configure: './jsdoc.json'
+                }
             }
         },
         jsdoc2md: {
@@ -429,8 +417,15 @@ module.exports = function(grunt) {
                 options: {
                     separators: true
                 },
-                src: 'red/runtime-api/*.js',
+                src: 'packages/node_modules/@node-red/runtime/lib/api/*.js',
                 dest: 'docs/runtime-api.md'
+            },
+            nodeREDUtil: {
+                options: {
+                    separators: true
+                },
+                src: 'packages/node_modules/@node-red/util/**/*.js',
+                dest: 'packages/node_modules/@node-red/util/docs/api.md'
             }
         }
     });
@@ -493,6 +488,15 @@ module.exports = function(grunt) {
         }
     });
 
+    grunt.registerTask('verifyPackageDependencies', function() {
+        var verifyDependencies = require("./scripts/verify-package-dependencies.js");
+        var failures = verifyDependencies();
+        if (failures.length > 0) {
+            failures.forEach(f => grunt.log.error(f));
+            grunt.fail.fatal("Failed to verify package dependencies");
+        }
+    });
+
     grunt.registerTask('setDevEnv',
         'Sets NODE_ENV=development so non-minified assets are used',
             function () {
@@ -501,7 +505,7 @@ module.exports = function(grunt) {
 
     grunt.registerTask('default',
         'Builds editor content then runs code style checks and unit tests on all components',
-        ['build','jshint:editor','mocha_istanbul:all']);
+        ['build','verifyPackageDependencies','jshint:editor','mocha_istanbul:all']);
 
     grunt.registerTask('test-core',
         'Runs code style check and unit tests on core runtime code',
@@ -529,7 +533,7 @@ module.exports = function(grunt) {
 
     grunt.registerTask('release',
         'Create distribution zip file',
-        ['build','clean:release','copy:release','chmod:release','compress:release']);
+        ['build','verifyPackageDependencies','clean:release','chmod:release','compress:release']);
 
     grunt.registerTask('coverage',
         'Run Istanbul code test coverage task',

README.md

@@ -44,9 +44,6 @@ 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
 

editor/js/ui/common/panels.js

@@ -1,81 +0,0 @@
-/**
- * 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.panels = (function() {
-
-    function createPanel(options) {
-        var container = options.container || $("#"+options.id);
-        var children = container.children();
-        if (children.length !== 2) {
-            throw new Error("Container must have exactly two children");
-        }
-
-        container.addClass("red-ui-panels");
-        var separator = $('<div class="red-ui-panels-separator"></div>').insertAfter(children[0]);
-        var startPosition;
-        var panelHeights = [];
-        var modifiedHeights = false;
-        var panelRatio;
-
-        separator.draggable({
-                axis: "y",
-                containment: container,
-                scroll: false,
-                start:function(event,ui) {
-                    var height = container.height();
-                    startPosition = ui.position.top;
-                    panelHeights = [$(children[0]).height(),$(children[1]).height()];
-                },
-                drag: function(event,ui) {
-                    var height = container.height();
-                    var delta = ui.position.top-startPosition;
-                    var newHeights = [panelHeights[0]+delta,panelHeights[1]-delta];
-                    $(children[0]).height(newHeights[0]);
-                    $(children[1]).height(newHeights[1]);
-                    if (options.resize) {
-                        options.resize(newHeights[0],newHeights[1]);
-                    }
-                    ui.position.top -= delta;
-                    panelRatio = newHeights[0]/height;
-                },
-                stop:function(event,ui) {
-                    modifiedHeights = true;
-                }
-        });
-
-        return {
-            resize: function(height) {
-                var panelHeights = [$(children[0]).height(),$(children[1]).height()];
-                container.height(height);
-                if (modifiedHeights) {
-                    var topPanelHeight = panelRatio*height;
-                    var bottomPanelHeight = height - topPanelHeight - 48;
-                    panelHeights = [topPanelHeight,bottomPanelHeight];
-                    $(children[0]).height(panelHeights[0]);
-                    $(children[1]).height(panelHeights[1]);
-                }
-                if (options.resize) {
-                    options.resize(panelHeights[0],panelHeights[1]);
-                }
-            }
-        }
-    }
-
-    return {
-        create: createPanel
-    }
-})();

jsdoc.json

@@ -1,6 +1,6 @@
 {
     "opts": {
-        "template": "./node_modules/ink-docstrap/template",
+        "template": "./node_modules/jsdoc-nr-template",
         "destination": "./docs",
         "recurse": true
     },
@@ -9,14 +9,18 @@
         "dictionaries": ["jsdoc"]
     },
     "source": {
-        "include": [
-            "./red/runtime-api"
+        "_include": [
+            "./packages/node_modules/@node-red/runtime/lib/api"
         ]
     },
     "templates": {
         "systemName": "Node-RED Runtime API",
         "theme":"yeti",
         "footer": "",
-        "copyright": "Released under the Apache License v2.0"
-    }
+        "copyright": "Released under the Apache License v2.0",
+        "default": {
+            "outputSourceFiles": false
+        }
+    },
+    "plugins": ["plugins/markdown"]
 }

lib/.gitignore

@@ -1 +0,0 @@
-*

nodes/core/io/lib/mqttConnectionPool.js

@@ -1,159 +0,0 @@
-/**
- * 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.
- **/
-var util = require("util");
-var mqtt = require("./mqtt");
-var settings = require(process.env.NODE_RED_HOME+"/red/red").settings;
-
-util.log("[warn] nodes/core/io/lib/mqttConnectionPool.js is deprecated and will be removed in a future release of Node-RED. Please report this usage to the Node-RED mailing list.");
-
-var connections = {};
-
-function matchTopic(ts,t) {
-    if (ts == "#") {
-        return true;
-    }
-    var re = new RegExp("^"+ts.replace(/([\[\]\?\(\)\\\\$\^\*\.|])/g,"\\$1").replace(/\+/g,"[^/]+").replace(/\/#$/,"(\/.*)?")+"$");
-    return re.test(t);
-}
-
-module.exports = {
-    get: function(broker,port,clientid,username,password,will) {
-        var id = "["+(username||"")+":"+(password||"")+"]["+(clientid||"")+"]@"+broker+":"+port;
-        if (!connections[id]) {
-            connections[id] = function() {
-                var uid = (1+Math.random()*4294967295).toString(16);
-                var client = mqtt.createClient(port,broker);
-                client.uid = uid;
-                client.setMaxListeners(0);
-                var options = {keepalive:15};
-                options.clientId = clientid || 'mqtt_' + (1+Math.random()*4294967295).toString(16);
-                options.username = username;
-                options.password = password;
-                options.will = will;
-                var queue = [];
-                var subscriptions = {};
-                var connecting = false;
-                var obj = {
-                    _instances: 0,
-                    publish: function(msg) {
-                        if (client.isConnected()) {
-                            client.publish(msg.topic,msg.payload,msg.qos,msg.retain);
-                        } else {
-                            if (!connecting) {
-                                connecting = true;
-                                client.connect(options);
-                            }
-                            queue.push(msg);
-                        }
-                    },
-                    subscribe: function(topic,qos,callback,ref) {
-                        ref = ref||0;
-                        subscriptions[topic] = subscriptions[topic]||{};
-
-                        var sub = {
-                            topic:topic,
-                            qos:qos,
-                            handler:function(mtopic,mpayload,mqos,mretain) {
-                                if (matchTopic(topic,mtopic)) {
-                                    callback(mtopic,mpayload,mqos,mretain);
-                                }
-                            },
-                            ref: ref
-                        };
-                        subscriptions[topic][ref] = sub;
-                        client.on('message',sub.handler);
-                        if (client.isConnected()) {
-                            client.subscribe(topic,qos);
-                        }
-                    },
-                    unsubscribe: function(topic,ref) {
-                        ref = ref||0;
-                        var sub = subscriptions[topic];
-                        if (sub) {
-                            if (sub[ref]) {
-                                client.removeListener('message',sub[ref].handler);
-                                delete sub[ref];
-                            }
-                            if (Object.keys(sub).length == 0) {
-                                delete subscriptions[topic];
-                                client.unsubscribe(topic);
-                            }
-                        }
-                    },
-                    on: function(a,b){
-                        client.on(a,b);
-                    },
-                    once: function(a,b){
-                        client.once(a,b);
-                    },
-                    connect: function() {
-                        if (client && !client.isConnected() && !connecting) {
-                            connecting = true;
-                            client.connect(options);
-                        }
-                    },
-                    disconnect: function(ref) {
-
-                        this._instances -= 1;
-                        if (this._instances == 0) {
-                            client.disconnect();
-                            client = null;
-                            delete connections[id];
-                        }
-                    },
-                    isConnected: function() {
-                        return client.isConnected();
-                    }
-                };
-                client.on('connect',function() {
-                        if (client) {
-                            util.log('[mqtt] ['+uid+'] connected to broker tcp://'+broker+':'+port);
-                            connecting = false;
-                            for (var s in subscriptions) {
-                                var topic = s;
-                                var qos = 0;
-                                for (var r in subscriptions[s]) {
-                                    qos = Math.max(qos,subscriptions[s][r].qos);
-                                }
-                                client.subscribe(topic,qos);
-                            }
-                            //console.log("connected - publishing",queue.length,"messages");
-                            while(queue.length) {
-                                var msg = queue.shift();
-                                //console.log(msg);
-                                client.publish(msg.topic,msg.payload,msg.qos,msg.retain);
-                            }
-                        }
-                });
-                client.on('connectionlost', function(err) {
-                        util.log('[mqtt] ['+uid+'] connection lost to broker tcp://'+broker+':'+port);
-                        connecting = false;
-                        setTimeout(function() {
-                            obj.connect();
-                        }, settings.mqttReconnectTime||5000);
-                });
-                client.on('disconnect', function() {
-                        connecting = false;
-                        util.log('[mqtt] ['+uid+'] disconnected from broker tcp://'+broker+':'+port);
-                });
-
-                return obj
-            }();
-        }
-        connections[id]._instances += 1;
-        return connections[id];
-    }
-};

package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "0.18.7",
+    "version": "0.20.0-alpha.0",
     "description": "A visual tool for wiring the Internet of Things",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -8,17 +8,13 @@
         "type": "git",
         "url": "https://github.com/node-red/node-red.git"
     },
-    "main": "red/red.js",
+    "private": "true",
     "scripts": {
-        "start": "node red.js",
+        "start": "node packages/node_modules/node-red/red.js",
         "test": "grunt",
         "build": "grunt build",
         "docs": "grunt docs"
     },
-    "bin": {
-        "node-red": "./red.js",
-        "node-red-pi": "bin/node-red-pi"
-    },
     "contributors": [
         {
             "name": "Nick O'Leary"
@@ -27,30 +23,25 @@
             "name": "Dave Conway-Jones"
         }
     ],
-    "keywords": [
-        "editor",
-        "messaging",
-        "iot",
-        "flow"
-    ],
     "dependencies": {
-        "ajv": "6.5.2",
+        "ajv": "6.5.3",
         "basic-auth": "2.0.0",
         "bcryptjs": "2.4.3",
         "body-parser": "1.18.3",
         "cheerio": "0.22.0",
-        "clone": "2.1.1",
+        "clone": "2.1.2",
         "cookie": "0.3.1",
         "cookie-parser": "1.4.3",
         "cors": "2.8.4",
-        "cron": "1.3.0",
+        "cron": "1.4.1",
         "denque": "1.3.0",
         "express": "4.16.3",
         "express-session": "1.15.6",
         "fs-extra": "5.0.0",
         "fs.notify": "0.0.4",
         "hash-sum": "1.0.2",
-        "i18next": "^11.4.0",
+        "https-proxy-agent": "2.2.1",
+        "i18next": "11.6.0",
         "is-utf8": "0.2.1",
         "js-yaml": "3.12.0",
         "json-stringify-safe": "5.0.1",
@@ -58,13 +49,13 @@
         "media-typer": "0.3.0",
         "memorystore": "1.6.0",
         "mime": "1.4.1",
-        "mqtt": "2.18.3",
+        "mqtt": "2.18.8",
         "multer": "1.3.1",
-        "mustache": "2.3.0",
+        "mustache": "2.3.2",
         "node-red-node-email": "0.1.*",
         "node-red-node-feedparser": "^0.1.12",
         "node-red-node-rbe": "0.2.*",
-        "node-red-node-twitter": "*",
+        "node-red-node-twitter": "^1.1.0",
         "nopt": "4.0.1",
         "oauth2orize": "1.11.0",
         "on-headers": "1.0.1",
@@ -72,10 +63,10 @@
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
         "raw-body": "2.3.3",
-        "request": "2.87.0",
-        "semver": "5.5.0",
+        "request": "2.88.0",
+        "semver": "5.5.1",
         "sentiment": "2.1.0",
-        "uglify-js": "3.4.5",
+        "uglify-js": "3.4.9",
         "when": "3.7.8",
         "ws": "1.1.5",
         "xml2js": "0.4.19"
@@ -84,17 +75,17 @@
         "bcrypt": "~2.0.0"
     },
     "devDependencies": {
-        "chromedriver": "^2.40.0",
+        "chromedriver": "^2.41.0",
         "grunt": "~1.0.3",
         "grunt-chmod": "~1.1.1",
-        "grunt-cli": "~1.2.0",
+        "grunt-cli": "~1.3.1",
         "grunt-concurrent": "~2.3.1",
         "grunt-contrib-clean": "~1.1.0",
         "grunt-contrib-compress": "~1.4.0",
         "grunt-contrib-concat": "~1.0.1",
         "grunt-contrib-copy": "~1.0.0",
         "grunt-contrib-jshint": "~1.1.0",
-        "grunt-contrib-uglify": "~3.3.0",
+        "grunt-contrib-uglify": "~3.4.0",
         "grunt-contrib-watch": "~1.1.0",
         "grunt-jsdoc": "^2.2.1",
         "grunt-jsdoc-to-markdown": "^4.0.0",
@@ -105,8 +96,8 @@
         "grunt-simple-mocha": "~0.4.1",
         "grunt-webdriver": "^2.0.3",
         "http-proxy": "^1.16.2",
-        "ink-docstrap": "^1.3.2",
         "istanbul": "0.4.5",
+        "minami": "1.2.3",
         "mocha": "^5.2.0",
         "should": "^8.4.0",
         "sinon": "1.17.7",
@@ -116,9 +107,10 @@
         "wdio-mocha-framework": "^0.6.2",
         "wdio-spec-reporter": "^0.1.5",
         "webdriverio": "^4.13.1",
-        "node-red-node-test-helper": "^0.1.7"
+        "node-red-node-test-helper": "node-red/node-red-node-test-helper",
+        "jsdoc-nr-template": "node-red/jsdoc-nr-template"
     },
     "engines": {
-        "node": ">=4"
+        "node": ">=8"
     }
 }

packages/node_modules/@node-red/editor-api/LICENSE

@@ -0,0 +1,178 @@
+Copyright JS Foundation and other contributors, http://js.foundation
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

packages/node_modules/@node-red/editor-api/README.md

@@ -0,0 +1,12 @@
+@node-red/editor-api
+====================
+
+Node-RED editor api module.
+
+This provides an Express application that can be used to serve the Node-RED
+editor.
+
+
+### Source
+
+The main Node-RED modules are maintained as a monorepo on [GitHub](https://github.com/node-red/node-red).

packages/node_modules/@node-red/editor-api/lib/auth/index.js

@@ -25,7 +25,7 @@ var permissions = require("./permissions");
 var theme = require("../editor/theme");
 
 var settings = null;
-var log = require("../../util").log; // TODO: separate module
+var log = require("@node-red/util").log; // TODO: separate module
 
 
 passport.use(strategies.bearerStrategy.BearerStrategy);

packages/node_modules/@node-red/editor-api/lib/auth/strategies.js

@@ -26,7 +26,7 @@ var Users = require("./users");
 var Clients = require("./clients");
 var permissions = require("./permissions");
 
-var log = require("../../util").log; // TODO: separate module
+var log = require("@node-red/util").log; // TODO: separate module
 
 var bearerStrategy = function (accessToken, done) {
     // is this a valid token?

packages/node_modules/@node-red/editor-api/lib/editor/comms.js

@@ -16,7 +16,7 @@
 
 var ws = require("ws");
 
-var log = require("../../util").log; // TODO: separate module
+var log = require("@node-red/util").log; // TODO: separate module
 var Tokens;
 var Users;
 var Permissions;

packages/node_modules/@node-red/editor-api/lib/editor/index.js

@@ -25,8 +25,8 @@ var auth = require("../auth");
 var nodes = require("../admin/nodes"); // TODO: move /icons into here
 var needsPermission;
 var runtimeAPI;
-var log = require("../../util").log; // TODO: separate module
-var i18n = require("../../util").i18n; // TODO: separate module
+var log = require("@node-red/util").log; // TODO: separate module
+var i18n = require("@node-red/util").i18n; // TODO: separate module
 
 var apiUtil = require("../util");
 

packages/node_modules/@node-red/editor-api/lib/editor/locales.js

@@ -17,7 +17,7 @@ var fs = require('fs');
 var path = require('path');
 //var apiUtil = require('../util');
 
-var i18n = require("../../util").i18n; // TODO: separate module
+var i18n = require("@node-red/util").i18n; // TODO: separate module
 
 var runtimeAPI;
 

packages/node_modules/@node-red/editor-api/lib/editor/locales/en-US/editor.json

@@ -97,6 +97,7 @@
             "undeployedChanges": "node has undeployed changes",
             "nodeActionDisabled": "node actions disabled within subflow",
             "missing-types": "<p>Flows stopped due to missing node types.</p>",
+            "safe-mode":"<p>Flows stopped in safe mode.</p><p>You can modify your flows and deploy the changes to restart.",
             "restartRequired": "Node-RED must be restarted to enable upgraded modules",
             "credentials_load_failed": "<p>Flows stopped as the credentials could not be decrypted.</p><p>The flow credential file is encrypted, but the project's encryption key is missing or invalid.</p>",
             "credentials_load_failed_reset":"<p>Credentials could not be decrypted</p><p>The flow credential file is encrypted, but the project's encryption key is missing or invalid.</p><p>The flow credential file will be reset on the next deployment. Any existing flow credentials will be cleared.</p>",
@@ -172,7 +173,10 @@
         "modifiedFlowsDesc": "Only deploys flows that contain changed nodes",
         "modifiedNodes": "Modified Nodes",
         "modifiedNodesDesc": "Only deploys nodes that have changed",
+        "restartFlows": "Restart Flows",
+        "restartFlowsDesc": "Restarts the current deployed flows",
         "successfulDeploy": "Successfully deployed",
+        "successfulRestart": "Successfully restarted flows",
         "deployFailed": "Deploy failed: __message__",
         "unusedConfigNodes":"You have some unused configuration nodes.",
         "unusedConfigNodesLink":"Click here to see them",
@@ -267,6 +271,7 @@
         "defaultLabel": "use default label",
         "searchIcons": "Search icons",
         "useDefault": "use default",
+        "description": "Description",
         "errors": {
             "scopeChange": "Changing the scope will make it unavailable to nodes in other flows that use it"
         }
@@ -433,6 +438,7 @@
             "instances": "Instances",
             "properties": "Properties",
             "info": "Information",
+            "desc": "Description",
             "blank": "blank",
             "null": "null",
             "showMore": "show more",
@@ -456,6 +462,7 @@
             "flows": "flows",
             "filterUnused":"unused",
             "filterAll":"all",
+            "deleteUnused":"Delete unused",
             "filtered": "__count__ hidden"
         },
         "context": {
@@ -587,6 +594,7 @@
                 "pullUnrelatedHistory": "<p>The remote has an unrelated history of commits.</p><p>Are you sure you want to pull the changes into your local repository?</p>",
                 "pullChanges": "Pull changes",
                 "history": "history",
+                "projectHistory": "Project History",
                 "daysAgo": "__count__ day ago",
                 "daysAgo_plural": "__count__ days ago",
                 "hoursAgo": "__count__ hour ago",

packages/node_modules/@node-red/editor-api/lib/editor/locales/ja/editor.json

@@ -266,6 +266,7 @@
         "defaultLabel": "既定の名前を使用",
         "searchIcons": "アイコンを検索",
         "useDefault":  "デフォルトを使用",
+        "description": "詳細",
         "errors": {
             "scopeChange": "スコープの変更は、他のフローで使われているノードを無効にします"
         }
@@ -585,6 +586,7 @@
                 "pullUnrelatedHistory": "<p>リモートに関連のないコミット履歴があります。</p><p>本当に変更をプルしてローカルリポジトリに反映しますか？</p>",
                 "pullChanges": "プル変更",
                 "history": "履歴",
+                "projectHistory": "プロジェクト履歴",
                 "daysAgo": "__count__ 日前",
                 "daysAgo_plural": "__count__ 日前",
                 "hoursAgo": "__count__ 時間前",

packages/node_modules/@node-red/editor-api/lib/editor/ui.js

@@ -24,14 +24,15 @@ var apiUtils = require("../util");
 var theme = require("./theme");
 
 var runtimeAPI;
-
-var templateDir = path.resolve(__dirname+"/../../../editor/templates");
+var editorClientDir = path.dirname(require.resolve("@node-red/editor-client"));
+var defaultNodeIcon = path.join(editorClientDir,"public","red","images","icons","arrow-in.png");
+var editorTemplatePath = path.join(editorClientDir,"templates","index.mst");
 var editorTemplate;
 
 module.exports = {
     init: function(_runtimeAPI) {
         runtimeAPI = _runtimeAPI;
-        editorTemplate = fs.readFileSync(path.join(templateDir,"index.mst"),"utf8");
+        editorTemplate = fs.readFileSync(editorTemplatePath,"utf8");
         Mustache.parse(editorTemplate);
     },
 
@@ -55,15 +56,20 @@ module.exports = {
             icon: icon
         }
         runtimeAPI.nodes.getIcon(opts).then(function(data) {
-            var contentType = mime.lookup(icon);
-            res.set("Content-Type", contentType);
-            res.send(data);
+            if (data) {
+                var contentType = mime.lookup(icon);
+                res.set("Content-Type", contentType);
+                res.send(data);
+            } else {
+                res.sendFile(defaultNodeIcon);
+            }
         }).catch(function(err) {
+            console.log(err.stack);
             apiUtils.rejectHandler(req,res,err);
         })
     },
     editor: function(req,res) {
         res.send(Mustache.render(editorTemplate,theme.context()));
     },
-    editorResources: express.static(__dirname + '/../../../public')
+    editorResources: express.static(path.join(editorClientDir,'public'))
 };

packages/node_modules/@node-red/editor-api/lib/util.js

@@ -15,8 +15,8 @@
  **/
 
 
-var log = require("../util").log; // TODO: separate module
-var i18n = require("../util").i18n; // TODO: separate module
+var log = require("@node-red/util").log; // TODO: separate module
+var i18n = require("@node-red/util").i18n; // TODO: separate module
 
 
 module.exports = {

packages/node_modules/@node-red/editor-api/package.json

@@ -0,0 +1,33 @@
+{
+    "name": "@node-red/editor",
+    "version": "0.20.0-alpha.0",
+    "license": "Apache-2.0",
+    "main": "./lib/index.js",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/node-red/node-red.git"
+    },
+    "contributors": [
+        { "name": "Nick O'Leary" },
+        { "name": "Dave Conway-Jones"}
+    ],
+    "dependencies": {
+        "@node-red/util": "*",
+        "@node-red/editor-client": "*",
+        "bcryptjs": "2.4.3",
+        "body-parser": "1.18.3",
+        "clone": "2.1.2",
+        "cors": "2.8.4",
+        "express-session": "1.15.6",
+        "express": "4.16.3",
+        "memorystore": "1.6.0",
+        "mime": "1.4.1",
+        "mustache": "2.3.2",
+        "oauth2orize": "1.11.0",
+        "passport-http-bearer": "1.0.1",
+        "passport-oauth2-client-password": "0.1.2",
+        "passport": "0.4.0",
+        "when": "3.7.8",
+        "ws": "1.1.5"
+    }
+}

packages/node_modules/@node-red/editor-client/.npmignore

@@ -0,0 +1 @@
+src

packages/node_modules/@node-red/editor-client/LICENSE

@@ -0,0 +1,178 @@
+Copyright JS Foundation and other contributors, http://js.foundation
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

packages/node_modules/@node-red/editor-client/README.md

@@ -0,0 +1,10 @@
+@node-red/editor-client
+====================
+
+Node-RED editor resources module.
+
+This provides all of the client-side resources of the Node-RED editor application.
+
+### Source
+
+The main Node-RED modules are maintained as a monorepo on [GitHub](https://github.com/node-red/node-red).

packages/node_modules/@node-red/editor-client/index.js

@@ -0,0 +1,17 @@
+/**
+ * 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.
+ **/
+
+module.exports = false

packages/node_modules/@node-red/editor-client/package.json

@@ -0,0 +1,14 @@
+{
+   "name": "@node-red/editor-client",
+   "version": "0.20.0-alpha.0",
+   "license": "Apache-2.0",
+   "repository": {
+       "type": "git",
+       "url": "https://github.com/node-red/node-red.git"
+   },
+   "contributors": [
+       { "name": "Nick O'Leary" },
+       { "name": "Dave Conway-Jones"}
+   ],
+   "main": "./lib/index.js"
+}

packages/node_modules/@node-red/editor-client/src/js/nodes.js

@@ -354,7 +354,6 @@ RED.nodes = (function() {
         subflows[sf.id] = sf;
         RED.nodes.registerType("subflow:"+sf.id, {
             defaults:{name:{value:""}},
-            info: sf.info,
             icon: function() { return sf.icon||"subflow.png" },
             category: sf.category || "subflows",
             inputs: sf.in.length,
@@ -510,6 +509,9 @@ RED.nodes = (function() {
                 }
             }
         }
+        if (n.info) {
+            node.info = n.info;
+        }
         return node;
     }
 
@@ -904,7 +906,14 @@ RED.nodes = (function() {
                 }
 
                 if (!existingConfigNode || existingConfigNode._def.exclusive) { //} || !compareNodes(existingConfigNode,n,true) || existingConfigNode.z !== n.z) {
-                    configNode = {id:n.id, z:n.z, type:n.type, users:[], _config:{}};
+                    configNode = {
+                        id:n.id,
+                        z:n.z,
+                        type:n.type,
+                        info: n.info,
+                        users:[],
+                        _config:{}
+                    };
                     for (d in def.defaults) {
                         if (def.defaults.hasOwnProperty(d)) {
                             configNode[d] = n[d];
@@ -947,6 +956,7 @@ RED.nodes = (function() {
                         inputLabels: n.inputLabels,
                         outputLabels: n.outputLabels,
                         icon: n.icon,
+                        info: n.info,
                         changed:false,
                         _config:{}
                     };

packages/node_modules/@node-red/editor-client/src/js/red.js

@@ -201,7 +201,16 @@ var RED = (function() {
                     id: notificationId
                 }
                 if (notificationId === "runtime-state") {
-                    if (msg.error === "missing-types") {
+                    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.join("</li><li>")+"</li></ul>";
                         if (!!RED.projects.getActiveProject()) {
                             options.buttons = [

packages/node_modules/@node-red/editor-client/src/js/ui/common/panels.js

@@ -0,0 +1,102 @@
+/**
+ * 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.panels = (function() {
+
+    function createPanel(options) {
+        var container = options.container || $("#"+options.id);
+        var children = container.children();
+        if (children.length !== 2) {
+            throw new Error("Container must have exactly two children");
+        }
+        var vertical = (!options.dir || options.dir === "vertical");
+        container.addClass("red-ui-panels");
+        if (!vertical) {
+            container.addClass("red-ui-panels-horizontal");
+        }
+        var separator = $('<div class="red-ui-panels-separator"></div>').insertAfter(children[0]);
+        var startPosition;
+        var panelSizes = [];
+        var modifiedSizes = false;
+        var panelRatio;
+
+        separator.draggable({
+                axis: vertical?"y":"x",
+                containment: container,
+                scroll: false,
+                start:function(event,ui) {
+                    startPosition = vertical?ui.position.top:ui.position.left;
+
+                    panelSizes = [
+                        vertical?$(children[0]).height():$(children[0]).width(),
+                        vertical?$(children[1]).height():$(children[1]).width()
+                    ];
+                },
+                drag: function(event,ui) {
+                    var size = vertical?container.height():container.width();
+                    var delta = (vertical?ui.position.top:ui.position.left)-startPosition;
+                    var newSizes = [panelSizes[0]+delta,panelSizes[1]-delta];
+                    if (vertical) {
+                        $(children[0]).height(newSizes[0]);
+                        $(children[1]).height(newSizes[1]);
+                        ui.position.top -= delta;
+                    } else {
+                        $(children[0]).width(newSizes[0]);
+                        $(children[1]).width(newSizes[1]);
+                        ui.position.left -= delta;
+                    }
+                    if (options.resize) {
+                        options.resize(newSizes[0],newSizes[1]);
+                    }
+                    panelRatio = newSizes[0]/size;
+                },
+                stop:function(event,ui) {
+                    modifiedSizes = true;
+                }
+        });
+
+        return {
+            resize: function(size) {
+                var panelSizes = [$(children[0]).height(),$(children[1]).height()];
+                if (vertical) {
+                    container.height(size);
+                } else {
+                    container.width(size);
+                }
+                if (modifiedSizes) {
+                    var topPanelSize = panelRatio*size;
+                    var bottomPanelSize = size - topPanelSize - 48;
+                    panelSizes = [topPanelSize,bottomPanelSize];
+                    if (vertical) {
+                        $(children[0]).height(panelSizes[0]);
+                        $(children[1]).height(panelSizes[1]);
+                    } else {
+                        $(children[0]).width(panelSizes[0]);
+                        $(children[1]).width(panelSizes[1]);
+                    }
+                }
+                if (options.resize) {
+                    options.resize(panelSizes[0],panelSizes[1]);
+                }
+            }
+        }
+    }
+
+    return {
+        create: createPanel
+    }
+})();