feat(core): {N} 7.0.0 (#164)

Author: NathanWalker

packages/template-blank-ng/nsconfig.json

@@ -1,21 +1,15 @@
 {
-  "nativescript": {
-    "id": "org.nativescript.Blank",
-    "templateVersion": "v2",
-    "tns-android": {
-      "version": "6.5.0"
-    },
-    "tns-ios": {
-      "version": "6.5.0"
-    }
-  },
-  "name": "tns-template-blank-ng",
+  "name": "@nativescript/template-blank-ng",
+  "main": "main.js",
   "displayName": "Blank",
   "templateType": "App template",
-  "version": "6.5.4",
+  "version": "7.0.0",
   "description": "Blank template for NativeScript apps using Angular",
-  "author": "NativeScript Team <[email protected]>",
+  "author": "NativeScript Team <[email protected]>",
   "license": "Apache-2.0",
+  "publishConfig": {
+    "access": "public"
+  },
   "keywords": [
     "nstudio",
     "nativescript",
@@ -35,25 +29,25 @@
     "url": "https://github.com/NativeScript/NativeScript/issues"
   },
   "dependencies": {
-    "@angular/animations": "~8.2.0",
-    "@angular/common": "~8.2.0",
-    "@angular/compiler": "~8.2.0",
-    "@angular/core": "~8.2.0",
-    "@angular/forms": "~8.2.0",
-    "@angular/platform-browser": "~8.2.0",
-    "@angular/platform-browser-dynamic": "~8.2.0",
-    "@angular/router": "~8.2.0",
+    "@angular/animations": "~10.0.0",
+    "@angular/common": "~10.0.0",
+    "@angular/compiler": "~10.0.0",
+    "@angular/core": "~10.0.0",
+    "@angular/forms": "~10.0.0",
+    "@angular/platform-browser": "~10.0.0",
+    "@angular/platform-browser-dynamic": "~10.0.0",
+    "@angular/router": "~10.0.0",
+    "@nativescript/core": "~7.0.0",
     "@nativescript/theme": "~2.3.0",
-    "nativescript-angular": "~8.21.0",
+    "@nativescript/angular": "~10.0.0",
     "reflect-metadata": "~0.1.12",
-    "rxjs": "^6.4.0",
-    "tns-core-modules": "~6.5.0",
-    "zone.js": "~0.9.1"
+    "rxjs": "^6.6.0",
+    "zone.js": "~0.11.1"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "~8.2.0",
-    "@ngtools/webpack": "~8.2.0",
-    "nativescript-dev-webpack": "~1.5.0",
-    "typescript": "~3.5.3"
+    "@angular/compiler-cli": "~10.0.0",
+    "@ngtools/webpack": "~10.0.0",
+    "@nativescript/webpack": "~3.0.0",
+    "typescript": "~3.9.0"
   }
 }

packages/template-blank-ng/package.json

@@ -1,6 +1,6 @@
 import { NgModule } from "@angular/core";
 import { Routes } from "@angular/router";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
+import { NativeScriptRouterModule } from "@nativescript/angular";
 
 const routes: Routes = [
     { path: "", redirectTo: "/home", pathMatch: "full" },

packages/template-blank-ng/src/app/app-routing.module.ts

@@ -1 +1,3 @@
-<page-router-outlet></page-router-outlet>
+<GridLayout>
+  <page-router-outlet></page-router-outlet>
+</GridLayout>

packages/template-blank-ng/src/app/app.component.html

@@ -1,5 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptModule } from "nativescript-angular/nativescript.module";
+import { NativeScriptModule } from "@nativescript/angular";
 
 import { AppRoutingModule } from "./app-routing.module";
 import { AppComponent } from "./app.component";

packages/template-blank-ng/src/app/app.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from "@angular/core";
 import { Routes } from "@angular/router";
-import { NativeScriptRouterModule } from "nativescript-angular/router";
+import { NativeScriptRouterModule } from "@nativescript/angular";
 
 import { HomeComponent } from "./home.component";
 

packages/template-blank-ng/src/app/home/home-routing.module.ts

@@ -1,5 +1,5 @@
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
-import { NativeScriptCommonModule } from "nativescript-angular/common";
+import { NativeScriptCommonModule } from "@nativescript/angular";
 
 import { HomeRoutingModule } from "./home-routing.module";
 import { HomeComponent } from "./home.component";

packages/template-blank-ng/src/app/home/home.module.ts

@@ -1,5 +1,5 @@
 // this import should be first in order to load some required settings (like globals and reflect-metadata)
-import { platformNativeScriptDynamic } from "nativescript-angular/platform";
+import { platformNativeScriptDynamic } from "@nativescript/angular";
 
 import { AppModule } from "./app/app.module";
 

packages/template-blank-ng/src/main.ts

@@ -1,24 +1,21 @@
 {
     "compilerOptions": {
-        "module": "commonjs",
-        "target": "es5",
+        "module": "esnext",
+        "target": "es2017",
+        "moduleResolution": "node",
         "experimentalDecorators": true,
         "emitDecoratorMetadata": true,
         "noEmitHelpers": true,
         "noEmitOnError": true,
         "skipLibCheck": true,
         "lib": [
-            "es6",
-            "dom",
-            "es2015.iterable"
+            "es2017",
+            "dom"
         ],
         "baseUrl": ".",
         "paths": {
             "~/*": [
                 "src/*"
-            ],
-            "*": [
-                "./node_modules/*"
             ]
         }
     },

packages/template-blank-ng/src/package.json

@@ -1,18 +1,9 @@
 {
-  "name": "tns-template-blank-react",
-  "version": "6.5.7",
-  "nativescript": {
-    "id": "org.nativescript.Blank",
-    "tns-android": {
-      "version": "6.5.0"
-    },
-    "tns-ios": {
-      "version": "6.5.0"
-    },
-    "templateVersion": "v2"
-  },
+  "name": "@nativescript/template-blank-react",
+  "version": "7.0.0",
   "description": "Blank template for NativeScript apps using React.",
   "author": "Jamie Birch <[email protected]>",
+  "main": "main.js",
   "scripts": {
     "postinstall": "patch-package",
     "type-check": "tsc --noEmit",
@@ -27,6 +18,9 @@
   "bugs": {
     "url": "https://github.com/NativeScript/NativeScript/issues"
   },
+  "publishConfig": {
+    "access": "public"
+  },
   "keywords": [
     "mobile",
     "nativescript",
@@ -40,7 +34,7 @@
     "@nativescript/theme": "2.2.1",
     "react": "^16.13.1",
     "react-nativescript": "^1.0.6",
-    "tns-core-modules": "^6.5.6"
+    "@nativescript/core": "~7.0.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.8.4",
@@ -53,11 +47,11 @@
     "@types/react": "16.9.34",
     "babel-loader": "^8.0.6",
     "fork-ts-checker-webpack-plugin": "^1.3.7",
-    "nativescript-dev-webpack": "~1.5.0",
+    "@nativescript/webpack": "~3.0.0",
     "node-sass": "^4.14.1",
     "patch-package": "^6.2.2",
     "react-refresh": "^0.8.3",
-    "tns-platform-declarations": "^6.0.1",
+    "@nativescript/types": "~7.0.0",
     "typescript": "^3.9.5"
   },
   "gitHead": "1350d382fb4b0ed4c6e9685df909518b2688e004",

packages/template-blank-ng/tsconfig.json

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { alert } from "tns-core-modules/ui/dialogs";
+import { Dialogs } from "@nativescript/core";
 
 export default function Greeting({}) {
     return (
@@ -26,7 +26,7 @@ export default function Greeting({}) {
                 col={1}
                 fontSize={24}
                 textAlignment={"center"}
-                onTap={() => alert("Tap received!")}
+                onTap={() => Dialogs.alert("Tap received!")}
             >
                 Tap me
             </button>

packages/template-blank-ng/tsconfig.tns.json

@@ -23,9 +23,6 @@
         "paths": {
             "~/*": [
                 "app/*"
-            ],
-            "*": [
-                "./node_modules/*"
             ]
         }
     },