diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a5893e95..9cf9e7ae 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -44,7 +44,7 @@ yarn test {plugin} To run e2e tests for a plugin, run: ``` -yarn e2e {plugin} +yarn e2e {plugin}-e2e ``` ## Testing Locally diff --git a/packages/ionic-angular/CHANGELOG.md b/packages/ionic-angular/CHANGELOG.md index e3e48878..1c128bdf 100644 --- a/packages/ionic-angular/CHANGELOG.md +++ b/packages/ionic-angular/CHANGELOG.md @@ -1,8 +1,14 @@ # Changelog +# 13.1.1 + +## Bug Fixes + +- move `@nrwl/angular` to dependencies section of `package.json` + # 13.1.0 -# Features +## Features - add page generator (courtesy of @joshuamorony) diff --git a/packages/ionic-angular/package.json b/packages/ionic-angular/package.json index 7b110dee..99fbac0c 100644 --- a/packages/ionic-angular/package.json +++ b/packages/ionic-angular/package.json @@ -1,6 +1,6 @@ { "name": "@nxtend/ionic-angular", - "version": "13.1.0", + "version": "13.1.1", "description": "An Nx plugin for developing Ionic React applications and libraries", "author": { "name": "Devin Shoemaker", diff --git a/packages/ionic-angular/src/generators/application/generator.spec.ts b/packages/ionic-angular/src/generators/application/generator.spec.ts index f8ff9f3d..ce7004c3 100644 --- a/packages/ionic-angular/src/generators/application/generator.spec.ts +++ b/packages/ionic-angular/src/generators/application/generator.spec.ts @@ -24,7 +24,7 @@ describe('application schematic', () => { const packageJson = readJson(appTree, 'package.json'); expect(packageJson.dependencies['@ionic/angular']).toBeDefined(); - expect(packageJson.devDependencies['@nrwl/angular']).toBeDefined(); + expect(packageJson.dependencies['@nrwl/angular']).toBeDefined(); expect(packageJson.devDependencies['@nxtend/capacitor']).toBeDefined(); }); diff --git a/packages/ionic-angular/src/generators/application/lib/add-dependencies.ts b/packages/ionic-angular/src/generators/application/lib/add-dependencies.ts index a5525b11..a0c100f0 100644 --- a/packages/ionic-angular/src/generators/application/lib/add-dependencies.ts +++ b/packages/ionic-angular/src/generators/application/lib/add-dependencies.ts @@ -1,16 +1,26 @@ -import { addDependenciesToPackageJson, Tree } from '@nrwl/devkit'; +import { addDependenciesToPackageJson, readJson, Tree } from '@nrwl/devkit'; import { ionicAngularVersion, nxtendCapacitorVersion, nxVersion, } from '../../../utils/versions'; +let packageJson; + +const isExistingDependency = (name: string) => + packageJson?.dependencies?.[name] ? true : false; + export function addDependencies(host: Tree) { - return addDependenciesToPackageJson( - host, - { - '@ionic/angular': ionicAngularVersion, - }, - { '@nrwl/angular': nxVersion, '@nxtend/capacitor': nxtendCapacitorVersion } - ); + packageJson = readJson(host, 'package.json'); + let dependencies: Record = { + '@ionic/angular': ionicAngularVersion, + }; + + if (!isExistingDependency('@nrwl/angular')) { + dependencies = { ...dependencies, '@nrwl/angular': nxVersion }; + } + + return addDependenciesToPackageJson(host, dependencies, { + '@nxtend/capacitor': nxtendCapacitorVersion, + }); }