Merge branch 'master' into sis0k0/platform-host

sis0k0 · web-flow · commit 26d40ca3432d · 2018-05-30T09:40:45.000+03:00
diff --git a/plugins/NativeScriptSnapshotPlugin/options.json b/plugins/NativeScriptSnapshotPlugin/options.json
@@ -1,6 +1,9 @@
 {
   "type": "object",
   "properties": {
+    "androidNdkPath": {
+      "type": "string"
+    },
     "chunk": {
       "type": "string"
     },
diff --git a/templates/webpack.angular.js b/templates/webpack.angular.js
@@ -149,6 +149,7 @@ module.exports = env => {
                         {
                             loader: "nativescript-dev-webpack/bundle-config-loader",
                             options: {
+                                registerPages: false,
                                 loadCss: !snapshot, // load the application css if in debug mode
                             }
                         },

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@ module.exports = env => {`
`149`	`149`	`{`
`150`	`150`	`loader: "nativescript-dev-webpack/bundle-config-loader",`
`151`	`151`	`options: {`
	`152`	`+ registerPages: false,`
`152`	`153`	`loadCss: !snapshot, // load the application css if in debug mode`
`153`	`154`	`}`
`154`	`155`	`},`