upstream merge

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

@@ -1,4 +1,4 @@
-Copyright JS Foundation and other contributors, http://js.foundation
+Copyright OpenJS Foundation and other contributors, https://openjsf.org/
 
                                  Apache License
                            Version 2.0, January 2004

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

@@ -122,6 +122,7 @@ module.exports = {
             }
 
             if (req.body.active) {
+                opts.clearContext = req.body.hasOwnProperty('clearContext')?req.body.clearContext:true
                 runtimeAPI.projects.setActiveProject(opts).then(function() {
                     listProjects(req,res);
                 }).catch(function(err) {

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "2.1.6",
+    "version": "2.2.0",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "2.1.6",
-        "@node-red/editor-client": "2.1.6",
+        "@node-red/util": "2.2.0",
+        "@node-red/editor-client": "2.2.0",
         "bcryptjs": "2.4.3",
         "body-parser": "1.19.1",
         "clone": "2.1.2",
@@ -25,14 +25,14 @@
         "express-session": "1.17.2",
         "express": "4.17.2",
         "memorystore": "1.6.6",
-        "mime": "2.5.2",
-        "multer": "1.4.3",
+        "mime": "3.0.0",
+        "multer": "1.4.4",
         "mustache": "4.2.0",
         "oauth2orize": "1.11.1",
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
         "passport": "0.5.2",
-        "ws": "7.5.1"
+        "ws": "7.5.6"
     },
     "optionalDependencies": {
         "bcrypt": "5.0.1"