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

Commit

Permalink
chore: update pob and use rollup
Browse files Browse the repository at this point in the history
  • Loading branch information
christophehurpeau committed Feb 18, 2018
1 parent 89c42d2 commit 7168802
Show file tree
Hide file tree
Showing 71 changed files with 6,673 additions and 5,230 deletions.
15 changes: 15 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"only": ["src/"],
"env": {
"test": {
"presets": [
["pob-babel/preset", { "flow": true }]
]
},
"doc": {
"presets": [
["pob-babel/jsdoc-preset", { "flow": true }]
]
}
}
}
6 changes: 0 additions & 6 deletions .eslintrc.js

This file was deleted.

25 changes: 25 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"extends": "pob/flow",
"rules": {
"flowtype/no-weak-types": "off"
},
"overrides": [
{
"files": [
"src/**/*.test.js",
"src/__tests__/**/*.js"
],
"env": {
"jest": true
},
"rules": {
"import/no-extraneous-dependencies": [
"error",
{
"devDependencies": true
}
]
}
}
]
}
4 changes: 2 additions & 2 deletions .flowconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[ignore]
<PROJECT_ROOT>/index.js
<PROJECT_ROOT>/lib.*
<PROJECT_ROOT>/node_modules/.*
.*/dist/.*
.*/node_modules/.*

[include]

Expand Down
5 changes: 5 additions & 0 deletions .git-hooks/post-checkout
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash

if [[ `git diff HEAD@{1} --stat -- yarn.lock` != "" ]]; then
yarn
fi
5 changes: 5 additions & 0 deletions .git-hooks/post-merge
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash

if [[ `git diff HEAD@{1} --stat -- yarn.lock` != "" ]]; then
yarn
fi
3 changes: 0 additions & 3 deletions git-hooks/pre-commit → .git-hooks/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,3 @@ fi

# If there are whitespace errors, print the offending file names and fail.
git diff-index --check --cached $against -- || exit 1

echo 'Lint check'
npm run lint || exit 1
File renamed without changes.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
node_modules
/docs
/coverage
/build

/.settings
Expand Down
1 change: 0 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
/examples
/samples
/docs
/coverage
/build
/test
/.pob.json
Expand Down
19 changes: 0 additions & 19 deletions .pob.json

This file was deleted.

1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: node_js
node_js:
- node
- "8"
- "6"
- "4"

Expand Down
55 changes: 55 additions & 0 deletions .yo-rc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"pob": {
"pob-config": {
"envs": [
{
"target": "node",
"version": "8",
"formats": [
"cjs",
"es"
]
},
{
"target": "node",
"version": "6",
"formats": [
"cjs"
]
},
{
"target": "node",
"version": "4",
"formats": [
"cjs"
]
},
{
"target": "browser",
"version": "modern",
"formats": [
"es"
]
},
{
"target": "browser",
"formats": [
"cjs",
"es"
]
}
],
"testing": {
"circleci": true,
"travisci": true,
"codecov": true
},
"documentation": {
"doclets": false
},
"entries": [
"index"
]
}
}
}
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ Logger for browser and node

[![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]
[![Dependency ci Status][dependencyci-image]][dependencyci-url]
[![Coverage percentage][coverage-image]][coverage-url]
[![Doclets Link][doclets-image]][doclets-url]

## nightingale

Expand Down Expand Up @@ -50,6 +49,3 @@ logger.success('It works !');
[coverage-image]: https://img.shields.io/codecov/c/github/nightingalejs/nightingale-logger/master.svg?style=flat-square
[coverage-url]: https://codecov.io/gh/nightingalejs/nightingale-logger
[docs-coverage-url]: https://nightingalejs.github.io/nightingale-logger/coverage/lcov-report/

[doclets-image]: https://img.shields.io/badge/doclets.io-master-green.svg?style=flat-square
[doclets-url]: https://doclets.io/nightingalejs/nightingale-logger/master
17 changes: 4 additions & 13 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
machine:
node:
version: 7.6.0
version: 8.3.0

general:
branches:
Expand All @@ -12,15 +12,14 @@ dependencies:
- ~/.cache/yarn
- node_modules
override:
- yarn
- yarn --prefer-offline --frozen-lockfile

test:
pre:
- mkdir -p $CIRCLE_TEST_REPORTS/junit/
override:
- yarn run preversion
- yarn run test
- 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 All @@ -33,14 +32,6 @@ deployment:
commands:
- git config user.email "[email protected]"
- git config user.name "CircleCi"
- mv coverage coverage-tmp
- mv docs docs-tmp
- git fetch
- git checkout -f gh-pages
- rm -Rf docs coverage
- mv docs-tmp docs
- mv coverage-tmp coverage
- date > date.txt
- git add -f docs coverage
- git commit -m"auto commit from circleci"
- git push -f origin gh-pages
- 'git commit -m "docs: update generated docs [skip ci]"'
- git push
Loading

0 comments on commit 7168802

Please sign in to comment.