feat(misc): dont generate defaultProject for non standalone workspaces

vsavkin · vsavkin · commit 82fbb98e7d23 · 2022-12-21T09:15:26.000-05:00
diff --git a/docs/generated/packages/angular/generators/application.json b/docs/generated/packages/angular/generators/application.json
@@ -139,11 +139,6 @@
         "description": "Whether to configure Tailwind CSS for the application.",
         "default": false
       },
-      "skipDefaultProject": {
-        "description": "Skip setting the project as the default project. When `false` (the default), the project is set as the default project only if there is no default project already set.",
-        "type": "boolean",
-        "default": false
-      },
       "standalone": {
         "description": "Generate an application that is setup to use standalone components.",
         "type": "boolean",
diff --git a/docs/generated/packages/react/generators/application.json b/docs/generated/packages/react/generators/application.json
@@ -159,11 +159,6 @@
         "enum": ["babel", "swc"],
         "default": "babel"
       },
-      "skipDefaultProject": {
-        "description": "Skip setting the project as the default project. When `false` (the default), the project is set as the default project only if there is no default project already set.",
-        "type": "boolean",
-        "default": false
-      },
       "skipPackageJson": {
         "description": "Do not add dependencies to `package.json`.",
         "type": "boolean",
diff --git a/packages/angular/src/generators/application/angular-v14/application.ts b/packages/angular/src/generators/application/angular-v14/application.ts
@@ -20,7 +20,6 @@ import {
   enableStrictTypeChecking,
   normalizeOptions,
   setApplicationStrictDefault,
-  setDefaultProject,
   updateAppComponentTemplate,
   updateComponentSpec,
   updateConfigFiles,
@@ -109,10 +108,6 @@ export async function applicationGenerator(
   await addE2e(host, options);
   updateEditorTsConfig(host, options);
 
-  if (!options.skipDefaultProject) {
-    setDefaultProject(host, options);
-  }
-
   if (options.backendProject) {
     addProxyConfig(host, options);
   }
diff --git a/packages/angular/src/generators/application/angular-v14/lib/index.ts b/packages/angular/src/generators/application/angular-v14/lib/index.ts
@@ -11,7 +11,6 @@ export * from './nrwl-home-tpl';
 export * from './remove-scaffolded-e2e';
 export * from './root-router-config';
 export * from './set-app-strict-default';
-export * from './set-default-project';
 export * from './update-component-spec';
 export * from './update-app-component-template';
 export * from './update-nx-component-template';
diff --git a/packages/angular/src/generators/application/angular-v14/lib/set-default-project.ts b/packages/angular/src/generators/application/angular-v14/lib/set-default-project.ts
diff --git a/packages/angular/src/generators/application/angular-v14/schema.d.ts b/packages/angular/src/generators/application/angular-v14/schema.d.ts
@@ -24,7 +24,6 @@ export interface Schema {
   port?: number;
   setParserOptionsProject?: boolean;
   skipPackageJson?: boolean;
-  skipDefaultProject?: boolean;
   standalone?: boolean;
   rootProject?: boolean;
 }
diff --git a/packages/angular/src/generators/application/application.spec.ts b/packages/angular/src/generators/application/application.spec.ts
@@ -219,15 +219,6 @@ describe('app', () => {
       expect(appTsConfig.extends).toBe('../../tsconfig.json');
     });
 
-    it('should set default project', async () => {
-      // ACT
-      await generateApp(appTree);
-
-      // ASSERT
-      const { defaultProject } = readWorkspaceConfiguration(appTree);
-      expect(defaultProject).toBe('my-app');
-    });
-
     it('should not overwrite default project if already set', async () => {
       // ARRANGE
       const workspace = readWorkspaceConfiguration(appTree);
@@ -241,15 +232,6 @@ describe('app', () => {
       const { defaultProject } = readWorkspaceConfiguration(appTree);
       expect(defaultProject).toBe('some-awesome-project');
     });
-
-    it('should not set default project when "--skip-default-project=true"', async () => {
-      // ACT
-      await generateApp(appTree, 'my-app', { skipDefaultProject: true });
-
-      // ASSERT
-      const { defaultProject } = readWorkspaceConfiguration(appTree);
-      expect(defaultProject).toBeUndefined();
-    });
   });
 
   describe('nested', () => {
diff --git a/packages/angular/src/generators/application/application.ts b/packages/angular/src/generators/application/application.ts
@@ -2,7 +2,9 @@ import {
   formatFiles,
   installPackagesTask,
   moveFilesToNewDirectory,
+  readWorkspaceConfiguration,
   Tree,
+  updateWorkspaceConfiguration,
 } from '@nrwl/devkit';
 import { wrapAngularDevkitSchematic } from '@nrwl/devkit/ngcli-adapter';
 import { convertToNxProjectGenerator } from '@nrwl/workspace/generators';
@@ -20,7 +22,6 @@ import {
   enableStrictTypeChecking,
   normalizeOptions,
   setApplicationStrictDefault,
-  setDefaultProject,
   updateAppComponentTemplate,
   updateComponentSpec,
   updateConfigFiles,
@@ -121,8 +122,10 @@ export async function applicationGenerator(
   await addE2e(tree, options);
   updateEditorTsConfig(tree, options);
 
-  if (!options.skipDefaultProject) {
-    setDefaultProject(tree, options);
+  if (options.rootProject) {
+    const workspace = readWorkspaceConfiguration(tree);
+    workspace.defaultProject = options.name;
+    updateWorkspaceConfiguration(tree, workspace);
   }
 
   if (options.backendProject) {
diff --git a/packages/angular/src/generators/application/application.v14.spec.ts b/packages/angular/src/generators/application/application.v14.spec.ts
@@ -214,15 +214,6 @@ describe('app', () => {
       expect(appTsConfig.extends).toBe('../../tsconfig.base.json');
     });
 
-    it('should set default project', async () => {
-      // ACT
-      await generateApp(appTree);
-
-      // ASSERT
-      const { defaultProject } = readWorkspaceConfiguration(appTree);
-      expect(defaultProject).toBe('my-app');
-    });
-
     it('should not overwrite default project if already set', async () => {
       // ARRANGE
       const workspace = readWorkspaceConfiguration(appTree);
@@ -236,15 +227,6 @@ describe('app', () => {
       const { defaultProject } = readWorkspaceConfiguration(appTree);
       expect(defaultProject).toBe('some-awesome-project');
     });
-
-    it('should not set default project when "--skip-default-project=true"', async () => {
-      // ACT
-      await generateApp(appTree, 'my-app', { skipDefaultProject: true });
-
-      // ASSERT
-      const { defaultProject } = readWorkspaceConfiguration(appTree);
-      expect(defaultProject).toBeUndefined();
-    });
   });
 
   describe('nested', () => {
diff --git a/packages/angular/src/generators/application/lib/index.ts b/packages/angular/src/generators/application/lib/index.ts
@@ -11,7 +11,6 @@ export * from './nrwl-home-tpl';
 export * from './remove-scaffolded-e2e';
 export * from './root-router-config';
 export * from './set-app-strict-default';
-export * from './set-default-project';
 export * from './update-component-spec';
 export * from './update-app-component-template';
 export * from './update-nx-component-template';
diff --git a/packages/angular/src/generators/application/lib/set-default-project.ts b/packages/angular/src/generators/application/lib/set-default-project.ts
diff --git a/packages/angular/src/generators/application/schema.d.ts b/packages/angular/src/generators/application/schema.d.ts
@@ -24,7 +24,6 @@ export interface Schema {
   port?: number;
   setParserOptionsProject?: boolean;
   skipPackageJson?: boolean;
-  skipDefaultProject?: boolean;
   standalone?: boolean;
   rootProject?: boolean;
 }
diff --git a/packages/angular/src/generators/application/schema.json b/packages/angular/src/generators/application/schema.json
@@ -142,11 +142,6 @@
       "description": "Whether to configure Tailwind CSS for the application.",
       "default": false
     },
-    "skipDefaultProject": {
-      "description": "Skip setting the project as the default project. When `false` (the default), the project is set as the default project only if there is no default project already set.",
-      "type": "boolean",
-      "default": false
-    },
     "standalone": {
       "description": "Generate an application that is setup to use standalone components.",
       "type": "boolean",
diff --git a/packages/angular/src/generators/remote/remote.ts b/packages/angular/src/generators/remote/remote.ts
@@ -21,7 +21,6 @@ export async function remote(tree: Tree, options: Schema) {
   const appInstallTask = await applicationGenerator(tree, {
     ...options,
     routing: true,
-    skipDefaultProject: true,
     port,
   });
 
diff --git a/packages/expo/src/generators/application/application.spec.ts b/packages/expo/src/generators/application/application.spec.ts
@@ -27,11 +27,9 @@ describe('app', () => {
       js: false,
       unitTestRunner: 'none',
     });
-    const workspace = readWorkspaceConfiguration(appTree);
     const projects = getProjects(appTree);
 
     expect(projects.get('my-app').root).toEqual('apps/my-app');
-    expect(workspace.defaultProject).toEqual('my-app');
   });
 
   it('should update nx.json', async () => {
@@ -105,7 +103,6 @@ describe('app', () => {
       const workspaceJson = readWorkspaceConfiguration(appTree);
       const projects = getProjects(appTree);
       expect(projects.get('my-dir-my-app').root).toEqual('apps/my-dir/my-app');
-      expect(workspaceJson.defaultProject).toEqual('my-dir-my-app');
 
       expect(
         appTree.exists('apps/my-dir/my-app-e2e/.detoxrc.json')
@@ -187,7 +184,6 @@ describe('app', () => {
       const workspaceJson = readWorkspaceConfiguration(appTree);
       const projects = getProjects(appTree);
       expect(projects.get('my-app').root).toEqual('apps/my-app');
-      expect(workspaceJson.defaultProject).toEqual('my-app');
 
       expect(appTree.exists('apps/my-app-e2e/.detoxrc.json')).toBeTruthy();
       const detoxrc = appTree.read('apps/my-app-e2e/.detoxrc.json', 'utf-8');
@@ -265,7 +261,6 @@ describe('app', () => {
       const workspaceJson = readWorkspaceConfiguration(appTree);
       const projects = getProjects(appTree);
       expect(projects.get('my-app').root).toEqual('apps/my-app');
-      expect(workspaceJson.defaultProject).toEqual('my-app');
 
       expect(appTree.exists('apps/my-app-e2e/.detoxrc.json')).toBeTruthy();
       const detoxrc = appTree.read('apps/my-app-e2e/.detoxrc.json', 'utf-8');
diff --git a/packages/expo/src/generators/application/lib/add-project.ts b/packages/expo/src/generators/application/lib/add-project.ts
@@ -24,14 +24,6 @@ export function addProject(host: Tree, options: NormalizedSchema) {
     projectConfiguration,
     options.standaloneConfig
   );
-
-  const workspace = readWorkspaceConfiguration(host);
-
-  if (!workspace.defaultProject) {
-    workspace.defaultProject = options.projectName;
-
-    updateWorkspaceConfiguration(host, workspace);
-  }
 }
 
 function getTargets(options: NormalizedSchema) {
diff --git a/packages/next/src/generators/application/application.spec.ts b/packages/next/src/generators/application/application.spec.ts
@@ -19,13 +19,10 @@ describe('app', () => {
       });
 
       const workspaceJson = readJson(tree, 'workspace.json');
-      const nxJson = readJson<NxJsonConfiguration>(tree, 'nx.json');
-
       expect(workspaceJson.projects['my-app'].root).toEqual('apps/my-app');
       expect(workspaceJson.projects['my-app-e2e'].root).toEqual(
         'apps/my-app-e2e'
       );
-      expect(nxJson.defaultProject).toEqual('my-app');
     });
 
     it('should update tags and implicit dependencies', async () => {
diff --git a/packages/next/src/generators/application/lib/set-defaults.ts b/packages/next/src/generators/application/lib/set-defaults.ts
@@ -9,10 +9,6 @@ import { NormalizedSchema } from './normalize-options';
 export function setDefaults(host: Tree, options: NormalizedSchema) {
   const workspace = readWorkspaceConfiguration(host);
 
-  if (!workspace.defaultProject) {
-    workspace.defaultProject = options.projectName;
-  }
-
   workspace.generators = workspace.generators || {};
   workspace.generators['@nrwl/next'] = workspace.generators['@nrwl/next'] || {};
   const prev = workspace.generators['@nrwl/next'];
diff --git a/packages/node/src/generators/application/application.spec.ts b/packages/node/src/generators/application/application.spec.ts
@@ -89,7 +89,6 @@ describe('app', () => {
         },
       });
       expect(workspaceJson.projects['my-node-app-e2e']).toBeUndefined();
-      expect(nxJson.defaultProject).toEqual('my-node-app');
     });
 
     it('should update tags', async () => {
@@ -215,7 +214,6 @@ describe('app', () => {
       });
 
       expect(workspaceJson.projects['my-dir-my-node-app-e2e']).toBeUndefined();
-      expect(nxJson.defaultProject).toEqual('my-dir-my-node-app');
     });
 
     it('should update tags', async () => {
diff --git a/packages/node/src/generators/application/application.ts b/packages/node/src/generators/application/application.ts
@@ -107,13 +107,6 @@ function addProject(tree: Tree, options: NormalizedSchema) {
     project,
     options.standaloneConfig
   );
-
-  const workspace = readWorkspaceConfiguration(tree);
-
-  if (!workspace.defaultProject) {
-    workspace.defaultProject = options.name;
-    updateWorkspaceConfiguration(tree, workspace);
-  }
 }
 
 function addAppFiles(tree: Tree, options: NormalizedSchema) {
diff --git a/packages/nx/src/nx-init/utils.ts b/packages/nx/src/nx-init/utils.ts
@@ -64,9 +64,6 @@ export function createNxJsonFile(
     }
   }
   nxJson.defaultBase = deduceDefaultBase();
-  if (defaultProject) {
-    nxJson.defaultProject = defaultProject;
-  }
   writeJsonFile(nxJsonPath, nxJson);
 }
 
diff --git a/packages/react-native/src/generators/application/application.spec.ts b/packages/react-native/src/generators/application/application.spec.ts
@@ -25,11 +25,9 @@ describe('app', () => {
       e2eTestRunner: 'none',
       install: false,
     });
-    const workspaceJson = readWorkspaceConfiguration(appTree);
     const projects = getProjects(appTree);
 
     expect(projects.get('my-app').root).toEqual('apps/my-app');
-    expect(workspaceJson.defaultProject).toEqual('my-app');
   });
 
   it('should update nx.json', async () => {
@@ -90,10 +88,8 @@ describe('app', () => {
         install: false,
       });
 
-      const workspaceJson = readWorkspaceConfiguration(appTree);
       const projects = getProjects(appTree);
       expect(projects.get('my-dir-my-app').root).toEqual('apps/my-dir/my-app');
-      expect(workspaceJson.defaultProject).toEqual('my-dir-my-app');
 
       expect(
         appTree.exists('apps/my-dir/my-app-e2e/.detoxrc.json')
@@ -146,12 +142,9 @@ describe('app', () => {
         install: false,
       });
 
-      const workspaceJson = readWorkspaceConfiguration(appTree);
       const projects = getProjects(appTree);
       expect(projects.get('my-app').root).toEqual('apps/my-app');
-      expect(workspaceJson.defaultProject).toEqual('my-app');
 
-      expect(appTree.exists('apps/my-app-e2e/.detoxrc.json')).toBeTruthy();
       const detoxrc = appTree.read('apps/my-app-e2e/.detoxrc.json', 'utf-8');
       // Strip trailing commas
       const detoxrcJson = JSON.parse(
diff --git a/packages/react-native/src/generators/application/lib/add-project.ts b/packages/react-native/src/generators/application/lib/add-project.ts
@@ -20,14 +20,6 @@ export function addProject(host: Tree, options: NormalizedSchema) {
   addProjectConfiguration(host, options.projectName, {
     ...project,
   });
-
-  const workspace = readWorkspaceConfiguration(host);
-
-  if (!workspace.defaultProject) {
-    workspace.defaultProject = options.projectName;
-
-    updateWorkspaceConfiguration(host, workspace);
-  }
 }
 
 function getTargets(options: NormalizedSchema) {
diff --git a/packages/react/src/generators/application/application.spec.ts b/packages/react/src/generators/application/application.spec.ts
diff --git a/packages/react/src/generators/application/lib/set-defaults.ts b/packages/react/src/generators/application/lib/set-defaults.ts
diff --git a/packages/react/src/generators/application/schema.d.ts b/packages/react/src/generators/application/schema.d.ts
diff --git a/packages/react/src/generators/application/schema.json b/packages/react/src/generators/application/schema.json
diff --git a/packages/react/src/generators/remote/remote.ts b/packages/react/src/generators/remote/remote.ts
diff --git a/packages/web/src/generators/application/application.spec.ts b/packages/web/src/generators/application/application.spec.ts
diff --git a/packages/web/src/generators/application/application.ts b/packages/web/src/generators/application/application.ts
diff --git a/packages/workspace/src/migrations/update-13-0-0/config-locations/config-locations.spec.ts b/packages/workspace/src/migrations/update-13-0-0/config-locations/config-locations.spec.ts

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ export interface Schema {`
`24`	`24`	`port?: number;`
`25`	`25`	`setParserOptionsProject?: boolean;`
`26`	`26`	`skipPackageJson?: boolean;`
`27`		`- skipDefaultProject?: boolean;`
`28`	`27`	`standalone?: boolean;`
`29`	`28`	`rootProject?: boolean;`
`30`	`29`	`}`