Skip to content

Commit

Permalink
feat(project): update rollup dependencies (#7633)
Browse files Browse the repository at this point in the history
* feat(project): update rollup dependencies

* chore(project): dedupe dependencies

* feat(react): update rollup for UMD build

* feat(components): update rollup for build step

* feat(cli): update node-resolve to 11.1.0

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
  • Loading branch information
joshblack and kodiakhq[bot] authored Jan 26, 2021
1 parent bfe8304 commit 025b20f
Show file tree
Hide file tree
Showing 86 changed files with 586 additions and 321 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@octokit/rest": "^16.28.1",
"@rollup/plugin-babel": "^5.2.2",
"@rollup/plugin-commonjs": "^17.0.0",
"@rollup/plugin-node-resolve": "^11.0.1",
"@rollup/plugin-node-resolve": "^11.1.0",
"chalk": "^2.4.2",
"change-case": "^4.1.2",
"child-process-promise": "^2.2.1",
Expand All @@ -46,7 +46,7 @@
"progress-estimator": "^0.2.2",
"remark": "^10.0.1",
"replace-in-file": "^6.1.0",
"rollup": "^2.36.1",
"rollup": "^2.38.0",
"sass": "^1.32.4",
"sassdoc": "^2.7.3",
"yargs": "^15.1.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/components/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const through = require('through2');

// Rollup
const { rollup } = require('rollup');
const commonjs = require('rollup-plugin-commonjs');
const commonjs = require('@rollup/plugin-commonjs');
const { terser: rollupTerser } = require('rollup-plugin-terser');
const rollupConfigDev = require('./tools/rollup.config.dev');
const rollupConfigProd = require('./tools/rollup.config');
Expand Down
16 changes: 8 additions & 8 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,11 @@
"@carbon/icons-react": "^10.24.0",
"@carbon/test-utils": "^10.14.0",
"@frctl/fractal": "^1.1.0",
"@rollup/plugin-babel": "^5.2.2",
"@rollup/plugin-commonjs": "^17.0.0",
"@rollup/plugin-node-resolve": "^11.1.0",
"@rollup/plugin-replace": "^2.3.4",
"@rollup/plugin-virtual": "^2.0.3",
"adaro": "1.0.4",
"autoprefixer": "^9.7.4",
"babel-core": "^7.0.0-bridge.0",
Expand Down Expand Up @@ -161,14 +166,9 @@
"react-copy-to-clipboard": "^5.0.0",
"react-dom": "^16.8.6",
"react-ga": "^2.4.0",
"rollup": "^1.0.0",
"rollup-plugin-babel": "^4.4.0",
"rollup-plugin-commonjs": "^9.0.0",
"rollup-plugin-filesize": "^6.0.0",
"rollup-plugin-node-resolve": "^4.0.0",
"rollup-plugin-replace": "^2.0.0",
"rollup-plugin-terser": "^4.0.0",
"rollup-plugin-virtual": "^1.0.0",
"rollup": "^2.38.0",
"rollup-plugin-filesize": "^9.1.0",
"rollup-plugin-terser": "^7.0.2",
"sass": "^1.24.5",
"sass-loader": "^8.0.2",
"serve-static": "^1.13.0",
Expand Down
12 changes: 6 additions & 6 deletions packages/components/tests/pure-modules-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
const path = require('path');
const glob = require('glob');
const { rollup } = require('rollup');
const commonjs = require('rollup-plugin-commonjs');
const resolve = require('rollup-plugin-node-resolve');
const replace = require('rollup-plugin-replace');
const commonjs = require('@rollup/plugin-commonjs');
const { nodeResolve } = require('@rollup/plugin-node-resolve');
const replace = require('@rollup/plugin-replace');
const terser = require('rollup-plugin-terser');
const virtual = require('rollup-plugin-virtual');
const virtual = require('@rollup/plugin-virtual');
const { breakingChangesX } = require('../src/globals/js/feature-flags');

const ignore = [
Expand Down Expand Up @@ -67,7 +67,7 @@ describe('ES modules', () => {
include: /node_modules/,
sourceMap: false,
}),
resolve(),
nodeResolve(),
terser.terser(),
],
onwarn: (warning, handle) => {
Expand Down Expand Up @@ -96,7 +96,7 @@ describe('ES modules', () => {
],
sourceMap: false,
}),
resolve(),
nodeResolve(),
replace({
'process.env.NODE_ENV': JSON.stringify('production'),
}),
Expand Down
38 changes: 6 additions & 32 deletions packages/components/tools/rollup.config.dev.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
'use strict';

const path = require('path');
const commonjs = require('rollup-plugin-commonjs');
const resolve = require('rollup-plugin-node-resolve');
const babel = require('rollup-plugin-babel');
const replace = require('rollup-plugin-replace');
const commonjs = require('@rollup/plugin-commonjs');
const { nodeResolve } = require('@rollup/plugin-node-resolve');
const { babel } = require('@rollup/plugin-babel');
const replace = require('@rollup/plugin-replace');

module.exports = {
input: 'demo/index.js',
Expand Down Expand Up @@ -33,44 +33,18 @@ module.exports = {
return undefined;
},
},
resolve({
jsnext: true,
main: true,
browser: true,
}),
nodeResolve(),
commonjs({
include: [
/node_modules/,
'src/globals/js/settings.js',
'demo/feature-flags.js',
],
sourceMap: true,
namedExports: {
'prop-types': ['oneOf'],
react: [
'Children',
'Component',
'PureComponent',
'Fragment',
'PropTypes',
'createElement',
'isValidElement',
],
'react-dom': ['render'],
'react-is': ['isForwardRef'],
'downshift/node_modules/react': [
'Children',
'Component',
'PureComponent',
'Fragment',
'PropTypes',
'createElement',
'isValidElement',
],
},
}),
babel({
exclude: ['node_modules/**'],
babelHelpers: 'bundled',
}),
replace({
'process.env.NODE_ENV': JSON.stringify('development'),
Expand Down
15 changes: 6 additions & 9 deletions packages/components/tools/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
'use strict';

const commonjs = require('rollup-plugin-commonjs');
const resolve = require('rollup-plugin-node-resolve');
const babel = require('rollup-plugin-babel');
const replace = require('rollup-plugin-replace');
const commonjs = require('@rollup/plugin-commonjs');
const { nodeResolve } = require('@rollup/plugin-node-resolve');
const { babel } = require('@rollup/plugin-babel');
const replace = require('@rollup/plugin-replace');

module.exports = {
input: 'src/bundle.js',
plugins: [
resolve({
jsnext: true,
main: true,
browser: true,
}),
nodeResolve(),
commonjs({
include: [
/node_modules/,
Expand All @@ -23,6 +19,7 @@ module.exports = {
}),
babel({
exclude: [/node_modules/], // only transpile our source code
babelHelpers: 'bundled',
}),
replace({
'process.env.NODE_ENV': JSON.stringify('production'),
Expand Down
2 changes: 1 addition & 1 deletion packages/feature-flags/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"fs-extra": "^9.0.1",
"js-yaml": "^3.14.0",
"rimraf": "^3.0.2",
"rollup": "^2.17.0",
"rollup": "^2.38.0",
"rollup-plugin-strip-banner": "^2.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/icon-build-helpers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"react": "^16.6.0",
"react-dom": "^16.6.0",
"rimraf": "^3.0.0",
"rollup": "^2.36.1",
"rollup": "^2.38.0",
"rollup-plugin-strip-banner": "^2.0.0",
"svgo": "^1.1.1"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/icons-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"fs-extra": "^8.1.0",
"prettier": "^2.2.1",
"rimraf": "^3.0.0",
"rollup": "^1.15.1",
"rollup": "^2.38.0",
"vue": "^2.6.8"
},
"sideEffects": false
Expand Down
16 changes: 8 additions & 8 deletions packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@
"@babel/preset-react": "^7.10.0",
"@carbon/test-utils": "^10.14.0",
"@percy/storybook": "^3.3.1",
"@rollup/plugin-babel": "^5.2.2",
"@rollup/plugin-commonjs": "^17.0.0",
"@rollup/plugin-node-resolve": "^11.1.0",
"@rollup/plugin-replace": "^2.3.4",
"@storybook/addon-storysource": "^5.3.19",
"@storybook/addons": "^5.3.19",
"@storybook/react": "^5.3.19",
Expand Down Expand Up @@ -108,14 +112,10 @@
"react-test-renderer": "^16.8.6",
"requestanimationframe": "^0.0.23",
"rimraf": "^3.0.0",
"rollup": "^1.10.0",
"rollup-plugin-babel": "^4.4.0",
"rollup-plugin-commonjs": "^9.3.4",
"rollup-plugin-node-resolve": "^4.2.3",
"rollup-plugin-replace": "^2.2.0",
"rollup-plugin-sizes": "^0.5.0",
"rollup-plugin-strip-banner": "^1.0.0",
"rollup-plugin-terser": "^4.0.0",
"rollup": "^2.38.0",
"rollup-plugin-sizes": "^1.0.3",
"rollup-plugin-strip-banner": "^2.0.0",
"rollup-plugin-terser": "^7.0.2",
"rtlcss": "^2.4.0",
"sass-loader": "^8.0.2",
"storybook-preset-carbon": "^0.1.0",
Expand Down
23 changes: 6 additions & 17 deletions packages/react/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

'use strict';

const babel = require('rollup-plugin-babel');
const commonjs = require('rollup-plugin-commonjs');
const resolve = require('rollup-plugin-node-resolve');
const replace = require('rollup-plugin-replace');
const { babel } = require('@rollup/plugin-babel');
const commonjs = require('@rollup/plugin-commonjs');
const { nodeResolve } = require('@rollup/plugin-node-resolve');
const replace = require('@rollup/plugin-replace');
const stripBanner = require('rollup-plugin-strip-banner');
const { terser } = require('rollup-plugin-terser');
const packageJson = require('./package.json');
Expand All @@ -23,21 +23,9 @@ const baseConfig = {
'prop-types',
],
plugins: [
resolve(),
nodeResolve(),
commonjs({
include: /node_modules/,
namedExports: {
'react/index.js': [
'Children',
'Component',
'PureComponent',
'Fragment',
'PropTypes',
'createElement',
],
'react-dom/index.js': ['render'],
'react-is/index.js': ['isForwardRef'],
},
}),
babel({
babelrc: false,
Expand All @@ -62,6 +50,7 @@ const baseConfig = {
'@babel/plugin-proposal-export-namespace-from',
'@babel/plugin-proposal-export-default-from',
],
babelHelpers: 'bundled',
}),
stripBanner(),
],
Expand Down
Loading

0 comments on commit 025b20f

Please sign in to comment.