docs: Update extended activity related code

demo/AngularApp/app/activity.android.ts

@@ -2,9 +2,14 @@ import {setActivityCallbacks, AndroidActivityCallbacks} from "ui/frame";
 
 @JavaProxy("org.myApp.MainActivity")
 class Activity extends android.support.v7.app.AppCompatActivity {
+    public isNativeScriptActivity: boolean;
     private _callbacks: AndroidActivityCallbacks;
 
     protected onCreate(savedInstanceState: any): void { // android.os.Bundle
+        // Set isNativeScriptActivity in onCreate (as done in the original NativeScript activity code).
+        // The JS constructor might not be called because the activity is created from Android.
+        this.isNativeScriptActivity = true;
+
         if (!this._callbacks) {
             setActivityCallbacks(this);
         }

demo/JavaScriptApp/app/activity.android.js

@@ -3,6 +3,10 @@ const frame = require("ui/frame");
 const superProto = android.support.v7.app.AppCompatActivity.prototype;
 android.support.v7.app.AppCompatActivity.extend("org.myApp.MainActivity", {
     onCreate: function(savedInstanceState) {
+        // Set isNativeScriptActivity in onCreate.
+        // The JS constructor might not be called because the activity is created from Android.
+        this.isNativeScriptActivity = true;
+
         if(!this._callbacks) {
             frame.setActivityCallbacks(this);
         }

demo/JavaScriptApp/package.json

@@ -9,7 +9,7 @@
       "version": "next"
     },
     "tns-android": {
-      "version": "next"
+      "version": "5.0.0-2018-11-05-171453-02"
     }
   },
   "dependencies": {
@@ -29,11 +29,11 @@
     "mocha-multi": "^0.11.0",
     "nativescript-dev-appium": "next",
     "nativescript-dev-sass": "next",
-    "nativescript-dev-webpack": "next",
+    "nativescript-dev-webpack": "^0.18.0-2018-11-05-214332-01",
     "node-sass": "^4.7.1"
   },
   "scripts": {
     "setup": "npm pack ../../ && npm i -D nativescript-dev-webpack*.tgz",
     "e2e": "mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json"
   }
-}
+}

demo/JavaScriptApp/webpack.config.js

@@ -41,7 +41,11 @@ module.exports = env => {
         uglify, // --env.uglify
         report, // --env.report
         sourceMap, // --env.sourceMap
+        hmr, // --env.hmr,
     } = env;
+    const externals = (env.externals || []).map((e) => { // --env.externals
+        return new RegExp(e + ".*");
+    });
 
     const appFullPath = resolve(projectRoot, appPath);
     const appResourcesFullPath = resolve(projectRoot, appResourcesPath);
@@ -52,6 +56,7 @@ module.exports = env => {
     const config = {
         mode: uglify ? "production" : "development",
         context: appFullPath,
+        externals,
         watchOptions: {
             ignored: [
                 appResourcesFullPath,
@@ -116,9 +121,9 @@ module.exports = env => {
             minimize: !!uglify,
             minimizer: [
                 new UglifyJsPlugin({
+                    parallel: true,
+                    cache: true,
                     uglifyOptions: {
-                        parallel: true,
-                        cache: true,
                         output: {
                             comments: false,
                         },
@@ -152,6 +157,21 @@ module.exports = env => {
                     ].filter(loader => !!loader)
                 },
 
+                {
+                    test: /-page\.js$/,
+                    use: "nativescript-dev-webpack/script-hot-loader"
+                },
+
+                {
+                    test: /\.(css|scss)$/,
+                    use: "nativescript-dev-webpack/style-hot-loader"
+                },
+
+                {
+                    test: /\.(html|xml)$/,
+                    use: "nativescript-dev-webpack/markup-hot-loader"
+                },
+
                 { test: /\.(html|xml)$/, use: "nativescript-dev-webpack/xml-namespace-loader"},
 
                 {
@@ -165,7 +185,7 @@ module.exports = env => {
                         { loader: "css-loader", options: { minimize: false, url: false } },
                         "sass-loader"
                     ]
-                }
+                },
             ]
         },
         plugins: [
@@ -229,5 +249,10 @@ module.exports = env => {
         }));
     }
 
+    if (hmr) {
+        config.plugins.push(new webpack.HotModuleReplacementPlugin());
+    }
+
+
     return config;
 };

demo/TypeScriptApp/app/activity.android.ts

@@ -2,9 +2,14 @@ import {setActivityCallbacks, AndroidActivityCallbacks} from "ui/frame";
 
 @JavaProxy("org.myApp.MainActivity")
 class Activity extends android.support.v7.app.AppCompatActivity {
+    public isNativeScriptActivity: boolean;
     private _callbacks: AndroidActivityCallbacks;
-
+    
     protected onCreate(savedInstanceState: any): void { // android.os.Bundle
+        // Set isNativeScriptActivity in onCreate (as done in the original NativeScript activity code).
+        // The JS constructor might not be called because the activity is created from Android.
+        this.isNativeScriptActivity = true;
+
         if (!this._callbacks) {
             setActivityCallbacks(this);
         }