Merge branch 'master' of github.com:ant-design/ant-design

This commit is contained in:
afc163 2016-09-08 11:15:45 +08:00
commit b7fc663b7f
3 changed files with 14 additions and 8 deletions

View File

@ -80,6 +80,7 @@
"babel-eslint": "^6.0.2",
"babel-jest": "^13.2.2",
"babel-plugin-antd": "^0.4.0",
"babel-plugin-transform-runtime": "~6.15.0",
"bisheng": "^0.12.0",
"bisheng-plugin-antd": "~0.2.0",
"bisheng-plugin-description": "^0.1.1",
@ -97,8 +98,6 @@
"eslint-plugin-react": "^6.1.2",
"eslint-tinker": "^0.3.1",
"history": "^3.0.0",
"intl": "^1.2.2",
"intl-locales-supported": "^1.0.0",
"jest-cli": "^13.2.3",
"jsonml-to-react-component": "~0.2.0",
"jsonml.js": "^0.1.0",

View File

@ -71,6 +71,14 @@ module.exports = {
'react-router': 'react-router/umd/ReactRouter',
};
config.babel.plugins.push([
require.resolve('babel-plugin-transform-runtime'),
{
polyfill: false,
regenerator: true,
},
]);
config.babel.plugins.push([
require.resolve('babel-plugin-antd'),
{

View File

@ -10,6 +10,11 @@
<!--[if lte IE 10]>
<script src="https://as.alipayobjects.com/g/component/??console-polyfill/0.2.2/index.js,media-match/2.0.2/media.match.min.js"></script>
<![endif]-->
<script>
if (!window.Intl) {
document.writeln('<script src="https://as.alipayobjects.com/g/component/intl/1.0.1/??Intl.js,locale-data/jsonp/en.js,locale-data/jsonp/zh.js">' + '<' + '/script>');
}
</script>
</head>
<body>
<div id="react-content"></div>
@ -45,12 +50,6 @@
/* eslint-enable */
}
</script>
<script>
if (!window.Intl) {
document.writeln('<script src="https://as.alipayobjects.com/g/component/intl/1.0.1/Intl.js">' + '<' + '/script>');
document.writeln('<script src="https://as.alipayobjects.com/g/component/intl/1.0.1/locale-data/jsonp/en.js">' + '<' + '/script>');
}
</script>
<script src="{{ root }}common.js"></script>
<script src="{{ root }}index.js"></script>
</body>