@flowfuse/nr-launcher - npm Package Compare versions

Comparing version 2.8.1-bef9854-202409091740.0 to 2.8.1-eba36e5-202409252052.0

lib/runtimeSettings.js

@@ -19,3 +19,3 @@ const path = require('path')
             allowList: ['*'],
-            catalogues: ['https://catalogue.nodered.org/catalogue.json']
+            catalogues: ['https://catalogue.nodered.org/catalogue.json', 'https://example.com/catalogue.json']
         },
@@ -174,8 +174,12 @@ modules: {
             staticSetting.path = path.normalize(path.join(settings.storageDir, staticSetting.path))
-            if (staticSetting.path.startsWith(settings.storageDir)) {
-                httpStatic.push(staticSetting)
+            if (staticSetting.path.startsWith(settings.storageDir) && staticSetting.root) {
+                httpStatic.push('{' +
+                    'path: ' + JSON.stringify(staticSetting.path) + ',' +
+                    'root: ' + JSON.stringify(staticSetting.root) +
+                    (authMiddlewareRequired ? ', middleware: flowforgeAuthMiddleware' : '') +
+                    '}')
             }
         })
         if (httpStatic.length > 0) {
-            projectSettings.httpStatic = httpStatic
+            projectSettings.httpStatic = '[' + httpStatic.join(', ') + ']'
         }
@@ -380,3 +384,3 @@ }
     ${projectSettings.uibuilder ? 'uibuilder: ' + JSON.stringify(projectSettings.uibuilder) + ',' : ''}
-    ${projectSettings.httpStatic ? 'httpStatic: ' + JSON.stringify(projectSettings.httpStatic) : ''}
+    ${projectSettings.httpStatic ? 'httpStatic: ' + projectSettings.httpStatic : ''}
 }
@@ -383,0 +387,0 @@ `

lib/theme/common/forge-common.js

@@ -29,2 +29,14 @@ (function () {
     }
+    const interceptLogOutClick = (url) => {
+        document.querySelector('#usermenu-item-logout')
+            .addEventListener('click', (e) => {
+                e.preventDefault()
+                e.stopPropagation()
+                if (context.shouldEmitInsteadOfRedirect) {
+                    window.parent.postMessage({
+                        type: 'logout'
+                    }, '*')
+                }
+            })
+    }
 
@@ -106,3 +118,3 @@ function changeFavicon (src) {
             }
-
+            interceptLogOutClick()
             interceptLogoClick(projectURL)
@@ -109,0 +121,0 @@ })

package.json

 {
-  "name": "@flowfuse/nr-launcher",
-  "version": "2.8.1-bef9854-202409091740.0",
-  "description": "FlowFuse Launcher for running Node-RED",
-  "exports": {
-    "./auditLogger": "./lib/auditLogger/index.js",
-    "./adminAuth": "./lib/auth/adminAuth.js",
-    "./authMiddleware": "./lib/auth/httpAuthMiddleware.js",
-    "./storage": "./lib/storage/index.js",
-    "./context": "./lib/context/index.js"
-  },
-  "node-red": {
-    "plugins": {
-      "flowfuse-auth": "lib/auth/httpAuthPlugin.js",
-      "flowfuse-library": "lib/storage/libraryPlugin.js",
-      "forge-light": "lib/theme/forge-light/forge-light.js",
-      "forge-dark": "lib/theme/forge-dark/forge-dark.js",
-      "forge-resources": "lib/resources/resourcePlugin.js"
+    "name": "@flowfuse/nr-launcher",
+    "version": "2.8.1-eba36e5-202409252052.0",
+    "description": "FlowFuse Launcher for running Node-RED",
+    "exports": {
+        "./auditLogger": "./lib/auditLogger/index.js",
+        "./adminAuth": "./lib/auth/adminAuth.js",
+        "./authMiddleware": "./lib/auth/httpAuthMiddleware.js",
+        "./storage": "./lib/storage/index.js",
+        "./context": "./lib/context/index.js"
+    },
+    "node-red": {
+        "plugins": {
+            "flowfuse-auth": "lib/auth/httpAuthPlugin.js",
+            "flowfuse-library": "lib/storage/libraryPlugin.js",
+            "forge-light": "lib/theme/forge-light/forge-light.js",
+            "forge-dark": "lib/theme/forge-dark/forge-dark.js",
+            "forge-resources": "lib/resources/resourcePlugin.js"
+        }
+    },
+    "scripts": {
+        "test": "mocha 'test/unit/**/*_spec.js'",
+        "lint": "eslint -c .eslintrc *.js lib/**/*.js test/**/*.js",
+        "lint:fix": "eslint -c .eslintrc *.js lib/*.js test/**/*.js --fix",
+        "build-theme": "node lib/theme/scripts/build.js "
+    },
+    "keywords": [
+        "FlowFuse"
+    ],
+    "bin": {
+        "flowforge-node-red": "./index.js",
+        "flowfuse-node-red": "./index.js"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/FlowFuse/nr-launcher.git"
+    },
+    "author": {
+        "name": "FlowFuse Inc."
+    },
+    "license": "Apache-2.0",
+    "bugs": {
+        "url": "https://github.com/FlowFuse/nr-launcher/issues"
+    },
+    "homepage": "https://github.com/FlowFuse/nr-launcher#readme",
+    "dependencies": {
+        "@flowfuse/nr-assistant": "^0.1.3",
+        "@flowfuse/nr-file-nodes": "^0.0.7",
+        "@flowfuse/nr-project-nodes": "^0.7.2",
+        "@node-red/util": "^3.1.0",
+        "body-parser": "^1.20.2",
+        "command-line-args": "^5.2.1",
+        "express": "^4.21.0",
+        "express-session": "^1.18.0",
+        "got": "^11.8.6",
+        "json-stringify-safe": "5.0.1",
+        "memorystore": "^1.6.7",
+        "multer": "^1.4.5-lts.1",
+        "oauth": "^0.9.15",
+        "parse-prometheus-text-format": "^1.1.1",
+        "passport": "0.6.0",
+        "passport-oauth2": "^1.6.1",
+        "prom-client": "^15.0.0",
+        "ws": "^8.7.0"
+    },
+    "devDependencies": {
+        "@flowforge/file-server": "git://github.com/FlowFuse/file-server.git",
+        "eslint": "^8.49.0",
+        "eslint-config-standard": "^17.1.0",
+        "eslint-plugin-no-only-tests": "^3.1.0",
+        "mocha": "^10.2.0",
+        "sass": "1.66.1",
+        "should": "^13.2.3",
+        "sinon": "^17.0.1",
+        "sqlite3": "^5.1.6",
+        "yaml": "^2.1.3"
     }
-  },
-  "scripts": {
-    "test": "mocha 'test/unit/**/*_spec.js'",
-    "lint": "eslint -c .eslintrc *.js lib/**/*.js test/**/*.js",
-    "lint:fix": "eslint -c .eslintrc *.js lib/*.js test/**/*.js --fix",
-    "build-theme": "node lib/theme/scripts/build.js "
-  },
-  "keywords": [
-    "FlowFuse"
-  ],
-  "bin": {
-    "flowforge-node-red": "./index.js",
-    "flowfuse-node-red": "./index.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/FlowFuse/nr-launcher.git"
-  },
-  "author": {
-    "name": "FlowFuse Inc."
-  },
-  "license": "Apache-2.0",
-  "bugs": {
-    "url": "https://github.com/FlowFuse/nr-launcher/issues"
-  },
-  "homepage": "https://github.com/FlowFuse/nr-launcher#readme",
-  "dependencies": {
-    "@flowfuse/nr-assistant": "nightly",
-    "@flowfuse/nr-file-nodes": "nightly",
-    "@flowfuse/nr-project-nodes": "nightly",
-    "@node-red/util": "^3.1.0",
-    "body-parser": "^1.20.2",
-    "command-line-args": "^5.2.1",
-    "express": "^4.18.2",
-    "express-session": "^1.18.0",
-    "got": "^11.8.6",
-    "json-stringify-safe": "5.0.1",
-    "memorystore": "^1.6.7",
-    "multer": "^1.4.5-lts.1",
-    "oauth": "^0.9.15",
-    "parse-prometheus-text-format": "^1.1.1",
-    "passport": "0.6.0",
-    "passport-oauth2": "^1.6.1",
-    "prom-client": "^15.0.0",
-    "ws": "^8.7.0"
-  },
-  "devDependencies": {
-    "@flowforge/file-server": "git://github.com/FlowFuse/file-server.git",
-    "eslint": "^8.49.0",
-    "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-no-only-tests": "^3.1.0",
-    "mocha": "^10.2.0",
-    "sass": "1.66.1",
-    "should": "^13.2.3",
-    "sinon": "^17.0.1",
-    "sqlite3": "^5.1.6",
-    "yaml": "^2.1.3"
-  }
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

567085

increased by0.18%

Lines of code

3547

increased by0.48%

Dependency changes

• + Added@flowfuse/nr-assistant@0.1.3(transitive)

• + Added@flowfuse/nr-file-nodes@0.0.7(transitive)

• + Added@flowfuse/nr-project-nodes@0.7.4(transitive)

• - Removed@flowfuse/nr-assistant@0.1.4-51c0518-202412161051.0(transitive)

• - Removed@flowfuse/nr-file-nodes@0.0.9-1e6a163-202412191018.0(transitive)

• - Removed@flowfuse/nr-project-nodes@0.7.5-1fb7208-202412091856.0(transitive)

• Updated@flowfuse/nr-assistant@^0.1.3

• Updated@flowfuse/nr-file-nodes@^0.0.7

• Updated@flowfuse/nr-project-nodes@^0.7.2

• Updatedexpress@^4.21.0