Skip to content

Commit 3c16baf

Browse files
sebmarkbagesebmarkbage
authored
Remove /dist/ UMD builds (#18473)
* Remove /dist/ UMD builds We publish UMDs to npm (and we're considering stopping even that). This means we'll stop publishing to http://react.zpao.com/builds/master/latest/ * Update fixture paths
1 parent 91c9d69 commit 3c16baf

File tree

10 files changed

+27
-55
lines changed

10 files changed

+27
-55
lines changed

‎.circleci/config.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ aliases:
3131
- *restore_yarn_cache
3232
- *run_yarn
3333
- run: node ./scripts/rollup/consolidateBundleSizes.js
34-
- run: ./scripts/circleci/upload_build.sh
3534
- run: ./scripts/circleci/pack_and_store_artifact.sh
3635
- store_artifacts:
3736
path: ./node_modules.tgz

‎fixtures/fizz-ssr-browser/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ <h1>Fizz Example</h1>
1616
If you checked out the source from GitHub make sure to run <code>npm run build</code>.
1717
</p>
1818
</div>
19-
<script src="../../build/dist/react.development.js"></script>
20-
<script src="../../build/dist/react-dom-unstable-fizz.browser.development.js"></script>
19+
<script src="../../build/node_modules/react/umd/react.development.js"></script>
20+
<script src="../../build/node_modules/react-dom/umd/react-dom-unstable-fizz.browser.development.js"></script>
2121
<script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
2222
<script type="text/babel">
2323
let stream = ReactDOMFizzServer.renderToReadableStream(<body>Success</body>);

‎fixtures/flight-browser/index.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ <h1>Flight Example</h1>
1616
If you checked out the source from GitHub make sure to run <code>npm run build</code>.
1717
</p>
1818
</div>
19-
<script src="../../build/dist/react.development.js"></script>
20-
<script src="../../build/dist/react-dom.development.js"></script>
21-
<script src="../../build/dist/react-dom-server.browser.development.js"></script>
22-
<script src="../../build/dist/react-flight-dom-webpack-server.browser.development.js"></script>
23-
<script src="../../build/dist/react-flight-dom-webpack.development.js"></script>
19+
<script src="../../build/node_modules/react/umd/react.development.js"></script>
20+
<script src="../../build/node_modules/react-dom/umd/react-dom.development.js"></script>
21+
<script src="../../build/node_modules/react-dom/umd/react-dom-server.browser.development.js"></script>
22+
<script src="../../build/node_modules/react-flight-dom-webpack/umd/react-flight-dom-webpack-server.browser.development.js"></script>
23+
<script src="../../build/node_modules/react-flight-dom-webpack/umd/react-flight-dom-webpack.development.js"></script>
2424
<script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
2525
<script type="text/babel">
2626
let Suspense = React.Suspense;

‎fixtures/packaging/rjs/dev/config.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ module.exports = {
77
react: '../../../../build/node_modules/react/umd/react.development',
88
'react-dom':
99
'../../../../build/node_modules/react-dom/umd/react-dom.development',
10-
schedule: '../../../../build/dist/schedule.development',
10+
schedule:
11+
'../../../../build/node_modules/scheduler/umd/schedule.development',
1112
},
1213
};

‎fixtures/packaging/rjs/prod/config.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ module.exports = {
77
react: '../../../../build/node_modules/react/umd/react.production.min',
88
'react-dom':
99
'../../../../build/node_modules/react-dom/umd/react-dom.production.min',
10-
schedule: '../../../../build/dist/schedule.development',
10+
schedule:
11+
'../../../../build/node_modules/scheduler/umd/schedule.development',
1112
},
1213
};

‎fixtures/packaging/systemjs-builder/dev/config.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ System.config({
33
react: '../../../../build/node_modules/react/umd/react.development.js',
44
'react-dom':
55
'../../../../build/node_modules/react-dom/umd/react-dom.development.js',
6-
schedule: '../../../../build/dist/schedule.development',
6+
schedule:
7+
'../../../../build/node_modules/scheduler/umd/schedule.development',
78
},
89
});

‎fixtures/packaging/systemjs-builder/prod/config.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ System.config({
33
react: '../../../../build/node_modules/react/umd/react.production.min.js',
44
'react-dom':
55
'../../../../build/node_modules/react-dom/umd/react-dom.production.min.js',
6-
schedule: '../../../../build/dist/schedule.development',
6+
schedule:
7+
'../../../../build/node_modules/scheduler/umd/schedule.development',
78
},
89
});

‎scripts/circleci/upload_build.sh‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎scripts/rollup/build.js‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const useForks = require('./plugins/use-forks-plugin');
2121
const stripUnusedImports = require('./plugins/strip-unused-imports');
2222
const extractErrorCodes = require('../error-codes/extract-errors');
2323
const Packaging = require('./packaging');
24-
const {asyncCopyTo, asyncRimRaf} = require('./utils');
24+
const {asyncRimRaf} = require('./utils');
2525
const codeFrame = require('babel-code-frame');
2626
const Wrappers = require('./wrappers');
2727

@@ -627,7 +627,7 @@ async function createBundle(bundle, bundleType) {
627627
esModule: false,
628628
},
629629
};
630-
const [mainOutputPath, ...otherOutputPaths] = Packaging.getBundleOutputPaths(
630+
const mainOutputPath = Packaging.getBundleOutputPath(
631631
bundleType,
632632
filename,
633633
packageName
@@ -649,9 +649,6 @@ async function createBundle(bundle, bundleType) {
649649
console.log(`${chalk.bgYellow.black(' BUILDING ')} ${logKey}`);
650650
break;
651651
case 'BUNDLE_END':
652-
for (let i = 0; i < otherOutputPaths.length; i++) {
653-
await asyncCopyTo(mainOutputPath, otherOutputPaths[i]);
654-
}
655652
console.log(`${chalk.bgGreen.black(' COMPLETE ')} ${logKey}\n`);
656653
break;
657654
case 'ERROR':
@@ -671,9 +668,6 @@ async function createBundle(bundle, bundleType) {
671668
handleRollupError(error);
672669
throw error;
673670
}
674-
for (let i = 0; i < otherOutputPaths.length; i++) {
675-
await asyncCopyTo(mainOutputPath, otherOutputPaths[i]);
676-
}
677671
console.log(`${chalk.bgGreen.black(' COMPLETE ')} ${logKey}\n`);
678672
}
679673
}

‎scripts/rollup/packaging.js‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,29 +34,26 @@ function getPackageName(name) {
3434
return name;
3535
}
3636

37-
function getBundleOutputPaths(bundleType, filename, packageName) {
37+
function getBundleOutputPath(bundleType, filename, packageName) {
3838
switch (bundleType) {
3939
case NODE_DEV:
4040
case NODE_PROD:
4141
case NODE_PROFILING:
42-
return [`build/node_modules/${packageName}/cjs/${filename}`];
42+
return `build/node_modules/${packageName}/cjs/${filename}`;
4343
case UMD_DEV:
4444
case UMD_PROD:
4545
case UMD_PROFILING:
46-
return [
47-
`build/node_modules/${packageName}/umd/${filename}`,
48-
`build/dist/${filename}`,
49-
];
46+
return `build/node_modules/${packageName}/umd/${filename}`;
5047
case FB_WWW_DEV:
5148
case FB_WWW_PROD:
5249
case FB_WWW_PROFILING:
53-
return [`build/facebook-www/${filename}`];
50+
return `build/facebook-www/${filename}`;
5451
case RN_OSS_DEV:
5552
case RN_OSS_PROD:
5653
case RN_OSS_PROFILING:
5754
switch (packageName) {
5855
case 'react-native-renderer':
59-
return [`build/react-native/implementations/${filename}`];
56+
return `build/react-native/implementations/${filename}`;
6057
default:
6158
throw new Error('Unknown RN package.');
6259
}
@@ -65,12 +62,10 @@ function getBundleOutputPaths(bundleType, filename, packageName) {
6562
case RN_FB_PROFILING:
6663
switch (packageName) {
6764
case 'react-native-renderer':
68-
return [
69-
`build/react-native/implementations/${filename.replace(
70-
/\.js$/,
71-
'.fb.js'
72-
)}`,
73-
];
65+
return `build/react-native/implementations/${filename.replace(
66+
/\.js$/,
67+
'.fb.js'
68+
)}`;
7469
default:
7570
throw new Error('Unknown RN package.');
7671
}
@@ -155,6 +150,6 @@ async function prepareNpmPackages() {
155150
module.exports = {
156151
copyAllShims,
157152
getPackageName,
158-
getBundleOutputPaths,
153+
getBundleOutputPath,
159154
prepareNpmPackages,
160155
};

0 commit comments

Comments
 (0)