Merge 97d0c15 into 95aa676

.flowconfig

@@ -1,8 +1,8 @@
 [ignore]
-.*/.flow-typed/.*
 .*/bin/.*
 .*/node_modules/jest-enzyme/.*
 .*/node_modules/enzyme-matchers/.*
+.*/__test__/bad-type/.*
 
 [include]
 

.gitignore

@@ -2,3 +2,4 @@ coverage
 node_modules
 flow-typed
 dist
+.DS_Store

.travis.yml

@@ -1,6 +1,5 @@
 language: node_js
 node_js:
-  - node
-  - 8
-  - 6
+    - node
+    - 8
 after_script: 'cat ./coverage/lcov.info | coveralls'

__test__/bad-type/bad-props-stateless-component.flow.js

@@ -0,0 +1,14 @@
+// @flow strict
+/* eslint-disable */
+import * as React from 'react';
+import { translate, type I18nType } from '../../src';
+import mockI18n from '../../src/mockI18n';
+
+
+// Case 1: React stateless component
+const StatelessCom = ({ name, i18n }: { name: string, i18n: I18nType }) => (
+    <div>{i18n.gettext('S')}</div>
+);
+const TStatelessCom = translate(StatelessCom);
+// Should throw error for missing required prop content
+result = <TStatelessCom />;

__test__/bad-type/bad-props.flow.js

@@ -0,0 +1,32 @@
+// @flow strict
+/* eslint-disable */
+import * as React from 'react';
+import { translate, type I18nType } from '../../src';
+import mockI18n from '../../src/mockI18n';
+
+// Case 1: throw error for missing props
+class ComponentB extends React.PureComponent<{
+    i18n: I18nType,
+    content: string,
+    children: React.Node,
+}> {
+    componentDidMount() {
+        console.log('hey');
+    }
+
+    render() {
+        const { i18n, content, children } = this.props;
+
+        return (
+            <div>
+                {i18n.gettext('hey')}
+                {content}
+                {children}
+            </div>
+        );
+    }
+}
+
+const TComponentB = translate(ComponentB);
+// Should throw error for missing required prop content
+const result = <TComponentB >bar</TComponentB>;

__test__/bad-type/bad-static-props.flow.js

@@ -0,0 +1,40 @@
+// @flow strict
+/* eslint-disable */
+import * as React from 'react';
+import { translate, type I18nType } from '../../src';
+import mockI18n from '../../src/mockI18n';
+
+//Case 1: class component with static
+class ComponentC extends React.Component<{
+    i18n: I18nType,
+    content: string,
+    children: React.Node,
+}> {
+    static method(str: string) {
+        console.log('hey', str);
+    }
+
+    componentDidMount() {
+        console.log('hey');
+    }
+
+    render() {
+        const { i18n, content, children } = this.props;
+
+        return (
+            <div>
+                {i18n.gettext('hey')}
+                {content}
+                {children}
+            </div>
+        );
+    }
+}
+
+const TComponentC = translate(ComponentC);
+const result = <TComponentC content="foo">bar</TComponentC>;
+
+ComponentC.method('foo');
+
+// Should throw Error
+TComponentC.WrappedComponent.notExistMethod('foo');

__test__/good-type.flow.js

@@ -0,0 +1,127 @@
+// @flow strict
+/* eslint-disable */
+import * as React from 'react';
+import { translate, type I18nType } from '../src';
+import mockI18n from '../src/mockI18n';
+
+let result;
+
+// Case 1: functional component
+const ComponentA = ({
+    i18n,
+    content,
+    children,
+}: {
+    i18n: I18nType,
+    content: string,
+    children: React.Node,
+}) => (
+    <div>
+        {i18n.gettext('hey')}
+        {content}
+        {children}
+    </div>
+);
+
+const TComponentA = translate(ComponentA);
+result = <TComponentA content="foo">bar</TComponentA>;
+result = (
+    <TComponentA.WrappedComponent content="foo" i18n={mockI18n}>
+        bar
+    </TComponentA.WrappedComponent>
+);
+
+// Case 2: simple class component
+class ComponentB extends React.PureComponent<{
+    i18n: I18nType,
+    content: string,
+    children: React.Node,
+}> {
+    componentDidMount() {
+        console.log('hey');
+    }
+
+    render() {
+        const { i18n, content, children } = this.props;
+
+        return (
+            <div>
+                {i18n.gettext('hey')}
+                {content}
+                {children}
+            </div>
+        );
+    }
+}
+
+const TComponentB = translate(ComponentB);
+result = <TComponentB content="foo">bar</TComponentB>;
+
+// Case 3: class component with static
+class ComponentC extends React.Component<{
+    i18n: I18nType,
+    content: string,
+    children: React.Node,
+}> {
+    static method(str: string) {
+        console.log('hey', str);
+    }
+
+    componentDidMount() {
+        console.log('hey');
+    }
+
+    render() {
+        const { i18n, content, children } = this.props;
+
+        return (
+            <div>
+                {i18n.gettext('hey')}
+                {content}
+                {children}
+            </div>
+        );
+    }
+}
+
+const TComponentC = translate(ComponentC);
+result = <TComponentC content="foo">bar</TComponentC>;
+
+ComponentC.method('foo');
+TComponentC.WrappedComponent.method('foo');
+// `name` is build-in string prop
+const TComponentName = TComponentC.name;
+const TComponentDisplayName = TComponentC.displayName;
+
+// Case 4: class component with defaultProps
+class ComponentD extends React.Component<{
+    i18n: I18nType,
+    content: string,
+    children: React.Node,
+}> {
+    static defaultProps = {
+        content: 'foo',
+    };
+
+    componentDidMount() {
+        console.log('hey');
+    }
+
+    render() {
+        const { i18n, content, children } = this.props;
+
+        return (
+            <div>
+                {i18n.gettext('hey')}
+                {content}
+                {children}
+            </div>
+        );
+    }
+}
+
+// Case 4: React stateless component
+const StatelessCom = ({name, i18n}: {name: string, i18n: I18nType}) => <div>{i18n.gettext('S')}</div>
+const TStatelessCom = translate(StatelessCom);
+
+result = <TStatelessCom name="Kate" />;

__test__/test.js

@@ -1,4 +1,4 @@
-// @flow
+// @flow strict
 import React from 'react';
 import { mount } from 'enzyme';
 import { Jed, translate, I18nProvider, type I18nType } from '../src';

jest.setup.js

@@ -1,5 +1,4 @@
 // @flow
-import 'raf/polyfill';
 import Enzyme from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
 

package.json

@@ -16,7 +16,6 @@
     "localization"
   ],
   "dependencies": {
-    "hoist-non-react-statics": "^3.1.0",
     "jed": "^1.1.1",
     "react": "^16.6.3"
   },
@@ -40,7 +39,7 @@
     "eslint-plugin-jsx-a11y": "^6.1.2",
     "eslint-plugin-prettier": "^3.0.0",
     "eslint-plugin-react": "^7.3.0",
-    "flow-bin": "^0.86.0",
+    "flow-bin": "^0.84.0",
     "flow-copy-source": "^2.0.2",
     "flow-typed": "^2.4.0",
     "husky": "^1.2.0",
@@ -49,16 +48,16 @@
     "jest-serializer-enzyme": "^1.0.0",
     "lint-staged": "^8.1.0",
     "prettier": "^1.15.2",
-    "raf": "^3.4.1",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.6.3"
   },
   "scripts": {
     "test": "jest --coverage",
+    "badtest": "node test.flow.js",
     "build": "babel src/ -d dist/ && flow-copy-source -v src/ dist/",
     "prepublish": "npm run build",
     "publish": "npm run build",
-    "pretest": "flow-typed install && flow && eslint ."
+    "pretest": "flow-typed install --overwrite && flow && npm run badtest && eslint ."
   },
   "lint-staged": {
     "*.js": [