OSSForks/react
1
0
Fork 0
mirror of https://github.com/zebrajr/react.git synced 2026-01-15 12:15:22 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Put .server.js at the end of bundle filenames (#20419)

Browse Source 
* Put .server.js at the end of bundle filenames

* Client too
This commit is contained in:
Dan Abramov
2020-12-09 22:47:17 +00:00
committed by GitHub
parent 03126dd087
commit dbf40ef759
4 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/react-server-dom-webpack/npm/writer.browser.server.js
View File

@@ -1,7 +1,7 @@
'use strict';
if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-server-dom-webpack-writer.browser.server.production.min.js');
module.exports = require('./cjs/react-server-dom-webpack-writer.browser.production.min.server.js');
} else {
module.exports = require('./cjs/react-server-dom-webpack-writer.browser.server.development.js');
module.exports = require('./cjs/react-server-dom-webpack-writer.browser.development.server.js');
}

4
packages/react-server-dom-webpack/npm/writer.node.server.js
View File

@@ -1,7 +1,7 @@
'use strict';
if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-server-dom-webpack-writer.node.server.production.min.js');
module.exports = require('./cjs/react-server-dom-webpack-writer.node.production.min.server.js');
} else {
module.exports = require('./cjs/react-server-dom-webpack-writer.node.server.development.js');
module.exports = require('./cjs/react-server-dom-webpack-writer.node.development.server.js');
}

4
packages/react/npm/unstable-index.server.js
View File

@@ -1,7 +1,7 @@
'use strict';
if (process.env.NODE_ENV === 'production') {
module.exports = require('./cjs/react-unstable-index.server.production.min.js');
module.exports = require('./cjs/react-unstable-index.production.min.server.js');
} else {
module.exports = require('./cjs/react-unstable-index.server.development.js');
module.exports = require('./cjs/react-unstable-index.development.server.js');
}

19
scripts/rollup/bundles.js
View File

@@ -834,7 +834,7 @@ deepFreeze(bundles);
deepFreeze(bundleTypes);
deepFreeze(moduleTypes);
function getFilename(bundle, bundleType) {
function getOriginalFilename(bundle, bundleType) {
let name = bundle.entry;
const globalName = bundle.global;
// we do this to replace / to -, for react-dom/server
@@ -871,6 +871,23 @@ function getFilename(bundle, bundleType) {
}
}
function getFilename(bundle, bundleType) {
const originalFilename = getOriginalFilename(bundle, bundleType);
// Ensure .server.js or .client.js is the final suffix.
// This is important for the Server tooling convention.
if (originalFilename.indexOf('.server.') !== -1) {
return originalFilename
.replace('.server.', '.')
.replace('.js', '.server.js');
}
if (originalFilename.indexOf('.client.') !== -1) {
return originalFilename
.replace('.client.', '.')
.replace('.js', '.client.js');
}
return originalFilename;
}
module.exports = {
bundleTypes,
moduleTypes,