kopia lustrzana https://github.com/c9/core
Merge pull request +8808 from c9/fix-sdk
Fix missing node_module error in sdk and add testpull/137/head
commit
ae6e89f36b
|
@ -178,7 +178,7 @@ module.exports = function(config, optimist) {
|
||||||
readonly: readonly
|
readonly: readonly
|
||||||
},
|
},
|
||||||
"./c9.vfs.server/vfs.server",
|
"./c9.vfs.server/vfs.server",
|
||||||
"./c9.error/logger.raygun_mock",
|
"./c9.error/logger.raygun_noop",
|
||||||
"./c9.preview/preview.handler",
|
"./c9.preview/preview.handler",
|
||||||
"./c9.vfs.server/cache",
|
"./c9.vfs.server/cache",
|
||||||
"./c9.vfs.server/download",
|
"./c9.vfs.server/download",
|
||||||
|
|
|
@ -5,13 +5,17 @@
|
||||||
*/
|
*/
|
||||||
var modules = require("module");
|
var modules = require("module");
|
||||||
var oldResolve = modules._resolveFilename;
|
var oldResolve = modules._resolveFilename;
|
||||||
var extraPaths = [
|
var path = require("path")
|
||||||
__dirname + "/../../"
|
var root = path.join(__dirname, "/../..");
|
||||||
];
|
var extraPaths = [ root ];
|
||||||
modules._resolveFilename = function(request, parent) {
|
modules._resolveFilename = function(request, parent) {
|
||||||
if (!parent) parent = { paths: [], filename: "" };
|
if (!parent) parent = { paths: [], filename: "" };
|
||||||
// Ensure client extensions can be loaded
|
// Ensure client extensions can be loaded
|
||||||
request = request.replace(/^lib\//, "node_modules/");
|
request = request.replace(/^lib\//, "node_modules/");
|
||||||
|
// ensure we never use node_modules outside of root dir
|
||||||
|
parent.paths = parent.paths.filter(function(p) {
|
||||||
|
return p.indexOf(root) == 0
|
||||||
|
});
|
||||||
// Add the extra paths
|
// Add the extra paths
|
||||||
extraPaths.forEach(function(p) {
|
extraPaths.forEach(function(p) {
|
||||||
if (parent.paths.indexOf(p) === -1)
|
if (parent.paths.indexOf(p) === -1)
|
||||||
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
plugin.consumes = [];
|
||||||
|
plugin.provides = ["error.logger"];
|
||||||
|
|
||||||
|
module.exports = plugin;
|
||||||
|
|
||||||
|
function plugin(options, imports, register) {
|
||||||
|
var noop = function() {};
|
||||||
|
|
||||||
|
register(null, {
|
||||||
|
"error.logger": {
|
||||||
|
log: noop,
|
||||||
|
error: noop,
|
||||||
|
warn: noop
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
Ładowanie…
Reference in New Issue