Deprecate defaultProject

docs/documentation/angular-workspace.md

@@ -8,7 +8,7 @@
 
 - **newProjectRoot** (`string`): Path where new projects will be created.
 
-- **defaultProject** (`string`): Default project name used in commands.
+- **defaultProject** (`string`): (**DEPRECATED**) Default project name used in commands.
 
 - **cli**: Workspace configuration options for Angular CLI.
   - *defaultCollection* (`string`): The default schematics collection to use.

packages/angular/cli/lib/config/schema.json

@@ -22,7 +22,7 @@
     },
     "defaultProject": {
       "type": "string",
-      "description": "Default project name used in commands."
+      "description": "(DEPRECATED) Default project name used in commands."
     },
     "projects": {
       "type": "object",

packages/angular/cli/models/architect-command.ts

@@ -15,6 +15,7 @@ import { experimental, json, schema, tags } from '@angular-devkit/core';
 import { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node';
 import { from } from 'rxjs';
 import { concatMap, map, tap, toArray } from 'rxjs/operators';
+import { getProjectByCwd } from '../utilities/config';
 import { parseJsonSchemaToOptions } from '../utilities/json-schema';
 import { BaseCommandOptions, Command } from './command';
 import { Arguments } from './interface';
@@ -212,11 +213,11 @@ export abstract class ArchitectCommand<
       // For multi target commands, we always list all projects that have the target.
       return allProjectsForTargetName;
     } else {
-      // For single target commands, we try the default project first,
+      // For single target commands, we try the current project first,
       // then the full list if it has a single project, then error out.
-      const maybeDefaultProject = this._workspace.getDefaultProjectName();
-      if (maybeDefaultProject && allProjectsForTargetName.includes(maybeDefaultProject)) {
-        return [maybeDefaultProject];
+      const maybeCurrentProject = getProjectByCwd(this._workspace, this.logger);
+      if (maybeCurrentProject && allProjectsForTargetName.includes(maybeCurrentProject)) {
+        return [maybeCurrentProject];
       }
 
       if (allProjectsForTargetName.length === 1) {

packages/angular/cli/models/schematic-command.ts

@@ -271,21 +271,7 @@ export abstract class SchematicCommand<
 
     workflow.registry.addSmartDefaultProvider('projectName', () => {
       if (this._workspace) {
-        try {
-          return this._workspace.getProjectByPath(normalize(process.cwd()))
-            || this._workspace.getDefaultProjectName();
-        } catch (e) {
-          if (e instanceof experimental.workspace.AmbiguousProjectPathException) {
-            this.logger.warn(tags.oneLine`
-              Two or more projects are using identical roots.
-              Unable to determine project using current working directory.
-              Using default workspace project instead.
-            `);
-
-            return this._workspace.getDefaultProjectName();
-          }
-          throw e;
-        }
+        return getProjectByCwd(this._workspace, this.logger);
       }
 
       return undefined;

packages/angular/cli/utilities/config.ts

@@ -11,9 +11,11 @@ import {
   JsonObject,
   JsonParseMode,
   experimental,
+  logging,
   normalize,
   parseJson,
   parseJsonAst,
+  tags,
   virtualFs,
 } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
@@ -140,11 +142,21 @@ export function validateWorkspace(json: JsonObject) {
   return true;
 }
 
-export function getProjectByCwd(workspace: experimental.workspace.Workspace): string | null {
+export function getProjectByCwd(
+  workspace: experimental.workspace.Workspace,
+  logger: logging.Logger = new logging.NullLogger(),
+): string | null {
   try {
     return workspace.getProjectByPath(normalize(process.cwd()));
   } catch (e) {
     if (e instanceof experimental.workspace.AmbiguousProjectPathException) {
+      logger.warn(tags.oneLine`
+        Two or more projects are using identical roots.
+        Unable to determine project using current working directory.
+        Using default workspace project instead.
+      `);
+      logger.warn(`The defaultProject property is DEPRECATED and will be removed in CLI v8.`);
+
       return workspace.getDefaultProjectName();
     }
     throw e;

packages/angular_devkit/core/src/workspace/workspace-schema.json

@@ -19,7 +19,7 @@
     },
     "defaultProject": {
       "type": "string",
-      "description": "The default project."
+      "description": "(DEPRECATED) The default project."
     },
     "cli": {
       "$ref": "#/definitions/tool",

packages/angular_devkit/core/src/workspace/workspace-schema.ts

@@ -20,6 +20,7 @@ export interface WorkspaceSchema {
    */
   newProjectRoot?: string;
   /**
+   * @deprecated From 7.0.0
    * The default project.
    */
   defaultProject?: string;

packages/angular_devkit/core/src/workspace/workspace.ts

@@ -140,6 +140,9 @@ export class Workspace {
     return workspaceProjectClone;
   }
 
+  /**
+   * @deprecated From 7.0.0
+   */
   getDefaultProjectName(): string | null {
     this._assertLoaded();