feat(angular): v10 support (#286)

Author: NathanWalker

.npmignore

@@ -7,6 +7,7 @@
 *.spec.js
 *.js.map
 tsconfig.json
+*.tgz
 
 /jasmine-config
 

README.md

@@ -141,8 +141,8 @@ This includes the following steps:
 In a code sharing project to build:
 
  * a `web` app call: `ng serve`,
- * an `iOS` app call: `tns run ios --env.aot`,
- * an `Android` app call: `tns run android --env.aot`
+ * an `iOS` app call: `tns run ios`,
+ * an `Android` app call: `tns run android`
 
 ## Templates
 

package.json

@@ -1,8 +1,9 @@
 {
   "name": "@nativescript/schematics",
-  "version": "9.0.0",
+  "version": "10.0.1",
   "description": "Schematics for NativeScript Angular apps.",
   "scripts": {
+    "clean": "npx rimraf node_modules package-lock.json && npm i",
     "build": "tsc -p tsconfig.json",
     "watch": "tsc -w -p tsconfig.json",
     "test": "npm run build && npm run jasmine",
@@ -23,21 +24,23 @@
   },
   "schematics": "./src/collection.json",
   "dependencies": {
-    "@angular-devkit/core": "~9.1.0",
-    "@angular-devkit/schematics": "~9.1.0",
+    "@angular-devkit/core": "~10.0.0",
+    "@angular-devkit/schematics": "~10.0.0",
     "@nativescript/tslint-rules": "~0.0.5",
-    "@phenomnomnominal/tsquery": "^4.1.0"
+    "@phenomnomnominal/tsquery": "^4.1.0",
+    "strip-json-comments": "~3.1.1"
   },
   "devDependencies": {
-    "@schematics/angular": "~9.1.0",
+    "@angular/cli": "~10.0.0",
+    "@schematics/angular": "~10.0.0",
     "@types/jasmine": "~3.5.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",
     "conventional-changelog-cli": "^2.0.1",
-    "jasmine": "^2.8.0",
-    "jasmine-spec-reporter": "^4.2.1",
+    "jasmine": "^3.5.0",
+    "jasmine-spec-reporter": "^5.0.2",
     "tslint": "~6.1.0",
-    "typescript": "~3.8.3"
+    "typescript": "~3.9.0"
   },
   "repository": {
     "type": "git",
@@ -60,7 +63,8 @@
   "contributors": [
     "Stanimira Vlaeva <Stanimira.Vlaeva@progress.com>",
     "Sebastian Witalec <Sebastian.Witalec@progress.com>",
-    "Danny Koppenhagen <d-koppenhagen>"
+    "Danny Koppenhagen <d-koppenhagen>",
+    "NativeScript Team <oss@nativescript.org>"
   ],
   "license": "Apache-2.0"
 }

src/add-ns/_ns-files/__sourceDir__/app/__entryComponentName@dasherize__.component__nsext__.html

@@ -1,4 +1,18 @@
-<!-- https://docs.nativescript.org/angular/core-concepts/angular-navigation.html#page-router-outlet -->
-<page-router-outlet></page-router-outlet>
-<% if (skipAutoGeneratedComponent && !sample) { %><Label text="Entry Component works" textWrap="true"></Label>
-<% } %>
+<GridLayout>
+  <!-- This will contain any angular routes you setup -->
+  <page-router-outlet></page-router-outlet>
+
+  <% if (skipAutoGeneratedComponent && !sample) { %>
+  <!-- This is just a fun sample for you to play with :) -->
+  <StackLayout verticalAlignment="center" (loaded)="loadedSuccess($event)" opacity="0">
+    <Label text="Sweet!" textWrap="true" class="h2 text-center"></Label>
+    <Label text="You should try adding some routes." class="h3 text-center"></Label>
+  </StackLayout>
+  <StackLayout verticalAlignment="center" (loaded)="loadedContainer($event)">
+    <Label text="Congrats! It works" textWrap="true" class="h2 text-center"></Label>
+    <Button text="Keep Tapping for a Surprise!" textWrap="true" class="-primary" (tap)="tapMe()"></Button>
+    <Label [text]="'You have ' + cnt + ' taps left.'" class="h3 text-center"></Label>
+  </StackLayout>
+  <% } %>
+  
+</GridLayout>

src/add-ns/_ns-files/__sourceDir__/app/__entryComponentName@dasherize__.component__nsext__.ts

@@ -1,8 +1,45 @@
-import { Component } from '@angular/core';
+import { Component } from '@angular/core';<% if (skipAutoGeneratedComponent && !sample) { %>
+import { StackLayout, Enums } from '@nativescript/core';<% } %>
 
 @Component({
   selector: '<%= indexAppRootTag %>',
   templateUrl: '<%= entryComponentImportPath %>.html',
 })
+export class <%= entryComponentClassName %> {
+  <% if (skipAutoGeneratedComponent && !sample) { %>
+  title = 'NativeScript';
+  cnt = 3;
+  private messageLayout: StackLayout;
+  private successLayout: StackLayout;
 
-export class <%= entryComponentClassName %> { }
+  tapMe() {
+    this.cnt--;
+    if (this.cnt === 0) {
+      this.messageLayout
+        .animate({
+          translate: { x: 0, y: 150 },
+          opacity: 0,
+          duration: 400,
+          curve: Enums.AnimationCurve.easeOut,
+        })
+        .then(() => {
+          this.successLayout.translateY = 150;
+          this.successLayout.animate({
+            translate: { x: 0, y: 0 },
+            opacity: 1,
+            duration: 300,
+            curve: Enums.AnimationCurve.easeInOut,
+          });
+        });
+    }
+  }
+
+  loadedContainer(args) {
+    this.messageLayout = args.object;
+  }
+
+  loadedSuccess(args) {
+    this.successLayout = args.object;
+  }
+  <% } %>
+}

src/add-ns/_ns-files/__sourceDir__/main__nsext__.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 { <%= entryModuleClassName %> } from '<%= entryModuleImportPath %>';
 

src/add-ns/_ns-files/ngcc.config.js

@@ -3,6 +3,5 @@
   "appPath": "<%= sourceDir %>",
   "nsext": "<%= nsext %>",
   "webext": "<%= webext %>",
-  "shared": true,
-  "useLegacyWorkflow": false
+  "shared": true
 }

src/add-ns/_ns-files/nsconfig.json

@@ -3,7 +3,9 @@
   "compilerOptions": {
     "module": "ESNext",
     "moduleResolution": "node",
+    "experimentalDecorators": true,
     "skipLibCheck": true,
+    "baseUrl": ".",
     "paths": {
       "@src/*": [
         "<%= sourceDir %>/*.tns.ts",

src/add-ns/_ns-files/tsconfig__nsext__.json

@@ -223,8 +223,8 @@ const addRunScriptsToPackageJson = (tree: Tree, context: SchematicContext) => {
   const packageJson = getPackageJson(tree);
 
   const scriptsToAdd = {
-    android: 'tns run android --env.aot',
-    ios: 'tns run ios --env.aot',
+    android: 'tns run android --no-hmr',
+    ios: 'tns run ios --no-hmr',
     mobile: 'tns run',
     preview: 'tns preview',
     ngcc: 'ngcc --properties es2015 module main --first-only',
@@ -364,16 +364,16 @@ const addDependencies = () => (tree: Tree, context: SchematicContext) => {
 
   // @UPGRADE: Update all versions whenever {N} version updates
   const depsToAdd = {
-    '@nativescript/angular': '~9.0.0',
-    '@nativescript/core': '~6.5.5',
+    '@nativescript/angular': '~10.0.0',
+    '@nativescript/core': 'rc',
     '@nativescript/theme': '~2.2.1',
     'reflect-metadata': '~0.1.12',
     tslib: '1.10.0',
   };
   packageJson.dependencies = {...depsToAdd, ...packageJson.dependencies};
 
   const devDepsToAdd = {
-    'nativescript-dev-webpack': '~1.5.0',
+    '@nativescript/webpack': '~2.0.0',
     '@nativescript/tslint-rules': '~0.0.5',
   };
   packageJson.devDependencies = {...devDepsToAdd, ...packageJson.devDependencies};