feat(nx): when creating a nx workspace try to use the same package ma…

…nager as Angular CLI create-nx-workspace now prefers to use the package manager configured in global angular.json.
nrwl · Jun 15, 2019 · 26903c0 · 26903c0
1 parent bf624b7
commit 26903c0
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 16 deletions.
diff --git a/packages/create-nx-workspace/bin/create-nx-workspace.ts b/packages/create-nx-workspace/bin/create-nx-workspace.ts
@@ -31,12 +31,23 @@ const nxTool = {
   name: 'Schematics',
   packageName: '@nrwl/workspace'
 };
-let useYarn = true;
 
+let packageManager: string;
 try {
-  execSync('yarn --version', { stdio: ['ignore', 'ignore', 'ignore'] });
+  packageManager = execSync('ng config -g cli.packageManager', {
+    stdio: ['ignore', 'pipe', 'ignore']
+  })
+    .toString()
+    .trim();
+} catch (e) {
+  packageManager = 'yarn';
+}
+try {
+  execSync(`${packageManager} --version`, {
+    stdio: ['ignore', 'ignore', 'ignore']
+  });
 } catch (e) {
-  useYarn = false;
+  packageManager = 'npm';
 }
 
 const projectName = parsedArgs._[2];
@@ -69,11 +80,10 @@ writeFileSync(
   })
 );
 
-if (useYarn) {
-  execSync('yarn install --silent', { cwd: tmpDir, stdio: [0, 1, 2] });
-} else {
-  execSync('npm install --silent', { cwd: tmpDir, stdio: [0, 1, 2] });
-}
+execSync(`${packageManager} install --silent`, {
+  cwd: tmpDir,
+  stdio: [0, 1, 2]
+});
 
 // creating the app itself
 const args = process.argv

diff --git a/packages/workspace/bin/create-nx-workspace.ts b/packages/workspace/bin/create-nx-workspace.ts
@@ -31,12 +31,23 @@ const nxTool = {
   name: 'Nx Workspace',
   packageName: '@nrwl/workspace'
 };
-let useYarn = true;
 
+let packageManager: string;
 try {
-  execSync('yarn --version', { stdio: ['ignore', 'ignore', 'ignore'] });
+  packageManager = execSync('ng config -g cli.packageManager', {
+    stdio: ['ignore', 'pipe', 'ignore']
+  })
+    .toString()
+    .trim();
+} catch (e) {
+  packageManager = 'yarn';
+}
+try {
+  execSync(`${packageManager} --version`, {
+    stdio: ['ignore', 'ignore', 'ignore']
+  });
 } catch (e) {
-  useYarn = false;
+  packageManager = 'npm';
 }
 
 const projectName = parsedArgs._[2];
@@ -69,11 +80,10 @@ writeFileSync(
   })
 );
 
-if (useYarn) {
-  execSync('yarn install --silent', { cwd: tmpDir, stdio: [0, 1, 2] });
-} else {
-  execSync('npm install --silent', { cwd: tmpDir, stdio: [0, 1, 2] });
-}
+execSync(`${packageManager} install --silent`, {
+  cwd: tmpDir,
+  stdio: [0, 1, 2]
+});
 
 // creating the app itself
 const args = process.argv