From a06117df1981e063667795e4941398ef57192f2a Mon Sep 17 00:00:00 2001 From: Jae Bradley Date: Mon, 15 Jun 2020 20:29:45 -0400 Subject: [PATCH] build: update rollup config --- .babelrc | 3 +++ package-lock.json | 52 +++++++++++++++++++++++------------------------ package.json | 6 ++++-- rollup.config.js | 10 +++++++-- 4 files changed, 40 insertions(+), 31 deletions(-) diff --git a/.babelrc b/.babelrc index 13fdda5..29d52c4 100644 --- a/.babelrc +++ b/.babelrc @@ -20,5 +20,8 @@ ], "ignore": [ "node_modules/**" + ], + "plugins": [ + "@babel/plugin-transform-runtime" ] } diff --git a/package-lock.json b/package-lock.json index 55d9d31..8fe17d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -993,6 +993,26 @@ "@babel/helper-plugin-utils": "^7.10.1" } }, + "@babel/plugin-transform-runtime": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.1.tgz", + "integrity": "sha512-4w2tcglDVEwXJ5qxsY++DgWQdNJcCCsPxfT34wCUwIf2E7dI7pMpH8JczkMBbgBTNzBX62SZlNJ9H+De6Zebaw==", + "dev": true, + "requires": { + "@babel/helper-module-imports": "^7.10.1", + "@babel/helper-plugin-utils": "^7.10.1", + "resolve": "^1.8.1", + "semver": "^5.5.1" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } + } + }, "@babel/plugin-transform-shorthand-properties": { "version": "7.10.1", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz", @@ -1254,20 +1274,11 @@ } }, "@babel/runtime": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.5.5.tgz", - "integrity": "sha512-28QvEGyQyNkB0/m2B4FU7IEZGK2NUrcMtT6BZEFALTguLk+AUT6ofsHtPk5QyjAdUkpMJ+/Em+quwz4HOt30AQ==", - "dev": true, + "version": "7.10.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz", + "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==", "requires": { - "regenerator-runtime": "^0.13.2" - }, - "dependencies": { - "regenerator-runtime": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz", - "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==", - "dev": true - } + "regenerator-runtime": "^0.13.4" } }, "@babel/runtime-corejs3": { @@ -27459,8 +27470,7 @@ "regenerator-runtime": { "version": "0.13.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", - "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==", - "dev": true + "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==" }, "regenerator-transform": { "version": "0.14.4", @@ -28037,18 +28047,6 @@ } } }, - "rollup-plugin-local-resolve": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/rollup-plugin-local-resolve/-/rollup-plugin-local-resolve-1.0.7.tgz", - "integrity": "sha1-xIZwFxbBWt0hJ1ZcLqoQESMyCIc=", - "dev": true - }, - "rollup-plugin-peer-deps-external": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/rollup-plugin-peer-deps-external/-/rollup-plugin-peer-deps-external-2.2.2.tgz", - "integrity": "sha512-XcHH4UW9exRTAf73d8rk2dw2UgF//cWbilhRI4Ni/n+t0zA1eBtohKyJROn0fxa4/+WZ5R3onAyIDiwRQL+59A==", - "dev": true - }, "rollup-plugin-postcss": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/rollup-plugin-postcss/-/rollup-plugin-postcss-3.1.2.tgz", diff --git a/package.json b/package.json index 03a5e5f..9e16e9f 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "devDependencies": { "@babel/cli": "^7.10.1", "@babel/core": "^7.10.2", + "@babel/plugin-transform-runtime": "^7.10.1", "@babel/preset-env": "^7.10.2", "@babel/preset-react": "^7.10.1", "@commitlint/cli": "^9.0.1", @@ -94,8 +95,6 @@ "react-test-renderer": "^16.13.1", "rollup": "^2.13.1", "rollup-plugin-filesize": "^9.0.0", - "rollup-plugin-local-resolve": "^1.0.7", - "rollup-plugin-peer-deps-external": "^2.2.2", "rollup-plugin-postcss": "^3.1.2", "sass": "^1.26.7", "sass-loader": "^8.0.2", @@ -113,5 +112,8 @@ "prop-types": "^15.7.2", "react": "^16.12.0", "react-dom": "^16.12.0" + }, + "dependencies": { + "@babel/runtime": "^7.10.2" } } diff --git a/rollup.config.js b/rollup.config.js index e3c73c7..bb6480b 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -4,7 +4,6 @@ import commonjs from '@rollup/plugin-commonjs'; import postcss from 'rollup-plugin-postcss'; import filesize from 'rollup-plugin-filesize'; import autoprefixer from 'autoprefixer'; -import localResolve from 'rollup-plugin-local-resolve'; import pkg from './package.json'; @@ -14,6 +13,7 @@ const OUTPUT_NAME = 'Example'; const GLOBALS = { react: 'React', 'react-dom': 'ReactDOM', + 'prop-types': 'PropTypes', }; const PLUGINS = [ @@ -24,11 +24,16 @@ const PLUGINS = [ ], }), babel({ + babelHelpers: 'runtime', exclude: 'node_modules/**', }), - localResolve(), resolve({ browser: true, + resolveOnly: [ + /^(?!react$)/, + /^(?!react-dom$)/, + /^(?!prop-types)/, + ], }), commonjs(), filesize(), @@ -37,6 +42,7 @@ const PLUGINS = [ const EXTERNAL = [ 'react', 'react-dom', + 'prop-types', ]; const OUTPUT_DATA = [