Skip to content

Commit 5bde02b

Browse files
committed
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
1 parent 0aef848 commit 5bde02b

File tree

102 files changed

+938
-606
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+938
-606
lines changed
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
es/
1+
cjs/
2+
esm/
23
umd/
3-
/*.js
4-
!/rollup.config.js
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
"use strict";
2+
3+
import warnAboutDeprecatedESMImport from "./warnAboutDeprecatedESMImport.js";
4+
warnAboutDeprecatedESMImport("matchRoutes");
5+
6+
import { matchRoutes } from "../esm/react-router-config.js";
7+
export default matchRoutes;
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
"use strict";
2+
3+
import warnAboutDeprecatedESMImport from "./warnAboutDeprecatedESMImport.js";
4+
warnAboutDeprecatedESMImport("renderRoutes");
5+
6+
import { renderRoutes } from "../esm/react-router-config.js";
7+
export default renderRoutes;
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
"use strict";
2+
3+
var printWarning = function() {};
4+
5+
if (process.env.NODE_ENV !== "production") {
6+
printWarning = function(format, subs) {
7+
var index = 0;
8+
var message =
9+
"Warning: " +
10+
(subs.length > 0
11+
? format.replace(/%s/g, function() {
12+
return subs[index++];
13+
})
14+
: format);
15+
16+
if (typeof console !== "undefined") {
17+
console.error(message);
18+
}
19+
20+
try {
21+
// --- Welcome to debugging React Router ---
22+
// This error was thrown as a convenience so that you can use the
23+
// stack trace to find the callsite that triggered this warning.
24+
throw new Error(message);
25+
} catch (e) {}
26+
};
27+
}
28+
29+
export default function(member) {
30+
printWarning(
31+
'Please use `import { %s } from "react-router-config"` instead of `import %s from "react-router-config/%s"`. ' +
32+
"Support for the latter will be removed in the next major release.",
33+
[member, member]
34+
);
35+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
"use strict";
2+
3+
if (process.env.NODE_ENV === "production") {
4+
module.exports = require("./cjs/react-router-config.min.js");
5+
} else {
6+
module.exports = require("./cjs/react-router-config.js");
7+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
"use strict";
2+
require("./warnAboutDeprecatedCJSRequire.js")("matchRoutes");
3+
module.exports = require("./index.js").matchRoutes;

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

Lines changed: 7 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,17 @@
11
{
2+
"presets": [["env", { "loose": true, "modules": false }], "react"],
3+
"plugins": [
4+
"dev-expression",
5+
["transform-object-rest-spread", { "useBuiltIns": true }],
6+
"transform-export-extensions"
7+
],
28
"env": {
3-
"build-cjs": {
4-
"presets": [["env", { "loose": true }], "react"],
5-
"plugins": [
6-
"dev-expression",
7-
["transform-object-rest-spread", { "useBuiltIns": true }],
8-
"transform-export-default",
9-
[
10-
"transform-imports",
11-
{
12-
"react-router": {
13-
"transform": "react-router/${member}"
14-
}
15-
}
16-
]
17-
]
18-
},
19-
"build-esm": {
20-
"presets": [["env", { "loose": true, "modules": false }], "react"],
21-
"plugins": [
22-
"dev-expression",
23-
["transform-object-rest-spread", { "useBuiltIns": true }],
24-
"transform-export-default",
25-
[
26-
"transform-imports",
27-
{
28-
"react-router": {
29-
"transform": "react-router/es/${member}"
30-
}
31-
}
32-
]
33-
]
34-
},
359
"test": {
3610
"presets": [["env", { "loose": true }], "react"],
3711
"plugins": [
3812
"dev-expression",
3913
["transform-object-rest-spread", { "useBuiltIns": true }],
40-
"transform-export-default",
41-
[
42-
"transform-imports",
43-
{
44-
"react-router": {
45-
"transform": "react-router/modules/${member}"
46-
}
47-
}
48-
]
14+
"transform-export-extensions"
4915
]
5016
}
5117
}

packages/react-router-config/package-lock.json

Lines changed: 9 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/react-router-config/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@
88
"Ryan Florence"
99
],
1010
"files": [
11+
"cjs",
1112
"es",
13+
"esm",
1214
"index.js",
1315
"matchRoutes.js",
1416
"renderRoutes.js",
1517
"umd"
1618
],
1719
"main": "index.js",
18-
"module": "es/index.js",
20+
"module": "esm/index.js",
1921
"sideEffects": false,
2022
"scripts": {
2123
"build": "node ./scripts/build.js",
@@ -34,7 +36,7 @@
3436
"babel-jest": "^23.0.1",
3537
"babel-plugin-dev-expression": "^0.2.1",
3638
"babel-plugin-external-helpers": "^6.22.0",
37-
"babel-plugin-transform-export-default": "^7.0.0-alpha.20",
39+
"babel-plugin-transform-export-extensions": "^6.22.0",
3840
"babel-plugin-transform-imports": "^1.5.1",
3941
"babel-plugin-transform-object-rest-spread": "^6.26.0",
4042
"babel-preset-env": "^1.7.0",
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
"use strict";
2+
require("./warnAboutDeprecatedCJSRequire.js")("renderRoutes");
3+
module.exports = require("./index.js").renderRoutes;

0 commit comments

Comments
 (0)