Merge pull request alibaba#587 from alibaba/fix-scaffold

fix: remove react-router dependencies

Author: chenbin92

react-materials/scaffolds/ice-creator-landingpage/package.json

@@ -12,7 +12,6 @@
     "@icedesign/menu": "^0.1.0",
     "@icedesign/skin": "^0.1.0",
     "prop-types": "^15.5.8",
-    "react-router": "^4.2.0",
     "react-router-dom": "^4.2.2"
   },
   "devDependencies": {

react-materials/scaffolds/ice-creator-landingpage/src/router.jsx

@@ -1,8 +1,7 @@
 /**
  * 定义应用路
  */
-import { HashRouter as Router } from 'react-router-dom';
-import { Switch, Route } from 'react-router';
+import { Switch, Route, HashRouter as Router } from 'react-router-dom';
 import React from 'react';
 
 import routerConfig from './routerConfig';

react-materials/scaffolds/ice-design-analysis/package.json

@@ -13,7 +13,6 @@
     "echarts": "^4.0.4",
     "echarts-for-react": "^2.0.8",
     "prop-types": "^15.5.8",
-    "react-router": "^4.2.0",
     "react-router-dom": "^4.2.2",
     "react-text-loop": "^1.1.0"
   },

react-materials/scaffolds/ice-design-analysis/src/router.jsx

@@ -1,8 +1,7 @@
 /**
  * 定义应用路
  */
-import { HashRouter as Router } from 'react-router-dom';
-import { Switch, Route } from 'react-router';
+import { Switch, Route, HashRouter as Router } from 'react-router-dom';
 import React from 'react';
 
 import routerConfig from './routerConfig';

react-materials/scaffolds/ice-design-cms/package.json

@@ -1,8 +1,10 @@
 {
   "name": "@icedesign/cms-scaffold",
   "version": "1.0.1",
-  "description": "该模板内置了丰富的区块，主要适用于类 CMS 管理系统，使用时需要根据需求进行删除和添加",
-  "homepage": "https://alibaba.github.io/ice/scaffold-preview/ice-design-cms.html",
+  "description":
+    "该模板内置了丰富的区块，主要适用于类 CMS 管理系统，使用时需要根据需求进行删除和添加",
+  "homepage":
+    "https://alibaba.github.io/ice/scaffold-preview/ice-design-cms.html",
   "dependencies": {
     "@antv/data-set": "^0.8.5",
     "@icedesign/base": "^0.2.0",
@@ -22,7 +24,6 @@
     "is-hotkey": "^0.1.1",
     "prop-types": "^15.5.8",
     "react-document-title": "^2.0.3",
-    "react-router": "^4.2.0",
     "react-router-dom": "^4.2.2",
     "slate": "^0.32.5",
     "slate-plain-serializer": "^0.5.6",
@@ -54,6 +55,7 @@
   "scaffoldConfig": {
     "name": "ice-design-cms",
     "title": "ICE Design CMS",
-    "screenshot": "https://img.alicdn.com/tfs/TB1ai53mqmWBuNjy1XaXXXCbXXa-1920-1080.png"
+    "screenshot":
+      "https://img.alicdn.com/tfs/TB1ai53mqmWBuNjy1XaXXXCbXXa-1920-1080.png"
   }
 }

react-materials/scaffolds/ice-design-cms/src/layouts/HeaderAsideFooterResponsiveLayout/Layout.jsx

@@ -4,8 +4,7 @@ import cx from 'classnames';
 import Layout from '@icedesign/layout';
 import { Icon } from '@icedesign/base';
 import Menu, { SubMenu, Item as MenuItem } from '@icedesign/menu';
-import { Link } from 'react-router-dom';
-import { withRouter } from 'react-router';
+import { withRouter, Link } from 'react-router-dom';
 import FoundationSymbol from 'foundation-symbol';
 import { enquire } from 'enquire-js';
 import Header from './../../components/Header';

react-materials/scaffolds/ice-design-cms/src/router.jsx

@@ -1,8 +1,7 @@
 /**
  * 定义应用路
  */
-import { HashRouter as Router } from 'react-router-dom';
-import { Switch, Route } from 'react-router';
+import { Switch, Route, HashRouter as Router } from 'react-router-dom';
 import React from 'react';
 
 import routerConfig from './routerConfig';

react-materials/scaffolds/ice-design-ecommerce/package.json

@@ -4,7 +4,8 @@
   "description":
     "该模板适用于电商类管理后台，布局方式采用左侧固定，右侧自适应方式，适合大量数据展示和界面操作",
   "author": "[email protected]",
-  "homepage": "https://alibaba.github.io/ice/scaffold-preview/ice-design-ecommerce.html",
+  "homepage":
+    "https://alibaba.github.io/ice/scaffold-preview/ice-design-ecommerce.html",
   "dependencies": {
     "@antv/data-set": "^0.8.7",
     "@icedesign/base": "^0.2.0",
@@ -17,7 +18,6 @@
     "enquire-js": "^0.1.2",
     "foundation-symbol": "^0.1.3",
     "prop-types": "^15.5.8",
-    "react-router": "^4.2.0",
     "react-router-dom": "^4.2.2"
   },
   "publishConfig": {

react-materials/scaffolds/ice-design-ecommerce/src/router.jsx

@@ -1,8 +1,7 @@
 /**
  * 定义应用路
  */
-import { HashRouter as Router } from 'react-router-dom';
-import { Switch, Route } from 'react-router';
+import { Switch, Route, HashRouter as Router } from 'react-router-dom';
 import React from 'react';
 
 import routerConfig from './routerConfig';

react-materials/scaffolds/ice-design-lite/package.json

@@ -1,8 +1,10 @@
 {
   "name": "@icedesign/lite-scaffold",
   "version": "1.0.1",
-  "description": "该模板适用于从 0 到 1 开始搭建项目，内置四套布局，以及基础的页面，路由和菜单展示",
-  "homepage": "https://alibaba.github.io/ice/scaffold-preview/ice-design-lite.html",
+  "description":
+    "该模板适用于从 0 到 1 开始搭建项目，内置四套布局，以及基础的页面，路由和菜单展示",
+  "homepage":
+    "https://alibaba.github.io/ice/scaffold-preview/ice-design-lite.html",
   "dependencies": {
     "@icedesign/base": "^0.2.0",
     "@icedesign/container": "^0.1.2",
@@ -18,7 +20,6 @@
     "foundation-symbol": "^0.1.0",
     "prop-types": "^15.5.8",
     "react-document-title": "^2.0.3",
-    "react-router": "^4.2.0",
     "react-router-dom": "^4.2.2"
   },
   "devDependencies": {
@@ -47,6 +48,7 @@
   "scaffoldConfig": {
     "name": "ice-design-lite",
     "title": "ICE Design Lite",
-    "screenshot": "https://img.alicdn.com/tfs/TB1IM1JmuuSBuNjy1XcXXcYjFXa-1920-1080.png"
+    "screenshot":
+      "https://img.alicdn.com/tfs/TB1IM1JmuuSBuNjy1XcXXcYjFXa-1920-1080.png"
   }
 }