From 1822dd568bb672e9dc597c305d4b9d73bc056460 Mon Sep 17 00:00:00 2001 From: duxiaodong Date: Wed, 20 Jun 2018 21:08:49 +0800 Subject: [PATCH 1/2] feat: remove allowSyntheticDefaultImports --- .npmrc | 1 + examples/basic.tsx | 4 +- package.json | 4 +- src/Calendar.tsx | 2 +- src/TimePicker.tsx | 2 +- src/calendar/AnimateWrapper.tsx | 2 +- tests/Calendar.spec.tsx | 5 +- tests/DatePicker.spec.tsx | 7 +- tests/__snapshots__/Calendar.spec.tsx.snap | 14 +- tests/__snapshots__/DatePicker.spec.tsx.snap | 632 ++++++++++--------- tsconfig.json | 1 - 11 files changed, 350 insertions(+), 324 deletions(-) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..43c97e7 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +package-lock=false diff --git a/examples/basic.tsx b/examples/basic.tsx index 3347239..57ddcbe 100644 --- a/examples/basic.tsx +++ b/examples/basic.tsx @@ -4,8 +4,8 @@ import 'rmc-picker/assets/index.css'; import 'rmc-date-picker/assets/index.css'; import 'rmc-calendar/assets/index.less'; -import React from 'react'; -import ReactDOM from 'react-dom'; +import * as React from 'react'; +import * as ReactDOM from 'react-dom'; import { Calendar, ExtraData, CalendarPropsType } from '../src'; import zhCN from '../src/locale/zh_CN'; diff --git a/package.json b/package.json index fb7d46b..d957d23 100644 --- a/package.json +++ b/package.json @@ -61,13 +61,13 @@ } }, "dependencies": { - "babel-runtime": "6.x", "rc-animate": "^2.4.1", - "rmc-date-picker": "~6.0.0-alpha.10" + "rmc-date-picker": "~6.0.8" }, "devDependencies": { "@types/jest": "^21.1.2", "jest": "^21.2.1", + "babel-runtime": "6.x", "@types/enzyme": "^2.8.11", "enzyme": "^3.1.0", "@types/enzyme-to-json": "^1.5.0", diff --git a/src/Calendar.tsx b/src/Calendar.tsx index e263a2d..1ceb10e 100644 --- a/src/Calendar.tsx +++ b/src/Calendar.tsx @@ -1,4 +1,4 @@ -import React from 'react'; +import * as React from 'react'; import Animate from 'rc-animate'; import TimePicker from './TimePicker'; diff --git a/src/TimePicker.tsx b/src/TimePicker.tsx index 6092d8a..1c96723 100644 --- a/src/TimePicker.tsx +++ b/src/TimePicker.tsx @@ -1,4 +1,4 @@ -import React from 'react'; +import * as React from 'react'; import DateTimePicker from 'rmc-date-picker'; import { Models } from './date/DataTypes'; diff --git a/src/calendar/AnimateWrapper.tsx b/src/calendar/AnimateWrapper.tsx index 7bcf246..1b24161 100644 --- a/src/calendar/AnimateWrapper.tsx +++ b/src/calendar/AnimateWrapper.tsx @@ -1,4 +1,4 @@ -import React from 'react'; +import * as React from 'react'; export interface PropsType { visible: boolean; diff --git a/tests/Calendar.spec.tsx b/tests/Calendar.spec.tsx index de4982a..87fffe8 100644 --- a/tests/Calendar.spec.tsx +++ b/tests/Calendar.spec.tsx @@ -1,6 +1,7 @@ -import React from 'react'; +import * as React from 'react'; import Adapter from 'enzyme-adapter-react-15'; -import { default as Enzyme, render } from 'enzyme'; +import * as Enzyme from 'enzyme'; +import { render } from 'enzyme'; import { renderToJson } from 'enzyme-to-json'; import { Calendar, Locale } from '../src'; diff --git a/tests/DatePicker.spec.tsx b/tests/DatePicker.spec.tsx index 1475051..f4dfbbd 100644 --- a/tests/DatePicker.spec.tsx +++ b/tests/DatePicker.spec.tsx @@ -1,6 +1,6 @@ -import React from 'react'; +import * as React from 'react'; import Adapter from 'enzyme-adapter-react-15'; -import { default as Enzyme, render } from 'enzyme'; +import * as Enzyme from 'enzyme'; import { renderToJson } from 'enzyme-to-json'; import { DatePicker } from '../src'; @@ -8,8 +8,9 @@ Enzyme.configure({ adapter: new Adapter() }); describe('DatePicker', () => { it('renders correctly', () => { - const wrapper = render( + const wrapper = Enzyme.render( ); expect(renderToJson(wrapper)).toMatchSnapshot(); diff --git a/tests/__snapshots__/Calendar.spec.tsx.snap b/tests/__snapshots__/Calendar.spec.tsx.snap index 30f6b4e..b2be261 100644 --- a/tests/__snapshots__/Calendar.spec.tsx.snap +++ b/tests/__snapshots__/Calendar.spec.tsx.snap @@ -57,37 +57,37 @@ exports[`Calendar english. renders correctly 1`] = `
- 日 + Sun
- 一 + Mon
- 二 + Tue
- 三 + Wed
- 四 + Thu
- 五 + Fir
- 六 + Sat
- 2017年10月 + 2017年08月
- 1 -
+ /> @@ -105,9 +103,7 @@ exports[`DatePicker renders correctly 1`] = ` />
- 2 -
+ /> @@ -128,7 +124,7 @@ exports[`DatePicker renders correctly 1`] = `
- 3 + 1
- 4 + 2
- 5 + 3 - 6 + 4 - 7 + 5 - 8 + 6 - 9 + 7 - 10 + 8 - 11 + 9 - 12 + 10 - 13 + 11 - 14 + 12 - 15 + 13 - 16 + 14 - 17 + 15 - 18 + 16 - 19 + 17 - 20 + 18 - 21 + 19 - 22 + 20 - 23 + 21 - 24 + 22 - 25 + 23 - 26 + 24 - 27 + 25 - 28 + 26
+ 27 +
+ + +
+
+
+
+ +
+ 28 +
+ +
+
+
+
+
+ +
29
@@ -779,7 +819,7 @@ exports[`DatePicker renders correctly 1`] = `
- 2017年11月 + 2017年09月
- 1 -
+ /> @@ -880,9 +918,7 @@ exports[`DatePicker renders correctly 1`] = ` />
- 2 -
+ /> @@ -903,7 +939,7 @@ exports[`DatePicker renders correctly 1`] = `
- 3 + 1
- 4 + 2
- 5 + 3
- 6 + 4
- 7 + 5
- 8 + 6 - 9 + 7 - 10 + 8 - 11 + 9 - 12 + 10 - 13 + 11 - 14 + 12 - 15 + 13 - 16 + 14 - 17 + 15 - 18 + 16 - 19 + 17 - 20 + 18 - 21 + 19 - 22 + 20 - 23 + 21 - 24 + 22 - 25 + 23 - 26 + 24 - 27 + 25 - 28 + 26 - 29 + 27 - 30 + 28 - - - -
-
- 2017年12月 -
-
-
-
-
- -
- -
-
-
@@ -1571,47 +1570,9 @@ exports[`DatePicker renders correctly 1`] = ` />
- -
-
-
-
-
- -
- -
-
-
-
-
- -
+ > + 29 +
@@ -1630,8 +1591,10 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
+ class="date grey" + > + 30 +
@@ -1640,6 +1603,23 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
+
+
+
+
+
+ 2017年10月 +
+
+
@@ -1650,7 +1630,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
1
@@ -1672,7 +1652,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
2
@@ -1684,10 +1664,6 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
-
-
@@ -1698,7 +1674,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
3
@@ -1786,7 +1762,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
7
@@ -1798,6 +1774,10 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
+
+
@@ -1808,7 +1788,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
8
@@ -1830,7 +1810,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
9
@@ -1842,10 +1822,6 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
-
-
@@ -1856,7 +1832,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
10
@@ -1944,7 +1920,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
14
@@ -1956,6 +1932,10 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
+
+
@@ -1966,7 +1946,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
15
@@ -1988,7 +1968,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
16
@@ -2000,10 +1980,6 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
-
-
@@ -2014,7 +1990,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
17
@@ -2102,7 +2078,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
21
@@ -2114,6 +2090,10 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
+
+
@@ -2124,7 +2104,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
22
@@ -2146,7 +2126,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
23
@@ -2158,10 +2138,6 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
-
-
@@ -2172,7 +2148,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
24
@@ -2260,7 +2236,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
28
@@ -2272,6 +2248,10 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
+
+
@@ -2282,7 +2262,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
29
@@ -2304,7 +2284,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
30
@@ -2316,10 +2296,6 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
-
-
@@ -2330,7 +2306,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
31
@@ -2351,7 +2327,7 @@ exports[`DatePicker renders correctly 1`] = `
- 2018年01月 + 2017年11月
- 1 -
+ /> @@ -2412,9 +2386,7 @@ exports[`DatePicker renders correctly 1`] = ` />
- 2 -
+ /> @@ -2435,7 +2407,7 @@ exports[`DatePicker renders correctly 1`] = `
- 3 + 1
- 4 + 2
- 5 + 3
- 6 + 4
- 7 + 5
- 8 + 6
- 9 + 7
- 10 + 8
- 11 + 9
- 12 + 10
- 13 + 11
- 14 + 12
- 15 + 13 - 16 + 14 - 17 + 15 - 18 + 16 - 19 + 17 - 20 + 18 - 21 + 19 - 22 + 20 - 23 + 21 - 24 + 22 - 25 + 23 - 26 + 24 - 27 + 25 - 28 + 26 - 29 + 27 - 30 + 28 - 31 + 29 + + + +
+
+
+
+ +
+ 30
- 2018年02月 + 2017年12月
- 1 -
+ /> @@ -3208,7 +3200,7 @@ exports[`DatePicker renders correctly 1`] = `
- 2 + 1
- 3 + 2
+ 3 +
+ +
+
+
+
+
+ +
4
@@ -3364,7 +3378,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
9
@@ -3376,6 +3390,10 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
+
+
@@ -3398,10 +3416,6 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
-
-
@@ -3412,7 +3426,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
11
@@ -3522,7 +3536,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
16
@@ -3534,6 +3548,10 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
+
+
@@ -3556,10 +3574,6 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
-
-
@@ -3570,7 +3584,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
18
@@ -3680,7 +3694,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
23
@@ -3692,6 +3706,10 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
+
+
@@ -3714,10 +3732,6 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
-
-
@@ -3728,7 +3742,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
25
@@ -3806,23 +3820,6 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
-
- - -
-
- 2018年03月 -
-
-
@@ -3833,8 +3830,10 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
+ class="date" + > + 29 +
@@ -3853,8 +3852,10 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
+ class="date grey" + > + 30 +
@@ -3863,6 +3864,10 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
+
+
@@ -3873,8 +3878,10 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
+ class="date grey" + > + 31 +
@@ -3883,6 +3890,23 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
+
+
+
+
+
+ 2018年01月 +
+
+
@@ -3893,7 +3917,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
3
@@ -3969,10 +3993,6 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
-
-
@@ -3983,7 +4003,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
4
@@ -4027,7 +4047,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
6
@@ -4039,6 +4059,10 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
+
+
@@ -4049,7 +4073,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
7
@@ -4115,7 +4139,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
10
@@ -4127,10 +4151,6 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
-
-
@@ -4141,7 +4161,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
11
@@ -4185,7 +4205,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
13
@@ -4197,6 +4217,10 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
+
+
@@ -4207,7 +4231,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
14
@@ -4273,7 +4297,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
17
@@ -4285,10 +4309,6 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
-
-
@@ -4299,7 +4319,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
18
@@ -4343,7 +4363,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
20
@@ -4355,6 +4375,10 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
+
+
@@ -4365,7 +4389,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
21
@@ -4431,7 +4455,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
24
@@ -4443,10 +4467,6 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
-
-
@@ -4457,7 +4477,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
25
@@ -4501,7 +4521,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
27
@@ -4513,6 +4533,10 @@ exports[`DatePicker renders correctly 1`] = ` class="info" />
+
+
@@ -4523,7 +4547,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
28
@@ -4589,7 +4613,7 @@ exports[`DatePicker renders correctly 1`] = ` class="left" />
31
diff --git a/tsconfig.json b/tsconfig.json index bb8e9ef..e057f10 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,7 +3,6 @@ "strictNullChecks": true, "moduleResolution": "node", "jsx": "preserve", - "allowSyntheticDefaultImports": true, "target": "es6", "noImplicitAny": true, "noUnusedLocals": true, From 6074b07de2749fdf8ccaa1670460118b8e223f3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AF=92=E6=9E=AD=E4=B8=9C?= Date: Wed, 27 Jun 2018 10:43:33 +0800 Subject: [PATCH 2/2] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d957d23..aece5f6 100644 --- a/package.json +++ b/package.json @@ -61,13 +61,13 @@ } }, "dependencies": { + "babel-runtime": "6.x", "rc-animate": "^2.4.1", "rmc-date-picker": "~6.0.8" }, "devDependencies": { "@types/jest": "^21.1.2", "jest": "^21.2.1", - "babel-runtime": "6.x", "@types/enzyme": "^2.8.11", "enzyme": "^3.1.0", "@types/enzyme-to-json": "^1.5.0",