fix(nativescript): postinstall

nstudio · Jul 3, 2021 · a573d3a · a573d3a
1 parent 6aadb85
commit a573d3a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/packages/nativescript-angular/src/schematics/application/_files/tools/xplat-postinstall.js b/packages/nativescript-angular/src/schematics/application/_files/tools/xplat-postinstall.js
@@ -15,9 +15,12 @@ try {
 }
 
 // Helpful to trigger ngcc after an install to ensure all has processed properly
-const child = childProcess.spawn(/^win/.test(process.platform) ? '<%= pathOffsetWindows %>node_modules\\.bin\\ngcc' : '<%= pathOffset %>node_modules/.bin/ngcc', ['--tsconfig', 'tsconfig.app.json', '--properties', 'es2015', 'module', 'main', '--first-only'], {
+const relativePath = '<%= pathOffset %>'.split('/').filter(p => !!p);
+const ngccPath = path.join(...relativePath, 'node_modules', '.bin', 'ngcc');
+const child = childProcess.spawn(ngccPath, ['--tsconfig', 'tsconfig.app.json', '--properties', 'es2015', 'module', 'main', '--first-only'], {
   cwd: process.cwd(),
   stdio: 'inherit',
+  shell: process.platform == 'win32'
 });
 child.on('close', (code) => {
 

diff --git a/...tivescript-angular/src/schematics/application/_skipxplat_files/tools/xplat-postinstall.js b/...tivescript-angular/src/schematics/application/_skipxplat_files/tools/xplat-postinstall.js
@@ -15,9 +15,12 @@ try {
 }
 
 // Helpful to trigger ngcc after an install to ensure all has processed properly
-const child = childProcess.spawn(/^win/.test(process.platform) ? '<%= pathOffsetWindows %>node_modules\\.bin\\ngcc' : '<%= pathOffset %>node_modules/.bin/ngcc', ['--tsconfig', 'tsconfig.app.json', '--properties', 'es2015', 'module', 'main', '--first-only'], {
+const relativePath = '<%= pathOffset %>'.split('/').filter(p => !!p);
+const ngccPath = path.join(...relativePath, 'node_modules', '.bin', 'ngcc');
+const child = childProcess.spawn(ngccPath, ['--tsconfig', 'tsconfig.app.json', '--properties', 'es2015', 'module', 'main', '--first-only'], {
   cwd: process.cwd(),
   stdio: 'inherit',
+  shell: process.platform == 'win32'
 });
 child.on('close', (code) => {
 

diff --git a/packages/nativescript-angular/src/schematics/application/index.ts b/packages/nativescript-angular/src/schematics/application/index.ts
@@ -235,7 +235,6 @@ function addAppFiles(
           appname,
           directoryAppPath: `${directory}${appPath}`,
           pathOffset: directory ? '../../../' : '../../',
-          pathOffsetWindows: directory ? '..\\..\\..\\' : '..\\..\\',
           angularVersion: angularVersion,
           nsNgScopedVersion: nsNgScopedVersion,
           nsNgFonticonVersion: nsNgFonticonVersion,