use blankLayout

trunghd2809 · Jun 13, 2019 · 57faf68 · 57faf68
1 parent 7c98ad9
commit 57faf68
Show file tree

Hide file tree

Showing 30 changed files with 8 additions and 13 deletions.
diff --git a/AccountCenter/snapshot.png b/AccountCenter/snapshot.png
diff --git a/AccountSettings/snapshot.png b/AccountSettings/snapshot.png
diff --git a/DashboardAnalysis/snapshot.png b/DashboardAnalysis/snapshot.png
diff --git a/DashboardMonitor/snapshot.png b/DashboardMonitor/snapshot.png
diff --git a/DashboardWorkplace/snapshot.png b/DashboardWorkplace/snapshot.png
diff --git a/EditorFlow/snapshot.png b/EditorFlow/snapshot.png
diff --git a/EditorKoni/snapshot.png b/EditorKoni/snapshot.png
diff --git a/EditorMind/snapshot.png b/EditorMind/snapshot.png
diff --git a/Exception403/snapshot.png b/Exception403/snapshot.png
diff --git a/Exception404/snapshot.png b/Exception404/snapshot.png
diff --git a/Exception500/snapshot.png b/Exception500/snapshot.png
diff --git a/FormAdvancedForm/snapshot.png b/FormAdvancedForm/snapshot.png
diff --git a/FormBasicForm/snapshot.png b/FormBasicForm/snapshot.png
diff --git a/FormStepForm/snapshot.png b/FormStepForm/snapshot.png
diff --git a/ListBasicList/snapshot.png b/ListBasicList/snapshot.png
diff --git a/ListCardList/snapshot.png b/ListCardList/snapshot.png
diff --git a/ListSearch/snapshot.png b/ListSearch/snapshot.png
diff --git a/ListSearchApplications/snapshot.png b/ListSearchApplications/snapshot.png
diff --git a/ListSearchArticles/snapshot.png b/ListSearchArticles/snapshot.png
diff --git a/ListSearchProjects/snapshot.png b/ListSearchProjects/snapshot.png
diff --git a/ListTableList/snapshot.png b/ListTableList/snapshot.png
diff --git a/ProfileAdvanced/snapshot.png b/ProfileAdvanced/snapshot.png
diff --git a/ProfileBasic/snapshot.png b/ProfileBasic/snapshot.png
diff --git a/ResultFail/snapshot.png b/ResultFail/snapshot.png
diff --git a/ResultSuccess/snapshot.png b/ResultSuccess/snapshot.png
diff --git a/UserLogin/snapshot.png b/UserLogin/snapshot.png
diff --git a/UserRegister/snapshot.png b/UserRegister/snapshot.png
diff --git a/UserRegisterResult/snapshot.png b/UserRegisterResult/snapshot.png
diff --git a/_scripts/screenshot.js b/_scripts/screenshot.js
@@ -2,7 +2,6 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 /* eslint-disable eslint-comments/no-unlimited-disable */
 const { spawn } = require('child_process');
-const { kill } = require('cross-port-killer');
 const puppeteer = require('puppeteer');
 const { join, dirname } = require('path');
 const fs = require('fs');
@@ -14,22 +13,19 @@ env.BROWSER = 'none';
 env.TEST = true;
 env.COMPRESS = 'none';
 env.PROGRESS = 'none';
-// flag to prevent multiple test
+env.BLOCK_PAGES_LAYOUT = 'blankLayout';
 
 let browser;
 
 const startServer = async path => {
   let once = false;
   return new Promise(resolve => {
     env.PAGES_PATH = path + '/src';
-    const startServer = spawn(/^win/.test(process.platform) ? 'npm.cmd' : 'npm', ['start'], {
+    console.log(path);
+    const startServer = spawn(/^win/.test(process.platform) ? 'npm.cmd' : 'npm', ['run', 'start'], {
       env,
     });
 
-    startServer.on('exit', () => {
-      kill(process.env.PORT || 8000);
-    });
-
     console.log('Starting development server');
     startServer.stdout.on('data', data => {
       console.log(data.toString());
@@ -115,8 +111,6 @@ const getAllFile = async () => {
 
 getAllFile().then(async dirList => {
   const registry = await getNpmRegistry();
-
-  kill(process.env.PORT || 8000);
   const page = await openBrowser();
   const loopGetImage = async index => {
     try {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "scripts": {
-    "dev": "cross-env PAGES_PATH='DashboardMonitor/src' umi dev",
+    "dev": "cross-env PAGES_PATH='AccountCenter/src' umi dev",
     "start": "umi dev",
     "lint": "npm run lint:ts && npm run lint:style && npm run lint:prettier",
     "lint-staged": "lint-staged",
@@ -29,8 +29,6 @@
   "dependencies": {
     "@types/react-dom": "^16.8.4",
     "cross-env": "^5.2.0",
-    "execa": "^1.0.0",
-    "getnpmregistry": "^1.0.1",
     "numeral": "^2.0.6",
     "react-dom": "^16.8.6"
   },
@@ -42,6 +40,9 @@
     "@types/numeral": "^0.0.25",
     "babel-eslint": "^10.0.1",
     "check-prettier": "^1.0.3",
+    "cross-port-killer": "^1.1.1",
+    "execa": "^1.0.0",
+    "getnpmregistry": "^1.0.1",
     "glob": "^7.1.3",
     "husky": "^2.2.0",
     "lint-staged": "^8.1.0",
@@ -59,7 +60,7 @@
     "tslint-react": "^3.6.0",
     "typescript": "^3.5.1",
     "umi": "^2.6.17",
-    "umi-plugin-block-dev": "^2.0.2",
+    "umi-plugin-block-dev": "^2.1.11",
     "umi-plugin-react": "^1.7.6",
     "umi-request": "^1.0.0"
   },