Skip to content

Commit 5582bc9

Browse files
author
Raphaël Benitte
committed
Merge pull request #11 from plouc/mozaik-1.1.x
Migrate to mozaik >= 1.1.0
2 parents 0a8320c + 24ddd18 commit 5582bc9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1159
-791
lines changed

‎.babelrc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"presets": [
3+
"es2015",
4+
"react"
5+
]
6+
}

‎.eslintrc‎

Lines changed: 52 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,63 @@
11
{
22
"parser": "babel-eslint",
3+
"parserOptions": {
4+
"ecmaVersion": 6,
5+
"sourceType": "module",
6+
"ecmaFeatures": {
7+
"blockBindings": true,
8+
"jsx": true
9+
},
10+
},
311
"env": {
412
"browser": true,
5-
"node": true
13+
"es6": true
614
},
15+
"plugins": [
16+
"react"
17+
],
718
"rules": {
8-
"strict": 0,
9-
"quotes": "single",
10-
"indent": 4,
11-
"no-multi-spaces": false,
12-
"no-underscore-dangle": false,
13-
"eol-last": [0],
19+
"semi": 2,
20+
"prefer-template": 2,
21+
"indent": [2, 4, {
22+
"SwitchCase": 1
23+
}],
24+
"dot-notation": [2, {
25+
"allowKeywords": true
26+
}],
1427
"key-spacing": [2, {
1528
"align": "value",
1629
"beforeColon": false,
1730
"afterColon": true
18-
}]
31+
}],
32+
"quotes": [2, "single"],
33+
"jsx-quotes": [2, "prefer-double"],
34+
"array-bracket-spacing": [2, "never"],
35+
"eol-last": 2,
36+
"comma-style": [2, "last"],
37+
"space-before-function-paren": [2, {
38+
"anonymous": "always",
39+
"named": "never"
40+
}],
41+
"react/jsx-key": 2,
42+
"react/jsx-pascal-case": 2,
43+
"react/jsx-indent": [2, 4],
44+
"react/jsx-closing-bracket-location": 2,
45+
"react/jsx-curly-spacing": [2, "never"],
46+
"react/jsx-no-duplicate-props": [2, {
47+
"ignoreCase": true
48+
}],
49+
"react/jsx-no-bind": [1, {
50+
"ignoreRefs": false,
51+
"allowArrowFunctions": false,
52+
"allowBind": false
53+
}],
54+
"react/no-direct-mutation-state": 2,
55+
"react/no-deprecated": [2, {
56+
"react": "0.13.3"
57+
}],
58+
"react/prop-types": [1, {}],
59+
"react/react-in-jsx-scope": 2,
60+
"react/prefer-es6-class": [2, "always"],
61+
"react/display-name": 2
1962
}
20-
}
63+
}

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
.DS_Store
22
node_modules
3-
npm-debug.log
3+
npm-debug.log*
4+
.nyc_output
5+
coverage

‎.npmignore‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1-
src/tests
1+
test
22
preview
3-
.travis.yml
3+
.travis.yml
4+
.eslintrc
5+
npm-debug.log*
6+
.nyc_output
7+
coverage
8+
.DS_Store
9+
ISSUE_TEMPLATE.md

‎.travis.yml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
11
language: node_js
22
node_js:
3-
- '0.12'
3+
- '0.12'
4+
- '4'
5+
- '5'
6+
before_install:
7+
- npm install -g npm
8+
script:
9+
- npm run eslint
10+
- npm run test-cover
11+
after_success:
12+
- npm run coveralls

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@
88
> - [Internal]
99
> - [Polish]
1010
11+
## v1.2.0 (2016-04-04)
12+
13+
* **Internal**
14+
* `mozaik`: [#11](https://github.com/plouc/mozaik-ext-github/pull/11) Make extension compatible with `[email protected]`.
15+
* `babel`: [#11](https://github.com/plouc/mozaik-ext-github/pull/11) Update babel packages.
16+
* `test-runner`: [#11](https://github.com/plouc/mozaik-ext-github/pull/11) Move tests to **ava**.
17+
* `code-coverage`: [#11](https://github.com/plouc/mozaik-ext-github/pull/11) Generate code coverage through **nyc**.
18+
1119
## v1.1.0 (2016-04-02)
1220

1321
* **New Feature**

‎LICENSE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) Raphaël Benitte
1+
Copyright (c) 2015-2016 Raphaël Benitte
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy of
44
this software and associated documentation files (the "Software"), to deal in

‎README.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# Mozaïk github widgets
22

3+
[![License][license-image]][license-url]
34
[![Travis CI][travis-image]][travis-url]
45
[![NPM version][npm-image]][npm-url]
56
[![Dependencies][gemnasium-image]][gemnasium-url]
7+
[![Coverage Status][coverage-image]][coverage-url]
68
![widget count][widget-count-image]
79

810
## Demo
@@ -226,10 +228,14 @@ key | required | description
226228
}
227229
```
228230

231+
[license-image]: https://img.shields.io/github/license/plouc/mozaik-ext-github.svg?style=flat-square
232+
[license-url]: https://github.com/plouc/mozaik-ext-github/blob/master/LICENSE.md
229233
[travis-image]: https://img.shields.io/travis/plouc/mozaik-ext-github.svg?style=flat-square
230234
[travis-url]: https://travis-ci.org/plouc/mozaik-ext-github
231235
[npm-image]: https://img.shields.io/npm/v/mozaik-ext-github.svg?style=flat-square
232236
[npm-url]: https://www.npmjs.com/package/mozaik-ext-github
233237
[gemnasium-image]: https://img.shields.io/gemnasium/plouc/mozaik-ext-github.svg?style=flat-square
234238
[gemnasium-url]: https://gemnasium.com/plouc/mozaik-ext-github
239+
[coverage-image]: https://img.shields.io/coveralls/plouc/mozaik-ext-github.svg?style=flat-square
240+
[coverage-url]: https://coveralls.io/github/plouc/mozaik-ext-github
235241
[widget-count-image]: https://img.shields.io/badge/widgets-x10-green.svg?style=flat-square

‎mocha.opts‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎package.json‎

Lines changed: 56 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "mozaik-ext-github",
3-
"version": "1.1.0",
3+
"version": "1.2.0",
44
"description": "Mozaik github widgets",
55
"repository": {
66
"type": "git",
@@ -13,42 +13,77 @@
1313
},
1414
"homepage": "https://github.com/plouc/mozaik-ext-github",
1515
"main": "./src/components/index.js",
16+
"keywords": [
17+
"github",
18+
"mozaik",
19+
"widget",
20+
"extension",
21+
"dashboard"
22+
],
1623
"engines": {
17-
"node": "0.12.x"
24+
"node": "0.12.x",
25+
"npm": ">=3.0.0"
1826
},
1927
"dependencies": {
20-
"babelify": "^6.1.3",
21-
"chalk": "^1.1.0",
28+
"babelify": "7.2.0",
29+
"babel-core": "6.7.2",
30+
"babel-preset-es2015": "6.6.0",
31+
"babel-preset-react": "6.5.0",
32+
"bluebird": "3.3.4",
33+
"chalk": "1.1.3",
2234
"convict": "^0.6.1",
23-
"lodash": "^3.2.0",
35+
"lodash": "4.6.1",
2436
"moment": "^2.10.3",
2537
"moment-duration-format": "^1.3.0",
26-
"react": "^0.13.3",
27-
"react-mixin": "^1.7.0",
28-
"reflux": "^0.2.5",
29-
"superagent": "^1.2.0",
30-
"superagent-bluebird-promise": "^0.6.0"
38+
"react-mixin": "3.0.4",
39+
"reflux": "0.4.0",
40+
"superagent": "1.8.3",
41+
"superagent-bluebird-promise": "3.0.0"
3142
},
3243
"devDependencies": {
33-
"babel": "^5.8.12",
34-
"babel-eslint": "^1.0.6",
35-
"chai": "^3.2.0",
36-
"eslint": "^0.15.1",
37-
"jsdom": "^2.0.0",
38-
"mocha": "^2.2.5",
39-
"mockery": "^1.4.0",
40-
"sinon": "^1.15.4"
44+
"ava": "0.13.0",
45+
"babel-eslint": "5.0.0",
46+
"babel-register": "6.7.2",
47+
"coveralls": "2.11.8",
48+
"enzyme": "2.1.0",
49+
"eslint": "2.2.0",
50+
"eslint-plugin-react": "4.2.2",
51+
"mockery": "1.4.1",
52+
"nock": "7.7.2",
53+
"nyc": "6.1.1",
54+
"react": "^0.13.3",
55+
"sinon": "1.17.3"
4156
},
4257
"peerDependencies": {
43-
"mozaik": "1.x"
58+
"mozaik": ">=1.1.0",
59+
"react": "^0.13.3"
4460
},
4561
"scripts": {
46-
"test": "mocha --opts mocha.opts ./src/tests/**/*.test.js",
47-
"eslint": "eslint ./src/*"
62+
"eslint": "eslint --ext .js --ext .jsx ./src/** ./test/**",
63+
"test": "ava",
64+
"test-cover": "nyc ava",
65+
"coveralls": "nyc report --reporter=text-lcov | coveralls",
66+
"cover-report": "nyc report --reporter=lcov && open coverage/lcov-report/index.html"
4867
},
4968
"browserify": {
5069
"transform": [
5170
"babelify"
5271
]
72+
},
73+
"ava": {
74+
"files": [
75+
"test/**/*.test.js"
76+
],
77+
"tap": false,
78+
"failFast": true,
79+
"require": [
80+
"babel-register"
81+
],
82+
"babel": "inherit"
83+
},
84+
"nyc": {
85+
"extension": [
86+
".jsx"
87+
]
5388
}
5489
}

0 commit comments

Comments
 (0)