fix(nx): fix workspace schematic package manager detection

nrwl · Aug 10, 2019 · bd7af85 · bd7af85
1 parent 4e0602a
commit bd7af85
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/packages/create-nx-workspace/bin/create-nx-workspace.ts b/packages/create-nx-workspace/bin/create-nx-workspace.ts
@@ -408,7 +408,7 @@ function showCliWarning(preset: string, parsedArgs: any) {
     ) {
       output.addVerticalSeparator();
       output.note({
-        title: `We generated an Nx workspace powered by the Nx CLi.`,
+        title: `We generated an Nx workspace powered by the Nx CLI.`,
         bodyLines: [
           `Run 'create-nx-workspace --help' to see how to select a different CLI.`
         ]

diff --git a/packages/workspace/src/command-line/workspace-schematic.ts b/packages/workspace/src/command-line/workspace-schematic.ts
@@ -24,6 +24,7 @@ import * as yargsParser from 'yargs-parser';
 import { fileExists } from '../utils/fileutils';
 import { appRootPath } from '../utils/app-root';
 import { output } from './output';
+import { platform } from 'os';
 
 const rootDirectory = appRootPath;
 
@@ -73,8 +74,12 @@ function getToolsOutDir() {
 
 function compileToolsDir(outDir: string) {
   copySync(path.join(rootDirectory, 'tools'), outDir);
+  const tsc =
+    platform() === 'win32'
+      ? `.\\node_modules\\.bin\\tsc`
+      : `./node_modules/.bin/tsc`;
   try {
-    execSync('tsc -p tools/tsconfig.tools.json', {
+    execSync(`${tsc} -p tools/tsconfig.tools.json`, {
       stdio: 'inherit',
       cwd: rootDirectory
     });
@@ -125,12 +130,13 @@ function createWorkflow(dryRun: boolean) {
 
 function detectPackageManager(): string {
   try {
-    const packageManager = execSync(`nx config cli.packageManager`, {
+    const output = execSync(`nx config cli.packageManager`, {
       stdio: ['ignore', 'pipe', 'ignore']
     })
       .toString()
-      .trim();
-    return packageManager;
+      .trim()
+      .split('\n');
+    return output[output.length - 1].trim();
   } catch (e) {
     return fileExists('yarn.lock')
       ? 'yarn'