From 271364cbb641f6ccdb2cdb6ae46d621e827d1cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20Marohni=C4=87?= Date: Fri, 22 Mar 2019 21:42:46 +0100 Subject: [PATCH] Revert "feat: support ESM (tree-shaking) (#455)" This reverts commit ef3e3571ddc64ee0a5f9eafecbdffe737d194900. Fixes #475 --- package.json | 11 +++-------- rollup.config.js | 2 +- src/index.js | 16 ++++++++++++---- src/umd.js | 4 ++++ yarn.lock | 28 ---------------------------- 5 files changed, 20 insertions(+), 41 deletions(-) create mode 100644 src/umd.js diff --git a/package.json b/package.json index 0b2f6964..5ca0989f 100644 --- a/package.json +++ b/package.json @@ -2,18 +2,14 @@ "name": "react-transition-group", "version": "2.7.0", "description": "A react component toolset for managing animations", - "main": "lib/cjs/index.js", - "module": "lib/esm/index.js", + "main": "lib/index.js", "scripts": { "test": "npm run lint && npm run testonly", "testonly": "jest --verbose", "tdd": "jest --watch", - "build": "rimraf lib && yarn build:cjs && yarn build:esm && yarn build:pick && yarn build:dist && cp README.md LICENSE ./lib", + "build": "babel src --out-dir lib --delete-dir-on-start && npm run build:dist && cp README.md LICENSE ./lib", "build:docs": "npm -C www run build", - "build:cjs": "babel src --out-dir lib/cjs", - "build:esm": "cross-env BABEL_ENV=esm babel src --out-dir lib/esm", - "build:pick": "cherry-pick --name=react-transition-group --cwd=lib --input-dir=../src --cjs-dir=cjs --esm-dir=esm", - "build:dist": "cross-env BABEL_ENV=esm rollup -c", + "build:dist": "cross-env BABEL_ENV=esm yarn rollup -c", "bootstrap": "yarn && yarn --cwd www", "lint": "eslint src test", "release": "release", @@ -78,7 +74,6 @@ "babel-loader": "^8.0.2", "babel-plugin-transform-react-remove-prop-types": "^0.4.18", "babel-preset-jason": "^6.0.1", - "cherry-pick": "^0.3.0", "cross-env": "^5.2.0", "enzyme": "^3.6.0", "enzyme-adapter-react-16": "^1.5.0", diff --git a/rollup.config.js b/rollup.config.js index 4e14898e..0d7e23c6 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -5,7 +5,7 @@ import replace from 'rollup-plugin-replace'; import { sizeSnapshot } from 'rollup-plugin-size-snapshot'; import { terser } from 'rollup-plugin-terser'; -const input = './src/index.js'; +const input = './src/umd.js'; const name = 'ReactTransitionGroup'; const globals = { react: 'React', diff --git a/src/index.js b/src/index.js index bbf1835e..e1ce1316 100644 --- a/src/index.js +++ b/src/index.js @@ -1,4 +1,12 @@ -export { default as CSSTransition } from './CSSTransition'; -export { default as ReplaceTransition } from './ReplaceTransition'; -export { default as TransitionGroup } from './TransitionGroup'; -export { default as Transition } from './Transition'; +import CSSTransition from './CSSTransition'; +import ReplaceTransition from './ReplaceTransition'; +import TransitionGroup from './TransitionGroup'; +import Transition from './Transition'; + + +module.exports = { + Transition, + TransitionGroup, + ReplaceTransition, + CSSTransition, +}; diff --git a/src/umd.js b/src/umd.js new file mode 100644 index 00000000..bbf1835e --- /dev/null +++ b/src/umd.js @@ -0,0 +1,4 @@ +export { default as CSSTransition } from './CSSTransition'; +export { default as ReplaceTransition } from './ReplaceTransition'; +export { default as TransitionGroup } from './TransitionGroup'; +export { default as Transition } from './Transition'; diff --git a/yarn.lock b/yarn.lock index ee59da8b..f3a54f67 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3419,16 +3419,6 @@ cheerio@^1.0.0-rc.2: lodash "^4.15.0" parse5 "^3.0.1" -cherry-pick@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/cherry-pick/-/cherry-pick-0.3.0.tgz#b52626016c41197e6bffa0fc27074ae07988804a" - integrity sha512-N/+3l1f9yvD6Qpsj3jkBvSt5skLudVXGoSSQUy+yWoM13RjfVCvOiYLFr/JczOhTMwBPBuzE4WKCSxmYE1FFBg== - dependencies: - chalk "^2.4.1" - rimraf "^2.6.2" - tiny-glob "^0.2.0" - yargs "^11.0.0" - child-process-promise@^2.2.1: version "2.2.1" resolved "http://storage.mds.yandex.net/get-npm/38095/child-process-promise-2.2.1.tgz#4730a11ef610fad450b8f223c79d31d7bdad8074" @@ -5644,11 +5634,6 @@ globals@^9.18.0: version "9.18.0" resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" -globalyzer@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465" - integrity sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q== - globby@8.0.1, globby@^8.0.0, globby@^8.0.1: version "8.0.1" resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.1.tgz#b5ad48b8aa80b35b814fc1281ecc851f1d2b5b50" @@ -5672,11 +5657,6 @@ globby@^5.0.0: pify "^2.0.0" pinkie-promise "^2.0.0" -globrex@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098" - integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg== - got@^6.7.1: version "6.7.1" resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0" @@ -11121,14 +11101,6 @@ timers-browserify@^2.0.4: dependencies: setimmediate "^1.0.4" -tiny-glob@^0.2.0: - version "0.2.6" - resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.6.tgz#9e056e169d9788fe8a734dfa1ff02e9b92ed7eda" - integrity sha512-A7ewMqPu1B5PWwC3m7KVgAu96Ch5LA0w4SnEN/LbDREj/gAD0nPWboRbn8YoP9ISZXqeNAlMvKSKoEuhcfK3Pw== - dependencies: - globalyzer "^0.1.0" - globrex "^0.1.1" - tiny-relative-date@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07"