diff --git a/packages/node_modules/@node-red/runtime/lib/flows/Flow.js b/packages/node_modules/@node-red/runtime/lib/flows/Flow.js index c0eb122c9..35fdc67fc 100644 --- a/packages/node_modules/@node-red/runtime/lib/flows/Flow.js +++ b/packages/node_modules/@node-red/runtime/lib/flows/Flow.js @@ -19,7 +19,7 @@ var redUtil = require("@node-red/util").util; const events = require("@node-red/util").events; var flowUtil = require("./util"); const context = require('../nodes/context'); -const hooks = require("../hooks"); +const hooks = require("@node-red/util").hooks; var Subflow; var Log; diff --git a/packages/node_modules/@node-red/runtime/lib/index.js b/packages/node_modules/@node-red/runtime/lib/index.js index 30481740f..79c69e77c 100644 --- a/packages/node_modules/@node-red/runtime/lib/index.js +++ b/packages/node_modules/@node-red/runtime/lib/index.js @@ -20,7 +20,6 @@ var redNodes = require("./nodes"); var flows = require("./flows"); var storage = require("./storage"); var library = require("./library"); -var hooks = require("./hooks"); var plugins = require("./plugins"); var settings = require("./settings"); @@ -29,7 +28,7 @@ var path = require('path'); var fs = require("fs"); var os = require("os"); -const {log,i18n,events,exec,util} = require("@node-red/util"); +const {log,i18n,events,exec,util,hooks} = require("@node-red/util"); var runtimeMetricInterval = null; diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js index faf07bda5..c13c812a9 100644 --- a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js +++ b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js @@ -21,7 +21,7 @@ var redUtil = require("@node-red/util").util; var Log = require("@node-red/util").log; var context = require("./context"); var flows = require("../flows"); -const hooks = require("../hooks"); +const hooks = require("@node-red/util").hooks; const NOOP_SEND = function() {} diff --git a/packages/node_modules/@node-red/util/index.js b/packages/node_modules/@node-red/util/index.js index aeb566540..f5dfd3449 100644 --- a/packages/node_modules/@node-red/util/index.js +++ b/packages/node_modules/@node-red/util/index.js @@ -19,6 +19,7 @@ const i18n = require("./lib/i18n"); const util = require("./lib/util"); const events = require("./lib/events"); const exec = require("./lib/exec"); +const hooks = require("./lib/hooks"); /** * This module provides common utilities for the Node-RED runtime and editor @@ -69,5 +70,12 @@ module.exports = { * @mixes @node-red/util_exec * @memberof @node-red/util */ - exec: exec + exec: exec, + + /** + * Runtime hooks + * @mixes @node-red/util_hooks + * @memberof @node-red/util + */ + hooks: hooks } diff --git a/packages/node_modules/@node-red/runtime/lib/hooks.js b/packages/node_modules/@node-red/util/lib/hooks.js similarity index 99% rename from packages/node_modules/@node-red/runtime/lib/hooks.js rename to packages/node_modules/@node-red/util/lib/hooks.js index 4ae537cc4..19912c7f2 100644 --- a/packages/node_modules/@node-red/runtime/lib/hooks.js +++ b/packages/node_modules/@node-red/util/lib/hooks.js @@ -1,4 +1,4 @@ -const Log = require("@node-red/util").log; +const Log = require("./log.js"); const VALID_HOOKS = [ // Message Routing Path @@ -179,4 +179,4 @@ module.exports = { add, remove, trigger -} \ No newline at end of file +} diff --git a/test/unit/@node-red/runtime/lib/hooks_spec.js b/test/unit/@node-red/util/lib/hooks_spec.js similarity index 98% rename from test/unit/@node-red/runtime/lib/hooks_spec.js rename to test/unit/@node-red/util/lib/hooks_spec.js index 4fb95b68a..d24729070 100644 --- a/test/unit/@node-red/runtime/lib/hooks_spec.js +++ b/test/unit/@node-red/util/lib/hooks_spec.js @@ -1,9 +1,9 @@ const should = require("should"); const NR_TEST_UTILS = require("nr-test-utils"); -const hooks = NR_TEST_UTILS.require("@node-red/runtime/lib/hooks"); +const hooks = NR_TEST_UTILS.require("@node-red/util/lib/hooks"); -describe("runtime/hooks", function() { +describe("util/hooks", function() { afterEach(function() { hooks.clear(); }) @@ -81,7 +81,7 @@ describe("runtime/hooks", function() { hooks.has("onSend.A").should.be.false(); hooks.has("onSend.B").should.be.false(); hooks.has("onSend").should.be.false(); - + done(err); } catch(err2) { done(err2);