Skip to content

Commit 9ebba43

Browse files
committed
Update Babel to 7, fix tests
1 parent 8726b83 commit 9ebba43

File tree

11 files changed

+814
-727
lines changed

11 files changed

+814
-727
lines changed

.babelrc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
{
2-
"presets": ["es2016", "es2015", "react"],
3-
"plugins": ["transform-flow-strip-types", "transform-class-properties", "transform-object-rest-spread"],
2+
"presets": ["@babel/preset-es2016", "@babel/preset-es2015", "@babel/preset-react", "@babel/preset-stage-2"],
3+
"plugins": ["@babel/plugin-transform-flow-strip-types"],
44
"env": {
55
"development": {
66
"plugins": ["react-hot-loader/babel"]
7-
},
8-
"test": {
9-
"plugins": ["rewire"]
107
}
118
}
129
}

package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,18 @@
4545
"union-class-names": "^1.0.0"
4646
},
4747
"devDependencies": {
48-
"babel-cli": "^6.26.0",
49-
"babel-core": "^6.26.0",
48+
"@babel/cli": "^7.0.0-beta.36",
49+
"@babel/core": "^7.0.0-beta.36",
50+
"@babel/plugin-transform-flow-strip-types": "^7.0.0-beta.36",
51+
"@babel/polyfill": "^7.0.0-beta.36",
52+
"@babel/preset-es2015": "^7.0.0-beta.36",
53+
"@babel/preset-es2016": "^7.0.0-beta.36",
54+
"@babel/preset-react": "^7.0.0-beta.36",
55+
"@babel/preset-stage-2": "^7.0.0-beta.36",
56+
"babel-core": "^7.0.0-0",
5057
"babel-eslint": "^8.1.2",
5158
"babel-jest": "^22.0.4",
52-
"babel-loader": "^7.1.2",
53-
"babel-plugin-rewire": "^1.1.0",
54-
"babel-plugin-transform-class-properties": "^6.24.1",
55-
"babel-plugin-transform-flow-strip-types": "^6.22.0",
56-
"babel-plugin-transform-object-rest-spread": "^6.26.0",
57-
"babel-polyfill": "^6.26.0",
58-
"babel-preset-es2015": "^6.24.1",
59-
"babel-preset-es2016": "^6.24.1",
60-
"babel-preset-react": "^6.24.1",
59+
"babel-loader": "^8.0.0-beta.0",
6160
"coveralls": "^3.0.0",
6261
"css-loader": "^0.28.7",
6362
"draft-js": "~0.10.4",
@@ -79,6 +78,7 @@
7978
"react-ghfork": "^0.5.1",
8079
"react-hot-loader": "^3.1.3",
8180
"react-test-renderer": "^16.2.0",
81+
"regenerator-runtime": "^0.11.1",
8282
"style-loader": "^0.19.1",
8383
"stylus": "^0.54.5",
8484
"stylus-loader": "^3.0.1",

test/Button/index-test.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import { CHECKABLE_LIST_ITEM } from 'draft-js-checkable-list-item'
44
import { shallow } from 'enzyme'
55
import Button from '../../src/Button'
66

7+
jest.unmock('draft-js-checkable-list-item')
8+
79
describe('<Button />', () => {
810
it('render with default icon', () => {
911
expect(
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
export const CheckableListItemUtils = {
2+
onTab(e, editorState) {
3+
if (editorState.param === 0) {
4+
return editorState
5+
}
6+
return {}
7+
}
8+
}

test/blockStyleFn-test.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import { ContentBlock } from 'draft-js'
22
import { CHECKABLE_LIST_ITEM } from 'draft-js-checkable-list-item'
33
import blockStyleFn from '../src/blockStyleFn'
44

5+
jest.unmock('draft-js-checkable-list-item')
6+
57
describe('blockStyleFn', () => {
68
it('return value is `checkable-list-item` ', () => {
79
const block = new ContentBlock({ key: 'item0', type: CHECKABLE_LIST_ITEM })

test/createBlockRenderMap-test.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { CHECKABLE_LIST_ITEM, UNORDERED_LIST_ITEM } from 'draft-js-checkable-list-item'
22
import createBlockRenderMap, { wrapper } from '../src/createBlockRenderMap'
33

4+
jest.unmock('draft-js-checkable-list-item')
5+
46
describe('createBlockRenderMap', () => {
57
it('return default blockRenderMap', () => {
68
const ret = createBlockRenderMap({ sameWrapperAsUnorderedListItem: false })

test/createBlockRendererFn-test.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import { Map } from 'immutable'
33
import { CheckableListItem, CHECKABLE_LIST_ITEM } from 'draft-js-checkable-list-item'
44
import createBlockRendererFn from '../src/createBlockRendererFn'
55

6+
jest.unmock('draft-js-checkable-list-item')
7+
68
describe('createBlockRendererFn', () => {
79
it('render `checkable-list-item` block', () => {
810
const block = new ContentBlock({ key: 'item0', type: CHECKABLE_LIST_ITEM, data: Map({ checked: true }) })

test/createOnTab-test.js

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,10 @@
11
import createOnTab from '../src/createOnTab'
22

3+
jest.mock('draft-js-checkable-list-item')
4+
35
describe('onTab', () => {
46
const config = { maxDepth: 4 }
57

6-
const mockOnTab = (e, editorState) => {
7-
if (editorState.param === 0) {
8-
return editorState
9-
}
10-
return {}
11-
}
12-
13-
beforeEach(() => {
14-
createOnTab.__Rewire__('CheckableListItemUtils', { onTab: mockOnTab })
15-
})
16-
17-
afterEach(() => {
18-
createOnTab.__ResetDependency__('CheckableListItemUtils')
19-
})
20-
218
it('return value is `function` ', () => {
229
const ret = createOnTab(config)
2310
expect(typeof ret).toBe('function')

test/index-test.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { Map } from 'immutable'
22
import createPlugin from '../src'
33

4+
jest.unmock('draft-js-checkable-list-item')
5+
46
describe('createPlugin', () => {
57
it('create plugin', () => {
68
const ret = createPlugin({})

webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const htmlWebpackPluginConfig = {
1313
}
1414

1515
const entry = [
16-
'babel-polyfill',
16+
'@babel/polyfill',
1717
'./example/index.js',
1818
]
1919

0 commit comments

Comments
 (0)