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/popup.tsx b/examples/popup.tsx index 7000a0d..92bef30 100644 --- a/examples/popup.tsx +++ b/examples/popup.tsx @@ -5,8 +5,8 @@ import 'rmc-picker/assets/index.css'; import 'rmc-cascader/assets/index.less'; import 'rmc-picker/assets/popup.css'; -import React from 'react'; -import ReactDOM from 'react-dom'; +import * as React from 'react'; +import * as ReactDOM from 'react-dom'; import PopupCascader from '../src/Popup'; import Cascader from '../src/Cascader'; import globalData from './data'; diff --git a/examples/react-native/picker.tsx b/examples/react-native/picker.tsx index 84916e4..e721ef2 100644 --- a/examples/react-native/picker.tsx +++ b/examples/react-native/picker.tsx @@ -5,7 +5,7 @@ import Cascader from '../../src/Cascader'; import { View, Text } from 'react-native'; import globalData from '../data'; -import React from 'react'; +import * as React from 'react'; export class PickerDemo extends React.Component { onChange = (value) => { diff --git a/examples/react-native/popup.tsx b/examples/react-native/popup.tsx index ac1333e..3dfd0f9 100644 --- a/examples/react-native/popup.tsx +++ b/examples/react-native/popup.tsx @@ -2,7 +2,7 @@ /* tslint:disable:no-console */ -import React from 'react'; +import * as React from 'react'; import { View, Text, StyleSheet, TouchableHighlight } from 'react-native'; import PopupCascader from '../../src/Popup'; import globalData from '../data'; diff --git a/examples/simple.tsx b/examples/simple.tsx index 1f10a70..68ff16f 100644 --- a/examples/simple.tsx +++ b/examples/simple.tsx @@ -3,8 +3,8 @@ import 'rmc-picker/assets/index.css'; import 'rmc-cascader/assets/index.less'; import Cascader from '../src/Cascader'; -import React from 'react'; -import ReactDOM from 'react-dom'; +import * as React from 'react'; +import * as ReactDOM from 'react-dom'; import globalData from './data'; class Demo extends React.Component { diff --git a/package.json b/package.json index c79d942..496779a 100644 --- a/package.json +++ b/package.json @@ -56,9 +56,9 @@ }, "devDependencies": { "@types/mocha": "~2.2.32", - "@types/react": "^15.5.0", - "@types/react-dom": "^15.5.0", - "@types/react-native": "^0.46.9", + "@types/react": "^16.0.0", + "@types/react-dom": "^16.0.0", + "@types/react-native": "^0.55.0", "create-react-class": "^15.6.0", "expect.js": "0.3.x", "fastclick": "^1.0.6", diff --git a/src/Cascader.tsx b/src/Cascader.tsx index 541ed34..6ddada6 100644 --- a/src/Cascader.tsx +++ b/src/Cascader.tsx @@ -1,4 +1,4 @@ -import React from 'react'; +import * as React from 'react'; import arrayTreeFilter from 'array-tree-filter'; import MultiPicker from 'rmc-picker/lib/MultiPicker'; import Picker from 'rmc-picker/lib/Picker'; diff --git a/src/Popup.tsx b/src/Popup.tsx index 6784a0a..bbdbd66 100644 --- a/src/Popup.tsx +++ b/src/Popup.tsx @@ -1,4 +1,4 @@ -import React from 'react'; +import * as React from 'react'; import PopupPicker from 'rmc-picker/lib/Popup'; import { IPopupPickerProps } from 'rmc-picker/lib/PopupPickerTypes'; import { ICascaderProps, CascaderValue } from './CascaderTypes'; diff --git a/tests/popup.spec.tsx b/tests/popup.spec.tsx index ec372ca..490fcaf 100644 --- a/tests/popup.spec.tsx +++ b/tests/popup.spec.tsx @@ -1,8 +1,8 @@ import expect from 'expect.js'; -import React from 'react'; -import ReactDOM from 'react-dom'; +import * as React from 'react'; +import * as ReactDOM from 'react-dom'; import createReactClass from 'create-react-class'; -import TestUtils from 'react-dom/test-utils'; +import * as TestUtils from 'react-dom/test-utils'; const Simulate = TestUtils.Simulate; import Cascader from '../src/Cascader'; import PopCascader from '../src/Popup'; diff --git a/tests/simple.spec.tsx b/tests/simple.spec.tsx index fe43218..a2f5b9a 100644 --- a/tests/simple.spec.tsx +++ b/tests/simple.spec.tsx @@ -1,7 +1,7 @@ import expect from 'expect.js'; // tslint:disable-next-line -import React from 'react'; -import ReactDOM from 'react-dom'; +import * as React from 'react'; +import * as ReactDOM from 'react-dom'; // const TestUtils = require('react-addons-test-utils'); // const Simulate = TestUtils.Simulate; diff --git a/tsconfig.json b/tsconfig.json index c029023..d1795c6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,7 +3,7 @@ "strictNullChecks": true, "moduleResolution": "node", "jsx": "react", - "allowSyntheticDefaultImports":true, - "target": "es6" + "target": "es6", + "skipLibCheck": true } } \ No newline at end of file diff --git a/typings/custom.d.ts b/typings/custom.d.ts index eb3eda3..d448b82 100644 --- a/typings/custom.d.ts +++ b/typings/custom.d.ts @@ -1,39 +1,9 @@ -declare module "rc-dialog" { - var Ret: any; - export default Ret; -} - -declare module "react-hammerjs" { - var Ret: any; - export default Ret; -} - -declare module "object-assign" { - var Ret: any; - export default Ret; -} - declare module "expect.js" { var Ret: any; export default Ret; } -declare module "react-native-picker-android" { - var Ret: any; - export default Ret; -} - -declare module "react-addons-test-utils" { - var Ret: any; - export default Ret; -} - declare module "array-tree-filter" { var Ret: any; export default Ret; } - -declare module "classnames" { - var Ret: any; - export default Ret; -}