diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js index 9b94b2783..83185158d 100644 --- a/src/static/js/pluginfw/plugins.js +++ b/src/static/js/pluginfw/plugins.js @@ -19,17 +19,13 @@ exports.hooks = {}; exports.ensure = function (cb) { if (!exports.loaded) exports.getPackages(function (er, packages) { -pkg = Object.keys(packages).map(function (name) { + requirejs.config({ + packages: Object.keys(packages).map(function (name) { return { name: name, location: packages[name].realPath } }) -; - - console.log(["AAAAAAAAA", pkg]); - requirejs.config({ - packages: pkg }); exports.update(cb); diff --git a/src/static/js/pluginfw/shared.js b/src/static/js/pluginfw/shared.js index 767487264..6dc763501 100644 --- a/src/static/js/pluginfw/shared.js +++ b/src/static/js/pluginfw/shared.js @@ -23,8 +23,6 @@ function loadFn(path, hookName, cb) { functionName = parts[1]; } - console.log(["loadName", path, functionName]); - var handleFunction = function (fn) { functionName = functionName ? functionName : hookName; @@ -38,6 +36,7 @@ function loadFn(path, hookName, cb) { /* We're apparently in NodeJS, so try to load using the built-in require first */ try { handleFunction(require(path)); + console.warn("Module uses old CommonJS format: " + path); } catch (e) { requirejs([path], handleFunction); }