From bfb00e754b0f14e86a8f72618be9152976c2cfb7 Mon Sep 17 00:00:00 2001
From: NickIliev <nikolay.iliev@telerik.com>
Date: Fri, 18 Oct 2019 11:13:27 +0300
Subject: [PATCH] fix: remove obsolete theme import  + update to scoped package
 of @nativescript/theme

---
 .gitignore                                    |  2 ++
 app/app.css                                   |  4 +--
 app/main.ts                                   |  1 -
 .../action-bar/styling/article.md             |  2 +-
 .../activity-indicator/styling/article.md     |  2 +-
 .../button/styling/styling.component.html     |  2 +-
 .../listview/styling/styling.component.html   |  2 +-
 .../progress/styling/styling.component.html   |  2 +-
 .../switch/styling/article.md                 |  2 +-
 .../web-view/web-view-examples.component.ts   |  3 +-
 .../web-view/web-view-examples.module.ts      |  8 +----
 .../web-view/web-view-html/article.md         |  1 -
 .../web-view/web-view-html/test.html          | 34 -------------------
 .../web-view-html.component.html              | 10 ------
 .../web-view-html/web-view-html.component.ts  | 13 -------
 package.json                                  | 17 +++++-----
 webpack.config.js                             | 12 ++++++-
 webpack.config.md                             | 10 ------
 18 files changed, 32 insertions(+), 95 deletions(-)
 delete mode 100644 app/ng-ui-widgets-category/web-view/web-view-html/article.md
 delete mode 100644 app/ng-ui-widgets-category/web-view/web-view-html/test.html
 delete mode 100644 app/ng-ui-widgets-category/web-view/web-view-html/web-view-html.component.html
 delete mode 100644 app/ng-ui-widgets-category/web-view/web-view-html/web-view-html.component.ts
 delete mode 100644 webpack.config.md

diff --git a/.gitignore b/.gitignore
index d16ebace..b3524fd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@ debugger
 dist
 report
 
+webpack.config.js
+
 app/**/*.map
 app/**/*.js
 
diff --git a/app/app.css b/app/app.css
index 70b45ea6..b8fecd9e 100644
--- a/app/app.css
+++ b/app/app.css
@@ -1,6 +1,6 @@
 
-@import '~nativescript-theme-core/css/core.css';
-@import '~nativescript-theme-core/css/forest.css';
+@import '~@nativescript/theme/css/core.css';
+@import '~@nativescript/theme/css/forest.css';
 
 .far {
     font-family: "Font Awesome 5 Free", "fa-regular-400";
diff --git a/app/main.ts b/app/main.ts
index 89f2fca3..c8530f25 100644
--- a/app/main.ts
+++ b/app/main.ts
@@ -3,7 +3,6 @@ import { AppModule } from "./app.module";
 import { ios } from "tns-core-modules/application";
 import { isIOS } from "tns-core-modules/platform";
 import { MyDelegate } from "./delegate/my-delegate";
-import "nativescript-theme-core";
 
 if (isIOS) {
     ios.delegate = MyDelegate;
diff --git a/app/ng-ui-widgets-category/action-bar/styling/article.md b/app/ng-ui-widgets-category/action-bar/styling/article.md
index f726edeb..83650e6f 100644
--- a/app/ng-ui-widgets-category/action-bar/styling/article.md
+++ b/app/ng-ui-widgets-category/action-bar/styling/article.md
@@ -1,5 +1,5 @@
 
-To style the `ActionBar`, you can use only `background-color` and `color` properties. Alternatively, you can use `nativescript-theme-core` and use the default styles for each different theme. The `icon` property of `ActionItem` can use Icon Fonts with the `font://` prefix. By setting up this prefix, a new image will be generated, which will be set as an ActionItem's `icon` resource. While using this functionality, we need to specify the `font-size`, which will calculate the size of the generated image base on the device's dpi.
+To style the `ActionBar`, you can use only `background-color` and `color` properties. Alternatively, you can use `@nativescript/theme` and use the default styles for each different theme. The `icon` property of `ActionItem` can use Icon Fonts with the `font://` prefix. By setting up this prefix, a new image will be generated, which will be set as an ActionItem's `icon` resource. While using this functionality, we need to specify the `font-size`, which will calculate the size of the generated image base on the device's dpi.
 
 <snippet id='actionbar-icon-fonts-html'/>
 
diff --git a/app/ng-ui-widgets-category/activity-indicator/styling/article.md b/app/ng-ui-widgets-category/activity-indicator/styling/article.md
index ae58247f..bff048c4 100644
--- a/app/ng-ui-widgets-category/activity-indicator/styling/article.md
+++ b/app/ng-ui-widgets-category/activity-indicator/styling/article.md
@@ -2,6 +2,6 @@ The `ActivityIndicator` supports styling the `color` (default value is `blue`) a
 
 <snippet id='activity-indicator-styling-html'/>
 
-| **nativescript-theme-core** CSS class  |  Description    |
+| **@nativescript/theme** CSS class  |  Description    |
 |:---------------------------------------|:----------------|
 | `activity-indicator`                   | Styles the `color` of the indicator in sync with the main theme color. |
diff --git a/app/ng-ui-widgets-category/button/styling/styling.component.html b/app/ng-ui-widgets-category/button/styling/styling.component.html
index eaae49e1..0a64bc76 100644
--- a/app/ng-ui-widgets-category/button/styling/styling.component.html
+++ b/app/ng-ui-widgets-category/button/styling/styling.component.html
@@ -6,7 +6,7 @@
         <Button text="Button"></Button>
         <!-- Using local CSS class -->
         <Button text=".my-button" class="my-button"></Button>
-        <!-- Using nativescript-theme-core CSS classes -->
+        <!-- Using @nativescript/theme CSS classes -->
         <Button text="Button.-primary" class="-primary"></Button>
         <Button class="-primary">
             <FormattedString>
diff --git a/app/ng-ui-widgets-category/listview/styling/styling.component.html b/app/ng-ui-widgets-category/listview/styling/styling.component.html
index d958b579..168a38ea 100644
--- a/app/ng-ui-widgets-category/listview/styling/styling.component.html
+++ b/app/ng-ui-widgets-category/listview/styling/styling.component.html
@@ -1,7 +1,7 @@
 <GridLayout rows="*" sdkExampleTitle sdkToggleNavButton>
 	<!-- >> listview-styling-html -->
 	<!-- 
-		The nativescript-theme-core provides ListView CSS classes (`list-group` & `list-group-item`) for setting recommended paddings & margins for ListView items.
+		The @nativescript/theme provides ListView CSS classes (`list-group` & `list-group-item`) for setting recommended paddings & margins for ListView items.
 		These class names adds a bit of spacing and the theme’s color scheme. 
 	-->
 	<ListView [items]="items" class="list-group" 
diff --git a/app/ng-ui-widgets-category/progress/styling/styling.component.html b/app/ng-ui-widgets-category/progress/styling/styling.component.html
index d9777738..95f295d3 100644
--- a/app/ng-ui-widgets-category/progress/styling/styling.component.html
+++ b/app/ng-ui-widgets-category/progress/styling/styling.component.html
@@ -7,7 +7,7 @@
                 Note; backgroundColor will work only on iOS; onAndroid the background will be the color with applied opacity
             -->
             <Progress value="50" maxValue="100" backgroundColor="red" color="green"></Progress>
-            <!-- Using the nativescript-theme-core CSS class to change the Progress style -->
+            <!-- Using the @nativescript/theme CSS class to change the Progress style -->
             <Progress value="25" maxValue="100" class="progress"></Progress>
             <!-- << progress-style-html -->
         </StackLayout>
diff --git a/app/ng-ui-widgets-category/switch/styling/article.md b/app/ng-ui-widgets-category/switch/styling/article.md
index f2be620a..0f1e3358 100644
--- a/app/ng-ui-widgets-category/switch/styling/article.md
+++ b/app/ng-ui-widgets-category/switch/styling/article.md
@@ -5,4 +5,4 @@ The styling properties for the `Swtich` control are as follows:
 
 <snippet id='switch-styling-html'/>
 
-> Note: When using `nativescript-theme-core` the default style will be set according to the used theme (no need to set additional CSS classes).
+> Note: When using `@nativescript/theme` the default style will be set according to the used theme (no need to set additional CSS classes).
diff --git a/app/ng-ui-widgets-category/web-view/web-view-examples.component.ts b/app/ng-ui-widgets-category/web-view/web-view-examples.component.ts
index 8006d761..fc614cfe 100644
--- a/app/ng-ui-widgets-category/web-view/web-view-examples.component.ts
+++ b/app/ng-ui-widgets-category/web-view/web-view-examples.component.ts
@@ -3,8 +3,7 @@ import { Link } from "./../../link";
 
 let menuLinks = [
     new Link("Usage", "/web-view/usage"),
-    new Link("Tips & Tricks", "/web-view/tips-and-tricks"),
-    new Link("WebView with HTML File", "/web-view/html-file"),
+    new Link("Tips & Tricks", "/web-view/tips-and-tricks")
 ];
 
 @Component({
diff --git a/app/ng-ui-widgets-category/web-view/web-view-examples.module.ts b/app/ng-ui-widgets-category/web-view/web-view-examples.module.ts
index e82a9408..df467662 100644
--- a/app/ng-ui-widgets-category/web-view/web-view-examples.module.ts
+++ b/app/ng-ui-widgets-category/web-view/web-view-examples.module.ts
@@ -5,7 +5,6 @@ import { NativeScriptCommonModule } from "nativescript-angular/common";
 import { WebViewExamplesComponent } from "./web-view-examples.component";
 import { UsageComponent } from "./usage/usage.component";
 import { TipsAndTricksComponent } from "./tips-and-tricks/tips-and-tricks.component";
-import { WebViewHtmlComponent } from "./web-view-html/web-view-html.component";
 import { TitleAndNavButtonModule } from "../../directives/title-and-nav-button.module";
 
 export const routerConfig = [
@@ -22,11 +21,6 @@ export const routerConfig = [
         path: "tips-and-tricks",
         component: TipsAndTricksComponent,
         data: { title: "Tips and Tricks" }
-    },
-    {
-        path: "html-file",
-        component: WebViewHtmlComponent,
-        data: { title: "Using HTML file" }
     }
 ];
 
@@ -38,7 +32,7 @@ export const routerConfig = [
         NativeScriptRouterModule,
         NativeScriptRouterModule.forChild(routerConfig)
     ],
-    declarations: [WebViewExamplesComponent, UsageComponent, TipsAndTricksComponent, WebViewHtmlComponent]
+    declarations: [WebViewExamplesComponent, UsageComponent, TipsAndTricksComponent]
 })
 
 export class WebViewExamplesModule { }
diff --git a/app/ng-ui-widgets-category/web-view/web-view-html/article.md b/app/ng-ui-widgets-category/web-view/web-view-html/article.md
deleted file mode 100644
index 8b137891..00000000
--- a/app/ng-ui-widgets-category/web-view/web-view-html/article.md
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/app/ng-ui-widgets-category/web-view/web-view-html/test.html b/app/ng-ui-widgets-category/web-view/web-view-html/test.html
deleted file mode 100644
index d4ab2229..00000000
--- a/app/ng-ui-widgets-category/web-view/web-view-html/test.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>MyTitle</title>
-        <meta charset="utf-8" />
-        <style>
-            table, th, td {
-                border: 1px solid black;
-            }
-        </style>
-</head>
-<body>
-
-    <table style="width:100%">
-      <tr>
-        <th>Firstname</th>
-        <th>Lastname</th>
-      </tr>
-    <tr>
-        <td>Nicol</td>
-        <td>Jackson</td>
-    </tr>
-    <tr>
-        <td>Eve</td>
-        <td>Smith</td>
-    </tr>
-    <tr>
-        <td>John</td>
-        <td>Doe</td>
-    </tr>
-    </table>
-
-</body>
-</html>
diff --git a/app/ng-ui-widgets-category/web-view/web-view-html/web-view-html.component.html b/app/ng-ui-widgets-category/web-view/web-view-html/web-view-html.component.html
deleted file mode 100644
index ce823ef3..00000000
--- a/app/ng-ui-widgets-category/web-view/web-view-html/web-view-html.component.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<StackLayout sdkExampleTitle sdkToggleNavButton>
-    <StackLayout>
-    <!-- >> web-view-xml-local-file -->
-        <GridLayout rows="100 *" columns="*">
-            <WebView row="0" col="0" [src]="firstWebViewSRC"></WebView>
-            <WebView row="1" col="0" [src]="secondWebViewSRC"></WebView>
-        </GridLayout>
-        <!-- << web-view-xml-local-file -->
-    </StackLayout>
-</StackLayout>
\ No newline at end of file
diff --git a/app/ng-ui-widgets-category/web-view/web-view-html/web-view-html.component.ts b/app/ng-ui-widgets-category/web-view/web-view-html/web-view-html.component.ts
deleted file mode 100644
index 6d388ac9..00000000
--- a/app/ng-ui-widgets-category/web-view/web-view-html/web-view-html.component.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// tslint:disable:max-line-length
-// >> web-view-src-local-file
-import { Component } from "@angular/core";
-
-@Component({
-    moduleId: module.id,
-    templateUrl: "./web-view-html.component.html",
-})
-export class WebViewHtmlComponent {
-    firstWebViewSRC = '<!DOCTYPE html><html><head><title>MyTitle</title><meta charset="utf-8" /></head><body><span style="color:#0099CC; text-align: center;">First WebView</span></body></html>';
-    secondWebViewSRC = "~/ng-ui-widgets-category/web-view/web-view-html/test.html";
-}
-// << web-view-src-local-file
diff --git a/package.json b/package.json
index 0b4980c9..8ad759f2 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
   "nativescript": {
     "id": "org.nativescript.nativescriptsdkexamplesng",
     "tns-android": {
-      "version": "6.1.0"
+      "version": "6.2.0-2019-10-16-170919-03"
     },
     "tns-ios": {
       "version": "6.1.0"
@@ -36,25 +36,25 @@
     "@angular/platform-browser": "~8.2.0",
     "@angular/platform-browser-dynamic": "~8.2.0",
     "@angular/router": "~8.2.0",
-    "nativescript-angular": "~8.2.0",
+    "@nativescript/theme": "^2.1.2",
+    "nativescript-angular": "8.3.0-next-2019-10-17-143908-01",
     "nativescript-camera": "^4.5.0",
     "nativescript-geolocation": "^5.1.0",
     "nativescript-intl": "~3.0.0",
-    "nativescript-theme-core": "^2.0.9",
     "reflect-metadata": "~0.1.12",
     "rxjs": "^6.4.0",
-    "tns-core-modules": "6.1.0",
+    "tns-core-modules": "6.3.0-next-2019-10-17-174536-07",
     "zone.js": "^0.9.1"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "8.2.0",
-    "@ngtools/webpack": "8.2.0",
+    "@angular/compiler-cli": "~8.2.0",
+    "@ngtools/webpack": "~8.2.0",
     "codelyzer": "^3.0.1",
     "fs-extra": "^0.30.0",
     "glob": "^7.1.3",
     "lazy": "1.0.11",
     "markdown-snippet-injector": "^0.2.2",
-    "nativescript-dev-webpack": "~1.2.0",
+    "nativescript-dev-webpack": "1.4.0-next-2019-10-17-185549-03",
     "opener": "^1.4.1",
     "rimraf": "^2.5.3",
     "tar.gz": "^1.0.5",
@@ -75,6 +75,7 @@
     "update-webpack": "./node_modules/.bin/update-ns-webpack --deps --configs",
     "update-angular": "./node_modules/.bin/update-app-ng-deps",
     "update-app-ng-deps": "update-app-ng-deps",
-    "ns-verify-bundle": "ns-verify-bundle"
+    "ns-verify-bundle": "ns-verify-bundle",
+    "update-ns-webpack": "update-ns-webpack"
   }
 }
diff --git a/webpack.config.js b/webpack.config.js
index 6a85ceee..593b27d0 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -7,6 +7,7 @@ const { nsReplaceBootstrap } = require("nativescript-dev-webpack/transformers/ns
 const { nsReplaceLazyLoader } = require("nativescript-dev-webpack/transformers/ns-replace-lazy-loader");
 const { nsSupportHmrNg } = require("nativescript-dev-webpack/transformers/ns-support-hmr-ng");
 const { getMainModulePath } = require("nativescript-dev-webpack/utils/ast-utils");
+const { getNoEmitOnErrorFromTSConfig } = require("nativescript-dev-webpack/utils/tsconfig-utils");
 const CleanWebpackPlugin = require("clean-webpack-plugin");
 const CopyWebpackPlugin = require("copy-webpack-plugin");
 const { BundleAnalyzerPlugin } = require("webpack-bundle-analyzer");
@@ -50,8 +51,12 @@ module.exports = env => {
         hmr, // --env.hmr,
         unitTesting, // --env.unitTesting
         verbose, // --env.verbose
+        snapshotInDocker, // --env.snapshotInDocker
+        skipSnapshotTools, // --env.skipSnapshotTools
+        compileSnapshot // --env.compileSnapshot
     } = env;
 
+    const useLibs = compileSnapshot;
     const isAnySourceMapEnabled = !!sourceMap || !!hiddenSourceMap;
     const externals = nsWebpack.getConvertedExternals(env.externals);
     const appFullPath = resolve(projectRoot, appPath);
@@ -107,6 +112,8 @@ module.exports = env => {
         itemsToClean.push(`${join(projectRoot, "platforms", "android", "app", "build", "configurations", "nativescript-android-snapshot")}`);
     }
 
+    const noEmitOnErrorFromTSConfig = getNoEmitOnErrorFromTSConfig(join(projectRoot, tsConfigName));
+
     nsWebpack.processAppComponents(appComponents, platform);
     const config = {
         mode: production ? "production" : "development",
@@ -158,6 +165,7 @@ module.exports = env => {
         devtool: hiddenSourceMap ? "hidden-source-map" : (sourceMap ? "inline-source-map" : "none"),
         optimization: {
             runtimeChunk: "single",
+            noEmitOnErrors: noEmitOnErrorFromTSConfig,
             splitChunks: {
                 cacheGroups: {
                     vendor: {
@@ -268,7 +276,6 @@ module.exports = env => {
             new CleanWebpackPlugin(itemsToClean, { verbose: !!verbose }),
             // Copy assets to out dir. Add your own globs as needed.
             new CopyWebpackPlugin([
-                { from: { glob: "ng-ui-widgets-category/web-view/web-view-html/*.html"} },
                 { from: { glob: "fonts/**" } },
                 { from: { glob: "**/*.jpg" } },
                 { from: { glob: "**/*.png" } },
@@ -309,6 +316,9 @@ module.exports = env => {
             ],
             projectRoot,
             webpackConfig: config,
+            snapshotInDocker,
+            skipSnapshotTools,
+            useLibs
         }));
     }
 
diff --git a/webpack.config.md b/webpack.config.md
deleted file mode 100644
index ff645990..00000000
--- a/webpack.config.md
+++ /dev/null
@@ -1,10 +0,0 @@
-Add the `test.html` for the WebView examples via the following line in `webpack.config.js`
-
-```JS
-new CopyWebpackPlugin([
-    { from: { glob: "ng-ui-widgets-category/web-view/web-view-html/*.html"} }, // HERE
-    { from: { glob: "fonts/**" } },
-    { from: { glob: "**/*.jpg" } },
-    { from: { glob: "**/*.png" } },
-]
-```