feat(@angular/cli): disable invalid commands on ejected apps

Author: hansl

packages/@angular/cli/tasks/build.ts

@@ -14,10 +14,14 @@ export default Task.extend({
   run: function (runTaskOptions: BuildTaskOptions) {
 
     const project = this.cliProject;
+    const config = CliConfig.fromProject().config;
 
-    const outputPath = runTaskOptions.outputPath || CliConfig.fromProject().config.apps[0].outDir;
+    const outputPath = runTaskOptions.outputPath || config.apps[0].outDir;
     if (project.root === outputPath) {
-      throw new SilentError ('Output path MUST not be project root directory!');
+      throw new SilentError('Output path MUST not be project root directory!');
+    }
+    if (config.project && config.project.ejected) {
+      throw new SilentError('An ejected project cannot use the build command anymore.');
     }
     rimraf.sync(path.resolve(project.root, outputPath));
 

packages/@angular/cli/tasks/e2e.ts

@@ -1,15 +1,23 @@
 import * as url from 'url';
 
 import { E2eTaskOptions } from '../commands/e2e';
+import { CliConfig } from '../models/config';
 import { requireProjectModule } from '../utilities/require-project-module';
+
 const Task = require('../ember-cli/lib/models/task');
+const SilentError = require('silent-error');
 
 
 export const E2eTask = Task.extend({
   run: function (e2eTaskOptions: E2eTaskOptions) {
+    const projectConfig = CliConfig.fromProject().config;
     const projectRoot = this.project.root;
     const protractorLauncher = requireProjectModule(projectRoot, 'protractor/built/launcher');
 
+    if (projectConfig.project && projectConfig.project.ejected) {
+      throw new SilentError('An ejected project cannot use the build command anymore.');
+    }
+
     return new Promise(function () {
       let promise = Promise.resolve();
       let additionalProtractorConfig: any = {

packages/@angular/cli/tasks/serve.ts

@@ -27,6 +27,9 @@ export default Task.extend({
     if (this.project.root === outputPath) {
       throw new SilentError('Output path MUST not be project root directory!');
     }
+    if (projectConfig.project && projectConfig.project.ejected) {
+      throw new SilentError('An ejected project cannot use the build command anymore.');
+    }
     rimraf.sync(path.resolve(this.project.root, outputPath));
 
     const serveDefaults = {

packages/@angular/cli/tasks/test.ts

@@ -1,11 +1,22 @@
-const Task = require('../ember-cli/lib/models/task');
-import { TestOptions } from '../commands/test';
 import * as path from 'path';
+
+import { TestOptions } from '../commands/test';
+import { CliConfig } from '../models/config';
 import { requireProjectModule } from '../utilities/require-project-module';
 
+const Task = require('../ember-cli/lib/models/task');
+const SilentError = require('silent-error');
+
+
 export default Task.extend({
   run: function (options: TestOptions) {
+    const projectConfig = CliConfig.fromProject().config;
     const projectRoot = this.project.root;
+
+    if (projectConfig.project && projectConfig.project.ejected) {
+      throw new SilentError('An ejected project cannot use the build command anymore.');
+    }
+
     return new Promise((resolve) => {
       const karma = requireProjectModule(projectRoot, 'karma');
       const karmaConfig = path.join(projectRoot, options.config ||

tests/e2e/tests/commands/eject/eject.ts

@@ -0,0 +1,17 @@
+import * as path from 'path';
+
+import {ng, silentNpm, exec} from '../../../utils/process';
+import {expectToFail} from '../../../utils/utils';
+import {expectGitToBeClean} from '../../../utils/git';
+
+
+export default function() {
+  return ng('eject')
+    .then(() => expectToFail(() => ng('build')))
+    .then(() => expectToFail(() => ng('test')))
+    .then(() => expectToFail(() => ng('e2e')))
+    .then(() => expectToFail(() => ng('serve')))
+    .then(() => expectToFail(() => expectGitToBeClean()))
+    .then(() => silentNpm('install'))
+    .then(() => exec(path.join('node_modules', '.bin', 'webpack')));
+}