diff --git a/node_modules/architect-build/build_support/mini_require.js b/node_modules/architect-build/build_support/mini_require.js index 8d4c219c..6e643a35 100644 --- a/node_modules/architect-build/build_support/mini_require.js +++ b/node_modules/architect-build/build_support/mini_require.js @@ -282,7 +282,13 @@ config.packages = Object.create(null); config.paths = Object.create(null); config.baseUrl = ""; -require.undef = function(module, callback) { +require.undef = function(module, recursive) { + if (recursive) { + var root = (module + "/").replace(/\/+$/, "/"); + undefAll(root, define.errors); + undefAll(root, define.loaded); + undefAll(root, define.modules); + } module = normalizeName("", module); var path = require.toUrl(module, ".js"); delete define.errors[module]; @@ -291,6 +297,13 @@ require.undef = function(module, callback) { delete define.fetchedUrls[path]; }; +function undefAll(module, hash) { + Object.keys(hash).forEach(function(key) { + if (key.lastIndexOf(module, 0) == 0) + require.undef(key); + }); +} + require.MODULE_LOAD_URL = MODULE_LOAD_URL; require.toUrl = function(moduleName, ext, skipExt) { diff --git a/package.json b/package.json index 51e58ad9..48a5a3e1 100644 --- a/package.json +++ b/package.json @@ -102,11 +102,11 @@ "c9.ide.recentfiles": "#7c099abf40", "c9.ide.remote": "#301d2ab519", "c9.ide.processlist": "#bc11818bb5", - "c9.ide.run": "#05c0054752", + "c9.ide.run": "#ba97f384a6", "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#61dcbd0180", "c9.ide.save": "#e00549cb0f", - "c9.ide.scm": "#5ad12f7236", + "c9.ide.scm": "#9bedd0fcd3", "c9.ide.terminal.monitor": "#b76f1c9f24", "c9.ide.theme.flat": "#2de8414db7", "c9.ide.threewaymerge": "#229382aa0b", diff --git a/plugins/c9.ide.plugins/loader.js b/plugins/c9.ide.plugins/loader.js index 6d8791af..144c79e2 100644 --- a/plugins/c9.ide.plugins/loader.js +++ b/plugins/c9.ide.plugins/loader.js @@ -239,7 +239,7 @@ define(function(require, exports, module) { paths[config.packagePath] = config.staticPrefix; requirejs.config({ paths: paths }); - requirejs.undef([config.packagePath, "__installed__.js"].join("/")); + requirejs.undef(config.packagePath, true); require([[config.packagePath, "__installed__"].join("/")], function(installed) { callback(null, installed);