Skip to content

Commit

Permalink
Merge 6b0747b into 1ed5c3a
Browse files Browse the repository at this point in the history
  • Loading branch information
sorrycc committed Dec 23, 2014
2 parents 1ed5c3a + 6b0747b commit dddc831
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 21 deletions.
13 changes: 0 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
SRC=$(wildcard lib/*.js)
BUILD = $(subst lib/,build/,$(SRC))

build/%.js: lib/%.js
node_modules/.bin/regenerator --include-runtime $< > $@

build: clean
@mkdir -p build
@$(MAKE) $(BUILD)

clean:
@rm -rf build

test:
@node --harmony \
node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha \
Expand Down
6 changes: 2 additions & 4 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
'use strict';

module.exports = require('generator-supported') ?
require('./lib') :
/* istanbul ignore next */
require('./build');
require('ali.gnode');
module.exports = require('./lib');
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"description": "spm client api",
"main": "index",
"dependencies": {
"ali.gnode": "~0.1.1",
"co-request": "~0.2.0",
"colorful": "~2.1.0",
"debug": "~1.0.4",
"extend": "~1.3.0",
"fstream": "~1.0.1",
"fstream-ignore": "~1.0.1",
"generator-supported": "~0.0.1",
"vinyl-fs": "~0.3.11",
"gulp-gunzip": "~0.0.2",
"gulp-untar2": "~0.0.5",
"inherits": "~1.0.0",
Expand All @@ -21,10 +21,10 @@
"semver": "~3.0.1",
"spm-log": "~0.1.0",
"spmrc": "~1.2.0",
"tar": "~1.0.0"
"tar": "~1.0.0",
"vinyl-fs": "~0.3.11"
},
"devDependencies": {
"ali.regenerator": "0",
"co-mocha": "0",
"coveralls": "2",
"istanbul-harmony": "0",
Expand All @@ -42,7 +42,6 @@
"author": "popomore <sakura9515@gmail.com>",
"license": "MIT",
"scripts": {
"prepublish": "make build",
"test": "make test"
}
}

0 comments on commit dddc831

Please sign in to comment.