From fff4f39e5f2873371e014333c59aa7fd51c0ff1c Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 6 Jul 2015 20:18:19 +0800 Subject: [PATCH] remove react-router from antd --- components/breadcrumb/demo/router.md | 4 ++-- components/breadcrumb/demo/withIcon.md | 2 +- index.js | 1 - package.json | 4 ++-- scripts/demo.js | 1 + scripts/release.js | 0 site/templates/component.html | 7 ++----- webpack.config.js | 1 + 8 files changed, 9 insertions(+), 11 deletions(-) create mode 100644 scripts/demo.js delete mode 100644 scripts/release.js diff --git a/components/breadcrumb/demo/router.md b/components/breadcrumb/demo/router.md index cc81ea653f..85a3cf8c06 100644 --- a/components/breadcrumb/demo/router.md +++ b/components/breadcrumb/demo/router.md @@ -7,11 +7,11 @@ --- ````jsx -var Router = antd.Router; +var Router = require('react-router'); var Route = Router.Route; var Link = Router.Link; var RouteHandler = Router.RouteHandler; -var Breadcrumb = antd.Breadcrumb; +var Breadcrumb = require('antd/lib/breadcrumb'); var Apps = React.createClass({ render() { diff --git a/components/breadcrumb/demo/withIcon.md b/components/breadcrumb/demo/withIcon.md index b2c9d919eb..fcc821c0c9 100644 --- a/components/breadcrumb/demo/withIcon.md +++ b/components/breadcrumb/demo/withIcon.md @@ -7,7 +7,7 @@ --- ````jsx -var Breadcrumb = antd.Breadcrumb; +var Breadcrumb = require('antd/lib/breadcrumb'); React.render( diff --git a/index.js b/index.js index 5c407464a2..3d8aa00a82 100644 --- a/index.js +++ b/index.js @@ -11,7 +11,6 @@ var antd = { Popover: require('./components/popover'), Select: require('./components/select'), Breadcrumb: require('./components/breadcrumb'), - Router: require('react-router'), Popconfirm: require('./components/popconfirm'), confirm: require('./components/modal/confirm'), Steps: require('./components/steps'), diff --git a/package.json b/package.json index 5f5b7b9bd4..d9e1806a16 100644 --- a/package.json +++ b/package.json @@ -24,10 +24,10 @@ "rc-select": "~4.0.0", "rc-steps": "~1.1.0", "rc-tabs": "~5.1.0", - "rc-tooltip": "~2.2.3", - "react-router": "~0.13.3" + "rc-tooltip": "~2.2.3" }, "devDependencies": { + "react-router": "~0.13.3", "babel": "~5.6.14", "babel-core": "~5.4.7", "babel-loader": "~5.1.3", diff --git a/scripts/demo.js b/scripts/demo.js new file mode 100644 index 0000000000..b7d26816cc --- /dev/null +++ b/scripts/demo.js @@ -0,0 +1 @@ +window['react-router'] = require('react-router'); diff --git a/scripts/release.js b/scripts/release.js deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/site/templates/component.html b/site/templates/component.html index 28a0703be3..3921e1a23f 100644 --- a/site/templates/component.html +++ b/site/templates/component.html @@ -2,16 +2,13 @@ {% block scripts %} +