Put .server.js at the end of bundle filenames (#20419)
* Put .server.js at the end of bundle filenames * Client too
Dan Abramov committed
Dec 9, 2020 at 22:47 UTC
dbf40ef7599b824f9712074540fedfa15d3e948a
4 files changed
+24
-7
packages/react-server-dom-webpack/npm/writer.browser.server.js
+2
-2
@@ -1,7 +1,7 @@
1
'use strict';
2
3
if (process.env.NODE_ENV === 'production') {
4
- module.exports = require('./cjs/react-server-dom-webpack-writer.browser.server.production.min.js');
4
+ module.exports = require('./cjs/react-server-dom-webpack-writer.browser.production.min.server.js');
5
} else {
6
- module.exports = require('./cjs/react-server-dom-webpack-writer.browser.server.development.js');
6
+ module.exports = require('./cjs/react-server-dom-webpack-writer.browser.development.server.js');
7
}
packages/react-server-dom-webpack/npm/writer.node.server.js
+2
-2
@@ -1,7 +1,7 @@
1
'use strict';
2
3
if (process.env.NODE_ENV === 'production') {
4
- module.exports = require('./cjs/react-server-dom-webpack-writer.node.server.production.min.js');
4
+ module.exports = require('./cjs/react-server-dom-webpack-writer.node.production.min.server.js');
5
} else {
6
- module.exports = require('./cjs/react-server-dom-webpack-writer.node.server.development.js');
6
+ module.exports = require('./cjs/react-server-dom-webpack-writer.node.development.server.js');
7
}
packages/react/npm/unstable-index.server.js
+2
-2
@@ -1,7 +1,7 @@
1
'use strict';
2
3
if (process.env.NODE_ENV === 'production') {
4
- module.exports = require('./cjs/react-unstable-index.server.production.min.js');
4
+ module.exports = require('./cjs/react-unstable-index.production.min.server.js');
5
} else {
6
- module.exports = require('./cjs/react-unstable-index.server.development.js');
6
+ module.exports = require('./cjs/react-unstable-index.development.server.js');
7
}
scripts/rollup/bundles.js
+18
-1
@@ -834,7 +834,7 @@ deepFreeze(bundles);
834
deepFreeze(bundleTypes);
835
deepFreeze(moduleTypes);
836
837
-function getFilename(bundle, bundleType) {
837
+function getOriginalFilename(bundle, bundleType) {
838
let name = bundle.entry;
839
const globalName = bundle.global;
840
// we do this to replace / to -, for react-dom/server
@@ -871,6 +871,23 @@ function getFilename(bundle, bundleType) {
871
}
872
}
873
874
+function getFilename(bundle, bundleType) {
875
+ const originalFilename = getOriginalFilename(bundle, bundleType);
876
+ // Ensure .server.js or .client.js is the final suffix.
877
+ // This is important for the Server tooling convention.
878
+ if (originalFilename.indexOf('.server.') !== -1) {
879
+ return originalFilename
880
+ .replace('.server.', '.')
881
+ .replace('.js', '.server.js');
882
+ }
883
+ if (originalFilename.indexOf('.client.') !== -1) {
884
+ return originalFilename
885
+ .replace('.client.', '.')
886
+ .replace('.js', '.client.js');
887
+ }
888
+ return originalFilename;
889
+}
890
+
891
module.exports = {
892
bundleTypes,
893
moduleTypes,