fix(angular): use hostReplacementPaths function instead of host (#615)

The new approach fixes the problems with watching platform-specific
files.

depends on #611
fixes #601

Author: sis0k0

Diff for: .gitignore

@@ -15,9 +15,9 @@ plugins/WatchStateLoggerPlugin.d.ts
 plugins/WatchStateLoggerPlugin.js
 plugins/WatchStateLoggerPlugin.js.map
 
-host/platform.d.ts
-host/platform.js
-host/platform.js.map
+host/resolver.d.ts
+host/resolver.js
+host/resolver.js.map
 
 hooks
 .DS_Store

Diff for: .npmignore

@@ -1,2 +1,6 @@
-prepublish
-demo
+build
+demo
+
+*.ts
+!*.d.ts
+

Diff for: demo/AngularApp/package.json

@@ -13,14 +13,14 @@
     }
   },
   "dependencies": {
-    "@angular/common": "~6.1.0-beta.3",
-    "@angular/compiler": "~6.1.0-beta.3",
-    "@angular/core": "~6.1.0-beta.3",
-    "@angular/forms": "~6.1.0-beta.3",
-    "@angular/http": "~6.1.0-beta.3",
-    "@angular/platform-browser": "~6.1.0-beta.3",
-    "@angular/platform-browser-dynamic": "~6.1.0-beta.3",
-    "@angular/router": "~6.1.0-beta.3",
+    "@angular/common": "~6.1.0-rc.0",
+    "@angular/compiler": "~6.1.0-rc.0",
+    "@angular/core": "~6.1.0-rc.0",
+    "@angular/forms": "~6.1.0-rc.0",
+    "@angular/http": "~6.1.0-rc.0",
+    "@angular/platform-browser": "~6.1.0-rc.0",
+    "@angular/platform-browser-dynamic": "~6.1.0-rc.0",
+    "@angular/router": "~6.1.0-rc.0",
     "nativescript-angular": "next",
     "nativescript-theme-core": "~1.0.2",
     "reflect-metadata": "~0.1.8",
@@ -29,8 +29,8 @@
     "zone.js": "^0.8.26"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "~6.1.0-beta.3",
-    "@ngtools/webpack": "6.1.0-rc.0",
+    "@angular/compiler-cli": "~6.1.0-rc.0",
+    "@ngtools/webpack": "~6.1.0-rc.3",
     "@types/chai": "^4.0.2",
     "@types/mocha": "^2.2.41",
     "@types/node": "^7.0.5",

Diff for: demo/AngularApp/webpack.config.js

@@ -3,7 +3,6 @@ const { join, relative, resolve, sep } = require("path");
 const webpack = require("webpack");
 const nsWebpack = require("nativescript-dev-webpack");
 const nativescriptTarget = require("nativescript-dev-webpack/nativescript-target");
-const { PlatformReplacementHost } = require("nativescript-dev-webpack/host/platform");
 const CleanWebpackPlugin = require("clean-webpack-plugin");
 const CopyWebpackPlugin = require("copy-webpack-plugin");
 const { BundleAnalyzerPlugin } = require("webpack-bundle-analyzer");
@@ -24,9 +23,6 @@ module.exports = env => {
         throw new Error("You need to provide a target platform!");
     }
 
-    const extensions = ["tns", platform];
-    const platformHost = new PlatformReplacementHost(extensions);
-
     const projectRoot = __dirname;
 
     // Default destination inside platforms/<platform>/...
@@ -227,7 +223,7 @@ module.exports = env => {
             new NativeScriptWorkerPlugin(),
 
             new AngularCompilerPlugin({
-                host: platformHost,
+                hostReplacementPaths: nsWebpack.getResolver([platform, "tns"]),
                 entryModule: resolve(appPath, "app.module#AppModule"),
                 tsConfigPath: join(__dirname, "tsconfig.esm.json"),
                 skipCodeGeneration: !aot,

Diff for: host/platform.ts

@@ -0,0 +1,39 @@
+import {
+    parse,
+    join,
+} from "path";
+import { statSync } from "fs";
+
+export function getResolver(platforms: string[]) {
+    return function(path: string) {
+        const { dir, name, ext } = parse(path);
+
+        for (const platform of platforms) {
+            const platformFileName = `${name}.${platform}${ext}`;
+            const platformPath = toSystemPath(join(dir, platformFileName));
+
+            try {
+                const stat = statSync(platformPath);
+                if (stat && stat.isFile()) {
+                    return platformPath;
+                }
+            } catch(_e) {
+                // continue checking the other platforms
+            }
+        }
+
+        return path;
+    }
+}
+
+// Convert paths from \c\some\path to c:\some\path
+function toSystemPath(path: string) {
+    if (!process.platform.startsWith("win32")) {
+        return path;
+    }
+
+    const drive = path.match(/^\\(\w)\\(.*)$/);
+    return drive ?
+        `${drive[1]}:\\${drive[2]}`:
+        path;
+}

Diff for: host/resolver.ts

@@ -9,6 +9,7 @@ const {
 } = require("./projectHelpers");
 
 Object.assign(exports, require('./plugins'));
+Object.assign(exports, require('./host/resolver'));
 
 exports.getAotEntryModule = function (appDirectory) {
 	verifyEntryModuleDirectory(appDirectory);

Diff for: index.js

@@ -92,11 +92,8 @@
     "sass-loader": "~7.0.1"
   },
   "devDependencies": {
-    "@angular-devkit/core": "^0.7.0-rc.0",
     "@types/node": "^8.0.0",
     "conventional-changelog-cli": "^1.3.22",
-    "rxjs": "^6.2.0",
-    "source-map-support": "^0.5.0",
     "typescript": "~2.7.2"
   }
 }

Diff for: package.json

@@ -3,7 +3,6 @@ const { join, relative, resolve, sep } = require("path");
 const webpack = require("webpack");
 const nsWebpack = require("nativescript-dev-webpack");
 const nativescriptTarget = require("nativescript-dev-webpack/nativescript-target");
-const { PlatformReplacementHost } = require("nativescript-dev-webpack/host/platform");
 const CleanWebpackPlugin = require("clean-webpack-plugin");
 const CopyWebpackPlugin = require("copy-webpack-plugin");
 const { BundleAnalyzerPlugin } = require("webpack-bundle-analyzer");
@@ -23,9 +22,6 @@ module.exports = env => {
         throw new Error("You need to provide a target platform!");
     }
 
-    const extensions = ["tns", platform];
-    const platformHost = new PlatformReplacementHost(extensions);
-
     const projectRoot = __dirname;
 
     // Default destination inside platforms/<platform>/...
@@ -226,7 +222,7 @@ module.exports = env => {
             new NativeScriptWorkerPlugin(),
 
             new AngularCompilerPlugin({
-                host: platformHost,
+                hostReplacementPaths: nsWebpack.getResolver([platform, "tns"]),
                 entryModule: resolve(appPath, "app.module#AppModule"),
                 tsConfigPath: join(__dirname, "tsconfig.esm.json"),
                 skipCodeGeneration: !aot,

Diff for: templates/webpack.angular.js

@@ -10,6 +10,6 @@
     "files": [
         "plugins/PlatformFSPlugin.ts",
         "plugins/WatchStateLoggerPlugin.ts",
-        "host/platform.ts"
+        "host/resolver.ts"
     ]
 }