Skip to content

Commit ab6d376

Browse files
committed
Merge remote-tracking branch 'origin/master' into new-context-backward-compatible
* origin/master: chore: bundle UMD with rollup (#449) chore(release): 2.5.3 [skip ci] fix: strip custom prop-types in production (#448) chore: fix storybook (#445) chore(release): 2.5.2 [skip ci] fix: pass appear to CSSTransition callbacks (#441) docs: Fix type declaration comment (#439) chore(release): 2.5.1 [skip ci] fix: prevent calling setState in TransitionGroup if it has been unmounted (#435)
2 parents aafaecd + ac15233 commit ab6d376

13 files changed

+2817
-3262
lines changed

.size-snapshot.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"./lib/dist/react-transition-group.js": {
3+
"bundled": 79410,
4+
"minified": 22589,
5+
"gzipped": 6905
6+
},
7+
"./lib/dist/react-transition-group.min.js": {
8+
"bundled": 46139,
9+
"minified": 14975,
10+
"gzipped": 4685
11+
}
12+
}

.storybook/webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = (config) => {
99
};
1010

1111
config.plugins.push(
12-
plugins.extractText({ disable: true })
12+
plugins.extractCss({ disable: true })
1313
)
1414
return config;
1515
};

CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
## [2.5.3](https://github.com/reactjs/react-transition-group/compare/v2.5.2...v2.5.3) (2019-01-14)
2+
3+
4+
### Bug Fixes
5+
6+
* 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))
7+
8+
## [2.5.2](https://github.com/reactjs/react-transition-group/compare/v2.5.1...v2.5.2) (2018-12-20)
9+
10+
11+
### Bug Fixes
12+
13+
* 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)
14+
15+
## [2.5.1](https://github.com/reactjs/react-transition-group/compare/v2.5.0...v2.5.1) (2018-12-10)
16+
17+
18+
### Bug Fixes
19+
20+
* 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))
21+
122
# [2.5.0](https://github.com/reactjs/react-transition-group/compare/v2.4.0...v2.5.0) (2018-09-26)
223

324

package.json

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-transition-group",
3-
"version": "2.5.0",
3+
"version": "2.5.3",
44
"description": "A react component toolset for managing animations",
55
"main": "lib/index.js",
66
"scripts": {
@@ -9,7 +9,7 @@
99
"tdd": "jest --watch",
1010
"build": "babel src --out-dir lib --delete-dir-on-start && npm run build:dist && cp README.md LICENSE ./lib",
1111
"build:docs": "npm -C www run build",
12-
"build:dist": "webpack --mode production",
12+
"build:dist": "cross-env BABEL_ENV=esm yarn rollup -c",
1313
"bootstrap": "yarn && yarn --cwd www",
1414
"lint": "eslint src test",
1515
"release": "release",
@@ -67,14 +67,15 @@
6767
"@semantic-release/git": "^7.0.4",
6868
"@semantic-release/github": "^5.0.5",
6969
"@semantic-release/npm": "^5.0.4",
70-
"@storybook/addon-actions": "^3.4.11",
71-
"@storybook/react": "^3.4.11",
70+
"@storybook/addon-actions": "^4.1.4",
71+
"@storybook/react": "^4.1.4",
7272
"babel-core": "^7.0.0-bridge.0",
7373
"babel-eslint": "^9.0.0",
7474
"babel-jest": "^23.6.0",
7575
"babel-loader": "^8.0.2",
7676
"babel-plugin-transform-react-remove-prop-types": "^0.4.18",
7777
"babel-preset-jason": "^6.0.1",
78+
"cross-env": "^5.2.0",
7879
"enzyme": "^3.7.0",
7980
"enzyme-adapter-react-16": "^1.6.0",
8081
"eslint": "^5.6.0",
@@ -92,13 +93,17 @@
9293
"react-test-renderer": "^16.6.0",
9394
"release-script": "^1.0.2",
9495
"rimraf": "^2.6.1",
96+
"rollup": "^1.1.0",
97+
"rollup-plugin-babel": "^4.3.0",
98+
"rollup-plugin-commonjs": "^9.2.0",
99+
"rollup-plugin-node-resolve": "^4.0.0",
100+
"rollup-plugin-replace": "^2.1.0",
101+
"rollup-plugin-size-snapshot": "^0.8.0",
102+
"rollup-plugin-terser": "^4.0.2",
95103
"semantic-release": "^15.9.16",
96104
"semantic-release-alt-publish-dir": "^2.1.1",
97105
"sinon": "^6.3.4",
98-
"travis-deploy-once": "^5.0.8",
99-
"webpack": "^4.19.1",
100-
"webpack-atoms": "^8.0.0",
101-
"webpack-cli": "^3.1.1"
106+
"travis-deploy-once": "^5.0.8"
102107
},
103108
"release": {
104109
"pkgRoot": "lib",

rollup.config.js

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
import nodeResolve from "rollup-plugin-node-resolve";
2+
import babel from "rollup-plugin-babel";
3+
import commonjs from "rollup-plugin-commonjs";
4+
import replace from "rollup-plugin-replace";
5+
import { sizeSnapshot } from "rollup-plugin-size-snapshot";
6+
import { terser } from "rollup-plugin-terser";
7+
8+
const input = "./src/umd.js";
9+
const name = "ReactTransitionGroup";
10+
const globals = {
11+
react: "React",
12+
"react-dom": "ReactDOM"
13+
};
14+
15+
const babelOptions = {
16+
exclude: /node_modules/,
17+
runtimeHelpers: true
18+
}
19+
20+
const commonjsOptions = {
21+
include: /node_modules/,
22+
namedExports: {
23+
"prop-types": ["object", "oneOfType", "element", "bool", "func"]
24+
}
25+
};
26+
27+
export default [
28+
{
29+
input,
30+
output: {
31+
file: "./lib/dist/react-transition-group.js",
32+
format: "umd",
33+
name,
34+
globals
35+
},
36+
external: Object.keys(globals),
37+
plugins: [
38+
nodeResolve(),
39+
babel(babelOptions),
40+
commonjs(commonjsOptions),
41+
replace({ "process.env.NODE_ENV": JSON.stringify("development") }),
42+
sizeSnapshot()
43+
]
44+
},
45+
46+
{
47+
input,
48+
output: {
49+
file: "./lib/dist/react-transition-group.min.js",
50+
format: "umd",
51+
name,
52+
globals
53+
},
54+
external: Object.keys(globals),
55+
plugins: [
56+
nodeResolve(),
57+
babel(babelOptions),
58+
commonjs(commonjsOptions),
59+
replace({ "process.env.NODE_ENV": JSON.stringify("production") }),
60+
sizeSnapshot(),
61+
terser()
62+
]
63+
}
64+
];

0 commit comments

Comments
 (0)