Skip to content

Commit

Permalink
chore: pob upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
christophehurpeau committed Mar 10, 2018
1 parent 369397c commit ed416a7
Show file tree
Hide file tree
Showing 43 changed files with 434 additions and 529 deletions.
6 changes: 3 additions & 3 deletions packages/nightingale/.pob.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"node6",
"node7",
"older-node",
"webpack-modern-browsers",
"webpack",
"webpack-node7",
"module-modern-browsers",
"module",
"module-node7",
"browsers"
],
"react": false,
Expand Down
2 changes: 1 addition & 1 deletion packages/nightingale/circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ test:
override:
- 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
- POBREGISTER_ONLY=./testXUNIT_FILE=$CIRCLE_TEST_REPORTS/junit/xunit.xml node_modules/.bin/mocha --require pob-babel/register --recursive --reporter xunit-file -u tdd test
- yarn run generate:docs
post:
- bash <(curl -s https://codecov.io/bash)
Expand Down
14 changes: 10 additions & 4 deletions packages/nightingale/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
var production = process.env.NODE_ENV === 'production';
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');
var nodeVersion = process.versions.node.split('.');
var nodeVersionMajor = Number(nodeVersion[0]);
var nodeVersionMinor = Number(nodeVersion[1]);
/* istanbul ignore next */
if (nodeVersionMajor > 7 || (nodeVersionMajor === 7 && nodeVersionMinor >= 6))
return module.exports = require('./lib-node7' + (production ? '' : '-dev') + '/index');
/* istanbul ignore next */
if (nodeVersionMajor > 6 || (nodeVersionMajor === 6 && nodeVersionMinor >= 5))
return module.exports = require('./lib-node6' + (production ? '' : '-dev') + '/index');
/* istanbul ignore next */
return module.exports = require('./lib-older-node' + (production ? '' : '-dev') + '/index');
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/nightingale/lib-older-node-dev/config.js

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

4 changes: 2 additions & 2 deletions packages/nightingale/lib-older-node-dev/index.js

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

2 changes: 1 addition & 1 deletion packages/nightingale/lib-older-node-dev/index.js.map

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

2 changes: 1 addition & 1 deletion packages/nightingale/lib-older-node/config.js

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

4 changes: 2 additions & 2 deletions packages/nightingale/lib-older-node/index.js

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

2 changes: 1 addition & 1 deletion packages/nightingale/lib-older-node/index.js.map

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

46 changes: 23 additions & 23 deletions packages/nightingale/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,43 +10,43 @@
"repository": "git@github.com:nightingalejs/nightingale.git",
"homepage": "https://github.com/nightingalejs/nightingale",
"main": "index.js",
"module": "./lib-module/index.js",
"module-dev": "./lib-module-dev/index.js",
"browser": "./lib-browsers/index.js",
"browser-dev": "./lib-browsers-dev/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",
"module:node": "./lib-module-node7/index.js",
"module:node-dev": "./lib-module-node7-dev/index.js",
"module:modern-browsers": "./lib-module-modern-browsers/index.js",
"module:modern-browsers-dev": "./lib-module-modern-browsers-dev/index.js",
"scripts": {
"build": "pob-build",
"clean": "rm -Rf docs dist test/node6 coverage",
"generate:api": "rm -Rf docs/ ; mkdir docs/ ; pob-build doc ; jsdoc README.md lib-doc --recurse --destination docs/ --configure jsdoc.conf.json ; rm -Rf lib-doc",
"generate:docs": "npm run generate:api && npm run generate:test-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 src/ test/src/",
"generate:test-coverage": "rm -Rf coverage/ ; NODE_ENV=production POBREGISTER_ONLY=./test node node_modules/istanbul/lib/cli.js cover node_modules/.bin/_mocha -- --require pob-babel/register --recursive --bail -u tdd test",
"lint": "eslint --ext .js,.jsx src/ test/",
"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",
"preversion": "yarn run lint && yarn run build && pob-repository-check-clean",
"release": "pob-repository-check-clean && pob-release",
"test": "mocha --harmony --es_staging --recursive --bail -u tdd test/node6",
"test": "POBREGISTER_ONLY=./test mocha --require pob-babel/register --recursive --bail -u tdd test",
"version": "pob-version",
"watch": "pob-watch"
},
"dependencies": {
"flow-runtime": "^0.7.0",
"flow-runtime": "^0.10.0",
"nightingale-levels": "^1.1.0",
"nightingale-logger": "^3.3.0"
"nightingale-logger": "^3.4.0"
},
"devDependencies": {
"babel-eslint": "^7.1.0",
"babel-eslint": "^7.2.0",
"babel-plugin-add-jsdoc-annotations": "^5.1.0",
"babel-preset-env": "^1.2.2",
"babel-preset-jsdoc": "^0.4.0",
"babel-preset-latest": "^6.22.0",
"babel-preset-latest-node": "^0.1.0",
"babel-preset-modern-browsers": "^8.1.2",
"eslint": "^3.17.0",
"eslint-config-airbnb-base": "^11.1.1",
"babel-preset-latest-node": "^0.2.2",
"babel-preset-modern-browsers": "^9.0.2",
"eslint": "^3.18.0",
"eslint-config-airbnb-base": "^11.1.2",
"eslint-config-pob": "^11.1.0",
"eslint-plugin-babel": "^4.1.1",
"eslint-plugin-import": "^2.2.0",
Expand All @@ -62,11 +62,11 @@
"komet-karma": "^0.2.5",
"minami": "^1.1.1",
"mocha": "^3.2.0",
"nightingale-console": "^2.3.0",
"nightingale-console-output": "^1.3.0",
"nightingale-json-formatter": "^1.3.0",
"nightingale-string": "^2.1.0",
"pob-babel": "^16.3.0",
"nightingale-console": "^2.4.1",
"nightingale-console-output": "^1.4.0",
"nightingale-json-formatter": "^1.4.0",
"nightingale-string": "^2.2.0",
"pob-babel": "^17.1.1",
"pob-release": "^3.1.0",
"xunit-file": "^1.0.0"
}
Expand Down
7 changes: 7 additions & 0 deletions packages/nightingale/test/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
exports.rules = {
"import/no-extraneous-dependencies": [2, {"devDependencies": true}]
};

exports.env = {
mocha: true,
};
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/* global suite, test */
/* eslint import/no-extraneous-dependencies: "off" */
import { strictEqual } from 'assert';
import StringHandler from 'nightingale-string';
import Logger, { levels } from '../../';
import Logger, { levels } from '../';

class TestableStringLogger extends Logger {
constructor() {
Expand Down
1 change: 0 additions & 1 deletion packages/nightingale/test/browser/index.js

This file was deleted.

84 changes: 0 additions & 84 deletions packages/nightingale/test/node6/Logger.js

This file was deleted.

1 change: 0 additions & 1 deletion packages/nightingale/test/node6/Logger.js.map

This file was deleted.

8 changes: 0 additions & 8 deletions packages/nightingale/test/node6/index.js

This file was deleted.

Loading

0 comments on commit ed416a7

Please sign in to comment.