From 76f443e1a7f9954d52fb3bbaacd989a054b9961c Mon Sep 17 00:00:00 2001 From: David Haubenstricker Date: Tue, 31 May 2016 16:43:20 -0400 Subject: [PATCH 1/2] fix jshint errors --- test/wiredep_test.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/wiredep_test.js b/test/wiredep_test.js index 120b7a0..1659e51 100644 --- a/test/wiredep_test.js +++ b/test/wiredep_test.js @@ -1,5 +1,5 @@ /*jshint latedef:false */ -/*global after, describe, it, before, beforeEach */ +/*global after, afterEach, describe, it, before, beforeEach */ 'use strict'; @@ -29,10 +29,10 @@ require.uncache = function (moduleName) { describe('wiredep', function () { beforeEach(function () { wiredep = require('../wiredep'); - }) + }); afterEach(function () { require.uncache('../wiredep'); - }) + }); before(function() { fs.copySync('test/fixture', '.tmp'); process.chdir('.tmp'); From c3beaf5eeee602933501a2bbff4d2c51314dc31d Mon Sep 17 00:00:00 2001 From: David Haubenstricker Date: Tue, 31 May 2016 16:53:39 -0400 Subject: [PATCH 2/2] Defaults getting changed by configuration due to shallow copy of defaults rather than a deep copy. --- test/wiredep_test.js | 28 ++-------------------------- wiredep.js | 2 +- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/test/wiredep_test.js b/test/wiredep_test.js index 1659e51..d723a9b 100644 --- a/test/wiredep_test.js +++ b/test/wiredep_test.js @@ -1,38 +1,14 @@ /*jshint latedef:false */ -/*global after, afterEach, describe, it, before, beforeEach */ +/*global after, describe, it, before, beforeEach */ 'use strict'; var fs = require('fs-extra'); var path = require('path'); var assert = require('chai').assert; -var wiredep; - -require.uncache = function (moduleName) { - var mod = require.resolve(moduleName); - if (mod && ((mod = require.cache[mod]) !== undefined)) { - (function run(mod) { - mod.children.forEach(function (child) { - run(child); - }); - delete require.cache[mod.id]; - })(mod); - } - - Object.keys(module.constructor._pathCache).forEach(function(cacheKey) { - if (cacheKey.indexOf(moduleName)>0) { - delete module.constructor._pathCache[cacheKey]; - } - }); -}; +var wiredep = require('../wiredep'); describe('wiredep', function () { - beforeEach(function () { - wiredep = require('../wiredep'); - }); - afterEach(function () { - require.uncache('../wiredep'); - }); before(function() { fs.copySync('test/fixture', '.tmp'); process.chdir('.tmp'); diff --git a/wiredep.js b/wiredep.js index c5f1e3e..68b2aca 100644 --- a/wiredep.js +++ b/wiredep.js @@ -82,7 +82,7 @@ function wiredep(opts) { } function mergeFileTypesWithDefaults(optsFileTypes) { - var fileTypes = $._.clone(fileTypesDefault, true); + var fileTypes = $._.cloneDeep(fileTypesDefault); $._(optsFileTypes).each(function (fileTypeConfig, fileType) { // fallback to the default type for all html-like extensions (php, twig, hbs, etc)