fix: add flow types and fix package exports

Closes #250

.flowconfig

@@ -1,4 +1,5 @@
 [ignore]
+.*/build/.*
 .*/examples/.*
 .*/node_modules/config-chain/.*
 .*/node_modules/conventional-changelog-core/.*

packages/cli/api.js

@@ -1,3 +1 @@
-// Replace in Babel 7.x (https://github.com/babel/babel/issues/2877):
-// export * from "./src/api"
-module.exports = require("./src/api")
+export * from "./src/api"

packages/cli/index.js

@@ -1,3 +1 @@
-// Replace in Babel 7.x (https://github.com/babel/babel/issues/2877):
-// export * from "./src/lingui"
-module.exports = require("./src/lingui")
+export * from "./src/lingui"

packages/cli/package.json

@@ -32,7 +32,8 @@
     "lingui.js",
     "lingui-add-locale.js",
     "lingui-compile.js",
-    "lingui-extract.js"
+    "lingui-extract.js",
+    "*.js.flow"
   ],
   "dependencies": {
     "@lingui/babel-plugin-extract-messages": "0.0.0-managed-by-release-script",

packages/conf/index.js

@@ -1,3 +1 @@
-// Replace in Babel 7.x (https://github.com/babel/babel/issues/2877):
-// export * from "./src"
-module.exports = require("./src")
+export * from "./src"

packages/core/index.js

@@ -1,3 +1 @@
-// Replace in Babel 7.x (https://github.com/babel/babel/issues/2877):
-// export * from "./src"
-module.exports = require("./src")
+export * from "./src"

packages/core/package.json

@@ -26,6 +26,7 @@
     "README.md",
     "index.js",
     "dev.js",
+    "*.js.flow",
     "cjs/"
   ],
   "dependencies": {

packages/loader/index.js

@@ -1,3 +1 @@
-// Replace in Babel 7.x (https://github.com/babel/babel/issues/2877):
-// export { default } from "./src"
-module.exports = require("./src")
+export { default } from "./src"

packages/react/index.js

@@ -1,3 +1 @@
-// Replace in Babel 7.x (https://github.com/babel/babel/issues/2877):
-// export * from "./src"
-module.exports = require("./src")
+export * from "./src"

packages/react/package.json

@@ -26,12 +26,20 @@
   "bugs": {
     "url": "https://github.com/lingui/js-lingui/issues"
   },
-  "peerDependencies": {
-    "react": "^15.0.0 || ^16.0.0"
-  },
   "engines": {
     "node": ">=4.0"
   },
+  "files": [
+    "LICENSE",
+    "README.md",
+    "index.js",
+    "dev.js",
+    "*.js.flow",
+    "cjs/"
+  ],
+  "peerDependencies": {
+    "react": "^15.0.0 || ^16.0.0"
+  },
   "dependencies": {
     "@lingui/core": "0.0.0-managed-by-release-script",
     "babel-runtime": "^6.26.0",

packages/react/src/I18nProvider.js

@@ -1,4 +1,4 @@
-/* @flow */
+// @flow
 import * as React from "react"
 import PropTypes from "prop-types"
 import hashSum from "hash-sum"
@@ -7,13 +7,13 @@ import { setupI18n } from "@lingui/core"
 import type { I18n, Catalogs, Locales } from "@lingui/core"
 
 export type I18nProviderProps = {
-  children?: React.Node,
+  children?: any,
   language: string,
   locales?: Locales,
   catalogs?: Catalogs,
   i18n?: I18n,
 
-  defaultRender: Node
+  defaultRender: ?any
 }
 
 /*
@@ -102,6 +102,6 @@ export default class I18nProvider extends React.Component<I18nProviderProps> {
   }
 
   render() {
-    return <React.Fragment>{this.props.children}</React.Fragment>
+    return this.props.children
   }
 }

packages/react/src/Trans.test.js

@@ -1,4 +1,4 @@
-/* @flow */
+// @flow
 import * as React from "react"
 import { mount, shallow } from "enzyme"
 

packages/react/src/format.js

@@ -14,7 +14,7 @@ const nlRe = /(?:\r\n|\r|\n)/g
  */
 function formatElements(
   value: string,
-  elements: Array<React$Element<any>> = []
+  elements: Array<any> = []
 ): string | Array<any> {
   // TODO: warn if there're any unprocessed elements
   // TODO: warn if element at `index` doesn't exist

packages/react/src/index.js

@@ -1,18 +1,26 @@
 // @flow
 import { date, number } from "@lingui/core"
 
-import createFormat from "./createFormat"
+import I18nProvider from "./I18nProvider"
+import Trans from "./Trans"
+import { Plural, Select, SelectOrdinal } from "./Select"
 
+import createFormat from "./createFormat"
 import withI18n from "./withI18n"
-import type { withI18nProps } from "./withI18n"
-export { withI18n }
-export type { withI18nProps }
 
-export { default as I18nProvider } from "./I18nProvider"
-export { default as Trans } from "./Trans"
-export { Plural, Select, SelectOrdinal } from "./Select"
+const DateFormat = withI18n()(createFormat(date))
+const NumberFormat = withI18n()(createFormat(number))
 
-export const DateFormat = withI18n()(createFormat(date))
-export const NumberFormat = withI18n()(createFormat(number))
+const i18nMark = (id: string) => id
 
-export const i18nMark = (id: string) => id
+export {
+  i18nMark,
+  withI18n,
+  I18nProvider,
+  Trans,
+  Plural,
+  Select,
+  SelectOrdinal,
+  DateFormat,
+  NumberFormat
+}

packages/react/src/withI18n.test.js

@@ -2,6 +2,8 @@
 import * as React from "react"
 import { mount } from "enzyme"
 
+// Don't import from @lingui/react,
+// otherwise we're not able to mockEnv in integration test
 import { withI18n } from "."
 import { mockEnv, mockConsole } from "./mocks"
 

scripts/build/babel.config.js

@@ -2,18 +2,27 @@
 // Rollup, however, needs `modules: false, babel modules: true`
 module.exports = function(options) {
   const config = {
+    // Workaround for transform-runtime bug with export * from "./module"
+    // https://github.com/babel/babel/issues/2877#issuecomment-245402025
+    passPerPreset: true,
     presets: [
-      "react",
-      [
-        "env",
-        {
-          targets: {
-            node: 4,
-            browsers: "> 1%, last 2 versions"
-          },
-          modules: options.modules === false ? false : "commonjs"
-        }
-      ]
+      { plugins: ["transform-runtime"] },
+      {
+        passPerPreset: false,
+        presets: [
+          "react",
+          [
+            "env",
+            {
+              targets: {
+                node: 4,
+                browsers: "> 1%, last 2 versions"
+              },
+              modules: options.modules === false ? false : "commonjs"
+            }
+          ]
+        ]
+      }
     ],
     plugins: [
       ["transform-class-properties", { loose: false }],

scripts/build/index.js

@@ -4,7 +4,7 @@ const Modules = require("./modules")
 const Bundles = require("./bundles")
 const Packaging = require("./packaging")
 const Stats = require("./stats")
-const { asyncCopyTo, asyncRimRaf } = require("./utils")
+const { asyncCopyTo, asyncRimRaf, asyncExecuteCommand } = require("./utils")
 
 const rollup = require("./rollup")
 const babel = require("./babel")
@@ -34,6 +34,13 @@ function shouldSkipBundle(bundle, bundleType) {
   return false
 }
 
+async function copyFlowTypes(srcDir, outDir) {
+  console.log('Generating flow types')
+  return asyncExecuteCommand(
+    `flow gen-flow-files --ignore ".*\.test\.js$" --out-dir ${outDir} ${srcDir}`
+  )
+}
+
 async function buildEverything() {
   await asyncRimRaf("build")
 
@@ -49,6 +56,10 @@ async function buildEverything() {
     }
 
     await builder(bundle)
+    if (bundle.type === UNIVERSAL || bundle.type === NODE) {
+      const name = bundle.entry.replace("@lingui/", "")
+      await copyFlowTypes(`packages/${name}/src`, `build/packages/${name}`)
+    }
   }
 
   console.log(Stats.printResults())

scripts/build/results.json

@@ -1,20 +1,20 @@
 {
   "bundleSizes": {
     "@lingui/core.development.js (NODE_DEV)": {
-      "size": 13974,
-      "gzip": 3692
+      "size": 13895,
+      "gzip": 3636
     },
     "@lingui/core.production.min.js (NODE_PROD)": {
-      "size": 5741,
-      "gzip": 1892
+      "size": 5800,
+      "gzip": 1902
     },
     "@lingui/react.development.js (NODE_DEV)": {
-      "size": 18214,
-      "gzip": 5063
+      "size": 18086,
+      "gzip": 4999
     },
     "@lingui/react.production.min.js (NODE_PROD)": {
-      "size": 8598,
-      "gzip": 3084
+      "size": 8664,
+      "gzip": 3099
     }
   }
 }

scripts/build/rollup.js

@@ -16,7 +16,6 @@ const argv = require("minimist")(process.argv.slice(2))
 const Stats = require("./stats")
 const sizes = require("./plugins/sizes")
 const codeFrame = require("babel-code-frame")
-// const Wrappers = require("./wrappers")
 const babelConfig = require("./babel.config")
 
 const Modules = require("./modules")