From 3b3984351365518a928467a932a54b079edb099c Mon Sep 17 00:00:00 2001 From: Meligy Date: Fri, 24 Feb 2017 01:20:59 +1100 Subject: [PATCH] fix(@angular/cli): fix e2e after eject Start webpack-dev-server with e2e & sync its port with protractor default config port. Close #4957 --- packages/@angular/cli/tasks/eject.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/@angular/cli/tasks/eject.ts b/packages/@angular/cli/tasks/eject.ts index 4292a55fb9..5fdbed83a7 100644 --- a/packages/@angular/cli/tasks/eject.ts +++ b/packages/@angular/cli/tasks/eject.ts @@ -439,6 +439,12 @@ export default Task.extend({ Your package.json scripts needs to not contain a start script as it will be overwritten. `); } + if (scripts['pree2e'] && scripts['prepree2e'] !== 'npm start' && !force) { + throw new SilentError(oneLine` + Your package.json scripts needs to not contain a prepree2e script as it will be + overwritten. + `); + } if (scripts['pree2e'] && scripts['pree2e'] !== pree2eNpmScript && !force) { throw new SilentError(oneLine` Your package.json scripts needs to not contain a pree2e script as it will be @@ -457,8 +463,9 @@ export default Task.extend({ } packageJson['scripts']['build'] = 'webpack'; - packageJson['scripts']['start'] = 'webpack-dev-server'; + packageJson['scripts']['start'] = 'webpack-dev-server --port=4200'; packageJson['scripts']['test'] = 'karma start ./karma.conf.js'; + packageJson['scripts']['prepree2e'] = 'npm start'; packageJson['scripts']['pree2e'] = pree2eNpmScript; packageJson['scripts']['e2e'] = 'protractor ./protractor.conf.js';