Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updated dependencies to latest versions to fix several bugs.

  • Loading branch information...
commit 6f14582b9818936ee7cd39db39b9dcbb367bcf2a 1 parent 11e4665
@brandonramirez brandonramirez authored
Showing with 19 additions and 34 deletions.
  1. +12 −27 lib/buildr.coffee
  2. +7 −7 package.json
View
39 lib/buildr.coffee
@@ -4,7 +4,7 @@ path = require 'path'
util = require 'bal-util'
coffee = require 'coffee-script'
less = require 'less'
-pulverizr = require 'pulverizr-bal'
+pulverizr = require 'pulverizr'
csslint = require('csslint').CSSLint
jshint = require('jshint').JSHINT
uglify = require 'uglify-js'
@@ -242,41 +242,31 @@ class Buildr
@config.outPath or= @config.srcPath
# Expand srcPath
- util.expandPath @config.srcPath, cwd, {}, (err,srcPath) =>
- return tasks.exit err if err
- @config.srcPath = srcPath
- tasks.complete err
+ @config.srcPath = path.resolve @config.srcPath
+ tasks.complete null
# Expand outPath
- util.expandPath @config.outPath, cwd, {}, (err,outPath) =>
- return tasks.exit err if err
- @config.outPath = outPath
- tasks.complete err
+ @config.outPath = path.resolve @config.outPath
+ tasks.complete null
# Expand bundleScriptPath
if @config.bundleScriptPath
- util.expandPath @config.bundleScriptPath, cwd, {}, (err,bundleScriptPath) =>
- return tasks.exit err if err
- @config.bundleScriptPath = bundleScriptPath
- tasks.complete err
+ @config.bundleScriptPath = path.resolve @config.bundleScriptPath
+ tasks.complete null
else
tasks.complete false
# Expand bundleStylePath
if @config.bundleStylePath
- util.expandPath @config.bundleStylePath, cwd, {}, (err,bundleStylePath) =>
- return tasks.exit err if err
- @config.bundleStylePath = bundleStylePath
- tasks.complete err
+ @config.bundleStylePaths = path.resolve @config.bundleStylePath
+ tasks.complete null
else
tasks.complete false
# Expand srcLoaderPath
if @config.srcLoaderPath
- util.expandPath @config.srcLoaderPath, cwd, {}, (err,srcLoaderPath) =>
- return tasks.exit err if err
- @config.srcLoaderPath = srcLoaderPath
- tasks.complete err
+ @config.srcLoaderPath = path.resolve @config.srcLoaderPath
+ tasks.complete null
else
tasks.complete false
@@ -402,7 +392,6 @@ class Buildr
return next false unless config.srcLoaderPath
# Log
- log = @log
log 'debug', "Generating #{config.srcLoaderPath}"
# Prepare
@@ -772,11 +761,7 @@ class Buildr
# Cycle
for fileRelativePath in files
# Expand filePath
- ((fileRelativePath)=>
- util.expandPath fileRelativePath, parentPath, {}, (err,fileFullPath) =>
- return tasks.exit err if err
- callback fileFullPath, fileRelativePath, tasks.completer()
- )(fileRelativePath)
+ callback path.resolve(parentPath, fileRelativePath),fileRelativePath, tasks.completer()
# Completed
true
View
14 package.json
@@ -52,15 +52,15 @@
},
"dependencies": {
"less": "1.3.x",
- "coffee-script": "1.2.x",
- "bal-util": "0.7.x",
- "jshint": "0.7.x",
+ "coffee-script": "1.4.x",
+ "bal-util": "1.x",
+ "jshint": "0.9.x",
"csslint": "0.9.x",
"uglify-js": "1.3.x",
- "pulverizr-bal": "0.6.x",
- "cson": "1.0.x",
- "watch-tree": "0.1.x",
- "caterpillar": "0.1.x"
+ "pulverizr": "0.7.x",
+ "cson": ">=1.4",
+ "watch-tree-maintained": "0.1.x",
+ "caterpillar": "1.x"
},
"engines" : {
"node": ">=0.4.0"
Please sign in to comment.
Something went wrong with that request. Please try again.