From 6c4d4985d2cec60b58b2c1e305766f562da32953 Mon Sep 17 00:00:00 2001 From: moklick Date: Mon, 11 Jan 2021 10:33:10 +0100 Subject: [PATCH] refactor(rollup): use one babel config for examples and lib --- .babelrc | 3 ++- package-lock.json | 30 +++++++++++++++++------------- package.json | 2 +- rollup.config.js | 1 - rollup.examples.js | 6 +++--- 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/.babelrc b/.babelrc index 4993c07f..c6a627e1 100644 --- a/.babelrc +++ b/.babelrc @@ -7,5 +7,6 @@ } ], "@babel/preset-react" - ] + ], + "plugins": ["@babel/plugin-transform-runtime"] } diff --git a/package-lock.json b/package-lock.json index 3f2d12b0..b7e30b56 100644 --- a/package-lock.json +++ b/package-lock.json @@ -47,7 +47,7 @@ "react-flow-renderer": "^8.3.2", "react-router-dom": "^5.2.0", "release-it": "^14.2.2", - "rollup": "^2.36.0", + "rollup": "^2.36.1", "rollup-plugin-bundle-size": "^1.0.3", "rollup-plugin-livereload": "^2.0.0", "rollup-plugin-postcss": "^4.0.0", @@ -10004,7 +10004,7 @@ "version": "17.0.1", "resolved": "https://registry.npmjs.org/react/-/react-17.0.1.tgz", "integrity": "sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w==", - "dev": true, + "peer": true, "dependencies": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" @@ -10554,9 +10554,9 @@ } }, "node_modules/rollup": { - "version": "2.36.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.36.0.tgz", - "integrity": "sha512-L38QyQK77bkJy9nPyeydnHFK6xMofqumh4scTV2d4RG4EFq6pGdxnn67dVHFUDJ9J0PSEQx8zn1FiVS5TydsKg==", + "version": "2.36.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.36.1.tgz", + "integrity": "sha512-eAfqho8dyzuVvrGqpR0ITgEdq0zG2QJeWYh+HeuTbpcaXk8vNFc48B7bJa1xYosTCKx0CuW+447oQOW8HgBIZQ==", "dev": true, "dependencies": { "fsevents": "~2.1.2" @@ -13448,7 +13448,8 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.2.tgz", "integrity": "sha512-oTJSNAmBqyDR41uSMunLQKMX0jmEXbwD1fpz8FG27lScV3RhtGfBa1/BBLym+PxcC16IBlF7KH9vP1BUYxA+Eg==", - "dev": true + "dev": true, + "requires": {} }, "@octokit/plugin-rest-endpoint-methods": { "version": "4.2.1", @@ -16597,7 +16598,8 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", - "dev": true + "dev": true, + "requires": {} }, "ignore": { "version": "5.1.8", @@ -19074,7 +19076,8 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", - "dev": true + "dev": true, + "requires": {} }, "postcss-modules-local-by-default": { "version": "4.0.0", @@ -19885,7 +19888,7 @@ "version": "17.0.1", "resolved": "https://registry.npmjs.org/react/-/react-17.0.1.tgz", "integrity": "sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w==", - "dev": true, + "peer": true, "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" @@ -20333,9 +20336,9 @@ } }, "rollup": { - "version": "2.36.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.36.0.tgz", - "integrity": "sha512-L38QyQK77bkJy9nPyeydnHFK6xMofqumh4scTV2d4RG4EFq6pGdxnn67dVHFUDJ9J0PSEQx8zn1FiVS5TydsKg==", + "version": "2.36.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.36.1.tgz", + "integrity": "sha512-eAfqho8dyzuVvrGqpR0ITgEdq0zG2QJeWYh+HeuTbpcaXk8vNFc48B7bJa1xYosTCKx0CuW+447oQOW8HgBIZQ==", "dev": true, "requires": { "fsevents": "~2.1.2" @@ -21299,7 +21302,8 @@ "use-memo-one": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.1.tgz", - "integrity": "sha512-oFfsyun+bP7RX8X2AskHNTxu+R3QdE/RC5IefMbqptmACAA/gfol1KDD5KRzPsGMa62sWxGZw+Ui43u6x4ddoQ==" + "integrity": "sha512-oFfsyun+bP7RX8X2AskHNTxu+R3QdE/RC5IefMbqptmACAA/gfol1KDD5KRzPsGMa62sWxGZw+Ui43u6x4ddoQ==", + "requires": {} }, "util-deprecate": { "version": "1.0.2", diff --git a/package.json b/package.json index 54f300e2..fbb4c701 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "react-flow-renderer": "^8.3.2", "react-router-dom": "^5.2.0", "release-it": "^14.2.2", - "rollup": "^2.36.0", + "rollup": "^2.36.1", "rollup-plugin-bundle-size": "^1.0.3", "rollup-plugin-livereload": "^2.0.0", "rollup-plugin-postcss": "^4.0.0", diff --git a/rollup.config.js b/rollup.config.js index 80dacfd6..495eca26 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -46,7 +46,6 @@ export default { babel({ exclude: 'node_modules/**', babelHelpers: 'runtime', - plugins: ['@babel/plugin-transform-runtime'], }), svgr(), typescript({ diff --git a/rollup.examples.js b/rollup.examples.js index b7cf0ca6..c04330c1 100644 --- a/rollup.examples.js +++ b/rollup.examples.js @@ -24,6 +24,7 @@ const rollupConfig = { ], plugins: [ replace({ + 'process.env.NODE_ENV': isProd ? JSON.stringify('production') : JSON.stringify('development'), 'process.env.FORCE_SIMILAR_INSTEAD_OF_MAP': 'false', }), postcss({ @@ -34,8 +35,7 @@ const rollupConfig = { }), babel({ exclude: 'node_modules/**', - babelHelpers: 'bundled', - plugins: [], + babelHelpers: 'runtime', }), resolve(), commonjs({ @@ -51,4 +51,4 @@ const rollupConfig = { ], }; -export default rollupConfig; // isTesting ? rollupConfig : [libraryRollupConfig, rollupConfig]; +export default isTesting ? rollupConfig : [libraryRollupConfig, rollupConfig];