chore: Angular 10.1 and NativeScript 7 (#296)

Author: NathanWalker

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/schematics",
-  "version": "10.0.2",
+  "version": "10.1.0",
   "description": "Schematics for NativeScript Angular apps.",
   "scripts": {
     "clean": "npx rimraf node_modules package-lock.json && npm i",
@@ -25,15 +25,15 @@
   },
   "schematics": "./src/collection.json",
   "dependencies": {
-    "@angular-devkit/core": "~10.0.0",
-    "@angular-devkit/schematics": "~10.0.0",
+    "@angular-devkit/core": "~10.1.0",
+    "@angular-devkit/schematics": "~10.1.0",
     "@nativescript/tslint-rules": "~0.0.5",
     "@phenomnomnominal/tsquery": "^4.1.0",
     "strip-json-comments": "~3.1.1"
   },
   "devDependencies": {
-    "@angular/cli": "~10.0.0",
-    "@schematics/angular": "~10.0.0",
+    "@angular/cli": "~10.1.0",
+    "@schematics/angular": "~10.1.0",
     "@types/jasmine": "~3.5.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",

src/add-ns/_ns-files/__sourceDir__/package.json

@@ -0,0 +1,11 @@
+import { NativeScriptConfig } from '@nativescript/core';
+
+export default {
+	id: 'org.nativescript.ngsample',
+	appResourcesPath: 'App_Resources',
+	android: {
+		v8Flags: '--expose_gc',
+		markingMode: 'none',
+	},
+	appPath: '<%= sourceDir %>'
+} as NativeScriptConfig;

src/add-ns/_ns-files/nativescript.config.ts

@@ -49,7 +49,7 @@ export default function(options: MigrationOptions): Rule {
     addAppResources(),
     mergeGitIgnore,
     addRunScriptsToPackageJson,
-    addNativeScriptProjectId,
+    // addNativeScriptProjectId,
 
     modifyWebTsconfig,
     modifyTsLintConfig,
@@ -223,12 +223,12 @@ const addRunScriptsToPackageJson = (tree: Tree, context: SchematicContext) => {
   const packageJson = getPackageJson(tree);
 
   const scriptsToAdd = {
-    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',
-    postinstall: 'npm run ngcc',
+    android: 'ns run android --no-hmr',
+    ios: 'ns run ios --no-hmr',
+    mobile: 'ns run',
+    // preview: 'ns preview',
+    // ngcc: 'ngcc --properties es2015 module main --first-only',
+    // postinstall: 'npm run ngcc',
   };
   packageJson.scripts = {...scriptsToAdd, ...packageJson.scripts};
 
@@ -362,18 +362,21 @@ const addDependencies = () => (tree: Tree, context: SchematicContext) => {
   context.logger.info('Adding npm dependencies');
   const packageJson = getPackageJson(tree);
 
+  // add {N} 7 main key
+  (<any>packageJson).main = 'main.tns.js';
+
   // @UPGRADE: Update all versions whenever {N} version updates
   const depsToAdd = {
-    '@nativescript/angular': '~10.0.0',
-    '@nativescript/core': 'rc',
-    '@nativescript/theme': '~2.2.1',
+    '@nativescript/angular': '~10.1.0',
+    '@nativescript/core': '~7.0.0',
+    '@nativescript/theme': '~2.5.0',
     'reflect-metadata': '~0.1.12',
     tslib: '1.10.0',
   };
   packageJson.dependencies = {...depsToAdd, ...packageJson.dependencies};
 
   const devDepsToAdd = {
-    '@nativescript/webpack': '~2.0.0',
+    '@nativescript/webpack': '~3.0.0',
     '@nativescript/tslint-rules': '~0.0.5',
   };
   packageJson.devDependencies = {...devDepsToAdd, ...packageJson.devDependencies};

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

@@ -45,7 +45,7 @@ describe('Add {N} schematic', () => {
         it('should add {N} specific files', () => {
             const files = appTree.files;
 
-            expect(files).toContain('/nsconfig.json');
+            expect(files).toContain('/nativescript.config.ts');
             expect(files).toContain('/tsconfig.tns.json');
             expect(files).toContain('/src/app.css');
             expect(files).toContain('/src/main.tns.ts');
@@ -94,22 +94,22 @@ describe('Add {N} schematic', () => {
             const packageJson = JSON.parse(stripJsonComments(getFileContent(appTree, packageJsonPath)));
             const { scripts } = packageJson;
             expect(scripts).toBeDefined();
-            expect(scripts.android).toEqual('tns run android --no-hmr');
-            expect(scripts.ios).toEqual('tns run ios --no-hmr');
-            expect(scripts.ngcc).toEqual('ngcc --properties es2015 module main --first-only');
-            expect(scripts.postinstall).toEqual('npm run ngcc');
+            expect(scripts.android).toEqual('ns run android --no-hmr');
+            expect(scripts.ios).toEqual('ns run ios --no-hmr');
+            // expect(scripts.ngcc).toEqual('ngcc --properties es2015 module main --first-only');
+            // expect(scripts.postinstall).toEqual('npm run ngcc');
         });
 
-        it('should add NativeScript key to the package json', () => {
-            const packageJsonPath = '/package.json';
-            expect(appTree.files).toContain(packageJsonPath);
+        // it('should add NativeScript key to the package json', () => {
+        //     const packageJsonPath = '/package.json';
+        //     expect(appTree.files).toContain(packageJsonPath);
 
-            const packageJson = JSON.parse(stripJsonComments(getFileContent(appTree, packageJsonPath)));
-            const { nativescript } = packageJson;
+        //     const packageJson = JSON.parse(stripJsonComments(getFileContent(appTree, packageJsonPath)));
+        //     const { nativescript } = packageJson;
 
-            expect(nativescript).toBeDefined();
-            expect(nativescript.id).toEqual('org.nativescript.ngsample');
-        });
+        //     expect(nativescript).toBeDefined();
+        //     expect(nativescript.id).toEqual('org.nativescript.ngsample');
+        // });
 
         it('should modify the tsconfig.app.json (web) to include files and path mappings', () => {
             const webTsConfigPath = '/tsconfig.app.json';
@@ -294,7 +294,7 @@ async function setupProject(
         'workspace',
         {
             name: 'workspace',
-            version: '10.0.0',
+            version: '10.1.0',
             newProjectRoot: '',
         },
     ).toPromise();

src/add-ns/index.ts

@@ -1,4 +1,4 @@
-import * as ts from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
+import * as ts from 'typescript';
 import { basename } from 'path';
 import { Tree, SchematicsException } from '@angular-devkit/schematics';
 import { getWorkspace } from '@schematics/angular/utility/config';

src/add-ns/index_spec.ts

@@ -1,4 +1,4 @@
-import * as ts from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
+import * as ts from 'typescript';
 import { IRule, Replacement } from 'tslint';
 import { tsquery } from '@phenomnomnominal/tsquery';
 import { Tree, SchematicContext, isContentAction } from '@angular-devkit/schematics';

src/angular-project-parser.ts

@@ -1,4 +1,4 @@
-import * as ts from '@schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript';
+import * as ts from 'typescript';
 import { Tree } from '@angular-devkit/schematics';
 
 import { findNode, findMatchingNodes, findImportPath, getSourceFile } from './ts-utils';

src/convert-relative-imports/index.ts

@@ -13,9 +13,10 @@ import {
 import { dasherize, classify } from '@angular-devkit/core/src/utils/strings';
 
 import { Schema as MasterDetailSchema } from './schema';
-import { getNsConfig } from '../../utils';
+// import { getNsConfig } from '../../utils';
 import { join } from 'path';
 import { Schema as ConvertRelativeImportsSchema } from '../../convert-relative-imports/schema';
+import { DEFAULT_SHARED_EXTENSIONS } from '../../generate/utils';
 
 let projectParams: ProjectInfo;
 
@@ -69,13 +70,13 @@ interface ProjectInfo {
   nsext: string;
 }
 const getProjectInfo = (tree: Tree): ProjectInfo => {
-  if (tree.exists('nsconfig.json')) {
-    const nsconfig = getNsConfig(tree);
+  if (tree.exists('nativescript.config.ts')) {
+    // const nsconfig = getNsConfig(tree);
 
     return {
-      shared: nsconfig.shared,
-      appPath: join(nsconfig.appPath, 'app'),
-      nsext: nsconfig.nsext,
+      shared: true,//nsconfig.shared,
+      appPath: join(tree.exists('app') ? 'app' : 'src', 'app'), //join(nsconfig.appPath, 'app'),
+      nsext: DEFAULT_SHARED_EXTENSIONS.ns,// nsconfig.nsext,
     };
   }