Skip to content
This repository was archived by the owner on Aug 1, 2024. It is now read-only.

Commit 464af40

Browse files
committed
more dep updates
1 parent 86e72f3 commit 464af40

File tree

6 files changed

+45
-63
lines changed

6 files changed

+45
-63
lines changed

.babelrc

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
11
{
2-
"stage": 0,
3-
"loose": [
4-
"all"
5-
],
6-
"plugins": [
7-
"object-assign",
8-
"jsx-fragment"
9-
]
10-
}
2+
"presets": ["jason"]
3+
}

.eslintrc

+24-27
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,42 @@
11
{
2+
"parser": "babel-eslint",
3+
"extends": "eslint:recommended",
24
"env": {
35
"browser": true,
46
"node": true
57
},
68
"ecmaFeatures": {
79
"jsx": true
810
},
9-
"parser": "babel-eslint",
1011
"plugins": [
11-
"react",
12-
"babel"
12+
"eslint-plugin-react"
1313
],
1414
"rules": {
15-
"constructor-super": 2,
16-
"comma-spacing": 2,
17-
"comma-style": 0,
18-
"one-var": 0,
15+
"no-eval": 2,
16+
"strict": 0,
17+
"eol-last": 2,
18+
"dot-notation": [2, { "allowKeywords": true }],
1919
"semi": [0, "never"],
20+
"semi-spacing": 0,
2021
"curly": 0,
21-
"key-spacing": 0,
22-
"consistent-return": 0,
23-
"no-this-before-super": 2,
22+
"eqeqeq": [2, "allow-null"],
23+
"no-undef": 2,
24+
"quotes": [2, "single", "avoid-escape"],
25+
"no-trailing-spaces": 0,
2426
"no-underscore-dangle": 0,
27+
"no-multi-spaces": 0,
2528
"no-unused-expressions": 0,
29+
"no-unused-vars": [2, {"vars": "all", "args": "after-used", "varsIgnorePattern": "^_$"}],
2630
"no-use-before-define": 0,
27-
"no-unused-vars": [2, { "vars": "all", "args": "none" }],
28-
"no-multi-spaces": 0,
29-
"babel/object-shorthand": 2,
30-
"quotes": [2, "single", "avoid-escape"],
31-
"react/display-name": 0,
32-
"react/jsx-boolean-value": [2, "never"],
33-
"react/jsx-no-duplicate-props": 2,
34-
"react/jsx-no-undef": 2,
35-
"react/jsx-uses-react": 2,
36-
"react/no-did-mount-set-state": 2,
37-
"react/no-did-update-set-state": 2,
38-
"react/react-in-jsx-scope": 2,
39-
"react/self-closing-comp": 2,
40-
"react/wrap-multilines": 2,
41-
"react/jsx-uses-vars": 2,
42-
"space-infix-ops": 2,
43-
"strict": [2, "never"]
31+
"key-spacing": 0,
32+
"consistent-return": 0,
33+
"no-shadow": 0,
34+
"no-sequences": 0,
35+
"no-return-assign": 0,
36+
"react/jsx-no-undef": 1,
37+
"react/jsx-uses-react": 1,
38+
"react/jsx-uses-vars": 1,
39+
"react/react-in-jsx-scope": 1,
40+
"react/self-closing-comp": 1
4441
}
4542
}

karma.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint no-var: 0, babel/object-shorthand: 0 */
2-
require('babel/register');
2+
require('babel-register');
33

44
var isCI = process.env.CONTINUOUS_INTEGRATION === 'true';
55
var reporters = ['mocha'];

package.json

+17-21
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"lint": "eslint src test",
2727
"test": "npm run lint && karma start --single-run",
2828
"tdd": "karma start",
29-
"coverage": "COVERAGE=true karma start --single-run",
3029
"release": "release"
3130
},
3231
"peerDependencies": {
@@ -35,28 +34,26 @@
3534
},
3635
"devDependencies": {
3736
"autoprefixer-core": "^5.2.1",
38-
"babel": "^5.8.34",
39-
"babel-core": "^5.8.34",
40-
"babel-eslint": "^3.1.20",
41-
"babel-loader": "^5.3.0",
42-
"babel-plugin-jsx-fragment": "^1.1.0",
43-
"babel-plugin-object-assign": "^1.2.1",
37+
"babel-cli": "^6.7.5",
38+
"babel-core": "^6.7.6",
39+
"babel-eslint": "^6.0.2",
40+
"babel-loader": "^6.2.4",
41+
"babel-preset-es2015": "^6.6.0",
42+
"babel-preset-jason": "^1.0.1",
43+
"babel-register": "^6.7.2",
4444
"chai": "^3.2.0",
4545
"chance": "^0.7.6",
46-
"component-metadata-loader": "^1.0.0",
46+
"component-metadata-loader": "^2.0.3",
4747
"cpy": "^3.4.1",
4848
"css-loader": "^0.15.6",
4949
"es5-shim": "^4.1.7",
50-
"es6-promise": "^3.0.2",
51-
"eslint": "^0.24.0",
50+
"eslint": "^1.0.0",
5251
"eslint-plugin-babel": "^1.0.0",
53-
"eslint-plugin-mocha": "^0.4.0",
52+
"eslint-plugin-mocha": "^1.0.0",
5453
"eslint-plugin-react": "^3.1.0",
5554
"file-loader": "^0.8.4",
5655
"globalize": "^0.1.1",
5756
"html-webpack-plugin": "^1.7.0",
58-
"isparta-loader": "^0.2.0",
59-
"jquery": "^2.1.4",
6057
"karma": "^0.13.3",
6158
"karma-chrome-launcher": "^0.2.0",
6259
"karma-cli": "^0.1.0",
@@ -69,21 +66,20 @@
6966
"karma-webpack": "^1.7.0",
7067
"less": "^2.5.1",
7168
"less-loader": "^2.2.0",
72-
"markdown-jsx-loader": "^2.0.0",
69+
"lolex": "^1.4.0",
70+
"markdown-jsx-loader": "^2.0.1",
7371
"marked": "^0.3.5",
7472
"mocha": "^2.2.5",
7573
"moment": "^2.10.6",
7674
"mt-changelog": "^0.6.1",
7775
"node-libs-browser": "^0.5.2",
7876
"postcss-loader": "^0.6.0",
7977
"raw-loader": "^0.5.1",
80-
"react": "^0.14.0",
81-
"react-bootstrap": "^0.27.2",
82-
"react-component-metadata": "^1.2.2",
83-
"react-dom": "^0.14.0",
84-
"release-script": "^0.2.1",
78+
"react": "^15.0.0",
79+
"react-bootstrap": "^0.28.0",
80+
"react-dom": "^15.0.0",
81+
"release-script": "^1.0.0",
8582
"rimraf": "^2.4.2",
86-
"simulant": "^0.1.5",
8783
"sinon": "^1.15.4",
8884
"sinon-chai": "^2.8.0",
8985
"style-loader": "^0.12.3",
@@ -98,7 +94,7 @@
9894
"dom-helpers": "^2.3.0",
9995
"invariant": "^2.1.0",
10096
"lodash": "^3.10.1",
101-
"react-overlays": "^0.5.0",
97+
"react-overlays": "^0.6.0",
10298
"react-prop-types": "^0.2.1",
10399
"uncontrollable": "^3.1.0",
104100
"warning": "^2.0.0"

src/localizers/oldGlobalize.js

-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ let weekRangeFormat = ({ start, end }, culture, local)=>
1313
local.format(start, 'MMM dd', culture) +
1414
' - ' + local.format(end, dates.eq(start, end, 'month') ? 'dd' : 'MMM dd', culture)
1515

16-
export default function(globalize) {
17-
18-
}
19-
2016
export let formats = {
2117
dateFormat: 'dd',
2218
dayFormat: 'ddd dd/MM',

src/utils/eventLevels.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export function endOfRange(dateRange, unit = 'day') {
88
}
99
}
1010

11-
export function eventSegments(event, first, last, { startAccessor, endAccessor, culture }) {
11+
export function eventSegments(event, first, last, { startAccessor, endAccessor }) {
1212
let slots = dates.diff(first, last, 'day')
1313
let start = dates.max(dates.startOf(get(event, startAccessor), 'day'), first);
1414
let end = dates.min(dates.ceil(get(event, endAccessor), 'day'), last)

0 commit comments

Comments
 (0)