From 0cf3212f5dc67586da6718d24bcd6231593ff439 Mon Sep 17 00:00:00 2001 From: jlukic Date: Thu, 12 Feb 2015 15:35:08 -0500 Subject: [PATCH] Trying out new extend --- package.json | 4 ++-- tasks/config/project/install.js | 4 +--- tasks/config/user.js | 2 +- tasks/install.js | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index c4388b824..7b7e11b86 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "peerDependencies": { "better-console" : "0.x.x", "del" : "1.x.x", - "extend" : "2.x.x", + "node.extend" : "1.x.x", "gulp" : "3.x.x", "gulp-autoprefixer" : "2.x.x", "gulp-chmod" : "1.x.x", @@ -47,7 +47,7 @@ "dependencies": { "better-console" : "0.x.x", "del" : "1.x.x", - "extend" : "2.x.x", + "node.extend" : "1.x.x", "gulp" : "3.x.x", "gulp-autoprefixer" : "2.x.x", "gulp-chmod" : "1.x.x", diff --git a/tasks/config/project/install.js b/tasks/config/project/install.js index 7b2eb9c46..043ddf684 100644 --- a/tasks/config/project/install.js +++ b/tasks/config/project/install.js @@ -11,8 +11,6 @@ var requireDotFile = require('require-dot-file') ; -console.log('start install', defaults.paths); - /******************************* When to Ask *******************************/ @@ -299,7 +297,7 @@ module.exports = { type : 'input', name : 'semanticRoot', message : 'Where should we put Semantic UI inside your project?', - default : defaults.pmRoot + default : 'semantic/' } ], diff --git a/tasks/config/user.js b/tasks/config/user.js index 4d7544011..ccc37c367 100644 --- a/tasks/config/user.js +++ b/tasks/config/user.js @@ -4,7 +4,7 @@ var // npm dependencies - extend = require('extend'), + extend = require('node.extend'), fs = require('fs'), path = require('path'), requireDotFile = require('require-dot-file'), diff --git a/tasks/install.js b/tasks/install.js index e2d153f99..505cd82ae 100644 --- a/tasks/install.js +++ b/tasks/install.js @@ -19,7 +19,7 @@ var // node dependencies console = require('better-console'), - extend = require('extend'), + extend = require('node.extend'), fs = require('fs'), mkdirp = require('mkdirp'), path = require('path'),