Permalink
Browse files

BUG: isBuilderTask doesn't correctly infer on Windows. (#140)

- **Actual issue**: Fix builder passthrough determination on Windows. This is just @GEMI 's fix from #139 that I've copied with lots of other stuff going on. Fixes #138 
- Travis CI fails weirdly from an istanbul / node-mkdirp issue on Node 6's somewhere by `6.10.2`. I've captured the issue in a ticket and just pinned `6.9.2`
- I've honed down the `.npmignore` to make the package smaller.
- Removed npm@2 from testing on Node 5 and 6.
  • Loading branch information...
ryan-roemer committed Apr 10, 2017
1 parent 25385e4 commit 37e33da85075f64f17892cb5888fa09d60d5f76e
Showing with 1,880 additions and 30 deletions.
  1. +8 −23 .npmignore
  2. +15 −5 .travis.yml
  3. +6 −0 HISTORY.md
  4. +3 −1 lib/task.js
  5. +1 −1 package.json
  6. +1,847 −0 yarn.lock
View
@@ -1,23 +1,8 @@
\.git
\.hg
\.DS_Store
\.project
bower_components
node_modules
npm-debug\.log*
phantomjsdriver\.log
# Build
dist
*/dist
build
*/build
coverage
Procfile
# NPM
test
.eslint*
.istanbul*
.travis*
/*
!/bin
!/lib
!CONTRIBUTING.md
!HISTORY.md
!LICENSE.txt
!README.md
!package.json
View
@@ -5,7 +5,11 @@ node_js:
- "0.12"
- "4"
- "5"
- "6"
# By `v6.10.2` we hit this error:
# - https://github.com/FormidableLabs/builder/issues/141
# - https://github.com/substack/node-mkdirp/pull/110
# so pin for now.
- "6.9.5"
# Use container-based Travis infrastructure.
sudo: false
@@ -15,10 +19,16 @@ branches:
- master
env:
matrix:
- TEST_NPM_VERSION=2
- TEST_NPM_VERSION=3
- TEST_NPM_VERSION=4
- TEST_NPM_VERSION=2
- TEST_NPM_VERSION=3
- TEST_NPM_VERSION=4
matrix:
exclude:
- node_js: "5"
env: TEST_NPM_VERSION=2
- node_js: "6.9.5"
env: TEST_NPM_VERSION=2
before_install:
# GUI for real browsers.
View
@@ -1,6 +1,11 @@
History
=======
## Unreleased
* Correctly infer if a builder passthrough task on Windows. ( [@GEMI][] )
[#138](https://github.com/FormidableLabs/builder/issues/138)
## 3.2.1
* Update module pattern documentation.
@@ -171,4 +176,5 @@ Other:
* Initial release.
[@exogen]: https://github.com/exogen
[@GEMI]: https://github.com/GEMI
[@ryan-roemer]: https://github.com/ryan-roemer
View
@@ -81,7 +81,9 @@ Task.prototype.toString = function () {
* @returns {Boolean} Is this task a passthrough?
*/
Task.prototype.isBuilderTask = function (task) {
var builder = path.basename(this._script);
// mac: '/PATH/TO/node_modules/.bin/builder'
// win: 'X:\\PATH\\TO\\node_modules\\builder\\bin\\builder.js',
var builder = path.basename(this._script, ".js");
var taskParts = task.split(/\s+/);
var taskBin = taskParts[0];
View
@@ -41,7 +41,7 @@
"eslint": "^1.7.3",
"eslint-config-defaults": "^7.0.1",
"eslint-plugin-filenames": "^0.1.2",
"istanbul": "^0.4.1",
"istanbul": "^0.4.5",
"mocha": "^2.3.4",
"mock-fs": "^3.7.0",
"sinon": "^1.17.2",
Oops, something went wrong.

0 comments on commit 37e33da

Please sign in to comment.