Merge pull request #1108 from NativeScript/tachev/ng-aot-scoped

fix: add missing tsconfig paths when the app is using only scoped core modules and Angular

Author: Dimitar Tachev

Diff for: index.js

@@ -11,18 +11,42 @@ Object.assign(exports, require("./plugins"));
 Object.assign(exports, require("./host/resolver"));
 
 exports.processTsPathsForScopedModules = function ({ compilerOptions }) {
-    return replacePathInCompilerOptions({
+    const tnsModulesOldPackage = "tns-core-modules";
+    const tnsModulesNewPackage = "@nativescript/core";
+    replacePathInCompilerOptions({
         compilerOptions,
-        targetPath: "tns-core-modules",
-        replacementPath: "@nativescript/core"
+        targetPath: tnsModulesOldPackage,
+        replacementPath: tnsModulesNewPackage
+    });
+    ensurePathInCompilerOptions({
+        compilerOptions,
+        sourcePath: tnsModulesOldPackage,
+        destinationPath: `./node_modules/${tnsModulesNewPackage}`
+    });
+    ensurePathInCompilerOptions({
+        compilerOptions,
+        sourcePath: `${tnsModulesOldPackage}/*`,
+        destinationPath: `./node_modules/${tnsModulesNewPackage}/*`
     });
 }
 
 exports.processTsPathsForScopedAngular = function ({ compilerOptions }) {
-    return replacePathInCompilerOptions({
+    const nsAngularOldPackage = "nativescript-angular";
+    const nsAngularNewPackage = "@nativescript/angular";
+    replacePathInCompilerOptions({
+        compilerOptions,
+        targetPath: nsAngularOldPackage,
+        replacementPath: nsAngularNewPackage
+    });
+    ensurePathInCompilerOptions({
+        compilerOptions,
+        sourcePath: nsAngularOldPackage,
+        destinationPath: `./node_modules/${nsAngularNewPackage}`
+    });
+    ensurePathInCompilerOptions({
         compilerOptions,
-        targetPath: "nativescript-angular",
-        replacementPath: "@nativescript/angular"
+        sourcePath: `${nsAngularOldPackage}/*`,
+        destinationPath: `./node_modules/${nsAngularNewPackage}/*`
     });
 }
 
@@ -215,4 +239,15 @@ function replacePathInCompilerOptions({ compilerOptions, targetPath, replacement
             }
         }
     }
+}
+
+function ensurePathInCompilerOptions({ compilerOptions, sourcePath, destinationPath }) {
+    const paths = (compilerOptions && compilerOptions.paths) || {};
+    if (paths[sourcePath]) {
+        if (Array.isArray(paths[sourcePath]) && paths[sourcePath].indexOf(destinationPath) === -1) {
+            paths[sourcePath].push(destinationPath);
+        }
+    } else {
+        paths[sourcePath] = [destinationPath];
+    }
 }

Diff for: package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-dev-webpack",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "main": "index",
   "description": "",
   "homepage": "http://www.telerik.com",