Skip to content

Commit

Permalink
Merge pull request #7 from plouc/mozaik-1.1.x
Browse files Browse the repository at this point in the history
Migrate to mozaik >= 1.1.0
  • Loading branch information
Raphaël Benitte committed Apr 4, 2016
2 parents 0663643 + 910d1e4 commit 4e043c1
Show file tree
Hide file tree
Showing 14 changed files with 376 additions and 113 deletions.
6 changes: 6 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"presets": [
"es2015",
"react"
]
}
63 changes: 63 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"parser": "babel-eslint",
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module",
"ecmaFeatures": {
"blockBindings": true,
"jsx": true
},
},
"env": {
"browser": true,
"es6": true
},
"plugins": [
"react"
],
"rules": {
"semi": 2,
"prefer-template": 2,
"indent": [2, 4, {
"SwitchCase": 1
}],
"dot-notation": [2, {
"allowKeywords": true
}],
"key-spacing": [2, {
"align": "value",
"beforeColon": false,
"afterColon": true
}],
"quotes": [2, "single"],
"jsx-quotes": [2, "prefer-double"],
"array-bracket-spacing": [2, "never"],
"eol-last": 2,
"comma-style": [2, "last"],
"space-before-function-paren": [2, {
"anonymous": "always",
"named": "never"
}],
"react/jsx-key": 2,
"react/jsx-pascal-case": 2,
"react/jsx-indent": [2, 4],
"react/jsx-closing-bracket-location": 2,
"react/jsx-curly-spacing": [2, "never"],
"react/jsx-no-duplicate-props": [2, {
"ignoreCase": true
}],
"react/jsx-no-bind": [1, {
"ignoreRefs": false,
"allowArrowFunctions": false,
"allowBind": false
}],
"react/no-direct-mutation-state": 2,
"react/no-deprecated": [2, {
"react": "0.13.3"
}],
"react/prop-types": [1, {}],
"react/react-in-jsx-scope": 2,
"react/prefer-es6-class": [2, "always"],
"react/display-name": 2
}
}
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.DS_Store
node_modules
npm-debug.log
lib
npm-debug.log*
.nyc_output
coverage
10 changes: 8 additions & 2 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
src/tests
test
preview
.travis.yml
.travis.yml
.eslintrc
npm-debug.log*
.nyc_output
coverage
.DS_Store
ISSUE_TEMPLATE.md
11 changes: 10 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
language: node_js
node_js:
- '0.10'
- '0.12'
- '4'
- '5'
before_install:
- npm install -g npm
script:
- npm run eslint
- npm run test-cover
after_success:
- npm run coveralls
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# mozaik-ext-time changelog

> **Tags:**
> - [New Feature]
> - [Bug Fix]
> - [Breaking Change]
> - [Documentation]
> - [Internal]
> - [Polish]
## v1.1.0 (2016-04-04)

* **Internal**
* `mozaik`: [#7](https://github.com/plouc/mozaik-ext-time/pull/7) Make extension compatible with `mozaik@1.1.0`.
* `babel`: [#7](https://github.com/plouc/mozaik-ext-time/pull/7) Update babel packages.
* `test-runner`: [#7](https://github.com/plouc/mozaik-ext-time/pull/7) Move tests to **ava**.
* `code-coverage`: [#7](https://github.com/plouc/mozaik-ext-time/pull/7) Generate code coverage through **nyc**.
19 changes: 19 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Copyright (c) 2015-2016 Raphaël Benitte

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
20 changes: 18 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# Mozaïk time widgets

[![Travis CI](https://img.shields.io/travis/plouc/mozaik-ext-time.svg?style=flat-square)](https://travis-ci.org/plouc/mozaik-ext-time)
[![NPM version](https://img.shields.io/npm/v/mozaik-ext-time.svg?style=flat-square)](https://www.npmjs.com/package/mozaik-ext-time)
[![License][license-image]][license-url]
[![Travis CI][travis-image]][travis-url]
[![NPM version][npm-image]][npm-url]
[![Dependencies][gemnasium-image]][gemnasium-url]
[![Coverage Status][coverage-image]][coverage-url]
![widget count][widget-count-image]

## Time — Clock

Expand Down Expand Up @@ -41,3 +45,15 @@ key | required | description
columns: 1, rows: 1, x: 2, y: 0
}
```

[license-image]: https://img.shields.io/github/license/plouc/mozaik-ext-time.svg?style=flat-square
[license-url]: https://github.com/plouc/mozaik-ext-time/blob/master/LICENSE.md
[travis-image]: https://img.shields.io/travis/plouc/mozaik-ext-time.svg?style=flat-square
[travis-url]: https://travis-ci.org/plouc/mozaik-ext-time
[npm-image]: https://img.shields.io/npm/v/mozaik-ext-time.svg?style=flat-square
[npm-url]: https://www.npmjs.com/package/mozaik-ext-time
[gemnasium-image]: https://img.shields.io/gemnasium/plouc/mozaik-ext-time.svg?style=flat-square
[gemnasium-url]: https://gemnasium.com/plouc/mozaik-ext-time
[coverage-image]: https://img.shields.io/coveralls/plouc/mozaik-ext-time.svg?style=flat-square
[coverage-url]: https://coveralls.io/github/plouc/mozaik-ext-time
[widget-count-image]: https://img.shields.io/badge/widgets-x1-green.svg?style=flat-square
64 changes: 53 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mozaik-ext-time",
"version": "1.0.2",
"version": "1.1.0",
"description": "Mozaik time widgets",
"repository": {
"type": "git",
Expand All @@ -12,29 +12,71 @@
"url": "https://github.com/plouc"
},
"engines": {
"node": "0.12.x"
"node": "0.12.x",
"npm": ">=3.0.0"
},
"homepage": "https://github.com/plouc/mozaik-ext-time",
"main": "./src/components/index.js",
"keywords": [
"time",
"mozaik",
"clock",
"timezone",
"widget",
"extension",
"dashboard"
],
"dependencies": {
"babelify": "^6.1.3",
"babel-core": "6.7.2",
"babel-preset-es2015": "6.6.0",
"babel-preset-react": "6.5.0",
"babelify": "7.2.0",
"classnames": "2.2.3",
"d3": "^3.5.5",
"moment": "^2.9.0",
"moment-timezone": "^0.3.0",
"react-classset": "0.0.2",
"jquery": "^2.1.3",
"react": "^0.13.3",
"reflux": "^0.2.5"
"moment": "2.12.0",
"moment-timezone": "0.5.3"
},
"devDependencies": {
"ava": "0.13.0",
"babel-eslint": "5.0.0",
"babel-register": "6.7.2",
"coveralls": "2.11.8",
"enzyme": "2.1.0",
"eslint": "2.2.0",
"eslint-plugin-react": "4.2.2",
"nyc": "6.1.1",
"react": "^0.13.3"
},
"peerDependencies": {
"mozaik": "1.x"
"mozaik": ">=1.1.0",
"react": "^0.13.3"
},
"scripts": {
"eslint": "eslint --ext .js --ext .jsx ./src/** ./test/**",
"test": "ava",
"test-cover": "nyc ava",
"coveralls": "nyc report --reporter=text-lcov | coveralls",
"cover-report": "nyc report --reporter=lcov && open coverage/lcov-report/index.html"
},
"scripts": {},
"browserify": {
"transform": [
"babelify"
]
},
"ava": {
"files": [
"test/**/*.test.js"
],
"tap": false,
"failFast": true,
"require": [
"babel-register"
],
"babel": "inherit"
},
"nyc": {
"extension": [
".jsx"
]
}
}
Loading

0 comments on commit 4e043c1

Please sign in to comment.