diff --git a/packages/cli-scripts/CHANGELOG.md b/packages/cli-scripts/CHANGELOG.md index ff967eb73b..ab1c6585c7 100644 --- a/packages/cli-scripts/CHANGELOG.md +++ b/packages/cli-scripts/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.0.32](https://github.com/ionic-team/ionic-cli/compare/cli-scripts@1.0.31...cli-scripts@1.0.32) (2020-02-04) + +**Note:** Version bump only for package cli-scripts + + + + + ## [1.0.31](https://github.com/ionic-team/ionic-cli/compare/cli-scripts@1.0.30...cli-scripts@1.0.31) (2020-01-15) **Note:** Version bump only for package cli-scripts diff --git a/packages/cli-scripts/package.json b/packages/cli-scripts/package.json index 74ef610b41..d2e35ef7b4 100644 --- a/packages/cli-scripts/package.json +++ b/packages/cli-scripts/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "cli-scripts", - "version": "1.0.31", + "version": "1.0.32", "bin": { "ionic-cli-scripts": "./bin/ionic-cli-scripts" }, @@ -21,7 +21,7 @@ "ansi-styles": "^4.0.0", "chalk": "^3.0.0", "escape-string-regexp": "^2.0.0", - "ionic": "5.4.15", + "ionic": "5.4.16", "strip-ansi": "^6.0.0", "tslib": "^1.9.0" }, diff --git a/packages/ionic/CHANGELOG.md b/packages/ionic/CHANGELOG.md index 06ceaf2357..79d4d49b64 100644 --- a/packages/ionic/CHANGELOG.md +++ b/packages/ionic/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [5.4.16](https://github.com/ionic-team/ionic-cli/compare/ionic@5.4.15...ionic@5.4.16) (2020-02-04) + + +### Bug Fixes + +* **update:** show update message even with command error ([dee817e](https://github.com/ionic-team/ionic-cli/commit/dee817ed13c6730156224e7a2f145ed0ac8f4f81)) + + + + + ## [5.4.15](https://github.com/ionic-team/ionic-cli/compare/ionic@5.4.14...ionic@5.4.15) (2020-01-15) diff --git a/packages/ionic/package.json b/packages/ionic/package.json index 63de0a83d0..214dd9ebcb 100644 --- a/packages/ionic/package.json +++ b/packages/ionic/package.json @@ -1,6 +1,6 @@ { "name": "ionic", - "version": "5.4.15", + "version": "5.4.16", "description": "A tool for creating and developing Ionic Framework mobile apps.", "homepage": "https://ionicframework.com", "author": "Ionic Team (https://ionicframework.com) ", diff --git a/packages/ionic/src/index.ts b/packages/ionic/src/index.ts index fbb702040f..497535c0cb 100644 --- a/packages/ionic/src/index.ts +++ b/packages/ionic/src/index.ts @@ -125,13 +125,13 @@ export async function run(pargv: string[]): Promise { } await executor.execute(location, process.env); - + } catch (e) { + err = e; + } finally { if (ienv.flags.interactive) { const { runUpdateNotify } = await import('./lib/updates'); await runUpdateNotify(ienv, await loadPackageJson()); } - } catch (e) { - err = e; } if (err) { diff --git a/packages/ionic/src/lib/updates.ts b/packages/ionic/src/lib/updates.ts index bbb9fb1713..2a0afae431 100644 --- a/packages/ionic/src/lib/updates.ts +++ b/packages/ionic/src/lib/updates.ts @@ -6,14 +6,14 @@ import * as semver from 'semver'; import { IConfig, IonicEnvironment } from '../definitions'; -import { input, success, weak } from './color'; +import { input, strong, success, weak } from './color'; import { sendMessage } from './helper'; import { pkgFromRegistry, pkgManagerArgs } from './utils/npm'; const UPDATE_CONFIG_FILE = 'update.json'; const UPDATE_CHECK_INTERVAL = 60 * 60 * 24 * 1000; // 1 day const UPDATE_NOTIFY_INTERVAL = 60 * 60 * 12 * 1000; // 12 hours -const PACKAGES = ['ionic', 'native-run', 'cordova-res']; +const PACKAGES = ['@ionic/cli', 'ionic', 'native-run', 'cordova-res']; export interface PersistedPackage { name: string; @@ -79,10 +79,15 @@ export async function runUpdateCheck({ config }: PersistPackageVersionsDeps): Pr export async function runNotify(env: IonicEnvironment, pkg: PersistedPackage, latestVersion: string): Promise { const dir = path.dirname(env.config.p); - const args = await pkgManagerArgs(env.config.get('npmClient'), { command: 'install', pkg: pkg.name, global: true }); + const uninstallArgs = await pkgManagerArgs(env.config.get('npmClient'), { command: 'uninstall', pkg: 'ionic', global: true }); + const installArgs = await pkgManagerArgs(env.config.get('npmClient'), { command: 'install', pkg: '@ionic/cli', global: true }); const lines = [ `Ionic CLI update available: ${weak(pkg.version)} → ${success(latestVersion)}`, - `Run ${input(args.join(' '))} to update`, + '', + `${strong(`The package name has changed from ${input('ionic')} to ${input('@ionic/cli')}!`)}`, + '', + `To update, run: ${input(uninstallArgs.join(' '))}`, + `Then run: ${input(installArgs.join(' '))}`, ]; // TODO: Pull this into utils/format @@ -104,7 +109,7 @@ export async function runNotify(env: IonicEnvironment, pkg: PersistedPackage, la } export async function runUpdateNotify(env: IonicEnvironment, pkg: PackageJson): Promise { - const { name, version } = pkg; + const { name, version } = { ...pkg, name: '@ionic/cli' }; // use new package name const { lastUpdate, lastNotify, packages } = await getUpdateConfig(env); const latestPkg = packages.find(pkg => pkg.name === name); const latestVersion = latestPkg ? latestPkg.version : undefined;