From 86ce23a2bd8c665291b9fff65a2cae4b80d13444 Mon Sep 17 00:00:00 2001 From: Pat Cavit Date: Wed, 18 May 2016 22:22:29 -0700 Subject: [PATCH] Fix bundler w/ relative paths from sub-dirs --- bundler/bundler.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bundler/bundler.js b/bundler/bundler.js index c551649a..5656a305 100644 --- a/bundler/bundler.js +++ b/bundler/bundler.js @@ -8,12 +8,12 @@ var modules = {} function resolve(dir, data) { var replacements = [] data = data.replace(/((?:var|let|const|)\s*)([\w_$]+)(\s*=\s*)require\(([^\)]+)\)/g, function(match, def, variable, eq, dep) { - var filename = new Function("return " + dep).call() - var pathname = path.dirname(filename) + var filename = new Function("return " + dep).call() + var pathname = path.dirname(path.resolve(dir, filename)) var normalized = path.normalize(dir + "/" + filename) if (modules[normalized] === undefined) { modules[normalized] = variable - return resolve(pathname, + return resolve(pathname, fs.readFileSync(dir + "/" + filename + ".js", "utf8") .replace(/"use strict"\s*/gm, "") .replace(/module\.exports\s*=\s*/gm, def + variable + eq)