From c0e1b87c2a40eeb5046ed55f41f89755f1a51924 Mon Sep 17 00:00:00 2001 From: jeroenvalcke Date: Wed, 8 Nov 2017 11:19:24 +0100 Subject: Remove opts and only use old load functionality for coffee scripts --- lib/index.js | 4 ++-- lib/moduleEnv.js | 2 +- lib/rewire.js | 15 ++++++--------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/lib/index.js b/lib/index.js index 765de10..0edcd2c 100644 --- a/lib/index.js +++ b/lib/index.js @@ -7,8 +7,8 @@ var rewireModule = require("./rewire.js"); * @param {!String} filename Path to the module that shall be rewired. Use it exactly like require(). * @return {*} the rewired module */ -function rewire(filename, opts) { - return rewireModule(module.parent, filename, opts); +function rewire(filename) { + return rewireModule(module.parent, filename); } module.exports = rewire; diff --git a/lib/moduleEnv.js b/lib/moduleEnv.js index 29c407c..dd003d7 100644 --- a/lib/moduleEnv.js +++ b/lib/moduleEnv.js @@ -12,7 +12,7 @@ var moduleWrapper0 = Module.wrapper[0], nodeRequire, currentModule; -function load(targetModule, isTransform) { +function load(targetModule) { nodeRequire = targetModule.require; targetModule.require = requireProxy; currentModule = targetModule; diff --git a/lib/rewire.js b/lib/rewire.js index 1d240d4..536929d 100644 --- a/lib/rewire.js +++ b/lib/rewire.js @@ -9,15 +9,11 @@ var Module = require("module"), /** * Does actual rewiring the module. For further documentation @see index.js */ -function internalRewire(parentModulePath, targetPath, opts) { +function internalRewire(parentModulePath, targetPath) { var targetModule, prelude, appendix, - src, - isTransform; - - opts = typeof opts === "object" ? opts : {}; - isTransform = !!opts.convertConst; + src; // Checking params if (typeof targetPath !== "string") { @@ -60,12 +56,13 @@ function internalRewire(parentModulePath, targetPath, opts) { moduleEnv.inject(prelude, appendix); - if(isTransform) { - moduleEnv.compile(targetModule, src, targetPath); - } else { + if (targetPath.match(/\.coffee$/)) { moduleEnv.load(targetModule); + } else { + moduleEnv.compile(targetModule, src, targetPath); } + return targetModule.exports; } -- cgit v1.2.3