chore: update dependencies & obsolete code snippets

NickIliev · NickIliev · commit 8bd58bdb9d08 · 2020-01-29T16:15:20.000+02:00
diff --git a/app/links-view-model.js b/app/links-view-model.js
@@ -26,14 +26,14 @@ function ListViewLinksModel(info) {
 
     viewModel.set("onItemTap", (args) => {
         const linkItem = viewModel.get("links").getItem(args.index);
-        frameModule.topmost().navigate({
+        frameModule.Frame.topmost().navigate({
             moduleName: linkItem.link,
             context: { "title": linkItem.title }
         });
     });
     viewModel.set("onSecondItemTap", (args) => {
         const linkItem = viewModel.get("tsclinks").getItem(args.index);
-        frameModule.topmost().navigate({
+        frameModule.Frame.topmost().navigate({
             moduleName: linkItem.link,
             context: { "title": linkItem.title }
         });
diff --git a/app/ns-framework-modules-category/application/application-events/application-events-page.xml b/app/ns-framework-modules-category/application/application-events/application-events-page.xml
@@ -4,10 +4,10 @@
 	</Page.actionBar>
 	<GridLayout rows="*, auto,  auto, auto, auto, *" columns="*" class="m-20" loaded="onGridLoaded" unloaded="onGridUnloaded">
 		<Label row="0" text="{{ 'Using orientationChanged event \nCurrent orientation: ' + orientation }}" fontSize="14" textWrap="true" />
-		<Label row="1" text="{{ orientation === 'portrait' ? '&#xf10b; Portrait' : '&#xf03e; Landscape' }}" fontSize="24" textWrap="true" class="fa"/>
-		<Label row="2" text="{{ displayedEvent }}" fontSize="14" textWrap="true" class="fa"/>
-		<Label row="3" text="{{ suspendEvent }}" fontSize="14" textWrap="true" class="fa"/>
-		<Label row="4" text="{{ resumeEvent }}" fontSize="14" textWrap="true" class="fa"/>
+		<Label row="1" text="{{ orientation === 'portrait' ? '&#xf10b; Portrait' : '&#xf03e; Landscape' }}" fontSize="24" textWrap="true" class="far"/>
+		<Label row="2" text="{{ displayedEvent }}" fontSize="14" textWrap="true" class="far"/>
+		<Label row="3" text="{{ suspendEvent }}" fontSize="14" textWrap="true" class="far"/>
+		<Label row="4" text="{{ resumeEvent }}" fontSize="14" textWrap="true" class="far"/>
 		<Label row="5" text="{{ info }}" textWrap="true" fontSize="14"/>
 	</GridLayout>
 </Page>
diff --git a/app/ns-framework-modules-category/application/application-events/application-events-ts-page.xml b/app/ns-framework-modules-category/application/application-events/application-events-ts-page.xml
@@ -4,10 +4,10 @@
 	</Page.actionBar>
 	<GridLayout rows="*, auto,  auto, auto, auto, *" columns="*" class="m-20" loaded="onGridLoaded" unloaded="onGridUnloaded">
 		<Label row="0" text="{{ 'Using orientationChanged event \nCurrent orientation: ' + orientation }}" fontSize="14" textWrap="true" />
-		<Label row="1" text="{{ orientation === 'portrait' ? '&#xf10b; Portrait' : '&#xf03e; Landscape' }}" fontSize="24" textWrap="true" class="fa"/>
-		<Label row="2" text="{{ displayedEvent }}" fontSize="14" textWrap="true" class="fa"/>
-		<Label row="3" text="{{ suspendEvent }}" fontSize="14" textWrap="true" class="fa"/>
-		<Label row="4" text="{{ resumeEvent }}" fontSize="14" textWrap="true" class="fa"/>
+		<Label row="1" text="{{ orientation === 'portrait' ? '&#xf10b; Portrait' : '&#xf03e; Landscape' }}" fontSize="24" textWrap="true" class="far"/>
+		<Label row="2" text="{{ displayedEvent }}" fontSize="14" textWrap="true" class="far"/>
+		<Label row="3" text="{{ suspendEvent }}" fontSize="14" textWrap="true" class="far"/>
+		<Label row="4" text="{{ resumeEvent }}" fontSize="14" textWrap="true" class="far"/>
 		<Label row="5" text="{{ info }}" textWrap="true" fontSize="14"/>
 	</GridLayout>
 </Page>
diff --git a/app/ns-framework-modules-category/application/application-page.js b/app/ns-framework-modules-category/application/application-page.js
@@ -27,13 +27,13 @@ function onNavigatingTo(args) {
         navigationLinks.push(
             new link(
                 "iOS Notification Observer",
-                "/application/ios-notification-observer/ios-notification-observer-page"
+                "ns-framework-modules-category/application/ios-notification-observer/ios-notification-observer-page"
             )
         );
         navigationLinksTsc.push(
             new link(
                 "iOS Notification Observer",
-                "/application/ios-notification-observer/ios-notification-observer-ts-page"
+                "ns-framework-modules-category/application/ios-notification-observer/ios-notification-observer-ts-page"
             )
         );
     } else if (platformModule.isAndroid && navigationLinks.filter((e) => e.title === "Android Broadcast Receiver").length < 1) {
diff --git a/app/ns-framework-modules-category/application/check-platform/check-platform-page.js b/app/ns-framework-modules-category/application/check-platform/check-platform-page.js
@@ -4,7 +4,7 @@ function onGridLoaded(args) {
     const grid = args.object;
     const lbl = grid.getViewById("lbl");
     const iconLabel = grid.getViewById("iconLabel");
-    iconLabel.className = "fa";
+    iconLabel.className = "far";
     iconLabel.textAlignment = "center";
     iconLabel.verticalAlignment = "middle";
     iconLabel.fontSize = 40;
diff --git a/app/ns-framework-modules-category/application/check-platform/check-platform-ts-page.ts b/app/ns-framework-modules-category/application/check-platform/check-platform-ts-page.ts
@@ -8,7 +8,7 @@ export function onGridLoaded(args: EventData) {
     const grid = <GridLayout>args.object;
     const lbl = <Label>grid.getViewById("lbl");
     const iconLabel = <Label>grid.getViewById("iconLabel");
-    iconLabel.className = "fa";
+    iconLabel.className = "far";
     iconLabel.textAlignment = "center";
     iconLabel.verticalAlignment = "middle";
     iconLabel.fontSize = 40;
diff --git a/app/ns-ui-widgets-category/action-bar/styling/styling-page.js b/app/ns-ui-widgets-category/action-bar/styling/styling-page.js
@@ -1,6 +1,6 @@
 const frameModule = require("tns-core-modules/ui/frame");
 
 function goBack() {
-    frameModule.topmost().goBack();
+    frameModule.Frame.topmost().goBack();
 }
 exports.goBack = goBack;
diff --git a/app/ns-ui-widgets-category/action-bar/usage/usage-page.js b/app/ns-ui-widgets-category/action-bar/usage/usage-page.js
@@ -2,7 +2,7 @@
 const frameModule = require("tns-core-modules/ui/frame");
 
 function goBack() {
-    frameModule.topmost().goBack();
+    frameModule.Frame.topmost().goBack();
 }
 function openSettings() {
     // implement the custom logic
diff --git a/app/ns-ui-widgets-category/action-bar/usage/usage-ts-page.ts b/app/ns-ui-widgets-category/action-bar/usage/usage-ts-page.ts
@@ -1,8 +1,8 @@
 // >> action-bar-basic-usage-sdk-ts
-import {topmost} from "tns-core-modules/ui/frame";
+import { Frame } from "tns-core-modules/ui/frame";
 
 export function goBack() {
-    topmost().goBack();
+    Frame.topmost().goBack();
 }
 export function openSettings() {
     // implement the custom logic
diff --git a/app/ns-ui-widgets-category/frame/frame-reference/frame-reference-page.js b/app/ns-ui-widgets-category/frame/frame-reference/frame-reference-page.js
@@ -1,8 +1,8 @@
 
 // >> frame-reference-topmost
-const topmost = require("tns-core-modules/ui/frame").topmost;
+const Frame = require("tns-core-modules/ui/frame").Frame;
 
-const topmostFrame = topmost();
+const topmostFrame = Frame.topmost();
 // << frame-reference-topmost
 
 // >> frame-reference-get-id
diff --git a/app/ns-ui-widgets-category/frame/frame-reference/frame-reference-ts-page.ts b/app/ns-ui-widgets-category/frame/frame-reference/frame-reference-ts-page.ts
@@ -1,7 +1,7 @@
 // >> frame-reference-topmost-ts
-import { Frame, topmost } from "tns-core-modules/ui/frame";
+import { Frame } from "tns-core-modules/ui/frame";
 
-const topmostFrame: Frame = topmost();
+const topmostFrame: Frame = Frame.topmost();
 // << frame-reference-topmost-ts
 
 // >> frame-reference-get-id-ts
diff --git a/package.json b/package.json
@@ -22,23 +22,23 @@
   "nativescript": {
     "id": "org.nativescript.nativescriptsdkexamplesjs",
     "tns-android": {
-      "version": "6.1.0"
+      "version": "6.3.1"
     },
     "tns-ios": {
-      "version": "6.1.0"
+      "version": "6.3.0"
     }
   },
   "dependencies": {
     "nativescript-theme-core": "^2.0.11",
-    "tns-core-modules": "^6.1.0"
+    "tns-core-modules": "^6.3.2"
   },
   "devDependencies": {
     "eslint": "~5.9.0",
     "fs-extra": "^0.30.0",
     "markdown-snippet-injector": "^0.2.4",
-    "nativescript-dev-webpack": "~1.2.0",
+    "nativescript-dev-webpack": "~1.4.1",
     "tar.gz": "^1.0.7",
-    "tns-platform-declarations": "next",
+    "tns-platform-declarations": "^6.3.2",
     "tslint": "5.11.0",
     "typescript": "3.4.5"
   },
diff --git a/webpack.config.js b/webpack.config.js
@@ -3,6 +3,7 @@ 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 { getNoEmitOnErrorFromTSConfig } = require("nativescript-dev-webpack/utils/tsconfig-utils");
 const CleanWebpackPlugin = require("clean-webpack-plugin");
 const CopyWebpackPlugin = require("copy-webpack-plugin");
 const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
@@ -45,11 +46,26 @@ 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);
+    const hasRootLevelScopedModules = nsWebpack.hasRootLevelScopedModules({ projectDir: projectRoot });
+    let coreModulesPackageName = "tns-core-modules";
+    const alias = {
+        '~': appFullPath
+    };
+
+    if (hasRootLevelScopedModules) {
+        coreModulesPackageName = "@nativescript/core";
+        alias["tns-core-modules"] = coreModulesPackageName;
+    }
     const appResourcesFullPath = resolve(projectRoot, appResourcesPath);
 
     const entryModule = nsWebpack.getEntryModule(appFullPath, platform);
@@ -71,6 +87,8 @@ module.exports = env => {
         itemsToClean.push(`${join(projectRoot, "platforms", "android", "app", "build", "configurations", "nativescript-android-snapshot")}`);
     }
 
+    const noEmitOnErrorFromTSConfig = getNoEmitOnErrorFromTSConfig(tsConfigPath);
+
     nsWebpack.processAppComponents(appComponents, platform);
     const config = {
         mode: production ? "production" : "development",
@@ -98,14 +116,12 @@ module.exports = env => {
             extensions: [".ts", ".js", ".scss", ".css"],
             // Resolve {N} system modules from tns-core-modules
             modules: [
-                resolve(__dirname, "node_modules/tns-core-modules"),
+                resolve(__dirname, `node_modules/${coreModulesPackageName}`),
                 resolve(__dirname, "node_modules"),
-                "node_modules/tns-core-modules",
+                `node_modules/${coreModulesPackageName}`,
                 "node_modules",
             ],
-            alias: {
-                '~': appFullPath
-            },
+            alias,
             // resolve symlinks to symlinked modules
             symlinks: true
         },
@@ -124,6 +140,7 @@ module.exports = env => {
         devtool: hiddenSourceMap ? "hidden-source-map" : (sourceMap ? "inline-source-map" : "none"),
         optimization: {
             runtimeChunk: "single",
+            noEmitOnErrors: noEmitOnErrorFromTSConfig,
             splitChunks: {
                 cacheGroups: {
                     vendor: {
@@ -183,7 +200,7 @@ module.exports = env => {
                         },
                     ].filter(loader => !!loader)
                 },
-                
+
                 {
                     test: /\.(ts|css|scss|html|xml)$/,
                     use: "nativescript-dev-webpack/hmr/hot-loader"
@@ -193,13 +210,13 @@ module.exports = env => {
 
                 {
                     test: /\.css$/,
-                    use: { loader: "css-loader", options: { url: false } }
+                    use: "nativescript-dev-webpack/css2json-loader"
                 },
 
                 {
                     test: /\.scss$/,
                     use: [
-                        { loader: "css-loader", options: { url: false } },
+                        "nativescript-dev-webpack/css2json-loader",
                         "sass-loader"
                     ]
                 },
@@ -255,6 +272,7 @@ module.exports = env => {
                 tsconfig: tsConfigPath,
                 async: false,
                 useTypescriptIncrementalApi: true,
+                checkSyntacticErrors: true,
                 memoryLimit: 4096
             })
         ],
@@ -279,6 +297,9 @@ module.exports = env => {
             ],
             projectRoot,
             webpackConfig: config,
+            snapshotInDocker,
+            skipSnapshotTools,
+            useLibs
         }));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`const frameModule = require("tns-core-modules/ui/frame");`
`2`	`2`
`3`	`3`	`function goBack() {`
`4`		`- frameModule.topmost().goBack();`
	`4`	`+ frameModule.Frame.topmost().goBack();`
`5`	`5`	`}`
`6`	`6`	`exports.goBack = goBack;`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`const frameModule = require("tns-core-modules/ui/frame");`
`3`	`3`
`4`	`4`	`function goBack() {`
`5`		`- frameModule.topmost().goBack();`
	`5`	`+ frameModule.Frame.topmost().goBack();`
`6`	`6`	`}`
`7`	`7`	`function openSettings() {`
`8`	`8`	`// implement the custom logic`