From d59d94a1c19dac29b077bbc0bf8ec7c58bdd8cd1 Mon Sep 17 00:00:00 2001 From: Emerson Jair Date: Sun, 17 Mar 2019 22:18:35 -0300 Subject: [PATCH] fix(generators): install dependencies for app.nativescript (#107) close #106 --- src/app.nativescript/index.ts | 3 ++- src/app.nest/index.ts | 9 ++------- src/utils/general.ts | 6 ++++++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/app.nativescript/index.ts b/src/app.nativescript/index.ts index 6123b5a6..1fa55e24 100644 --- a/src/app.nativescript/index.ts +++ b/src/app.nativescript/index.ts @@ -13,7 +13,7 @@ import { schematic, noop, } from '@angular-devkit/schematics'; -import { stringUtils, prerun, getNpmScope, getPrefix, addRootDeps, updatePackageScripts, updateAngularProjects, updateNxProjects, applyAppNamingConvention, getGroupByName, getAppName, missingArgument, getJsonFromFile, setDependency, updateJsonFile } from '../utils'; +import { stringUtils, prerun, getNpmScope, getPrefix, addRootDeps, updatePackageScripts, updateAngularProjects, updateNxProjects, applyAppNamingConvention, getGroupByName, getAppName, missingArgument, addInstall, getJsonFromFile, setDependency, updateJsonFile } from '../utils'; import { Schema as ApplicationOptions } from './schema'; export default function (options: ApplicationOptions) { @@ -43,6 +43,7 @@ export default function (options: ApplicationOptions) { })(tree, context), // add root package dependencies (tree: Tree) => addRootDeps(tree, {nativescript: true}), + addInstall, addNsCli(options.addCliDependency), // add start/clean scripts (tree: Tree) => { diff --git a/src/app.nest/index.ts b/src/app.nest/index.ts index e0fe2114..33d22a1c 100644 --- a/src/app.nest/index.ts +++ b/src/app.nest/index.ts @@ -14,7 +14,6 @@ import { noop, externalSchematic } from "@angular-devkit/schematics"; -import { NodePackageInstallTask } from "@angular-devkit/schematics/tasks"; import { stringUtils, getNpmScope, @@ -29,7 +28,8 @@ import { applyAppNamingConvention, getAppName, updateJsonInTree, - missingArgument + missingArgument, + addInstall } from "../utils"; export default function (options: ApplicationOptions) { @@ -101,11 +101,6 @@ export default function (options: ApplicationOptions) { ]); } -function addInstall(host: Tree, context: SchematicContext) { - context.addTask(new NodePackageInstallTask()); - return host; -} - function addAppFiles( options: ApplicationOptions, appPath: string, diff --git a/src/utils/general.ts b/src/utils/general.ts index 56aef446..f68f325f 100644 --- a/src/utils/general.ts +++ b/src/utils/general.ts @@ -23,6 +23,7 @@ import { toFileName } from "./name-utils"; const util = require('util'); const xml2js = require('xml2js'); import * as stripJsonComments from 'strip-json-comments'; +import { NodePackageInstallTask } from "@angular-devkit/schematics/tasks"; export const supportedPlatforms = [ "web", @@ -1315,3 +1316,8 @@ export const toComponentClassName = (name: string) => `${classify(name)}Component`; export const toNgModuleClassName = (name: string) => `${classify(name)}Module`; + +export function addInstall(host: Tree, context: SchematicContext) { + context.addTask(new NodePackageInstallTask()); + return host; +} \ No newline at end of file