fix(core): correctly derive the name of the project based on package.json without name

vsavkin · FrozenPandaz · commit 86c5819f1dfd · 2022-11-07T13:56:00.000-05:00
(cherry picked from commit 67e032d)
diff --git a/e2e/add-nx-to-monorepo/src/add-nx-to-monorepo.test.ts b/e2e/add-nx-to-monorepo/src/add-nx-to-monorepo.test.ts
@@ -11,14 +11,15 @@ import {
 import { Workspaces } from 'nx/src/config/workspaces';
 
 describe('add-nx-to-monorepo', () => {
-  const packageManagerCommand = getPackageManagerCommand({
+  const pmc = getPackageManagerCommand({
     packageManager: getSelectedPackageManager(),
-  }).runUninstalledPackage;
+  });
 
   it('should not throw', () => {
-    if (packageManagerCommand) {
+    if (pmc.runUninstalledPackage) {
       // Arrange
       createNonNxProjectDirectory();
+      runCommand(pmc.install);
       updateFile(
         'packages/package-a/package.json',
         JSON.stringify({
@@ -42,17 +43,20 @@ describe('add-nx-to-monorepo', () => {
 
       // Act
       const output = runCommand(
-        `${packageManagerCommand} add-nx-to-monorepo@${getPublishedVersion()} -y`
+        `${
+          pmc.runUninstalledPackage
+        } add-nx-to-monorepo@${getPublishedVersion()} -y`
       );
       // Assert
       expect(output).toContain('🎉 Done!');
     }
   });
 
   it('should build', () => {
-    if (packageManagerCommand) {
+    if (pmc.runUninstalledPackage) {
       // Arrange
       createNonNxProjectDirectory();
+      runCommand(pmc.runUninstalledPackage);
       updateFile(
         'packages/package-a/package.json',
         JSON.stringify({
@@ -65,7 +69,9 @@ describe('add-nx-to-monorepo', () => {
 
       // Act
       runCommand(
-        `${packageManagerCommand} add-nx-to-monorepo@${getPublishedVersion()} -y`
+        `${
+          pmc.runUninstalledPackage
+        } add-nx-to-monorepo@${getPublishedVersion()} -y`
       );
       const output = runCLI('build package-a');
       // Assert
diff --git a/e2e/nx-init/src/nx-init.test.ts b/e2e/nx-init/src/nx-init.test.ts
@@ -10,9 +10,9 @@ import {
 } from '@nrwl/e2e/utils';
 
 describe('nx init', () => {
-  const packageManagerCommand = getPackageManagerCommand({
+  const pmc = getPackageManagerCommand({
     packageManager: getSelectedPackageManager(),
-  }).runUninstalledPackage;
+  });
 
   afterEach(() => cleanupProject());
 
@@ -28,8 +28,10 @@ describe('nx init', () => {
       })
     );
 
-    const output = runCommand(`${packageManagerCommand} nx init -y`);
-    expect(output).toContain('Done!');
+    runCommand(pmc.install);
+
+    const output = runCommand(`${pmc.runUninstalledPackage} nx init -y`);
+    expect(output).toContain('Enabled computation caching');
 
     expect(runCLI('run package:echo')).toContain('123');
     renameFile('nx.json', 'nx.json.old');
diff --git a/e2e/nx-init/src/nx-project-graph.test.ts b/e2e/nx-init/src/nx-project-graph.test.ts
@@ -13,23 +13,16 @@ describe('project graph creation', () => {
   afterEach(() => cleanupProject());
 
   it('should correctly build the nxdeps.json containing files for the project', () => {
-    // ARRANGE
     const libName = uniq('mylib');
-
     runCLI(`generate @nrwl/workspace:lib ${libName}`);
 
-    // ACT
-
     runCLI(`graph --file=graph.json`);
-
-    // ASSERT
     const { graph: graphJson } = readJson('graph.json');
 
     expect(graphJson.nodes[libName].data.files.length).toBeGreaterThan(0);
   });
 
   it("should correctly build the nxdeps.json containing files for the project when root is ''", () => {
-    // ARRANGE
     const libName = uniq('mylib');
 
     runCLI(`generate @nrwl/workspace:lib ${libName}`);
@@ -38,18 +31,13 @@ describe('project graph creation', () => {
       root: '',
     }));
 
-    // ACT
-
     runCLI(`graph --file=graph.json`);
 
-    // ASSERT
-
     const { graph: graphJson } = readJson('graph.json');
     expect(graphJson.nodes[libName].data.files.length).toBeGreaterThan(0);
   });
 
   it("should correctly build the graph.json containing files for the project when root is '' and for project that do not have root as ''", () => {
-    // ARRANGE
     const libName = uniq('mylib');
     const secondLibName = uniq('mysecondlib');
 
@@ -60,12 +48,8 @@ describe('project graph creation', () => {
       root: '',
     }));
 
-    // ACT
-
     runCLI(`graph --file=graph.json`);
 
-    // ASSERT
-
     const { graph: graphJson } = readJson('graph.json');
     expect(graphJson.nodes[libName].data.files.length).toBeGreaterThan(0);
     expect(graphJson.nodes[secondLibName].data.files.length).toBeGreaterThan(0);
diff --git a/e2e/nx-misc/src/extras.test.ts b/e2e/nx-misc/src/extras.test.ts
@@ -189,7 +189,7 @@ describe('Extra Nx Misc Tests', () => {
       expect(resultArgs).toContain('camel: d');
     }, 120000);
 
-    it('ttt should fail when a process exits non-zero', async () => {
+    it('should fail when a process exits non-zero', async () => {
       updateProjectConfig(mylib, (config) => {
         config.targets.error = {
           executor: 'nx:run-commands',
diff --git a/e2e/nx-misc/src/workspace.test.ts b/e2e/nx-misc/src/workspace.test.ts
@@ -15,6 +15,9 @@ import {
   tmpProjPath,
   readResolvedWorkspaceConfiguration,
   removeFile,
+  getPackageManagerCommand,
+  getSelectedPackageManager,
+  runCommand,
 } from '@nrwl/e2e/utils';
 
 let proj: string;
@@ -112,6 +115,18 @@ describe('Workspace Tests', () => {
 
       runCLI(`generate @nrwl/workspace:npm-package ${npmPackage}`);
 
+      updateFile('package.json', (content) => {
+        const json = JSON.parse(content);
+        json.workspaces = ['libs/*'];
+        return JSON.stringify(json);
+      });
+
+      const pmc = getPackageManagerCommand({
+        packageManager: getSelectedPackageManager(),
+      });
+
+      runCommand(pmc.install);
+
       const result = runCLI(`test ${npmPackage}`);
       expect(result).toContain('Hello World');
     });
diff --git a/e2e/utils/index.ts b/e2e/utils/index.ts
@@ -128,6 +128,7 @@ export function createNonNxProjectDirectory(name = uniq('proj')) {
     'package.json',
     JSON.stringify({
       name,
+      workspaces: ['packages/*'],
     })
   );
 }
@@ -857,6 +858,7 @@ export function getPackageManagerCommand({
   runNx: string;
   runNxSilent: string;
   runUninstalledPackage: string;
+  install: string;
   addProd: string;
   addDev: string;
   list: string;
@@ -873,6 +875,7 @@ export function getPackageManagerCommand({
       runNx: `npx nx`,
       runNxSilent: `npx nx`,
       runUninstalledPackage: `npx --yes`,
+      install: 'npm install',
       addProd: `npm install --legacy-peer-deps`,
       addDev: `npm install --legacy-peer-deps -D`,
       list: 'npm ls --depth 10',
@@ -884,6 +887,7 @@ export function getPackageManagerCommand({
       runNx: `yarn nx`,
       runNxSilent: `yarn --silent nx`,
       runUninstalledPackage: 'npx --yes',
+      install: 'yarn',
       addProd: `yarn add`,
       addDev: `yarn add -D`,
       list: 'npm ls --depth 10',
@@ -895,6 +899,7 @@ export function getPackageManagerCommand({
       runNx: `pnpm exec nx`,
       runNxSilent: `pnpm exec nx`,
       runUninstalledPackage: 'pnpm dlx',
+      install: 'pnpm i',
       addProd: `pnpm add`,
       addDev: `pnpm add -D`,
       list: 'npm ls --depth 10',
diff --git a/packages/add-nx-to-monorepo/src/add-nx-to-monorepo.ts b/packages/add-nx-to-monorepo/src/add-nx-to-monorepo.ts
@@ -306,7 +306,7 @@ function printFinalMessage() {
   output.success({
     title: `🎉 Done!`,
     bodyLines: [
-      `- Enabled Computation caching!`,
+      `- Enabled computation caching!`,
       `- Run "${
         getPackageManagerCommand().exec
       } nx run-many --target=build" to run the build script for every project in the monorepo.`,
diff --git a/packages/nx/src/command-line/affected.ts b/packages/nx/src/command-line/affected.ts
@@ -57,7 +57,7 @@ export async function affected(
           if (apps.length) {
             output.warn({
               title:
-                'Deprecated: Use "nx print-affected --type=app --select=projects" instead. This command will be removed in v15.',
+                'Deprecated: Use "nx print-affected --type=app --select=projects" instead. This command will be removed in v16.',
             });
             output.log({
               title: 'Affected apps:',
@@ -77,7 +77,7 @@ export async function affected(
           if (libs.length) {
             output.warn({
               title:
-                'Deprecated: Use "nx print-affected --type=lib --select=projects" instead. This command will be removed in v15.',
+                'Deprecated: Use "nx print-affected --type=lib --select=projects" instead. This command will be removed in v16.',
             });
             output.log({
               title: 'Affected libs:',
diff --git a/packages/nx/src/config/workspaces.spec.ts b/packages/nx/src/config/workspaces.spec.ts
@@ -82,6 +82,9 @@ describe('Workspaces', () => {
           'workspace.json': JSON.stringify({
             projects: { 'lib1-workspace': 'libs/lib1' },
           }),
+          'package.json': JSON.stringify({
+            workspaces: ['**/package.json'],
+          }),
         },
         '/root'
       );
@@ -93,44 +96,11 @@ describe('Workspaces', () => {
       expect(projects['lib1']).toBeUndefined();
       expect(projects.lib2).toEqual(lib2Config);
       expect(projects['domain-lib3']).toEqual(domainPackageConfig);
-      expect(projects['domain-lib4']).toEqual(domainLibConfig);
+      expect(projects['lib4']).toEqual(domainLibConfig);
     });
   });
 
   describe('to project name', () => {
-    it('should trim default directories from beginning', () => {
-      const appResults = toProjectName(
-        'apps/directory/my-app/project.json',
-        null
-      );
-      const libResults = toProjectName(
-        'libs/directory/my-lib/project.json',
-        null
-      );
-      expect(appResults).toEqual('directory-my-app');
-      expect(libResults).toEqual('directory-my-lib');
-    });
-
-    it('should trim custom directories from beginning', () => {
-      const nxJson: NxJsonConfiguration = {
-        npmScope: '',
-        workspaceLayout: {
-          appsDir: 'my-apps',
-          libsDir: 'packages',
-        },
-      };
-      const appResults = toProjectName(
-        'my-apps/directory/my-app/project.json',
-        nxJson
-      );
-      const libResults = toProjectName(
-        'packages/directory/my-lib/project.json',
-        nxJson
-      );
-      expect(appResults).toEqual('directory-my-app');
-      expect(libResults).toEqual('directory-my-lib');
-    });
-
     it('should lowercase names', () => {
       const nxJson: NxJsonConfiguration = {
         npmScope: '',
@@ -139,16 +109,10 @@ describe('Workspaces', () => {
           libsDir: 'packages',
         },
       };
-      const appResults = toProjectName(
-        'my-apps/directory/my-app/package.json',
-        nxJson
-      );
-      const libResults = toProjectName(
-        'packages/directory/MyLib/package.json',
-        nxJson
-      );
-      expect(appResults).toEqual('directory-my-app');
-      expect(libResults).toEqual('directory-mylib');
+      const appResults = toProjectName('my-apps/directory/my-app/package.json');
+      const libResults = toProjectName('packages/directory/MyLib/package.json');
+      expect(appResults).toEqual('my-app');
+      expect(libResults).toEqual('mylib');
     });
 
     it('should use the workspace globs in package.json', () => {
diff --git a/packages/nx/src/config/workspaces.ts b/packages/nx/src/config/workspaces.ts
diff --git a/packages/nx/src/project-graph/affected/locators/project-glob-changes.ts b/packages/nx/src/project-graph/affected/locators/project-glob-changes.ts
diff --git a/packages/nx/src/utils/assert-workspace-validity.ts b/packages/nx/src/utils/assert-workspace-validity.ts
