Skip to content
This repository has been archived by the owner on Mar 11, 2018. It is now read-only.

Commit

Permalink
feat: pob upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
christophehurpeau committed Feb 28, 2017
1 parent 1260479 commit 7c6cf85
Show file tree
Hide file tree
Showing 17 changed files with 3,723 additions and 29 deletions.
11 changes: 9 additions & 2 deletions .pob.json
@@ -1,10 +1,17 @@
{
"envs": [
"node6",
"node7",
"webpack-modern-browsers",
"webpack"
"webpack",
"webpack-node7"
],
"react": false,
"testing": true,
"documentation": false
"documentation": false,
"entries": [
"index"
],
"flow": false,
"doclets": false
}
2 changes: 2 additions & 0 deletions .travis.yml
@@ -1,8 +1,10 @@
language: node_js
node_js:
- node
- "6"
- "4"

cache:
yarn: true
directories:
- node_modules
18 changes: 14 additions & 4 deletions README.md
Expand Up @@ -2,8 +2,11 @@

Nightingale JSON formatter

[![Build Status][build-status-image]][build-status-url] [![Dependency Status][daviddm-image]][daviddm-url]

[![Build Status][circleci-status-image]][circleci-status-url]
[![Travis Status][travisci-status-image]][travisci-status-url]
[![Dependency ci Status][dependencyci-image]][dependencyci-url]
[![Dependency Status][daviddm-image]][daviddm-url]
[![Coverage percentage][coverage-image]][coverage-url]

## Install

Expand All @@ -23,5 +26,12 @@ console.log(nightingaleJsonFormatter);
[npm-url]: https://npmjs.org/package/nightingale-json-formatter
[daviddm-image]: https://david-dm.org/nightingalejs/nightingale-json-formatter.svg?style=flat-square
[daviddm-url]: https://david-dm.org/nightingalejs/nightingale-json-formatter
[build-status-image]: https://img.shields.io/circleci/project/nightingalejs/nightingale-json-formatter/master.svg?style=flat-square
[build-status-url]: https://circleci.com/gh/nightingalejs/nightingale-json-formatter
[dependencyci-image]: https://dependencyci.com/github/nightingalejs/nightingale-json-formatter/badge?style=flat-square
[dependencyci-url]: https://dependencyci.com/github/nightingalejs/nightingale-json-formatter
[circleci-status-image]: https://img.shields.io/circleci/project/nightingalejs/nightingale-json-formatter/master.svg?style=flat-square
[circleci-status-url]: https://circleci.com/gh/nightingalejs/nightingale-json-formatter
[travisci-status-image]: https://img.shields.io/travis/nightingalejs/nightingale-json-formatter/master.svg?style=flat-square
[travisci-status-url]: https://travis-ci.org/nightingalejs/nightingale-json-formatter
[coverage-image]: https://img.shields.io/codecov/c/github/nightingalejs/nightingale-json-formatter/master.svg?style=flat-square
[coverage-url]: https://codecov.io/gh/nightingalejs/nightingale-json-formatter
[docs-coverage-url]: https://nightingalejs.github.io/nightingale-json-formatter/coverage/lcov-report/
11 changes: 6 additions & 5 deletions circle.yml
@@ -1,6 +1,6 @@
machine:
node:
version: 6.6.0
version: 7.6.0

general:
branches:
Expand All @@ -9,18 +9,19 @@ general:

dependencies:
cache_directories:
- ~/.cache/yarn
- node_modules
override:
- npm prune && npm install --no-progress
- yarn

test:
pre:
- mkdir -p $CIRCLE_TEST_REPORTS/junit/
override:
- npm run preversion
- npm run test
- yarn run preversion
- yarn run test
- XUNIT_FILE=$CIRCLE_TEST_REPORTS/junit/xunit.xml node_modules/.bin/mocha --harmony --recursive --reporter xunit-file -u tdd test/node6
- npm run generate:test-coverage
- yarn run generate:test-coverage
post:
- bash <(curl -s https://codecov.io/bash)
- cp -R coverage $CIRCLE_ARTIFACTS/
2 changes: 1 addition & 1 deletion git-hooks/post-checkout
@@ -1,5 +1,5 @@
#!/bin/bash

if [[ `git diff HEAD@{1} --stat -- package.json` != "" ]]; then
npm install ; npm prune
yarn
fi
2 changes: 1 addition & 1 deletion git-hooks/post-merge
@@ -1,5 +1,5 @@
#!/bin/bash

if [[ `git diff HEAD@{1} --stat -- package.json` != "" ]]; then
npm install ; npm prune
yarn
fi
6 changes: 5 additions & 1 deletion index.js
@@ -1,2 +1,6 @@
var production = process.env.NODE_ENV === 'production';
module.exports = require('./lib-node6' + (production ? '' : '-dev') + '/');
if (process.version.startsWith && process.version.startsWith('v7.'))
return module.exports = require('./lib-node7' + (production ? '' : '-dev') + '/index');
if (process.version.startsWith && process.version.startsWith('v6.'))
return module.exports = require('./lib-node6' + (production ? '' : '-dev') + '/index');
throw new Error('Platform not supported: ' + process.version + '.');
21 changes: 21 additions & 0 deletions lib-node7-dev/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions lib-node7-dev/index.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions lib-node7/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions lib-node7/index.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions lib-webpack-node7-dev/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions lib-webpack-node7-dev/index.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions lib-webpack-node7/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions lib-webpack-node7/index.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 21 additions & 15 deletions package.json
Expand Up @@ -10,16 +10,22 @@
"license": "ISC",
"repository": "git@github.com:nightingalejs/nightingale-json-formatter.git",
"homepage": "https://github.com/nightingalejs/nightingale",
"engines": {
"node": ">=6.5.0"
},
"main": "./index.js",
"webpack:main": "./lib-webpack/index.js",
"webpack:main-dev": "./lib-webpack-dev/index.js",
"webpack:node": "./lib-webpack-node7/index.js",
"webpack:node-dev": "./lib-webpack-node7-dev/index.js",
"webpack:main-modern-browsers": "./lib-webpack-modern-browsers/index.js",
"webpack:main-modern-browsers-dev": "./lib-webpack-modern-browsers-dev/index.js",
"scripts": {
"build": "pob-build",
"clean": "rm -Rf docs dist test/node6 coverage",
"generate:test-coverage": "rm -Rf coverage/ ; NODE_ENV=production node --harmony --es_staging node_modules/istanbul/lib/cli.js cover node_modules/.bin/_mocha -- --recursive --reporter=spec -u tdd test/node6",
"lint": "eslint --ext .js,.jsx --fix src/ test/src/",
"lint": "eslint --ext .js,.jsx src/ test/src/",
"prepare": "ln -s ../../git-hooks/pre-commit .git/hooks/pre-commit 2>/dev/null || true ; ln -s ../../git-hooks/post-checkout .git/hooks/post-checkout 2>/dev/null || true ; ln -s ../../git-hooks/post-merge .git/hooks/post-merge 2>/dev/null || true ; ln -s ../../git-hooks/prepare-commit-msg .git/hooks/prepare-commit-msg 2>/dev/null || true",
"prepublish": "ln -s ../../git-hooks/pre-commit .git/hooks/pre-commit 2>/dev/null || true ; ln -s ../../git-hooks/post-checkout .git/hooks/post-checkout 2>/dev/null || true ; ln -s ../../git-hooks/post-merge .git/hooks/post-merge 2>/dev/null || true ; ln -s ../../git-hooks/prepare-commit-msg .git/hooks/prepare-commit-msg 2>/dev/null || true",
"preversion": "npm run lint && npm run build && pob-repository-check-clean",
"release": "pob-repository-check-clean && pob-release",
Expand All @@ -28,25 +34,25 @@
"watch": "pob-watch"
},
"dependencies": {
"flow-runtime": "^0.6.1",
"nightingale-formatter": "^1.1.0"
},
"devDependencies": {
"babel-eslint": "^7.0.0",
"babel-preset-es2015": "^6.16.0",
"babel-preset-es2015-node6": "^0.3.0",
"babel-preset-modern-browsers": "^6.0.0",
"eslint": "^3.6.1",
"eslint-config-airbnb-base": "^8.0.0",
"eslint-config-pob": "^7.6.0",
"eslint-plugin-babel": "^3.3.0",
"eslint-plugin-import": "^1.16.0",
"babel-preset-latest": "^6.22.0",
"babel-preset-latest-node": "^0.1.0",
"babel-preset-modern-browsers": "^8.1.1",
"eslint": "^3.16.1",
"eslint-config-airbnb-base": "^11.1.0",
"eslint-config-pob": "^11.1.0",
"eslint-plugin-babel": "^4.1.0",
"eslint-plugin-import": "^2.2.0",
"istanbul": "^0.4.5",
"komet": "^0.1.3",
"komet-karma": "^0.2.3",
"mocha": "^3.1.0",
"pob-babel": "^9.0.0",
"pob-release": "^2.2.2",
"tcomb-forked": "^3.4.0",
"komet": "^0.1.4",
"komet-karma": "^0.2.5",
"mocha": "^3.2.0",
"pob-babel": "^16.1.0",
"pob-release": "^3.1.0",
"xunit-file": "^1.0.0"
}
}

0 comments on commit 7c6cf85

Please sign in to comment.