Use rollup for all builds

- Provide production-ready versions of CJS and ESM builds
- Deprecate requiring individual files, e.g. require('react-router/Route')
- Remove dependency on babel-plugin-transform-imports

Fixes #6387

packages/react-router-config/.gitignore

@@ -1,4 +1,3 @@
-es/
+cjs/
+esm/
 umd/
-/*.js
-!/rollup.config.js

packages/react-router-config/es/matchRoutes.js

@@ -0,0 +1,7 @@
+"use strict";
+
+import warnAboutDeprecatedESMImport from "./warnAboutDeprecatedESMImport.js";
+warnAboutDeprecatedESMImport("matchRoutes");
+
+import { matchRoutes } from "../esm/react-router-config.js";
+export default matchRoutes;

packages/react-router-config/es/renderRoutes.js

@@ -0,0 +1,7 @@
+"use strict";
+
+import warnAboutDeprecatedESMImport from "./warnAboutDeprecatedESMImport.js";
+warnAboutDeprecatedESMImport("renderRoutes");
+
+import { renderRoutes } from "../esm/react-router-config.js";
+export default renderRoutes;

packages/react-router-config/es/warnAboutDeprecatedESMImport.js

@@ -0,0 +1,35 @@
+"use strict";
+
+var printWarning = function() {};
+
+if (process.env.NODE_ENV !== "production") {
+  printWarning = function(format, subs) {
+    var index = 0;
+    var message =
+      "Warning: " +
+      (subs.length > 0
+        ? format.replace(/%s/g, function() {
+            return subs[index++];
+          })
+        : format);
+
+    if (typeof console !== "undefined") {
+      console.error(message);
+    }
+
+    try {
+      // --- Welcome to debugging React Router ---
+      // This error was thrown as a convenience so that you can use the
+      // stack trace to find the callsite that triggered this warning.
+      throw new Error(message);
+    } catch (e) {}
+  };
+}
+
+export default function(member) {
+  printWarning(
+    'Please use `import { %s } from "react-router-config"` instead of `import %s from "react-router-config/%s"`. ' +
+      "Support for the latter will be removed in the next major release.",
+    [member, member]
+  );
+}

packages/react-router-config/index.js

@@ -0,0 +1,7 @@
+"use strict";
+
+if (process.env.NODE_ENV === "production") {
+  module.exports = require("./cjs/react-router-config.min.js");
+} else {
+  module.exports = require("./cjs/react-router-config.js");
+}

packages/react-router-config/matchRoutes.js

@@ -0,0 +1,3 @@
+"use strict";
+require("./warnAboutDeprecatedCJSRequire.js")("matchRoutes");
+module.exports = require("./index.js").matchRoutes;

packages/react-router-config/modules/.babelrc

@@ -1,51 +1,17 @@
 {
+  "presets": [["env", { "loose": true, "modules": false }], "react"],
+  "plugins": [
+    "dev-expression",
+    ["transform-object-rest-spread", { "useBuiltIns": true }],
+    "transform-export-extensions"
+  ],
   "env": {
-    "build-cjs": {
-      "presets": [["env", { "loose": true }], "react"],
-      "plugins": [
-        "dev-expression",
-        ["transform-object-rest-spread", { "useBuiltIns": true }],
-        "transform-export-default",
-        [
-          "transform-imports",
-          {
-            "react-router": {
-              "transform": "react-router/${member}"
-            }
-          }
-        ]
-      ]
-    },
-    "build-esm": {
-      "presets": [["env", { "loose": true, "modules": false }], "react"],
-      "plugins": [
-        "dev-expression",
-        ["transform-object-rest-spread", { "useBuiltIns": true }],
-        "transform-export-default",
-        [
-          "transform-imports",
-          {
-            "react-router": {
-              "transform": "react-router/es/${member}"
-            }
-          }
-        ]
-      ]
-    },
     "test": {
       "presets": [["env", { "loose": true }], "react"],
       "plugins": [
         "dev-expression",
         ["transform-object-rest-spread", { "useBuiltIns": true }],
-        "transform-export-default",
-        [
-          "transform-imports",
-          {
-            "react-router": {
-              "transform": "react-router/modules/${member}"
-            }
-          }
-        ]
+        "transform-export-extensions"
       ]
     }
   }

packages/react-router-config/package.json

@@ -8,14 +8,16 @@
     "Ryan Florence"
   ],
   "files": [
+    "cjs",
     "es",
+    "esm",
     "index.js",
     "matchRoutes.js",
     "renderRoutes.js",
     "umd"
   ],
   "main": "index.js",
-  "module": "es/index.js",
+  "module": "esm/index.js",
   "sideEffects": false,
   "scripts": {
     "build": "node ./scripts/build.js",
@@ -34,7 +36,7 @@
     "babel-jest": "^23.0.1",
     "babel-plugin-dev-expression": "^0.2.1",
     "babel-plugin-external-helpers": "^6.22.0",
-    "babel-plugin-transform-export-default": "^7.0.0-alpha.20",
+    "babel-plugin-transform-export-extensions": "^6.22.0",
     "babel-plugin-transform-imports": "^1.5.1",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-preset-env": "^1.7.0",

packages/react-router-config/renderRoutes.js

@@ -0,0 +1,3 @@
+"use strict";
+require("./warnAboutDeprecatedCJSRequire.js")("renderRoutes");
+module.exports = require("./index.js").renderRoutes;

packages/react-router-config/rollup.config.js

@@ -6,33 +6,21 @@ import resolve from "rollup-plugin-node-resolve";
 
 const config = {
   output: {
-    format: "umd",
     name: "ReactRouterConfig",
     globals: {
       react: "React",
-      "react-router": "ReactRouter",
-      "react-router/es/Route": "ReactRouter.Route",
-      "react-router/es/Router": "ReactRouter.Router",
-      "react-router/es/Switch": "ReactRouter.Switch",
-      "react-router/es/matchPath": "ReactRouter.matchPath"
+      "react-router": "ReactRouter"
     }
   },
-  external: [
-    "react",
-    "react-router",
-    "react-router/es/Route",
-    "react-router/es/Router",
-    "react-router/es/Switch",
-    "react-router/es/matchPath"
-  ],
+  external: ["react", "react-router"],
   plugins: [
     babel({
       exclude: "node_modules/**",
       plugins: ["external-helpers"]
     }),
     resolve(),
     commonjs({
-      include: /node_modules/
+      include: "node_modules/**"
     }),
     replace({
       "process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV)

packages/react-router-config/scripts/build.js

@@ -10,34 +10,27 @@ function exec(command, extraEnv) {
   });
 }
 
-console.log("Building CommonJS modules ...");
-console.log();
-
-exec("babel modules -d . --ignore __tests__", {
-  BABEL_ENV: "build-cjs"
+exec("rollup -c -i modules/index.js -o cjs/react-router-config.js -f cjs", {
+  NODE_ENV: "development"
 });
 
-console.log();
-console.log("Building ES modules ...");
-console.log();
+exec("rollup -c -i modules/index.js -o cjs/react-router-config.min.js -f cjs", {
+  NODE_ENV: "production"
+});
 
-exec("babel modules -d es --ignore __tests__", {
-  BABEL_ENV: "build-esm"
+exec("rollup -c -i modules/index.js -o esm/react-router-config.js -f esm", {
+  NODE_ENV: "development"
 });
 
-console.log();
-console.log("Building react-router-config.js ...");
+exec("rollup -c -i modules/index.js -o esm/react-router-config.min.js -f esm", {
+  NODE_ENV: "production"
+});
 
-exec("rollup -c -i modules/index.js -o umd/react-router-config.js", {
-  BABEL_ENV: "build-esm",
+exec("rollup -c -i modules/index.js -o umd/react-router-config.js -f umd", {
   NODE_ENV: "development"
 });
 
-console.log();
-console.log("Building react-router-config.min.js ...");
-
-exec("rollup -c -i modules/index.js -o umd/react-router-config.min.js", {
-  BABEL_ENV: "build-esm",
+exec("rollup -c -i modules/index.js -o umd/react-router-config.min.js -f umd", {
   NODE_ENV: "production"
 });
 

packages/react-router-config/warnAboutDeprecatedCJSRequire.js

@@ -0,0 +1,35 @@
+"use strict";
+
+var printWarning = function() {};
+
+if (process.env.NODE_ENV !== "production") {
+  printWarning = function(format, subs) {
+    var index = 0;
+    var message =
+      "Warning: " +
+      (subs.length > 0
+        ? format.replace(/%s/g, function() {
+            return subs[index++];
+          })
+        : format);
+
+    if (typeof console !== "undefined") {
+      console.error(message);
+    }
+
+    try {
+      // --- Welcome to debugging React Router ---
+      // This error was thrown as a convenience so that you can use the
+      // stack trace to find the callsite that triggered this warning.
+      throw new Error(message);
+    } catch (e) {}
+  };
+}
+
+module.exports = function(member) {
+  printWarning(
+    'Please use `require("react-router-config").%s` instead of `require("react-router-config/%s")`. ' +
+      "Support for the latter will be removed in the next major release.",
+    [member, member]
+  );
+};

packages/react-router-dom/.gitignore

@@ -1,4 +1,3 @@
-es/
+cjs/
+esm/
 umd/
-/*.js
-!/rollup.config.js

packages/react-router-dom/BrowserRouter.js

@@ -0,0 +1,3 @@
+"use strict";
+require("./warnAboutDeprecatedCJSRequire")("BrowserRouter");
+module.exports = require("./index.js").BrowserRouter;

packages/react-router-dom/HashRouter.js

@@ -0,0 +1,3 @@
+"use strict";
+require("./warnAboutDeprecatedCJSRequire")("HashRouter");
+module.exports = require("./index.js").HashRouter;

packages/react-router-dom/Link.js

@@ -0,0 +1,3 @@
+"use strict";
+require("./warnAboutDeprecatedCJSRequire")("Link");
+module.exports = require("./index.js").Link;

packages/react-router-dom/MemoryRouter.js

@@ -0,0 +1,3 @@
+"use strict";
+require("./warnAboutDeprecatedCJSRequire")("MemoryRouter");
+module.exports = require("./index.js").MemoryRouter;

packages/react-router-dom/NavLink.js

@@ -0,0 +1,3 @@
+"use strict";
+require("./warnAboutDeprecatedCJSRequire")("NavLink");
+module.exports = require("./index.js").NavLink;

packages/react-router-dom/Prompt.js

@@ -0,0 +1,3 @@
+"use strict";
+require("./warnAboutDeprecatedCJSRequire")("Prompt");
+module.exports = require("./index.js").Prompt;

packages/react-router-dom/Redirect.js

@@ -0,0 +1,3 @@
+"use strict";
+require("./warnAboutDeprecatedCJSRequire")("Redirect");
+module.exports = require("./index.js").Redirect;

packages/react-router-dom/Route.js

@@ -0,0 +1,3 @@
+"use strict";
+require("./warnAboutDeprecatedCJSRequire")("Route");
+module.exports = require("./index.js").Route;

packages/react-router-dom/Router.js

@@ -0,0 +1,3 @@
+"use strict";
+require("./warnAboutDeprecatedCJSRequire")("Router");
+module.exports = require("./index.js").Router;

packages/react-router-dom/StaticRouter.js

@@ -0,0 +1,3 @@
+"use strict";
+require("./warnAboutDeprecatedCJSRequire")("StaticRouter");
+module.exports = require("./index.js").StaticRouter;

packages/react-router-dom/Switch.js

@@ -0,0 +1,3 @@
+"use strict";
+require("./warnAboutDeprecatedCJSRequire")("Switch");
+module.exports = require("./index.js").Switch;

packages/react-router-dom/es/BrowserRouter.js

@@ -0,0 +1,7 @@
+"use strict";
+
+import warnAboutDeprecatedESMImport from "./warnAboutDeprecatedESMImport.js";
+warnAboutDeprecatedESMImport("BrowserRouter");
+
+import { BrowserRouter } from "../esm/react-router-dom.js";
+export default BrowserRouter;

packages/react-router-dom/es/HashRouter.js

@@ -0,0 +1,7 @@
+"use strict";
+
+import warnAboutDeprecatedESMImport from "./warnAboutDeprecatedESMImport.js";
+warnAboutDeprecatedESMImport("HashRouter");
+
+import { HashRouter } from "../esm/react-router-dom.js";
+export default HashRouter;

packages/react-router-dom/es/Link.js

@@ -0,0 +1,7 @@
+"use strict";
+
+import warnAboutDeprecatedESMImport from "./warnAboutDeprecatedESMImport.js";
+warnAboutDeprecatedESMImport("Link");
+
+import { Link } from "../esm/react-router-dom.js";
+export default Link;

packages/react-router-dom/es/MemoryRouter.js

@@ -0,0 +1,7 @@
+"use strict";
+
+import warnAboutDeprecatedESMImport from "./warnAboutDeprecatedESMImport.js";
+warnAboutDeprecatedESMImport("MemoryRouter");
+
+import { MemoryRouter } from "../esm/react-router-dom.js";
+export default MemoryRouter;