fix(schematics): fix create-nx-workspace to respect the --directory

nrwl · Mar 9, 2018 · da9310e · da9310e
1 parent e21caa0
commit da9310e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/e2e/schematics/create-nx-workspace.test.ts b/e2e/schematics/create-nx-workspace.test.ts
@@ -34,6 +34,16 @@ xdescribe('CreateNxWorkspace', () => {
     1000000
   );
 
+  it(
+    'should create a new workspace with the --directory option',
+    () => {
+      const res = createNxWorkspace('myproj --npmScope=myscope --directory=proj');
+      expect(res).toContain("Project 'myproj' successfully created.");
+      checkFilesExist('package-lock.json');
+    },
+    1000000
+  );
+
   it(
     'should error when no name is given',
     () => {

diff --git a/packages/schematics/bin/create-nx-workspace.ts b/packages/schematics/bin/create-nx-workspace.ts
@@ -65,8 +65,11 @@ execSync(
   }
 );
 
+const dir = process.argv.filter(a => a.startsWith('-dir') || a.startsWith('--directory'))[0];
+const cwd = dir ? dir.split('=')[1] : projectName;
+
 if (useYarn) {
-  execSync(`yarn install`, { stdio: [0, 1, 2], cwd: projectName });
+  execSync(`yarn install`, { stdio: [0, 1, 2], cwd });
 } else {
-  execSync(`npm install`, { stdio: [0, 1, 2], cwd: projectName });
+  execSync(`npm install`, { stdio: [0, 1, 2], cwd });
 }