refactor!: Flatten exports (#677)

.babelrc.js

@@ -0,0 +1,14 @@
+module.exports = (api) => ({
+  presets: [
+    [
+      '@4c',
+      {
+        runtime: true,
+        corejs: 3,
+        targets: {},
+        modules: api.env() === 'esm' ? false : 'commonjs',
+      },
+    ],
+  ],
+  plugins: [api.env() !== 'esm' && 'add-module-exports'].filter(Boolean),
+});

.eslintignore

@@ -1,3 +1,6 @@
+!.babelrc.js
+!.eslintrc.js
+
 **/coverage/
 **/lib/
 **/node_modules/

.eslintrc.js

@@ -0,0 +1,12 @@
+module.exports = {
+  extends: [
+    '4catalyzer-react',
+    '4catalyzer-jest',
+    'prettier',
+    'prettier/react',
+  ],
+  plugins: ['prettier'],
+  rules: {
+    'prettier/prettier': 'error',
+  },
+};

.travis.yml

@@ -2,7 +2,9 @@ language: node_js
 node_js:
   - stable
 
-cache: yarn
+cache:
+  yarn: true
+  npm: true
 
 after_script:
   - node_modules/.bin/codecov

README.md

@@ -897,12 +897,12 @@ You can also manually replace the route configuration and rerun the match by cal
 
 ### Server-side rendering
 
-Found supports server-side rendering for universal applications. Functionality specific to server-side rendering is available in `found/lib/server`.
+Found supports server-side rendering for universal applications. Functionality specific to server-side rendering is available in `found/server`.
 
 To render your application on the server, use `getFarceResult`.
 
 ```js
-import { getFarceResult } from 'found/lib/server';
+import { getFarceResult } from 'found/server';
 
 /* ... */
 
@@ -975,7 +975,7 @@ Found exposes lower-level functionality for doing server-side rendering for use
 
 ```js
 import { getStoreRenderArgs } from 'found';
-import { RouterProvider } from 'found/lib/server';
+import { RouterProvider } from 'found/server';
 
 /* ... */
 
@@ -1043,13 +1043,13 @@ import { getStoreRenderArgs } from 'found';
 
 ### Minimizing bundle size
 
-The top-level `found` package exports everything available in this library. It is unlikely that any single application will use all the features available. As such, for real applications, you should import the modules that you need from `found/lib` directly, to pull in only the code that you use.
+The top-level `found` package exports everything available in this library. It is unlikely that any single application will use all the features available. As such, for real applications, you should import the modules you need directly, to pull in only the code that you use.
 
 ```js
-import createBrowserRouter from 'found/lib/createBrowserRouter';
-import makeRouteConfig from 'found/lib/makeRouteConfig';
-import { routerShape } from 'found/lib/PropTypes';
-import Route from 'found/lib/Route';
+import createBrowserRouter from 'found/createBrowserRouter';
+import makeRouteConfig from 'found/makeRouteConfig';
+import { routerShape } from 'found/PropTypes';
+import Route from 'found/Route';
 
 // Instead of:
 // import {

examples/.eslintrc.js

@@ -0,0 +1,10 @@
+module.exports = {
+  env: {
+    browser: true,
+  },
+  rules: {
+    // Don't fail linting if example dependencies aren't installed.
+    'import/extensions': 'off',
+    'import/no-unresolved': 'off',
+  },
+};

examples/hot-reloading/.babelrc.js

@@ -0,0 +1,14 @@
+module.exports = {
+  presets: [
+    [
+      '@babel/env',
+      {
+        loose: true,
+        useBuiltIns: 'usage',
+        corejs: 3,
+      },
+    ],
+    '@babel/react',
+  ],
+  plugins: ['react-hot-loader/babel'],
+};

examples/universal-redux/.babelrc.js

@@ -0,0 +1,13 @@
+module.exports = {
+  presets: [
+    [
+      '@babel/env',
+      {
+        loose: true,
+        useBuiltIns: 'usage',
+        corejs: 3,
+      },
+    ],
+    '@babel/react',
+  ],
+};

examples/universal/.babelrc.js

@@ -0,0 +1,13 @@
+module.exports = {
+  presets: [
+    [
+      '@babel/env',
+      {
+        loose: true,
+        useBuiltIns: 'usage',
+        corejs: 3,
+      },
+    ],
+    '@babel/react',
+  ],
+};

package.json

@@ -5,14 +5,20 @@
   "files": [
     "lib"
   ],
-  "main": "lib/index.js",
+  "main": "lib/cjs/index.js",
+  "module": "lib/esm/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
-    "build": "babel src -d lib --delete-dir-on-start && cpy types/*.d.ts lib && cpy types/server/*.d.ts lib/server",
+    "build": "rimraf lib && npm run build:cjs && npm run build:esm && npm run build:pick && npm run build:types",
+    "build:cjs": "babel -d lib/cjs src",
+    "build:esm": "babel --env-name esm -d lib/esm src",
+    "build:pick": "cherry-pick --cjs-dir cjs --esm-dir esm --cwd lib ../src",
+    "build:types": "cpy types/*.d.ts lib",
     "format": "eslint --fix . && npm run prettier -- --write",
     "lint": "eslint . && npm run prettier -- -l",
     "prepublish": "npm run build",
     "prettier": "prettier --ignore-path .eslintignore '**/*.{md,ts,tsx}'",
+    "release": "rollout",
     "tdd": "jest --watch",
     "test": "npm run lint && npm run test:ts && npm run testonly -- --coverage",
     "test:ts": "dtslint types",
@@ -66,6 +72,7 @@
   "dependencies": {
     "@babel/runtime-corejs3": "^7.6.2",
     "@restart/context": "^2.1.4",
+    "@types/react": "^16.9.31",
     "farce": "^0.4.1",
     "invariant": "^2.2.4",
     "is-promise": "^2.1.0",
@@ -82,17 +89,18 @@
   },
   "devDependencies": {
     "@4c/babel-preset": "^7.3.4",
+    "@4c/rollout": "^2.1.5",
     "@babel/cli": "^7.8.4",
     "@babel/core": "^7.9.0",
-    "@types/react": "^16.9.27",
-    "@types/react-dom": "^16.9.5",
+    "@types/react-dom": "^16.9.6",
     "babel-jest": "^25.2.4",
     "babel-plugin-add-module-exports": "^1.0.2",
+    "cherry-pick": "^0.5.0",
     "codecov": "^3.6.5",
     "cpy-cli": "^3.1.0",
     "delay": "^4.3.0",
     "doctoc": "^1.4.0",
-    "dtslint": "^3.4.0",
+    "dtslint": "^3.4.1",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
     "eslint": "^6.8.0",
@@ -107,7 +115,7 @@
     "eslint-plugin-react-hooks": "^3.0.0",
     "husky": "^4.2.3",
     "jest": "^25.2.4",
-    "lint-staged": "^10.1.0",
+    "lint-staged": "^10.1.1",
     "p-defer": "^3.0.0",
     "prettier": "^2.0.2",
     "react": "^16.13.1",

src/createBaseRouter.js

@@ -8,8 +8,8 @@ import warning from 'warning';
 
 import RouterContext from './RouterContext';
 import createRender from './createRender';
-import createStoreRouterObject from './utils/createStoreRouterObject';
-import resolveRenderArgs from './utils/resolveRenderArgs';
+import createStoreRouterObject from './createStoreRouterObject';
+import resolveRenderArgs from './resolveRenderArgs';
 
 export default function createBaseRouter({
   renderPending,

src/createFarceRouter.js

@@ -3,7 +3,7 @@ import React from 'react';
 import { Provider } from 'react-redux';
 
 import createConnectedRouter from './createConnectedRouter';
-import createFarceStore from './utils/createFarceStore';
+import createFarceStore from './createFarceStore';
 
 export default function createFarceRouter({
   store,

src/utils/createFarceStore.js → src/createFarceStore.js

@@ -3,9 +3,9 @@ import createHistoryEnhancer from 'farce/createHistoryEnhancer';
 import queryMiddleware from 'farce/queryMiddleware';
 import { combineReducers, compose, createStore } from 'redux';
 
-import Matcher from '../Matcher';
-import createMatchEnhancer from '../createMatchEnhancer';
-import foundReducer from '../foundReducer';
+import Matcher from './Matcher';
+import createMatchEnhancer from './createMatchEnhancer';
+import foundReducer from './foundReducer';
 
 export default function createFarceStore({
   historyProtocol,

src/createInitialFarceRouter.js

@@ -1,6 +1,6 @@
 import createFarceRouter from './createFarceRouter';
+import createFarceStore from './createFarceStore';
 import getStoreRenderArgs from './getStoreRenderArgs';
-import createFarceStore from './utils/createFarceStore';
 
 export default async function createInitialFarceRouter({
   historyProtocol,

src/getRenderArgs.js

@@ -1,4 +1,4 @@
-import resolveRenderArgs from './utils/resolveRenderArgs';
+import resolveRenderArgs from './resolveRenderArgs';
 
 export default async function getRenderArgs(router, props) {
   let elements;

src/getStoreRenderArgs.js

@@ -1,5 +1,5 @@
+import createStoreRouterObject from './createStoreRouterObject';
 import getRenderArgs from './getRenderArgs';
-import createStoreRouterObject from './utils/createStoreRouterObject';
 
 // This function returns a promise. It doesn't need to be an async function
 // because it doesn't use the promise's value.

src/index.js

@@ -5,10 +5,12 @@ export createBrowserRouter from './createBrowserRouter';
 export createConnectedRouter from './createConnectedRouter';
 export createElements from './createElements';
 export createFarceRouter from './createFarceRouter';
+export createFarceStore from './createFarceStore';
 export createInitialBrowserRouter from './createInitialBrowserRouter';
 export createInitialFarceRouter from './createInitialFarceRouter';
 export createMatchEnhancer from './createMatchEnhancer';
 export createRender from './createRender';
+export createStoreRouterObject from './createStoreRouterObject';
 export ElementsRenderer from './ElementsRenderer';
 export foundReducer from './foundReducer';
 export getRenderArgs from './getRenderArgs';
@@ -22,6 +24,7 @@ export { matcherShape, matchShape, routerShape } from './PropTypes';
 export Redirect from './Redirect';
 export RedirectException from './RedirectException';
 export resolver from './resolver';
+export resolveRenderArgs from './resolveRenderArgs';
 export * as ResolverUtils from './ResolverUtils';
 export Route from './Route';
 export RouterContext from './RouterContext';

src/utils/resolveRenderArgs.js → src/resolveRenderArgs.js

@@ -1,4 +1,4 @@
-import HttpError from '../HttpError';
+import HttpError from './HttpError';
 
 function foldElements(elementsRaw, routeIndices) {
   const elements = [];