Quellcode durchsuchen

update dependencies and fix lint and test case

afc163 vor 8 Jahren
Ursprung
Commit
2e0efbb04c

+ 1 - 0
.stylelintrc

@@ -20,6 +20,7 @@
     "selector-list-comma-newline-after": null,
     "selector-pseudo-element-colon-notation": null,
     "unit-no-unknown": null,
+    "no-descending-specificity": null,
     "value-list-max-empty-lines": null
   }
 }

+ 6 - 7
package.json

@@ -26,13 +26,11 @@
     "bizcharts": "^3.1.0-beta.4",
     "bizcharts-plugin-slider": "^2.0.1",
     "classnames": "^2.2.5",
-    "core-js": "^2.5.1",
     "dva": "^2.1.0",
     "enquire-js": "^0.1.1",
     "fastclick": "^1.0.6",
     "lodash": "^4.17.4",
     "lodash-decorators": "^4.4.1",
-    "lodash.clonedeep": "^4.5.0",
     "moment": "^2.19.1",
     "numeral": "^2.0.6",
     "prop-types": "^15.5.10",
@@ -46,8 +44,8 @@
   },
   "devDependencies": {
     "babel-eslint": "^8.0.1",
-    "babel-jest": "^21.0.0",
-    "babel-plugin-dva-hmr": "^0.3.2",
+    "babel-jest": "^22.0.4",
+    "babel-plugin-dva-hmr": "^0.4.0",
     "babel-plugin-import": "^1.2.1",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
@@ -68,8 +66,9 @@
     "eslint-plugin-react": "^7.0.1",
     "gh-pages": "^1.0.0",
     "husky": "^0.14.3",
-    "jest": "^21.0.1",
-    "lint-staged": "^4.3.0",
+    "jest": "^22.0.4",
+    "jsdom": "^11.5.1",
+    "lint-staged": "^6.0.0",
     "mockjs": "^1.0.1-beta3",
     "prettier": "^1.9.0",
     "pro-download": "^1.0.0",
@@ -79,7 +78,7 @@
     "roadhog-api-doc": "^0.3.3",
     "rollbar": "^2.3.1",
     "stylelint": "^8.1.0",
-    "stylelint-config-standard": "^17.0.0"
+    "stylelint-config-standard": "^18.0.0"
   },
   "optionalDependencies": {
     "nightmare": "^2.10.0"

+ 2 - 2
src/components/DescriptionList/DescriptionList.js

@@ -6,8 +6,8 @@ import styles from './index.less';
 export default ({ className, title, col = 3, layout = 'horizontal', gutter = 32,
   children, size, ...restProps }) => {
   const clsString = classNames(styles.descriptionList, styles[layout], className, {
-    [styles.descriptionListSmall]: size === 'small',
-    [styles.descriptionListLarge]: size === 'large',
+    [styles.small]: size === 'small',
+    [styles.large]: size === 'large',
   });
   const column = col > 4 ? 4 : col;
   return (

+ 22 - 22
src/components/DescriptionList/index.less

@@ -40,8 +40,29 @@
     display: table-cell;
   }
 
-  &.vertical {
+  &.small {
+    // offset the padding-bottom of last row
+    :global {
+      .ant-row {
+        margin-bottom: -8px;
+      }
+    }
+    .title {
+      margin-bottom: 12px;
+      color: @text-color;
+    }
+    .term, .detail {
+      padding-bottom: 8px;
+    }
+  }
 
+  &.large {
+    .title {
+      font-size: 16px;
+    }
+  }
+
+  &.vertical {
     .term {
       padding-bottom: 8px;
       display: block;
@@ -52,24 +73,3 @@
     }
   }
 }
-
-.descriptionListSmall {
-  // offset the padding-bottom of last row
-  :global {
-    .ant-row {
-      margin-bottom: -8px;
-    }
-  }
-  .title {
-    margin-bottom: 12px;
-    color: @text-color;
-  }
-  .term, .detail {
-    padding-bottom: 8px;
-  }
-}
-.descriptionListLarge {
-  .title {
-    font-size: 16px;
-  }
-}

+ 2 - 2
src/components/GlobalHeader/index.less

@@ -60,8 +60,8 @@ i.trigger {
       font-size: 16px;
       vertical-align: middle;
     }
-    &:global(.ant-popover-open),
-    &:hover {
+    &:hover,
+    &:global(.ant-popover-open) {
       background: @primary-1;
     }
   }

+ 0 - 5
src/routes/Dashboard/Analysis.less

@@ -83,11 +83,6 @@
       padding-right: 24px;
       line-height: 55px;
     }
-  }
-}
-
-.salesCard {
-  :global {
     .ant-card-head {
       position: relative;
     }

+ 1 - 1
src/routes/Forms/StepForm/style.less

@@ -64,7 +64,7 @@
 }
 
 .money {
-  font-family: Helvetica Neue;
+  font-family: "Helvetica Neue", sans-serif;
   font-weight: 500;
   font-size: 20px;
   line-height: 14px;

+ 1 - 3
src/routes/List/BasicList.less

@@ -15,15 +15,13 @@
     }
     .ant-list-pagination {
       text-align: right;
+      margin-top: 24px;
     }
     .ant-avatar-lg {
       width: 48px;
       height: 48px;
       line-height: 48px;
     }
-    .ant-list-pagination {
-      margin-top: 24px;
-    }
   }
   .headerInfo {
     position: relative;

+ 2 - 2
tests/setupTests.js

@@ -3,7 +3,7 @@ global.requestAnimationFrame =
   global.requestAnimationFrame || function requestAnimationFrame(callback) {
     setTimeout(callback, 0);
   };
-import { jsdom } from 'jsdom';
+import { JSDOM } from 'jsdom';
 import Enzyme from 'enzyme';
 import Adapter from 'enzyme-adapter-react-16';
 
@@ -11,6 +11,6 @@ Enzyme.configure({ adapter: new Adapter() });
 
 // fixed jsdom miss
 const documentHTML = '<!doctype html><html><body><div id="root"></div></body></html>';
-global.document = jsdom(documentHTML);
+global.document = new JSDOM(documentHTML);
 global.window = document.defaultView;
 global.navigator = global.window.navigator;