chore(release): 11.2.0-rc.0

Author: NathanWalker

package.json

@@ -1,9 +1,9 @@
 {
   "name": "@nativescript/schematics",
-  "version": "11.0.0",
+  "version": "11.2.0-rc.0",
   "description": "Schematics for NativeScript Angular apps.",
   "scripts": {
-    "clean": "npx rimraf node_modules package-lock.json && npm i",
+    "clean": "npx rimraf node_modules package-lock.json && npm i --legacy-peer-deps",
     "build": "tsc -p tsconfig.json",
     "watch": "tsc -w -p tsconfig.json",
     "test": "npm run build && npm run jasmine",
@@ -25,15 +25,15 @@
   },
   "schematics": "./src/collection.json",
   "dependencies": {
-    "@angular-devkit/core": "~11.0.0",
-    "@angular-devkit/schematics": "~11.0.0",
+    "@angular-devkit/core": "~11.2.0",
+    "@angular-devkit/schematics": "~11.2.0",
     "@nativescript/tslint-rules": "~0.0.5",
     "@phenomnomnominal/tsquery": "^4.1.0",
-    "@schematics/angular": "~11.0.0",
+    "@schematics/angular": "~11.2.0",
     "strip-json-comments": "~3.1.1"
   },
   "devDependencies": {
-    "@angular/cli": "~11.0.0",
+    "@angular/cli": "~11.2.0",
     "@types/jasmine": "~3.5.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",

src/add-ns/index.ts

@@ -81,9 +81,9 @@ const validateOptions = (options: MigrationOptions) => () => {
   }
 };
 
-const getProjectSettings = (projectName: string) => (tree: Tree, context: SchematicContext) => {
+const getProjectSettings = (projectName: string) => async (tree: Tree, context: SchematicContext) => {
   context.logger.info('Reading Project Settings');
-  projectSettings = getAngularProjectSettings(tree, projectName);
+  projectSettings = await getAngularProjectSettings(tree, projectName);
 
   context.logger.info(`Project settings:
 ${JSON.stringify(projectSettings, null, 2)}`);

src/angular-project-parser.ts

@@ -1,11 +1,11 @@
 import * as ts from 'typescript';
 import { basename } from 'path';
 import { Tree, SchematicsException } from '@angular-devkit/schematics';
-import { getWorkspace } from '@schematics/angular/utility/config';
 import {
   findBootstrapModuleCall,
   findBootstrapModulePath,
 } from '@schematics/angular/utility/ng-ast-utils';
+import { getWorkspace } from '@schematics/angular/utility/workspace';
 
 import { safeGet } from './utils';
 import { findNode, findImportPath, getSourceFile } from './ts-utils';
@@ -17,6 +17,8 @@ export interface AngularProjectSettings {
   /** default: 'src' */
   sourceRoot: string;
 
+  architect?: any;
+
   /** default: 'main' */
   mainName: string;
   /** default: 'src/main.ts' */
@@ -91,8 +93,8 @@ export interface ClassMetadata {
 
 type TypescriptResolver = (moduleName: string, containingFilePath: string) => string;
 
-export function getAngularProjectSettings(tree: Tree, projectName: string): AngularProjectSettings {
-  const projectSettings = getCoreProjectSettings(tree, projectName);
+export async function getAngularProjectSettings(tree: Tree, projectName: string): Promise<AngularProjectSettings> {
+  const projectSettings = await getCoreProjectSettings(tree, projectName);
 
   const tsResolver = getTypescriptResolver(tree, projectSettings.tsConfig);
   const entryModule = getEntryModuleMetadata(tree, projectSettings.mainPath, tsResolver);
@@ -118,8 +120,8 @@ export function getAngularProjectSettings(tree: Tree, projectName: string): Angu
   };
 }
 
-function getCoreProjectSettings(tree: Tree, projectName: string): CoreProjectSettings {
-  const { targets, project } = parseAngularConfig(tree, projectName);
+async function getCoreProjectSettings(tree: Tree, projectName: string): Promise<CoreProjectSettings> {
+  const { targets, project } = await parseAngularConfig(tree, projectName);
   if (!targets) {
     throw new SchematicsException(
       `Failed to find build targets for project ${projectName}!`,
@@ -150,22 +152,22 @@ function getCoreProjectSettings(tree: Tree, projectName: string): CoreProjectSet
   };
 }
 
-export function getTsConfigFromProject(tree: Tree, projectName: string): string {
-  const { targets } = parseAngularConfig(tree, projectName);
+export async function getTsConfigFromProject(tree: Tree, projectName: string) {
+  const { targets } = await parseAngularConfig(tree, projectName);
   const tsConfig = safeGet(targets, 'build', 'options', 'tsConfig');
 
   return tsConfig;
 }
 
-function parseAngularConfig(tree, projectName: string) {
-  const project = getProjectObject(tree, projectName);
+async function parseAngularConfig(tree, projectName: string) {
+  const project = await getProjectObject(tree, projectName);
   const targets = project.architect;
 
   return { targets, project };
 }
 
-export function getProjectObject(tree: Tree, projectName: string) {
-  const workspace = getWorkspace(tree);
+export async function getProjectObject(tree: Tree, projectName: string) {
+  const workspace = await getWorkspace(tree);
   const project = workspace.projects[projectName];
   if (!project) {
     throw new SchematicsException(`Couldn't find project "${projectName}" in the workspace!`);

src/convert-relative-imports/index.ts

@@ -15,7 +15,7 @@ const conversionFailureMessage = `Failed to generate remapped imports! Please se
   `https://docs.nativescript.org/angular/code-sharing/intro#remapped-imports`;
 
 export default function(options: ConvertRelativeImportsSchema) {
-  return (tree: Tree, context: SchematicContext) => {
+  return async (tree: Tree, context: SchematicContext) => {
     const { logger } = context;
 
     const filesToFix = getFilesToFix(tree, options.filesToIgnore);
@@ -25,7 +25,7 @@ export default function(options: ConvertRelativeImportsSchema) {
       return tree;
     }
 
-    const tsConfigPath = getTsConfigFromProject(tree, options.project) || 'tsconfig.json';
+    const tsConfigPath = await getTsConfigFromProject(tree, options.project) || 'tsconfig.json';
     const compilerOptions = getCompilerOptions(tree, tsConfigPath);
 
     if (!compilerOptions) {

src/migrate-component/component-info-utils.ts

@@ -19,8 +19,8 @@ export interface ComponentInfo {
 
 let projectSettings: AngularProjectSettings;
 
-export const parseComponentInfo = (options: MigrateComponentSchema) => (tree: Tree, context: SchematicContext) => {
-  projectSettings = getAngularProjectSettings(tree, options.project);
+export const parseComponentInfo = (options: MigrateComponentSchema) => async (tree: Tree, context: SchematicContext) => {
+  projectSettings = await getAngularProjectSettings(tree, options.project);
 
   const className = (options.name.endsWith('Component'))
     ? options.name

src/migrate-component/index.ts

@@ -37,8 +37,8 @@ export default function(options: MigrateComponentSchema): Rule {
         web: options.webext || nsconfigExtensions.web,
       };
     },
-    (tree: Tree, context: SchematicContext) => {
-      componentInfo = parseComponentInfo(options)(tree, context);
+    async (tree: Tree, context: SchematicContext) => {
+      componentInfo = await parseComponentInfo(options)(tree, context);
     },
 
     (tree: Tree, context: SchematicContext) =>

src/migrate-module/index.ts

@@ -39,8 +39,8 @@ export default function(options: MigrateModuleSchema): Rule {
         nsext = '.' + nsext;
       }
     },
-    (tree: Tree, context: SchematicContext) => {
-      moduleInfo = parseModuleInfo(options)(tree, context);
+    async (tree: Tree, context: SchematicContext) => {
+      moduleInfo = await parseModuleInfo(options)(tree, context);
     },
 
     (tree) => {

src/migrate-module/module-info-utils.ts

@@ -16,11 +16,11 @@ export interface ModuleInfo {
 
 let projectSettings: AngularProjectSettings;
 
-export const parseModuleInfo = (options: MigrateModuleSchema) => (
+export const parseModuleInfo = (options: MigrateModuleSchema) => async (
   tree: Tree,
   context: SchematicContext,
-): ModuleInfo => {
-  projectSettings = getAngularProjectSettings(tree, options.project);
+): Promise<ModuleInfo> => {
+  projectSettings = await getAngularProjectSettings(tree, options.project);
 
   const className = classify(`${options.name}Module`);
   const modulePath = findModulePath(options, tree);