Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into new-context-backwar…
Browse files Browse the repository at this point in the history
…d-compatible

* origin/master:
  chore: bundle UMD with rollup (reactjs#449)
  chore(release): 2.5.3 [skip ci]
  fix: strip custom prop-types in production (reactjs#448)
  chore: fix storybook (reactjs#445)
  chore(release): 2.5.2 [skip ci]
  fix: pass appear to CSSTransition callbacks (reactjs#441)
  docs: Fix type declaration comment (reactjs#439)
  chore(release): 2.5.1 [skip ci]
  fix: prevent calling setState in TransitionGroup if it has been unmounted (reactjs#435)
  • Loading branch information
errendir committed Feb 14, 2019
2 parents aafaecd + ac15233 commit ab6d376
Show file tree
Hide file tree
Showing 13 changed files with 2,817 additions and 3,262 deletions.
12 changes: 12 additions & 0 deletions .size-snapshot.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"./lib/dist/react-transition-group.js": {
"bundled": 79410,
"minified": 22589,
"gzipped": 6905
},
"./lib/dist/react-transition-group.min.js": {
"bundled": 46139,
"minified": 14975,
"gzipped": 4685
}
}
2 changes: 1 addition & 1 deletion .storybook/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = (config) => {
};

config.plugins.push(
plugins.extractText({ disable: true })
plugins.extractCss({ disable: true })
)
return config;
};
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
## [2.5.3](https://github.com/reactjs/react-transition-group/compare/v2.5.2...v2.5.3) (2019-01-14)


### Bug Fixes

* strip custom prop-types in production ([#448](https://github.com/reactjs/react-transition-group/issues/448)) ([46fa20f](https://github.com/reactjs/react-transition-group/commit/46fa20f))

## [2.5.2](https://github.com/reactjs/react-transition-group/compare/v2.5.1...v2.5.2) (2018-12-20)


### Bug Fixes

* pass appear to CSSTransition callbacks ([#441](https://github.com/reactjs/react-transition-group/issues/441)) ([df7adb4](https://github.com/reactjs/react-transition-group/commit/df7adb4)), closes [#143](https://github.com/reactjs/react-transition-group/issues/143)

## [2.5.1](https://github.com/reactjs/react-transition-group/compare/v2.5.0...v2.5.1) (2018-12-10)


### Bug Fixes

* prevent calling setState in TransitionGroup if it has been unmounted ([#435](https://github.com/reactjs/react-transition-group/issues/435)) ([6d46b69](https://github.com/reactjs/react-transition-group/commit/6d46b69))

# [2.5.0](https://github.com/reactjs/react-transition-group/compare/v2.4.0...v2.5.0) (2018-09-26)


Expand Down
21 changes: 13 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-transition-group",
"version": "2.5.0",
"version": "2.5.3",
"description": "A react component toolset for managing animations",
"main": "lib/index.js",
"scripts": {
Expand All @@ -9,7 +9,7 @@
"tdd": "jest --watch",
"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:dist": "webpack --mode production",
"build:dist": "cross-env BABEL_ENV=esm yarn rollup -c",
"bootstrap": "yarn && yarn --cwd www",
"lint": "eslint src test",
"release": "release",
Expand Down Expand Up @@ -67,14 +67,15 @@
"@semantic-release/git": "^7.0.4",
"@semantic-release/github": "^5.0.5",
"@semantic-release/npm": "^5.0.4",
"@storybook/addon-actions": "^3.4.11",
"@storybook/react": "^3.4.11",
"@storybook/addon-actions": "^4.1.4",
"@storybook/react": "^4.1.4",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^9.0.0",
"babel-jest": "^23.6.0",
"babel-loader": "^8.0.2",
"babel-plugin-transform-react-remove-prop-types": "^0.4.18",
"babel-preset-jason": "^6.0.1",
"cross-env": "^5.2.0",
"enzyme": "^3.7.0",
"enzyme-adapter-react-16": "^1.6.0",
"eslint": "^5.6.0",
Expand All @@ -92,13 +93,17 @@
"react-test-renderer": "^16.6.0",
"release-script": "^1.0.2",
"rimraf": "^2.6.1",
"rollup": "^1.1.0",
"rollup-plugin-babel": "^4.3.0",
"rollup-plugin-commonjs": "^9.2.0",
"rollup-plugin-node-resolve": "^4.0.0",
"rollup-plugin-replace": "^2.1.0",
"rollup-plugin-size-snapshot": "^0.8.0",
"rollup-plugin-terser": "^4.0.2",
"semantic-release": "^15.9.16",
"semantic-release-alt-publish-dir": "^2.1.1",
"sinon": "^6.3.4",
"travis-deploy-once": "^5.0.8",
"webpack": "^4.19.1",
"webpack-atoms": "^8.0.0",
"webpack-cli": "^3.1.1"
"travis-deploy-once": "^5.0.8"
},
"release": {
"pkgRoot": "lib",
Expand Down
64 changes: 64 additions & 0 deletions rollup.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import nodeResolve from "rollup-plugin-node-resolve";
import babel from "rollup-plugin-babel";
import commonjs from "rollup-plugin-commonjs";
import replace from "rollup-plugin-replace";
import { sizeSnapshot } from "rollup-plugin-size-snapshot";
import { terser } from "rollup-plugin-terser";

const input = "./src/umd.js";
const name = "ReactTransitionGroup";
const globals = {
react: "React",
"react-dom": "ReactDOM"
};

const babelOptions = {
exclude: /node_modules/,
runtimeHelpers: true
}

const commonjsOptions = {
include: /node_modules/,
namedExports: {
"prop-types": ["object", "oneOfType", "element", "bool", "func"]
}
};

export default [
{
input,
output: {
file: "./lib/dist/react-transition-group.js",
format: "umd",
name,
globals
},
external: Object.keys(globals),
plugins: [
nodeResolve(),
babel(babelOptions),
commonjs(commonjsOptions),
replace({ "process.env.NODE_ENV": JSON.stringify("development") }),
sizeSnapshot()
]
},

{
input,
output: {
file: "./lib/dist/react-transition-group.min.js",
format: "umd",
name,
globals
},
external: Object.keys(globals),
plugins: [
nodeResolve(),
babel(babelOptions),
commonjs(commonjsOptions),
replace({ "process.env.NODE_ENV": JSON.stringify("production") }),
sizeSnapshot(),
terser()
]
}
];
Loading

0 comments on commit ab6d376

Please sign in to comment.