From 0af3300c7a5c29da1e3b16acfd76e30317653d0d Mon Sep 17 00:00:00 2001
From: jim <wasd2144@hotmail.com>
Date: Wed, 2 May 2018 17:24:06 +0800
Subject: [PATCH] fix ci

---
 .babelrc.js                  | 13 +++++++++++--
 package.json                 |  6 +++---
 src/e2e/home.e2e.js          |  2 +-
 src/e2e/login.e2e.js         |  2 +-
 src/routes/Result/Success.js |  2 +-
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/.babelrc.js b/.babelrc.js
index 96df8001..e89d2204 100644
--- a/.babelrc.js
+++ b/.babelrc.js
@@ -1,12 +1,21 @@
+const path = require('path');
+
 module.exports = {
   plugins: [
     [
       'babel-plugin-module-resolver',
       {
         alias: {
-          components: './src/components',
+          components: path.join(__dirname, './src/components'),
         },
       },
     ],
+    [
+      'import',
+      {
+        libraryName: 'antd',
+        style: true, // or 'css'
+      },
+    ],
   ],
-};
\ No newline at end of file
+};
diff --git a/package.json b/package.json
index 650e5e92..10970b44 100755
--- a/package.json
+++ b/package.json
@@ -23,8 +23,6 @@
   "dependencies": {
     "@antv/data-set": "^0.8.0",
     "@babel/polyfill": "^7.0.0-beta.36",
-    "@types/react": "^16.3.8",
-    "@types/react-dom": "^16.0.5",
     "antd": "^3.4.3",
     "antd-theme-webpack-plugin": "^1.0.8",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
@@ -53,6 +51,8 @@
     "url-polyfill": "^1.0.10"
   },
   "devDependencies": {
+    "@types/react": "^16.3.8",
+    "@types/react-dom": "^16.0.5",
     "babel-eslint": "^8.1.2",
     "babel-plugin-dva-hmr": "^0.4.1",
     "babel-plugin-import": "^1.6.7",
@@ -84,7 +84,7 @@
     "stylelint-config-standard": "^18.0.0"
   },
   "optionalDependencies": {
-    "puppeteer": "^1.1.1"
+    "puppeteer": "^1.3.0"
   },
   "lint-staged": {
     "**/*.{js,jsx,less}": [
diff --git a/src/e2e/home.e2e.js b/src/e2e/home.e2e.js
index 1a5d9513..05377e85 100644
--- a/src/e2e/home.e2e.js
+++ b/src/e2e/home.e2e.js
@@ -4,7 +4,7 @@ describe('Homepage', () => {
   it('it should have logo text', async () => {
     const browser = await puppeteer.launch();
     const page = await browser.newPage();
-    await page.goto('http://localhost:8000');
+    await page.goto('http://localhost:8000', { waitUntil: 'networkidle2' });
     await page.waitForSelector('h1');
     const text = await page.evaluate(() => document.body.innerHTML);
     expect(text).toContain('<h1>Ant Design Pro</h1>');
diff --git a/src/e2e/login.e2e.js b/src/e2e/login.e2e.js
index 5211a3b4..6095b9e5 100644
--- a/src/e2e/login.e2e.js
+++ b/src/e2e/login.e2e.js
@@ -10,7 +10,7 @@ describe('Login', () => {
 
   beforeEach(async () => {
     page = await browser.newPage();
-    await page.goto('http://localhost:8000/#/user/login');
+    await page.goto('http://localhost:8000/#/user/login', { waitUntil: 'networkidle2' });
     await page.evaluate(() => window.localStorage.setItem('antd-pro-authority', 'guest'));
   });
 
diff --git a/src/routes/Result/Success.js b/src/routes/Result/Success.js
index 9e20e278..c27567a8 100644
--- a/src/routes/Result/Success.js
+++ b/src/routes/Result/Success.js
@@ -1,6 +1,6 @@
 import React, { Fragment } from 'react';
 import { Button, Row, Col, Icon, Steps, Card } from 'antd';
-import Result from 'components/Result';
+import Result from '../../components/Result';
 import PageHeaderLayout from '../../layouts/PageHeaderLayout';
 
 const { Step } = Steps;
-- 
GitLab