From e73875bca68d3109ff4aa597d0c0a24e53b19856 Mon Sep 17 00:00:00 2001 From: popomore Date: Mon, 7 Jan 2019 22:17:12 +0800 Subject: [PATCH 1/2] feat(assets): use autoPort --- assets-with-roadhog/config/config.default.js | 7 ++++--- assets-with-umi/config/config.default.js | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/assets-with-roadhog/config/config.default.js b/assets-with-roadhog/config/config.default.js index 61c02b7e..03830a3c 100644 --- a/assets-with-roadhog/config/config.default.js +++ b/assets-with-roadhog/config/config.default.js @@ -22,13 +22,14 @@ module.exports = appInfo => { publicPath: '/public/', devServer: { debug: false, + autoPort: true, command: 'roadhog dev', - port: 8000, env: { + PORT: '{port}', BROWSER: 'none', ESLINT: 'none', - SOCKET_SERVER: 'http://127.0.0.1:8000', - PUBLIC_PATH: 'http://127.0.0.1:8000', + SOCKET_SERVER: 'http://127.0.0.1:{port}', + PUBLIC_PATH: 'http://127.0.0.1:{port}', }, }, }; diff --git a/assets-with-umi/config/config.default.js b/assets-with-umi/config/config.default.js index b92fe45a..bb7b3b04 100644 --- a/assets-with-umi/config/config.default.js +++ b/assets-with-umi/config/config.default.js @@ -19,14 +19,14 @@ module.exports = appInfo => { publicPath: '/public/', devServer: { debug: true, - command: 'umi dev', - port: 8000, + autoPort: true, + command: 'umi dev --port={port}', env: { APP_ROOT: process.cwd() + '/app/web', BROWSER: 'none', ESLINT: 'none', - SOCKET_SERVER: 'http://127.0.0.1:8000', - PUBLIC_PATH: 'http://127.0.0.1:8000', + SOCKET_SERVER: 'http://127.0.0.1:{port}', + PUBLIC_PATH: 'http://127.0.0.1:{port}', }, }, }; From 99fd4a9f446b2fc77c824e7f1378c32e902de5f6 Mon Sep 17 00:00:00 2001 From: popomore Date: Tue, 8 Jan 2019 18:13:26 +0800 Subject: [PATCH 2/2] f --- assets-with-roadhog/test/app/controller/home.test.js | 2 +- assets-with-umi/test/app/controller/home.test.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets-with-roadhog/test/app/controller/home.test.js b/assets-with-roadhog/test/app/controller/home.test.js index aa36c58e..03a414e2 100644 --- a/assets-with-roadhog/test/app/controller/home.test.js +++ b/assets-with-roadhog/test/app/controller/home.test.js @@ -16,7 +16,7 @@ describe('test/app/controller/home.test.js', () => { it('should GET /', async function() { return app.httpRequest() .get('/') - .expect(/http:\/\/127.0.0.1:8000\/index.js/) + .expect(/http:\/\/127.0.0.1:10000\/index.js/) .expect(200); }); diff --git a/assets-with-umi/test/app/controller/home.test.js b/assets-with-umi/test/app/controller/home.test.js index 625d50e5..6d9e156c 100644 --- a/assets-with-umi/test/app/controller/home.test.js +++ b/assets-with-umi/test/app/controller/home.test.js @@ -16,7 +16,7 @@ describe('test/app/controller/home.test.js', () => { it('should GET /', async function() { return app.httpRequest() .get('/') - .expect(/http:\/\/127.0.0.1:8000\/umi.js/) + .expect(/http:\/\/127.0.0.1:10000\/umi.js/) .expect(200); });