From 5545731c907396c7c3bc8d012ae8f93d75217c59 Mon Sep 17 00:00:00 2001 From: Michael Iwersen Date: Tue, 5 Jan 2016 09:34:43 +0100 Subject: [PATCH 1/6] Adjusted babel and travis --- .babelrc | 9 ++++++++- .travis.yml | 10 ++++++---- package.json | 10 +++++++--- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/.babelrc b/.babelrc index 3607b0c..ce107e4 100644 --- a/.babelrc +++ b/.babelrc @@ -2,5 +2,12 @@ "ignore": [ "node_modules/*" ], - "plugins": ["transform-es2015-modules-commonjs", "transform-es2015-parameters"] + "plugins": [ + "transform-es2015-modules-commonjs", + "transform-es2015-parameters", + "babel-plugin-transform-es2015-block-scoping", + "babel-plugin-check-es2015-constants", + "babel-plugin-transform-es2015-classes", + "babel-plugin-transform-es2015-template-literals" + ] } \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 6edb096..e7047c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,11 @@ language: node_js node_js: - - "5.3" - - "5.2" - - "5.1" - - "5.0" + - "0.12" + - "1" + - "2" + - "3" + - "4" + - "5" install: npm install --dev script: npm test after_script: npm run coveralls diff --git a/package.json b/package.json index 8b8b9bb..3a0d941 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "name": "radix-tree", - "version": "0.1.2", + "version": "0.1.3", "description": "Node.js version of a radix tree usable for routers or url path based storage.", "main": "index.js", - "engines" : { - "node" : ">=4.0.0" + "engines": { + "node": ">=0.12" }, "scripts": { "prepublish": "babel src --out-dir lib", @@ -28,8 +28,12 @@ }, "devDependencies": { "babel-cli": "^6.3.17", + "babel-plugin-check-es2015-constants": "^6.3.13", + "babel-plugin-transform-es2015-block-scoping": "^6.3.13", + "babel-plugin-transform-es2015-classes": "^6.3.15", "babel-plugin-transform-es2015-modules-commonjs": "^6.3.16", "babel-plugin-transform-es2015-parameters": "^6.3.26", + "babel-plugin-transform-es2015-template-literals": "^6.3.13", "benchmark": "^2.0.0", "chai": "^3.4.1", "coveralls": "^2.11.6", From d6242c93b11a7e29c6b69e1e768be5047265bcc8 Mon Sep 17 00:00:00 2001 From: Michael Iwersen Date: Tue, 5 Jan 2016 10:29:29 +0100 Subject: [PATCH 2/6] Removed lodash dependency --- package.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/package.json b/package.json index 3a0d941..b4ece07 100644 --- a/package.json +++ b/package.json @@ -23,9 +23,6 @@ "url": "https://github.com/evangelion1204/radix-tree/issues" }, "homepage": "https://github.com/evangelion1204/radix-tree#readme", - "dependencies": { - "lodash": "^3.10.1" - }, "devDependencies": { "babel-cli": "^6.3.17", "babel-plugin-check-es2015-constants": "^6.3.13", From 389ab5ac532af9ec3efaf00fe9303cb2eb53d7c6 Mon Sep 17 00:00:00 2001 From: Michael Iwersen Date: Tue, 5 Jan 2016 10:43:41 +0100 Subject: [PATCH 3/6] Removed coveralls from dependency list --- .travis.yml | 2 +- package.json | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e7047c4..d2c2ca3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,4 +8,4 @@ node_js: - "5" install: npm install --dev script: npm test -after_script: npm run coveralls +after_script: npm run coverage diff --git a/package.json b/package.json index b4ece07..3d364a9 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,6 @@ "prepublish": "babel src --out-dir lib", "test": "babel-node ./node_modules/.bin/_mocha", "coverage": "babel-node ./node_modules/.bin/isparta cover ./node_modules/.bin/_mocha", - "coveralls": "babel-node ./node_modules/.bin/isparta cover ./node_modules/.bin/_mocha && cat ./coverage/lcov.info | coveralls", "bench": "babel-node --harmony benchmark/joined.js" }, "repository": { @@ -33,7 +32,6 @@ "babel-plugin-transform-es2015-template-literals": "^6.3.13", "benchmark": "^2.0.0", "chai": "^3.4.1", - "coveralls": "^2.11.6", "isparta": "^4.0.0", "mocha": "^2.3.4", "sinon": "^1.17.2", From ef4bba9d311ae5d4d8c07825f2bcd65b078893c3 Mon Sep 17 00:00:00 2001 From: Michael Iwersen Date: Tue, 5 Jan 2016 12:49:08 +0100 Subject: [PATCH 4/6] Changed install and publish options, custom distribute command added --- .travis.yml | 2 +- package.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d2c2ca3..f813a73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,6 @@ node_js: - "3" - "4" - "5" -install: npm install --dev +install: npm install script: npm test after_script: npm run coverage diff --git a/package.json b/package.json index 3d364a9..9397382 100644 --- a/package.json +++ b/package.json @@ -7,10 +7,11 @@ "node": ">=0.12" }, "scripts": { - "prepublish": "babel src --out-dir lib", + "predistribute": "babel src --out-dir lib", "test": "babel-node ./node_modules/.bin/_mocha", "coverage": "babel-node ./node_modules/.bin/isparta cover ./node_modules/.bin/_mocha", "bench": "babel-node --harmony benchmark/joined.js" + "distribute": "npm publish" }, "repository": { "type": "git", From 2cbe5006c6de97695cdb627c532db4d0382487aa Mon Sep 17 00:00:00 2001 From: Michael Iwersen Date: Tue, 5 Jan 2016 12:50:28 +0100 Subject: [PATCH 5/6] Fixed missing , in package json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9397382..9d474d8 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "predistribute": "babel src --out-dir lib", "test": "babel-node ./node_modules/.bin/_mocha", "coverage": "babel-node ./node_modules/.bin/isparta cover ./node_modules/.bin/_mocha", - "bench": "babel-node --harmony benchmark/joined.js" + "bench": "babel-node --harmony benchmark/joined.js", "distribute": "npm publish" }, "repository": { From 2c553739ed08fba58f69855c6e66eab9985e1cb1 Mon Sep 17 00:00:00 2001 From: Michael Iwersen Date: Tue, 5 Jan 2016 13:38:59 +0100 Subject: [PATCH 6/6] Added code coverage via coveralls --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f813a73..89e21a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,4 +8,4 @@ node_js: - "5" install: npm install script: npm test -after_script: npm run coverage +after_script: npm install coveralls && npm run coverage && cat ./coverage/lcov.info | coveralls