fix(@angular/cli): fix delete path check

angular · Jun 7, 2017 · 0a464ea · 0a464ea
1 parent 4f1c37b
commit 0a464ea
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/packages/@angular/cli/tasks/build.ts b/packages/@angular/cli/tasks/build.ts
@@ -20,7 +20,7 @@ export default Task.extend({
     const app = getAppFromConfig(runTaskOptions.app);
 
     const outputPath = runTaskOptions.outputPath || app.outDir;
-    if (this.project.root === outputPath) {
+    if (this.project.root === path.resolve(outputPath)) {
       throw new SilentError('Output path MUST not be project root directory!');
     }
     if (config.project && config.project.ejected) {

diff --git a/packages/@angular/cli/tasks/eject.ts b/packages/@angular/cli/tasks/eject.ts
@@ -397,7 +397,7 @@ export default Task.extend({
     const outputPath = runTaskOptions.outputPath || appConfig.outDir;
     const force = runTaskOptions.force;
 
-    if (project.root === outputPath) {
+    if (project.root === path.resolve(outputPath)) {
       throw new SilentError ('Output path MUST not be project root directory!');
     }
 

diff --git a/packages/@angular/cli/tasks/serve.ts b/packages/@angular/cli/tasks/serve.ts
@@ -25,7 +25,7 @@ export default Task.extend({
     const appConfig = getAppFromConfig(serveTaskOptions.app);
 
     const outputPath = serveTaskOptions.outputPath || appConfig.outDir;
-    if (this.project.root === outputPath) {
+    if (this.project.root === path.resolve(outputPath)) {
       throw new SilentError('Output path MUST not be project root directory!');
     }
     if (projectConfig.project && projectConfig.project.ejected) {

diff --git a/tests/e2e/tests/commands/build/build-outdir.ts b/tests/e2e/tests/commands/build/build-outdir.ts
@@ -0,0 +1,17 @@
+import {ng} from '../../../utils/process';
+import {updateJsonFile} from '../../../utils/project';
+import {expectToFail} from '../../../utils/utils';
+
+export default function() {
+  return Promise.resolve()
+    .then(() => updateJsonFile('.angular-cli.json', configJson => {
+      const app = configJson['apps'][0];
+      app['outDir'] = './';
+    }))
+    .then(() => expectToFail(() => ng('build')))
+    .then(() => expectToFail(() => ng('serve')))
+    .then(() => expectToFail(() => ng('eject')));
+}
+
+
+