fix(command-line): make affected and format windows-friendly

nrwl · Jan 20, 2018 · 9609fc6 · 9609fc6
1 parent e12eafd
commit 9609fc6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/packages/schematics/src/command-line/affected.ts b/packages/schematics/src/command-line/affected.ts
@@ -41,7 +41,7 @@ function build(apps: string[], rest: string[]) {
   if (apps.length > 0) {
     console.log(`Building ${apps.join(', ')}`);
     apps.forEach(app => {
-      execSync(`${ngPath()} build ${rest.join(' ')} -a=${app}`, { stdio: [0, 1, 2] });
+      execSync(`node ${ngPath()} build ${rest.join(' ')} -a=${app}`, { stdio: [0, 1, 2] });
     });
   } else {
     console.log('No apps to build');
@@ -52,13 +52,14 @@ function e2e(apps: string[], rest: string[]) {
   if (apps.length > 0) {
     console.log(`Testing ${apps.join(', ')}`);
     apps.forEach(app => {
-      execSync(`${ngPath()} e2e ${rest.join(' ')} -a=${app}`, { stdio: [0, 1, 2] });
+      execSync(`node ${ngPath()} e2e ${rest.join(' ')} -a=${app}`, { stdio: [0, 1, 2] });
     });
   } else {
     console.log('No apps to test');
   }
 }
 
 function ngPath() {
-  return `${path.dirname(path.dirname(path.dirname(resolve.sync('@angular/cli', { basedir: __dirname }))))}/bin/ng`;
+  const basePath = path.dirname(path.dirname(path.dirname(resolve.sync('@angular/cli', { basedir: __dirname }))));
+  return path.join(basePath, 'bin', 'ng');
 }
diff --git a/packages/schematics/src/command-line/format.ts b/packages/schematics/src/command-line/format.ts
@@ -77,5 +77,6 @@ function check(patterns: string[]) {
 }
 
 function prettierPath() {
-  return `${path.dirname(resolve.sync('prettier', { basedir: __dirname }))}/bin-prettier.js`;
+  const basePath = path.dirname(resolve.sync('prettier', { basedir: __dirname }));
+  return path.join(basePath, 'bin-prettier.js');
 }