fix(core): tests

Author: devinshoemaker

Diff for: e2e/workspace/src/workspace-aux-commands.test.ts

@@ -15,6 +15,8 @@ import {
   uniq,
   updateFile,
   workspaceConfigName,
+  setCurrentProjName,
+  runCreateWorkspace,
 } from '@nrwl/e2e/utils';
 
 forEachCli((cli) => {
@@ -666,6 +668,147 @@ forEachCli((cli) => {
         `import { fromLibOne } from '@proj/shared/${lib1}/data-access';`
       );
     });
+
+    it('should work for custom workspace layouts', () => {
+      const lib1 = uniq('mylib');
+      const lib2 = uniq('mylib');
+      const lib3 = uniq('mylib');
+      newProject();
+
+      let nxJson = readJson('nx.json');
+      nxJson.workspaceLayout = { libsDir: 'packages' };
+      updateFile('nx.json', JSON.stringify(nxJson));
+
+      runCLI(`generate @nrwl/workspace:lib ${lib1}/data-access`);
+
+      updateFile(
+        `packages/${lib1}/data-access/src/lib/${lib1}-data-access.ts`,
+        `export function fromLibOne() { console.log('This is completely pointless'); }`
+      );
+
+      updateFile(
+        `packages/${lib1}/data-access/src/index.ts`,
+        `export * from './lib/${lib1}-data-access.ts'`
+      );
+
+      /**
+       * Create a library which imports a class from lib1
+       */
+
+      runCLI(`generate @nrwl/workspace:lib ${lib2}/ui`);
+
+      updateFile(
+        `packages/${lib2}/ui/src/lib/${lib2}-ui.ts`,
+        `import { fromLibOne } from '@proj/${lib1}/data-access';
+
+        export const fromLibTwo = () => fromLibOne(); }`
+      );
+
+      /**
+       * Create a library which has an implicit dependency on lib1
+       */
+
+      runCLI(`generate @nrwl/workspace:lib ${lib3}`);
+      nxJson = JSON.parse(readFile('nx.json')) as NxJson;
+      nxJson.projects[lib3].implicitDependencies = [`${lib1}-data-access`];
+      updateFile(`nx.json`, JSON.stringify(nxJson));
+
+      /**
+       * Now try to move lib1
+       */
+
+      const moveOutput = runCLI(
+        `generate @nrwl/workspace:move --project ${lib1}-data-access shared/${lib1}/data-access`
+      );
+
+      expect(moveOutput).toContain(`DELETE packages/${lib1}/data-access`);
+      expect(exists(`packages/${lib1}/data-access`)).toBeFalsy();
+
+      const newPath = `packages/shared/${lib1}/data-access`;
+      const newName = `shared-${lib1}-data-access`;
+
+      const readmePath = `${newPath}/README.md`;
+      expect(moveOutput).toContain(`CREATE ${readmePath}`);
+      checkFilesExist(readmePath);
+
+      const jestConfigPath = `${newPath}/jest.config.js`;
+      expect(moveOutput).toContain(`CREATE ${jestConfigPath}`);
+      checkFilesExist(jestConfigPath);
+      const jestConfig = readFile(jestConfigPath);
+      expect(jestConfig).toContain(`name: 'shared-${lib1}-data-access'`);
+      expect(jestConfig).toContain(`preset: '../../../../jest.config.js'`);
+      expect(jestConfig).toContain(
+        `coverageDirectory: '../../../../coverage/${newPath}'`
+      );
+
+      const tsConfigPath = `${newPath}/tsconfig.json`;
+      expect(moveOutput).toContain(`CREATE ${tsConfigPath}`);
+      checkFilesExist(tsConfigPath);
+
+      const tsConfigLibPath = `${newPath}/tsconfig.lib.json`;
+      expect(moveOutput).toContain(`CREATE ${tsConfigLibPath}`);
+      checkFilesExist(tsConfigLibPath);
+      const tsConfigLib = readJson(tsConfigLibPath);
+      expect(tsConfigLib.compilerOptions.outDir).toEqual(
+        '../../../../dist/out-tsc'
+      );
+
+      const tsConfigSpecPath = `${newPath}/tsconfig.spec.json`;
+      expect(moveOutput).toContain(`CREATE ${tsConfigSpecPath}`);
+      checkFilesExist(tsConfigSpecPath);
+      const tsConfigSpec = readJson(tsConfigSpecPath);
+      expect(tsConfigSpec.compilerOptions.outDir).toEqual(
+        '../../../../dist/out-tsc'
+      );
+
+      const indexPath = `${newPath}/src/index.ts`;
+      expect(moveOutput).toContain(`CREATE ${indexPath}`);
+      checkFilesExist(indexPath);
+
+      const rootClassPath = `${newPath}/src/lib/${lib1}-data-access.ts`;
+      expect(moveOutput).toContain(`CREATE ${rootClassPath}`);
+      checkFilesExist(rootClassPath);
+
+      expect(moveOutput).toContain('UPDATE nx.json');
+      nxJson = JSON.parse(readFile('nx.json')) as NxJson;
+      expect(nxJson.projects[`${lib1}-data-access`]).toBeUndefined();
+      expect(nxJson.projects[newName]).toEqual({
+        tags: [],
+      });
+      expect(nxJson.projects[lib3].implicitDependencies).toEqual([
+        `shared-${lib1}-data-access`,
+      ]);
+
+      expect(moveOutput).toContain('UPDATE tsconfig.base.json');
+      const rootTsConfig = readJson('tsconfig.base.json');
+      expect(
+        rootTsConfig.compilerOptions.paths[`@proj/${lib1}/data-access`]
+      ).toBeUndefined();
+      expect(
+        rootTsConfig.compilerOptions.paths[`@proj/shared/${lib1}/data-access`]
+      ).toEqual([`packages/shared/${lib1}/data-access/src/index.ts`]);
+
+      expect(moveOutput).toContain(`UPDATE ${workspace}.json`);
+      const workspaceJson = readJson(`${workspace}.json`);
+      expect(workspaceJson.projects[`${lib1}-data-access`]).toBeUndefined();
+      const project = workspaceJson.projects[newName];
+      expect(project).toBeTruthy();
+      expect(project.root).toBe(newPath);
+      expect(project.sourceRoot).toBe(`${newPath}/src`);
+      expect(project.architect.lint.options.tsConfig).toEqual([
+        `packages/shared/${lib1}/data-access/tsconfig.lib.json`,
+        `packages/shared/${lib1}/data-access/tsconfig.spec.json`,
+      ]);
+
+      /**
+       * Check that the import in lib2 has been updated
+       */
+      const lib2FilePath = `packages/${lib2}/ui/src/lib/${lib2}-ui.ts`;
+      const lib2File = readFile(lib2FilePath);
+      expect(lib2File).toContain(
+        `import { fromLibOne } from '@proj/shared/${lib1}/data-access';`
+      );
+    });
   });
 
   describe('Remove Project', () => {

Diff for: packages/workspace/src/schematics/move/lib/update-imports.ts

@@ -9,6 +9,7 @@ import { from, Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { Schema } from '../schema';
 import { normalizeSlashes } from './utils';
+import { ProjectType } from '@nrwl/workspace/src/utils/project-type';
 
 /**
  * Updates all the imports in the workspace and modifies the tsconfig appropriately.
@@ -20,6 +21,9 @@ export function updateImports(schema: Schema) {
     return from(getWorkspace(tree)).pipe(
       map((workspace) => {
         const nxJson = readJsonInTree<NxJson>(tree, 'nx.json');
+        const libsDir = nxJson.workspaceLayout?.libsDir
+          ? nxJson.workspaceLayout.libsDir
+          : 'libs';
         const project = workspace.projects.get(schema.projectName);
 
         if (project.extensions['projectType'] === 'application') {
@@ -29,7 +33,7 @@ export function updateImports(schema: Schema) {
 
         const projectRef = {
           from: normalizeSlashes(
-            `@${nxJson.npmScope}/${project.root.substr(5)}`
+            `@${nxJson.npmScope}/${project.root.substr(libsDir.length + 1)}`
           ),
           to: normalizeSlashes(`@${nxJson.npmScope}/${schema.destination}`),
         };
@@ -57,7 +61,7 @@ export function updateImports(schema: Schema) {
         }
 
         const projectRoot = {
-          from: project.root.substr(5),
+          from: project.root.substr(libsDir.length + 1),
           to: schema.destination,
         };
 

Diff for: packages/workspace/src/schematics/move/lib/update-workspace.spec.ts

@@ -1,5 +1,6 @@
 import { Tree } from '@angular-devkit/schematics';
 import { UnitTestTree } from '@angular-devkit/schematics/testing';
+import { NxJson, updateJsonInTree } from '@nrwl/workspace';
 import { createEmptyWorkspace } from '@nrwl/workspace/testing';
 import { callRule } from '../../../utils/testing';
 import { Schema } from '../schema';
@@ -207,4 +208,28 @@ describe('updateWorkspace Rule', () => {
       e2eProject.architect.e2e.configurations.production.devServerTarget
     ).toBe('subfolder-my-destination:serve:production');
   });
+
+  it('honor custom workspace layouts', async () => {
+    const schema: Schema = {
+      projectName: 'my-source',
+      destination: 'subfolder/my-destination',
+    };
+
+    tree = (await callRule(
+      updateJsonInTree<NxJson>('nx.json', (json) => {
+        json.workspaceLayout = { appsDir: 'e2e', libsDir: 'packages' };
+        return json;
+      }),
+      tree
+    )) as UnitTestTree;
+
+    tree = (await callRule(updateWorkspace(schema), tree)) as UnitTestTree;
+
+    const workspace = JSON.parse(tree.read('workspace.json').toString());
+
+    const project = workspace.projects['subfolder-my-destination'];
+    expect(project).toBeDefined();
+    expect(project.root).toBe('e2e/subfolder/my-destination');
+    expect(project.sourceRoot).toBe('e2e/subfolder/my-destination/src');
+  });
 });