Skip to content

Commit 7e08a9d

Browse files
committed
Update rollup to v3
1 parent 4f5365b commit 7e08a9d

File tree

11 files changed

+238
-353
lines changed

11 files changed

+238
-353
lines changed

package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@
3636
"@babel/preset-flow": "^7.10.4",
3737
"@babel/preset-react": "^7.10.4",
3838
"@babel/traverse": "^7.11.0",
39+
"@rollup/plugin-babel": "^6.0.3",
40+
"@rollup/plugin-commonjs": "^24.0.1",
41+
"@rollup/plugin-node-resolve": "^15.0.1",
42+
"@rollup/plugin-replace": "^5.0.2",
3943
"abort-controller": "^3.0.0",
4044
"abortcontroller-polyfill": "^1.7.5",
4145
"art": "0.10.1",
@@ -64,6 +68,7 @@
6468
"filesize": "^6.0.1",
6569
"flow-bin": "^0.196.3",
6670
"flow-remove-types": "^2.196.1",
71+
"fs-extra": "^11.1.0",
6772
"glob": "^7.1.6",
6873
"glob-stream": "^6.1.0",
6974
"google-closure-compiler": "^20200517.0.0",
@@ -86,13 +91,9 @@
8691
"random-seed": "^0.3.0",
8792
"react-lifecycles-compat": "^3.0.4",
8893
"rimraf": "^3.0.0",
89-
"rollup": "^1.19.4",
90-
"rollup-plugin-babel": "^4.0.1",
91-
"rollup-plugin-commonjs": "^9.3.4",
92-
"rollup-plugin-node-resolve": "^2.1.1",
93-
"rollup-plugin-prettier": "^0.6.0",
94-
"rollup-plugin-replace": "^2.2.0",
95-
"rollup-plugin-strip-banner": "^0.2.0",
94+
"rollup": "^3.12.0",
95+
"rollup-plugin-prettier": "^3.0.0",
96+
"rollup-plugin-strip-banner": "^3.0.0",
9697
"semver": "^7.1.1",
9798
"targz": "^1.0.1",
9899
"through2": "^3.0.1",

packages/react-client/src/forks/ReactFlightClientHostConfig.dom.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99

1010
export * from 'react-client/src/ReactFlightClientHostConfigBrowser';
1111
export * from 'react-client/src/ReactFlightClientHostConfigStream';
12-
export * from 'react-server-dom-webpack/src/ReactFlightClientWebpackBundlerConfig';
12+
export * from 'react-server-dom-webpack/src/ReactFlightClientWebpackBundlerConfig.js';

packages/react-devtools-extensions/package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,6 @@
5555
"os-name": "^3.1.0",
5656
"parse-filepath": "^1.0.2",
5757
"raw-loader": "^3.1.0",
58-
"rollup": "^1.19.4",
59-
"rollup-plugin-babel": "^4.0.1",
60-
"rollup-plugin-commonjs": "^9.3.4",
61-
"rollup-plugin-node-resolve": "^2.1.1",
6258
"source-map-js": "^0.6.2",
6359
"sourcemap-codec": "^1.4.8",
6460
"style-loader": "^0.23.1",

packages/react-devtools-shared/src/hooks/__tests__/updateMockSourceMaps.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ const {
1010
const {emptyDirSync} = require('fs-extra');
1111
const {resolve} = require('path');
1212
const rollup = require('rollup');
13-
const babel = require('rollup-plugin-babel');
14-
const commonjs = require('rollup-plugin-commonjs');
13+
const babel = require('@rollup/plugin-babel').babel;
14+
const commonjs = require('@rollup/plugin-commonjs');
1515
const jsx = require('acorn-jsx');
16-
const rollupResolve = require('rollup-plugin-node-resolve');
16+
const rollupResolve = require('@rollup/plugin-node-resolve');
1717
const {encode, decode} = require('sourcemap-codec');
1818
const {generateEncodedHookMap} = require('../generateHookMap');
1919
const {parse} = require('@babel/parser');
@@ -323,7 +323,11 @@ async function bundle() {
323323
plugins: [
324324
rollupResolve(),
325325
commonjs(),
326-
babel({presets: ['@babel/preset-react'], sourceMap: true}),
326+
babel({
327+
presets: ['@babel/preset-react'],
328+
sourceMap: true,
329+
babelHelpers: 'bundled',
330+
}),
327331
],
328332
external: ['react'],
329333
});

packages/react-dom/src/server/ReactDOMFizzStaticNode.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
import type {ReactNodeList} from 'shared/ReactTypes';
1111
import type {BootstrapScriptDescriptor} from 'react-dom-bindings/src/server/ReactDOMServerFormatConfig';
1212

13-
import {Writable, Readable} from 'stream';
13+
import type {Writable} from 'stream';
14+
import {Readable} from 'stream';
1415

1516
import ReactVersion from 'shared/ReactVersion';
1617

packages/react-dom/src/test-utils/FizzTestUtils.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
import * as tmp from 'tmp';
1212
import * as fs from 'fs';
13-
import replace from 'rollup-plugin-replace';
14-
import resolve from 'rollup-plugin-node-resolve';
13+
import replace from '@rollup/plugin-replace';
14+
import resolve from '@rollup/plugin-node-resolve';
1515
import {rollup} from 'rollup';
1616
import path from 'path';
1717

@@ -30,15 +30,16 @@ async function getRollupResult(scriptSrc: string): Promise<string | null> {
3030
input: require.resolve(scriptSrc),
3131
onwarn: console.warn,
3232
plugins: [
33-
replace({__DEV__: 'true'}),
33+
replace({preventAssignment: true, values: {__DEV__: 'true'}}),
3434
resolve({
3535
rootDir: path.join(__dirname, '..', '..', '..'),
3636
}),
3737
],
3838
output: {
3939
externalLiveBindings: false,
4040
freeze: false,
41-
interop: false,
41+
interop: 'auto',
42+
exports: 'auto',
4243
esModule: false,
4344
},
4445
};

packages/react-dom/unstable_server-external-runtime.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
* @flow
88
*/
99

10-
export * from 'react-dom-bindings/src/server/ReactDOMServerExternalRuntime';
10+
module.exports = require('react-dom-bindings/src/server/ReactDOMServerExternalRuntime');

packages/react-server/src/forks/ReactFlightServerConfig.dom-browser.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
*/
99

1010
export * from '../ReactFlightServerConfigStream';
11-
export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
11+
export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig.js';

packages/react-server/src/forks/ReactFlightServerConfig.dom.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
*/
99

1010
export * from '../ReactFlightServerConfigStream';
11-
export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig';
11+
export * from 'react-server-dom-webpack/src/ReactFlightServerWebpackBundlerConfig.js';

scripts/rollup/build.js

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
'use strict';
22

33
const rollup = require('rollup');
4-
const babel = require('rollup-plugin-babel');
4+
const babel = require('@rollup/plugin-babel').babel;
55
const closure = require('./plugins/closure-plugin');
6-
const commonjs = require('rollup-plugin-commonjs');
6+
const commonjs = require('@rollup/plugin-commonjs');
77
const flowRemoveTypes = require('flow-remove-types');
88
const prettier = require('rollup-plugin-prettier');
9-
const replace = require('rollup-plugin-replace');
9+
const replace = require('@rollup/plugin-replace');
1010
const stripBanner = require('rollup-plugin-strip-banner');
1111
const chalk = require('chalk');
12-
const resolve = require('rollup-plugin-node-resolve');
12+
const resolve = require('@rollup/plugin-node-resolve');
1313
const fs = require('fs');
1414
const argv = require('minimist')(process.argv.slice(2));
1515
const Modules = require('./modules');
@@ -144,6 +144,7 @@ function getBabelConfig(
144144
exclude: '/**/node_modules/**',
145145
babelrc: false,
146146
configFile: false,
147+
babelHelpers: 'bundled',
147148
presets: [],
148149
plugins: [...babelPlugins],
149150
};
@@ -185,7 +186,8 @@ function getRollupOutputOptions(
185186
format,
186187
globals,
187188
freeze: !isProduction,
188-
interop: false,
189+
interop: 'auto',
190+
exports: 'auto',
189191
name: globalName,
190192
sourcemap: false,
191193
esModule: false,
@@ -366,11 +368,14 @@ function getPlugins(
366368
},
367369
// Turn __DEV__ and process.env checks into constants.
368370
replace({
369-
__DEV__: isProduction ? 'false' : 'true',
370-
__PROFILE__: isProfiling || !isProduction ? 'true' : 'false',
371-
__UMD__: isUMDBundle ? 'true' : 'false',
372-
'process.env.NODE_ENV': isProduction ? "'production'" : "'development'",
373-
__EXPERIMENTAL__,
371+
preventAssignment: true,
372+
values: {
373+
__DEV__: isProduction ? 'false' : 'true',
374+
__PROFILE__: isProfiling || !isProduction ? 'true' : 'false',
375+
__UMD__: isUMDBundle ? 'true' : 'false',
376+
'process.env.NODE_ENV': isProduction ? "'production'" : "'development'",
377+
__EXPERIMENTAL__,
378+
},
374379
}),
375380
// The CommonJS plugin *only* exists to pull "art" into "react-art".
376381
// I'm going to port "art" to ES modules to avoid this problem.
@@ -550,14 +555,15 @@ async function createBundle(bundle, bundleType) {
550555
}
551556

552557
const importSideEffects = Modules.getImportSideEffects();
553-
const pureExternalModules = Object.keys(importSideEffects).filter(
558+
const moduleSideEffects = Object.keys(importSideEffects).filter(
554559
module => !importSideEffects[module]
555560
);
556561

557562
const rollupConfig = {
563+
strictDeprecations: true,
558564
input: resolvedEntry,
559565
treeshake: {
560-
pureExternalModules,
566+
moduleSideEffects,
561567
},
562568
external(id) {
563569
const containsThisModule = pkg => id === pkg || id.startsWith(pkg + '/');
@@ -588,13 +594,14 @@ async function createBundle(bundle, bundleType) {
588594
bundleType,
589595
bundle.global,
590596
bundle.moduleType,
591-
pureExternalModules,
597+
moduleSideEffects,
592598
bundle
593599
),
594600
output: {
595601
externalLiveBindings: false,
596602
freeze: false,
597-
interop: false,
603+
interop: 'auto',
604+
exports: 'auto',
598605
esModule: false,
599606
},
600607
};

0 commit comments

Comments
 (0)