diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 4644900027..0000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,193 +0,0 @@ -version: 2 - -# ALIASES & DEFAULTS - -aliases: - - &restore-cache - keys: - - dependency-cache-{{ checksum "package.json" }} - - dependency-cache-{{ checksum "packages/@ionic/cli/package.json" }} - - dependency-cache-{{ checksum "packages/@ionic/cli-framework/package.json" }} - - dependency-cache-{{ checksum "packages/@ionic/cli-framework-prompts/package.json" }} - - dependency-cache-{{ checksum "packages/@ionic/discover/package.json" }} - - dependency-cache-{{ checksum "packages/@ionic/lab/package.json" }} - - dependency-cache-{{ checksum "packages/@ionic/utils-array/package.json" }} - - dependency-cache-{{ checksum "packages/@ionic/utils-fs/package.json" }} - - dependency-cache-{{ checksum "packages/@ionic/utils-network/package.json" }} - - dependency-cache-{{ checksum "packages/@ionic/utils-object/package.json" }} - - dependency-cache-{{ checksum "packages/@ionic/utils-process/package.json" }} - - dependency-cache-{{ checksum "packages/@ionic/utils-stream/package.json" }} - - dependency-cache-{{ checksum "packages/@ionic/utils-subprocess/package.json" }} - - dependency-cache-{{ checksum "packages/@ionic/utils-terminal/package.json" }} - - dependency-cache-{{ checksum "packages/@ionic/v1-toolkit/package.json" }} - - dependency-cache-{{ checksum "packages/cli-scripts/package.json" }} - - - &save-cache - key: dependency-cache-{{ checksum "package.json" }} - paths: - - node_modules - - - &save-cache-cli - key: dependency-cache-{{ checksum "packages/@ionic/cli/package.json" }} - paths: - - packages/@ionic/cli/node_modules - - - &save-cache-cli-framework - key: dependency-cache-{{ checksum "packages/@ionic/cli-framework/package.json" }} - paths: - - packages/@ionic/cli-framework/node_modules - - - &save-cache-cli-framework-prompts - key: dependency-cache-{{ checksum "packages/@ionic/cli-framework-prompts/package.json" }} - paths: - - packages/@ionic/cli-framework-prompts/node_modules - - - &save-cache-discover - key: dependency-cache-{{ checksum "packages/@ionic/discover/package.json" }} - paths: - - packages/@ionic/discover/node_modules - - - &save-cache-lab - key: dependency-cache-{{ checksum "packages/@ionic/lab/package.json" }} - paths: - - packages/@ionic/lab/node_modules - - - &save-cache-utils-array - key: dependency-cache-{{ checksum "packages/@ionic/utils-array/package.json" }} - paths: - - packages/@ionic/utils-array/node_modules - - - &save-cache-utils-fs - key: dependency-cache-{{ checksum "packages/@ionic/utils-fs/package.json" }} - paths: - - packages/@ionic/utils-fs/node_modules - - - &save-cache-utils-network - key: dependency-cache-{{ checksum "packages/@ionic/utils-network/package.json" }} - paths: - - packages/@ionic/utils-network/node_modules - - - &save-cache-utils-object - key: dependency-cache-{{ checksum "packages/@ionic/utils-object/package.json" }} - paths: - - packages/@ionic/utils-object/node_modules - - - &save-cache-utils-process - key: dependency-cache-{{ checksum "packages/@ionic/utils-process/package.json" }} - paths: - - packages/@ionic/utils-process/node_modules - - - &save-cache-utils-stream - key: dependency-cache-{{ checksum "packages/@ionic/utils-stream/package.json" }} - paths: - - packages/@ionic/utils-stream/node_modules - - - &save-cache-utils-subprocess - key: dependency-cache-{{ checksum "packages/@ionic/utils-subprocess/package.json" }} - paths: - - packages/@ionic/utils-subprocess/node_modules - - - &save-cache-utils-terminal - key: dependency-cache-{{ checksum "packages/@ionic/utils-terminal/package.json" }} - paths: - - packages/@ionic/utils-terminal/node_modules - - - &save-cache-v1-toolkit - key: dependency-cache-{{ checksum "packages/@ionic/v1-toolkit/package.json" }} - paths: - - packages/@ionic/v1-toolkit/node_modules - - - &save-cache-cli-scripts - key: dependency-cache-{{ checksum "packages/cli-scripts/package.json" }} - paths: - - packages/cli-scripts/node_modules - -defaults: &defaults - docker: - - image: circleci/node:12 - working_directory: /tmp/workspace - - -unit-test-base: &unit-test-base - <<: *defaults - steps: - - checkout - - attach_workspace: - at: /tmp/workspace - - run: npm rebuild # We need to rebuild/recompile for specific Node versions. - - run: npm run test - -# JOBS - -jobs: - build: - <<: *defaults - steps: - - checkout - - restore_cache: *restore-cache - - run: npm install - - save_cache: *save-cache - - run: npm run bootstrap - - run: npm run lint - - save_cache: *save-cache-cli - - save_cache: *save-cache-cli-framework - - save_cache: *save-cache-cli-framework-prompts - - save_cache: *save-cache-discover - - save_cache: *save-cache-lab - - save_cache: *save-cache-utils-array - - save_cache: *save-cache-utils-fs - - save_cache: *save-cache-utils-network - - save_cache: *save-cache-utils-object - - save_cache: *save-cache-utils-process - - save_cache: *save-cache-utils-stream - - save_cache: *save-cache-utils-subprocess - - save_cache: *save-cache-utils-terminal - - save_cache: *save-cache-v1-toolkit - - save_cache: *save-cache-cli-scripts - - persist_to_workspace: - root: /tmp/workspace - paths: - - "*" - - unit-test-node-10: - <<: *unit-test-base - docker: - - image: circleci/node:10 - - unit-test-node-12: - <<: *unit-test-base - - deploy: - <<: *defaults - environment: - GIT_AUTHOR_NAME: Ionitron - GIT_AUTHOR_EMAIL: hi@ionicframework.com - GIT_COMMITTER_NAME: Ionitron - GIT_COMMITTER_EMAIL: hi@ionicframework.com - steps: - - add_ssh_keys: - fingerprints: - - "d6:7e:1d:d6:ff:84:c5:2a:60:c8:19:a7:22:08:b5:e6" # ionitron user key - - checkout - - attach_workspace: - at: /tmp/workspace - - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc - - run: npm run publish:ci -- --yes - - -workflows: - version: 2 - build: - jobs: - - build - - unit-test-node-10: - requires: [build] - - unit-test-node-12: - requires: [build] - - deploy: - requires: - - unit-test-node-10 - - unit-test-node-12 - filters: - branches: - only: master diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml new file mode 100644 index 0000000000..0796b7fd3f --- /dev/null +++ b/.github/workflows/cd.yml @@ -0,0 +1,32 @@ +name: CD + +on: + push: + branches: + - master + +jobs: + build: + name: Build, Test, and Deploy + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ~/.npmrc + - uses: actions/setup-node@v1 + with: + node-version: 12.x + - uses: actions/checkout@v2 + - name: Restore Dependency Cache + uses: actions/cache@v1 + with: + path: ~/.npm + key: ${{ runner.OS }}-dependency-cache-${{ hashFiles('**/package.json') }} + - run: npm install + - run: npm run bootstrap + - run: npm run publish:ci -- --yes + env: + GH_TOKEN: ${{ secrets.GH_TOKEN }} + GIT_AUTHOR_NAME: Ionitron + GIT_AUTHOR_EMAIL: hi@ionicframework.com + GIT_COMMITTER_NAME: Ionitron + GIT_COMMITTER_EMAIL: hi@ionicframework.com diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000000..3f88007ad7 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,31 @@ +name: CI + +on: + push: + branches-ignore: + - master + +jobs: + build-and-test: + name: Build and Test (Node ${{ matrix.node }}) + runs-on: ubuntu-latest + timeout-minutes: 30 + strategy: + matrix: + node: + - 12.x + - 10.x + steps: + - uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node }} + - uses: actions/checkout@v2 + - name: Restore Dependency Cache + uses: actions/cache@v1 + with: + path: ~/.npm + key: ${{ runner.OS }}-dependency-cache-${{ hashFiles('**/package.json') }} + - run: npm install + - run: npm run bootstrap + - run: npm run lint + - run: npm test diff --git a/README.md b/README.md index 6c2ed374db..b15062e253 100644 --- a/README.md +++ b/README.md @@ -48,5 +48,5 @@ ionic cordova run --help [circle-badge]: https://circleci.com/gh/ionic-team/ionic-cli.svg?style=shield [circle-badge-url]: https://circleci.com/gh/ionic-team/ionic-cli -[npm-badge]: https://img.shields.io/npm/v/ionic.svg +[npm-badge]: https://img.shields.io/npm/v/@ionic/cli.svg [npm-badge-url]: https://www.npmjs.com/package/@ionic/cli diff --git a/packages/@ionic/cli-framework-prompts/CHANGELOG.md b/packages/@ionic/cli-framework-prompts/CHANGELOG.md index bc4fc108e7..00e2199ee2 100644 --- a/packages/@ionic/cli-framework-prompts/CHANGELOG.md +++ b/packages/@ionic/cli-framework-prompts/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. +## 2.0.1 (2020-02-03) + +**Note:** Version bump only for package @ionic/cli-framework-prompts + + + + + # [2.0.0](https://github.com/ionic-team/ionic-cli/compare/@ionic/cli-framework-prompts@1.0.4...@ionic/cli-framework-prompts@2.0.0) (2020-01-25) diff --git a/packages/@ionic/cli-framework-prompts/package.json b/packages/@ionic/cli-framework-prompts/package.json index 0728ab0c26..ab69956ef7 100644 --- a/packages/@ionic/cli-framework-prompts/package.json +++ b/packages/@ionic/cli-framework-prompts/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/cli-framework-prompts", - "version": "2.0.0", + "version": "2.0.1", "description": "The interactive prompts portion of Ionic CLI Framework", "homepage": "https://ionicframework.com/", "author": "Ionic Team (https://ionicframework.com)", @@ -24,7 +24,7 @@ }, "license": "MIT", "dependencies": { - "@ionic/utils-terminal": "2.0.0", + "@ionic/utils-terminal": "2.0.1", "debug": "^4.0.0", "inquirer": "^7.0.0", "tslib": "^1.9.0" @@ -32,10 +32,10 @@ "devDependencies": { "@types/debug": "^4.1.1", "@types/inquirer": "0.0.43", - "@types/jest": "^24.0.3", + "@types/jest": "^25.1.0", "@types/node": "~10.17.13", "jest": "^25.1.0", - "jest-cli": "^24.1.0", + "jest-cli": "^25.1.0", "lint-staged": "^10.0.2", "ts-jest": "^25.0.0", "tslint": "^5.9.1", diff --git a/packages/@ionic/cli-framework/CHANGELOG.md b/packages/@ionic/cli-framework/CHANGELOG.md index e2544b2f7f..2b8f83befb 100644 --- a/packages/@ionic/cli-framework/CHANGELOG.md +++ b/packages/@ionic/cli-framework/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. +## 4.0.1 (2020-02-03) + +**Note:** Version bump only for package @ionic/cli-framework + + + + + # [4.0.0](https://github.com/ionic-team/ionic-cli/compare/@ionic/cli-framework@3.0.6...@ionic/cli-framework@4.0.0) (2020-01-25) diff --git a/packages/@ionic/cli-framework/package.json b/packages/@ionic/cli-framework/package.json index 4cb2ae63e1..77e93f7322 100644 --- a/packages/@ionic/cli-framework/package.json +++ b/packages/@ionic/cli-framework/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/cli-framework", - "version": "4.0.0", + "version": "4.0.1", "description": "The foundation framework of the Ionic CLI", "homepage": "https://ionicframework.com/", "author": "Ionic Team (https://ionicframework.com) ", @@ -19,13 +19,13 @@ }, "license": "MIT", "dependencies": { - "@ionic/utils-array": "2.0.0", - "@ionic/utils-fs": "3.0.0", - "@ionic/utils-object": "2.0.0", - "@ionic/utils-process": "2.0.0", - "@ionic/utils-stream": "3.0.0", - "@ionic/utils-subprocess": "2.0.0", - "@ionic/utils-terminal": "2.0.0", + "@ionic/utils-array": "2.0.1", + "@ionic/utils-fs": "3.0.1", + "@ionic/utils-object": "2.0.1", + "@ionic/utils-process": "2.0.1", + "@ionic/utils-stream": "3.0.1", + "@ionic/utils-subprocess": "2.0.1", + "@ionic/utils-terminal": "2.0.1", "chalk": "^3.0.0", "debug": "^4.0.0", "lodash": "^4.17.5", @@ -42,7 +42,7 @@ }, "devDependencies": { "@types/debug": "^4.1.1", - "@types/jest": "^24.0.3", + "@types/jest": "^25.1.0", "@types/lodash": "^4.14.104", "@types/minimist": "^1.2.0", "@types/node": "~10.17.13", @@ -51,7 +51,7 @@ "@types/wrap-ansi": "^3.0.0", "@types/write-file-atomic": "^3.0.0", "jest": "^25.1.0", - "jest-cli": "^24.1.0", + "jest-cli": "^25.1.0", "lint-staged": "^10.0.2", "ts-jest": "^25.0.0", "tslint": "^5.9.1", diff --git a/packages/@ionic/cli-framework/src/lib/__tests__/help.ts b/packages/@ionic/cli-framework/src/lib/__tests__/help.ts index b0fb2d4f79..9ecb02018c 100644 --- a/packages/@ionic/cli-framework/src/lib/__tests__/help.ts +++ b/packages/@ionic/cli-framework/src/lib/__tests__/help.ts @@ -130,7 +130,7 @@ describe('@ionic/cli-framework', () => { it('should format a command appropriately', async () => { const myns = new MyNamespace(); - const location = await myns.locate(['foo', 'bar']); + const location = await myns.locate(['foo', 'b']); const formatter = new CommandStringHelpFormatter({ location, command: location.obj as any }); const result = await formatter.format(); @@ -193,7 +193,7 @@ describe('@ionic/cli-framework', () => { it('should format a subnamespace appropriately', async () => { const myns = new MyNamespace(); - const location = await myns.locate(['foo']); + const location = await myns.locate(['f']); const formatter = new NamespaceStringHelpFormatter({ location, namespace: location.obj as any }); const result = await formatter.format(); diff --git a/packages/@ionic/cli-framework/src/lib/help.ts b/packages/@ionic/cli-framework/src/lib/help.ts index 36d98746ac..0ee16e20ef 100644 --- a/packages/@ionic/cli-framework/src/lib/help.ts +++ b/packages/@ionic/cli-framework/src/lib/help.ts @@ -139,7 +139,14 @@ export abstract class NamespaceHelpFormatter, async getNamespaceFullName(): Promise { if (!this._fullName) { - this._fullName = this.location.path.map(([p]) => p).join(' '); + const parts = await map( + this.location.path.slice(0, this.location.path.length - 1), + async ([, cmd]) => (await cmd.getMetadata()).name + ); + + const name = (await this.getNamespaceMetadata()).name; + + this._fullName = [...parts, name].join(' '); } return this._fullName; @@ -406,7 +413,14 @@ export abstract class CommandHelpFormatter, N async getCommandFullName(): Promise { if (!this._fullName) { - this._fullName = this.location.path.map(([p]) => p).join(' '); + const parts = await map( + this.location.path.slice(0, this.location.path.length - 1), + async ([, cmd]) => (await cmd.getMetadata()).name + ); + + const name = (await this.getCommandMetadata()).name; + + this._fullName = [...parts, name].join(' '); } return this._fullName; diff --git a/packages/@ionic/cli/CHANGELOG.md b/packages/@ionic/cli/CHANGELOG.md index 7d01f69e9a..ac9a3d070d 100644 --- a/packages/@ionic/cli/CHANGELOG.md +++ b/packages/@ionic/cli/CHANGELOG.md @@ -3,19 +3,45 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. -# 6.0.0 (2020-01-25) +## 6.0.1 (2020-02-03) +**Note:** Version bump only for package @ionic/cli -### chore -* rename Ionic CLI package to `@ionic/cli` ([1f86b34](https://github.com/ionic-team/ionic-cli/commit/1f86b34dc4ebfd565c240a6b4a44f3815a18b769)) -### BREAKING CHANGES -* The npm package for the Ionic CLI is now `@ionic/cli`. +# [6.0.0](https://github.com/ionic-team/ionic-cli/compare/ionic@5.4.15...@ionic/cli@6.0.0) (2020-01-25) + +The following changes were made in this major release of the Ionic CLI: + +* The package name for the Ionic CLI is now `@ionic/cli`! :tada: The old `ionic` package will not be updated to CLI 6. +* The DevApp [has been retired](https://ionicframework.com/docs/appflow/devapp), so `--devapp` has been removed from `ionic serve`. We encourage you to use native tooling (Cordova/Capacitor, Android Studio, and Xcode) to develop apps on hardware and virtual devices. +* The Ionic Resources server is being retired, so `--no-cordova-res` has been removed from `ionic cordova resources`. We encourage you to switch to [`cordova-res`](https://github.com/ionic-team/cordova-res). +* We are now recommending :zap: [Capacitor](https://capacitor.ionicframework.com/) :zap: as the official native runtime for Ionic apps. Cordova will still be supported for this major release. +#### :lollipop: Upgrading from CLI 5 +Make sure you have NodeJS v10.3.0+ installed. We recommend [the latest LTS version](https://nodejs.org/). + +Uninstall the old Ionic CLI from your computer. + +``` +npm uninstall -g ionic +``` + +Install Ionic CLI 6 to your computer. + +``` +npm install -g @ionic/cli +``` + +### BREAKING CHANGES + +* The npm package for the Ionic CLI is now `@ionic/cli`. +* A minimum of Node.js 10.3.0 is required. +* `--devapp` is no longer an option of `ionic serve`. +* `--no-cordova-res` is no longer an option of `ionic cordova resources`. diff --git a/packages/@ionic/cli/package.json b/packages/@ionic/cli/package.json index 0d06294f39..d7032f5003 100644 --- a/packages/@ionic/cli/package.json +++ b/packages/@ionic/cli/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/cli", - "version": "6.0.0", + "version": "6.0.1", "description": "A tool for creating and developing Ionic Framework mobile apps.", "homepage": "https://ionicframework.com", "author": "Ionic Team (https://ionicframework.com) ", @@ -40,15 +40,15 @@ }, "license": "MIT", "dependencies": { - "@ionic/cli-framework": "4.0.0", - "@ionic/cli-framework-prompts": "2.0.0", - "@ionic/utils-array": "2.0.0", - "@ionic/utils-fs": "3.0.0", - "@ionic/utils-network": "2.0.0", - "@ionic/utils-process": "2.0.0", - "@ionic/utils-stream": "3.0.0", - "@ionic/utils-subprocess": "2.0.0", - "@ionic/utils-terminal": "2.0.0", + "@ionic/cli-framework": "4.0.1", + "@ionic/cli-framework-prompts": "2.0.1", + "@ionic/utils-array": "2.0.1", + "@ionic/utils-fs": "3.0.1", + "@ionic/utils-network": "2.0.1", + "@ionic/utils-process": "2.0.1", + "@ionic/utils-stream": "3.0.1", + "@ionic/utils-subprocess": "2.0.1", + "@ionic/utils-terminal": "2.0.1", "chalk": "^3.0.0", "debug": "^4.0.0", "diff": "^4.0.1", @@ -63,7 +63,7 @@ "stream-combiner2": "^1.1.1", "superagent": "^5.2.1", "superagent-proxy": "^2.0.0", - "tar": "^5.0.5", + "tar": "^6.0.1", "through2": "^3.0.0", "tslib": "^1.9.0", "uuid": "^3.2.1" @@ -72,12 +72,12 @@ "@types/debug": "^4.1.1", "@types/diff": "^4.0.0", "@types/elementtree": "^0.1.0", - "@types/jest": "^24.0.3", + "@types/jest": "^25.1.0", "@types/lodash": "^4.14.104", "@types/node": "~10.17.13", "@types/open": "~6.2.1", "@types/os-name": "^3.1.0", - "@types/semver": "^6.0.0", + "@types/semver": "^7.1.0", "@types/split2": "^2.1.6", "@types/superagent": "^4.1.3", "@types/superagent-proxy": "^2.0.0", @@ -85,7 +85,7 @@ "@types/through2": "^2.0.33", "@types/uuid": "^3.4.3", "jest": "^25.1.0", - "jest-cli": "^24.1.0", + "jest-cli": "^25.1.0", "lint-staged": "^10.0.2", "rimraf": "^3.0.0", "source-map": "^0.7.0", diff --git a/packages/@ionic/cli/src/commands/config/index.ts b/packages/@ionic/cli/src/commands/config/index.ts index c7796d17e9..66c6026fad 100644 --- a/packages/@ionic/cli/src/commands/config/index.ts +++ b/packages/@ionic/cli/src/commands/config/index.ts @@ -26,6 +26,8 @@ To use these commands for the global CLI config file (${strong('~/.ionic/config. ['get', async () => { const { ConfigGetCommand } = await import('./get'); return new ConfigGetCommand(this); }], ['set', async () => { const { ConfigSetCommand } = await import('./set'); return new ConfigSetCommand(this); }], ['unset', async () => { const { ConfigUnsetCommand } = await import('./unset'); return new ConfigUnsetCommand(this); }], + ['delete', 'unset'], + ['del', 'unset'], ]); } } diff --git a/packages/@ionic/cli/src/commands/cordova/index.ts b/packages/@ionic/cli/src/commands/cordova/index.ts index 2e1c3c9c6b..3cf5169e7e 100644 --- a/packages/@ionic/cli/src/commands/cordova/index.ts +++ b/packages/@ionic/cli/src/commands/cordova/index.ts @@ -29,6 +29,7 @@ Cordova Reference documentation: ['requirements', async () => { const { RequirementsCommand } = await import('./requirements'); return new RequirementsCommand(this); }], ['platforms', 'platform'], ['plugins', 'plugin'], + ['res', 'resources'], ]); } } diff --git a/packages/@ionic/cli/src/commands/index.ts b/packages/@ionic/cli/src/commands/index.ts index ec3fe113cb..427a73aabf 100644 --- a/packages/@ionic/cli/src/commands/index.ts +++ b/packages/@ionic/cli/src/commands/index.ts @@ -54,7 +54,9 @@ export class IonicNamespace extends Namespace { ['integrations', async () => { const { IntegrationsNamespace } = await import('./integrations/index'); return new IntegrationsNamespace(this); }], ['enterprise', async () => { const { EnterpriseNamespace } = await import('./enterprise/index'); return new EnterpriseNamespace(this); }], ['cap', 'capacitor'], + ['cdv', 'cordova'], ['i', 'integrations'], + ['integration', 'integrations'], ]); } diff --git a/packages/@ionic/cli/src/commands/integrations/index.ts b/packages/@ionic/cli/src/commands/integrations/index.ts index 8cb767dcaa..691ddab91e 100644 --- a/packages/@ionic/cli/src/commands/integrations/index.ts +++ b/packages/@ionic/cli/src/commands/integrations/index.ts @@ -15,6 +15,13 @@ export class IntegrationsNamespace extends Namespace { ['disable', async () => { const { IntegrationsDisableCommand } = await import('./disable'); return new IntegrationsDisableCommand(this); }], ['list', async () => { const { IntegrationsListCommand } = await import('./list'); return new IntegrationsListCommand(this); }], ['ls', 'list'], + ['en', 'enable'], + ['add', 'enable'], + ['dis', 'disable'], + ['delete', 'disable'], + ['del', 'disable'], + ['remove', 'disable'], + ['rm', 'disable'], ]); } } diff --git a/packages/@ionic/cli/src/index.ts b/packages/@ionic/cli/src/index.ts index fbb702040f..497535c0cb 100644 --- a/packages/@ionic/cli/src/index.ts +++ b/packages/@ionic/cli/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/cli/src/lib/start.ts b/packages/@ionic/cli/src/lib/start.ts index 9c62390d58..ea141fef75 100644 --- a/packages/@ionic/cli/src/lib/start.ts +++ b/packages/@ionic/cli/src/lib/start.ts @@ -240,7 +240,7 @@ export const STARTER_TEMPLATES: StarterTemplate[] = [ projectType: 'angular', type: 'repo', description: 'An example application that builds a camera with gallery', - repo: 'https://github.com/ionic-team/photo-gallery-tutorial-ionic4', + repo: 'https://github.com/ionic-team/photo-gallery-capacitor-ng', }, { name: 'conference', @@ -256,6 +256,13 @@ export const STARTER_TEMPLATES: StarterTemplate[] = [ description: 'A blank starter project', id: 'react-official-blank', }, + { + name: 'my-first-app', + projectType: 'react', + type: 'repo', + description: 'An example application that builds a camera with gallery', + repo: 'https://github.com/ionic-team/photo-gallery-capacitor-react', + }, { name: 'sidemenu', projectType: 'react', diff --git a/packages/@ionic/discover/CHANGELOG.md b/packages/@ionic/discover/CHANGELOG.md index df0079ea46..ca1c22538b 100644 --- a/packages/@ionic/discover/CHANGELOG.md +++ b/packages/@ionic/discover/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. +## 3.0.1 (2020-02-03) + +**Note:** Version bump only for package @ionic/discover + + + + + # [3.0.0](https://github.com/ionic-team/ionic-cli/compare/@ionic/discover@2.0.8...@ionic/discover@3.0.0) (2020-01-25) diff --git a/packages/@ionic/discover/package.json b/packages/@ionic/discover/package.json index d358aca33a..4b81f2bacf 100644 --- a/packages/@ionic/discover/package.json +++ b/packages/@ionic/discover/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/discover", - "version": "3.0.0", + "version": "3.0.1", "description": "Simple UDP based protocol for service discovery implemented in pure JS.", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -35,12 +35,12 @@ }, "devDependencies": { "@types/debug": "^4.1.1", - "@types/jest": "^24.0.3", + "@types/jest": "^25.1.0", "@types/netmask": "^1.0.30", "@types/node": "~10.17.13", "@types/ws": "^7.2.0", "jest": "^25.1.0", - "jest-cli": "^24.1.0", + "jest-cli": "^25.1.0", "lint-staged": "^10.0.2", "rimraf": "^3.0.0", "ts-jest": "^25.0.0", diff --git a/packages/@ionic/lab/CHANGELOG.md b/packages/@ionic/lab/CHANGELOG.md index 0a6ff66f89..dddcd3850f 100644 --- a/packages/@ionic/lab/CHANGELOG.md +++ b/packages/@ionic/lab/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. +## 3.0.1 (2020-02-03) + +**Note:** Version bump only for package @ionic/lab + + + + + # [3.0.0](https://github.com/ionic-team/ionic-cli/compare/@ionic/lab@2.0.19...@ionic/lab@3.0.0) (2020-01-25) diff --git a/packages/@ionic/lab/package.json b/packages/@ionic/lab/package.json index dd93ba5359..62b1748226 100644 --- a/packages/@ionic/lab/package.json +++ b/packages/@ionic/lab/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/lab", - "version": "3.0.0", + "version": "3.0.1", "description": "Ionic Lab utility for developing Ionic apps, used by Ionic CLI", "bin": { "ionic-lab": "./bin/ionic-lab" @@ -41,8 +41,8 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@ionic/cli-framework": "4.0.0", - "@ionic/utils-fs": "3.0.0", + "@ionic/cli-framework": "4.0.1", + "@ionic/utils-fs": "3.0.1", "chalk": "^3.0.0", "express": "^4.16.2", "tslib": "^1.9.0" diff --git a/packages/@ionic/utils-array/CHANGELOG.md b/packages/@ionic/utils-array/CHANGELOG.md index 813ed62a68..cc171404f6 100644 --- a/packages/@ionic/utils-array/CHANGELOG.md +++ b/packages/@ionic/utils-array/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. +## 2.0.1 (2020-02-03) + +**Note:** Version bump only for package @ionic/utils-array + + + + + # [2.0.0](https://github.com/ionic-team/ionic-cli/compare/@ionic/utils-array@1.2.2...@ionic/utils-array@2.0.0) (2020-01-25) diff --git a/packages/@ionic/utils-array/package.json b/packages/@ionic/utils-array/package.json index 6c085b7432..93ad75957b 100644 --- a/packages/@ionic/utils-array/package.json +++ b/packages/@ionic/utils-array/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/utils-array", - "version": "2.0.0", + "version": "2.0.1", "description": "Array utils", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -36,10 +36,10 @@ }, "devDependencies": { "@types/debug": "^4.1.1", - "@types/jest": "^24.0.3", + "@types/jest": "^25.1.0", "@types/node": "~10.17.13", "jest": "^25.1.0", - "jest-cli": "^24.1.0", + "jest-cli": "^25.1.0", "lint-staged": "^10.0.2", "rimraf": "^3.0.0", "ts-jest": "^25.0.0", diff --git a/packages/@ionic/utils-fs/CHANGELOG.md b/packages/@ionic/utils-fs/CHANGELOG.md index 8e45e48d48..d739fd7a0c 100644 --- a/packages/@ionic/utils-fs/CHANGELOG.md +++ b/packages/@ionic/utils-fs/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. +## 3.0.1 (2020-02-03) + +**Note:** Version bump only for package @ionic/utils-fs + + + + + # [3.0.0](https://github.com/ionic-team/ionic-cli/compare/@ionic/utils-fs@2.0.9...@ionic/utils-fs@3.0.0) (2020-01-25) diff --git a/packages/@ionic/utils-fs/package.json b/packages/@ionic/utils-fs/package.json index b0e14c8601..14b4d315c8 100644 --- a/packages/@ionic/utils-fs/package.json +++ b/packages/@ionic/utils-fs/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/utils-fs", - "version": "3.0.0", + "version": "3.0.1", "description": "Filesystem utils for Node", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -39,11 +39,11 @@ "devDependencies": { "@types/debug": "^4.1.1", "@types/fs-extra": "^8.0.0", - "@types/jest": "^24.0.3", + "@types/jest": "^25.1.0", "@types/node": "~10.17.13", "@types/through2": "^2.0.33", "jest": "^25.1.0", - "jest-cli": "^24.1.0", + "jest-cli": "^25.1.0", "lint-staged": "^10.0.2", "rimraf": "^3.0.0", "ts-jest": "^25.0.0", diff --git a/packages/@ionic/utils-network/CHANGELOG.md b/packages/@ionic/utils-network/CHANGELOG.md index 136eda63b7..e28b137bf0 100644 --- a/packages/@ionic/utils-network/CHANGELOG.md +++ b/packages/@ionic/utils-network/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. +## 2.0.1 (2020-02-03) + +**Note:** Version bump only for package @ionic/utils-network + + + + + # [2.0.0](https://github.com/ionic-team/ionic-cli/compare/@ionic/utils-network@1.0.6...@ionic/utils-network@2.0.0) (2020-01-25) diff --git a/packages/@ionic/utils-network/package.json b/packages/@ionic/utils-network/package.json index 60f58bfd6d..0cae680340 100644 --- a/packages/@ionic/utils-network/package.json +++ b/packages/@ionic/utils-network/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/utils-network", - "version": "2.0.0", + "version": "2.0.1", "description": "Network utils for Node", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -36,10 +36,10 @@ }, "devDependencies": { "@types/debug": "^4.1.1", - "@types/jest": "^24.0.3", + "@types/jest": "^25.1.0", "@types/node": "~10.17.13", "jest": "^25.1.0", - "jest-cli": "^24.1.0", + "jest-cli": "^25.1.0", "lint-staged": "^10.0.2", "rimraf": "^3.0.0", "ts-jest": "^25.0.0", diff --git a/packages/@ionic/utils-object/CHANGELOG.md b/packages/@ionic/utils-object/CHANGELOG.md index 4ffb7a4d04..7cf7959c5c 100644 --- a/packages/@ionic/utils-object/CHANGELOG.md +++ b/packages/@ionic/utils-object/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. +## 2.0.1 (2020-02-03) + +**Note:** Version bump only for package @ionic/utils-object + + + + + # [2.0.0](https://github.com/ionic-team/ionic-cli/compare/@ionic/utils-object@1.0.6...@ionic/utils-object@2.0.0) (2020-01-25) diff --git a/packages/@ionic/utils-object/package.json b/packages/@ionic/utils-object/package.json index f4ee6b0078..8db2c08f15 100644 --- a/packages/@ionic/utils-object/package.json +++ b/packages/@ionic/utils-object/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/utils-object", - "version": "2.0.0", + "version": "2.0.1", "description": "Object utils", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -36,10 +36,10 @@ }, "devDependencies": { "@types/debug": "^4.1.1", - "@types/jest": "^24.0.3", + "@types/jest": "^25.1.0", "@types/node": "~10.17.13", "jest": "^25.1.0", - "jest-cli": "^24.1.0", + "jest-cli": "^25.1.0", "lint-staged": "^10.0.2", "rimraf": "^3.0.0", "ts-jest": "^25.0.0", diff --git a/packages/@ionic/utils-process/CHANGELOG.md b/packages/@ionic/utils-process/CHANGELOG.md index e1feb14275..27726e1e11 100644 --- a/packages/@ionic/utils-process/CHANGELOG.md +++ b/packages/@ionic/utils-process/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. +## 2.0.1 (2020-02-03) + +**Note:** Version bump only for package @ionic/utils-process + + + + + # [2.0.0](https://github.com/ionic-team/ionic-cli/compare/@ionic/utils-process@1.0.9...@ionic/utils-process@2.0.0) (2020-01-25) diff --git a/packages/@ionic/utils-process/package.json b/packages/@ionic/utils-process/package.json index 0dc1624a6c..65fd1e1cb4 100644 --- a/packages/@ionic/utils-process/package.json +++ b/packages/@ionic/utils-process/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/utils-process", - "version": "2.0.0", + "version": "2.0.1", "description": "Process utils for NodeJS", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -31,8 +31,8 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@ionic/utils-object": "2.0.0", - "@ionic/utils-terminal": "2.0.0", + "@ionic/utils-object": "2.0.1", + "@ionic/utils-terminal": "2.0.1", "debug": "^4.0.0", "lodash": "^4.17.5", "tree-kill": "^1.2.2", @@ -40,11 +40,11 @@ }, "devDependencies": { "@types/debug": "^4.1.1", - "@types/jest": "^24.0.3", + "@types/jest": "^25.1.0", "@types/lodash": "^4.14.104", "@types/node": "~10.17.13", "jest": "^25.1.0", - "jest-cli": "^24.1.0", + "jest-cli": "^25.1.0", "lint-staged": "^10.0.2", "rimraf": "^3.0.0", "ts-jest": "^25.0.0", diff --git a/packages/@ionic/utils-stream/CHANGELOG.md b/packages/@ionic/utils-stream/CHANGELOG.md index 4bd877c2a5..6a5c37946b 100644 --- a/packages/@ionic/utils-stream/CHANGELOG.md +++ b/packages/@ionic/utils-stream/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. +## 3.0.1 (2020-02-03) + +**Note:** Version bump only for package @ionic/utils-stream + + + + + # [3.0.0](https://github.com/ionic-team/ionic-cli/compare/@ionic/utils-stream@2.0.5...@ionic/utils-stream@3.0.0) (2020-01-25) diff --git a/packages/@ionic/utils-stream/package.json b/packages/@ionic/utils-stream/package.json index 51a47a0317..c8ed0a41c7 100644 --- a/packages/@ionic/utils-stream/package.json +++ b/packages/@ionic/utils-stream/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/utils-stream", - "version": "3.0.0", + "version": "3.0.1", "description": "Stream utils for NodeJS", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -36,10 +36,10 @@ }, "devDependencies": { "@types/debug": "^4.1.1", - "@types/jest": "^24.0.3", + "@types/jest": "^25.1.0", "@types/node": "~10.17.13", "jest": "^25.1.0", - "jest-cli": "^24.1.0", + "jest-cli": "^25.1.0", "lint-staged": "^10.0.2", "rimraf": "^3.0.0", "stream-combiner2": "^1.1.1", diff --git a/packages/@ionic/utils-subprocess/CHANGELOG.md b/packages/@ionic/utils-subprocess/CHANGELOG.md index 06c98a706d..b8629e93b2 100644 --- a/packages/@ionic/utils-subprocess/CHANGELOG.md +++ b/packages/@ionic/utils-subprocess/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. +## 2.0.1 (2020-02-03) + +**Note:** Version bump only for package @ionic/utils-subprocess + + + + + # [2.0.0](https://github.com/ionic-team/ionic-cli/compare/@ionic/utils-subprocess@1.0.13...@ionic/utils-subprocess@2.0.0) (2020-01-25) diff --git a/packages/@ionic/utils-subprocess/package.json b/packages/@ionic/utils-subprocess/package.json index 08c8cc9b45..3793c86238 100644 --- a/packages/@ionic/utils-subprocess/package.json +++ b/packages/@ionic/utils-subprocess/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/utils-subprocess", - "version": "2.0.0", + "version": "2.0.1", "description": "Subprocess utils for NodeJS", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -31,11 +31,11 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@ionic/utils-array": "2.0.0", - "@ionic/utils-fs": "3.0.0", - "@ionic/utils-process": "2.0.0", - "@ionic/utils-stream": "3.0.0", - "@ionic/utils-terminal": "2.0.0", + "@ionic/utils-array": "2.0.1", + "@ionic/utils-fs": "3.0.1", + "@ionic/utils-process": "2.0.1", + "@ionic/utils-stream": "3.0.1", + "@ionic/utils-terminal": "2.0.1", "cross-spawn": "^7.0.0", "debug": "^4.0.0", "tslib": "^1.9.0" @@ -43,10 +43,10 @@ "devDependencies": { "@types/cross-spawn": "^6.0.0", "@types/debug": "^4.1.1", - "@types/jest": "^24.0.3", + "@types/jest": "^25.1.0", "@types/node": "~10.17.13", "jest": "^25.1.0", - "jest-cli": "^24.1.0", + "jest-cli": "^25.1.0", "lint-staged": "^10.0.2", "rimraf": "^3.0.0", "ts-jest": "^25.0.0", diff --git a/packages/@ionic/utils-terminal/CHANGELOG.md b/packages/@ionic/utils-terminal/CHANGELOG.md index 7eab9839da..17b9a1e263 100644 --- a/packages/@ionic/utils-terminal/CHANGELOG.md +++ b/packages/@ionic/utils-terminal/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. +## 2.0.1 (2020-02-03) + +**Note:** Version bump only for package @ionic/utils-terminal + + + + + # [2.0.0](https://github.com/ionic-team/ionic-cli/compare/@ionic/utils-terminal@1.1.2...@ionic/utils-terminal@2.0.0) (2020-01-25) diff --git a/packages/@ionic/utils-terminal/package.json b/packages/@ionic/utils-terminal/package.json index 5fc406a686..516373fb8f 100644 --- a/packages/@ionic/utils-terminal/package.json +++ b/packages/@ionic/utils-terminal/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/utils-terminal", - "version": "2.0.0", + "version": "2.0.1", "description": "Terminal utils for NodeJS", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -36,10 +36,10 @@ }, "devDependencies": { "@types/debug": "^4.1.1", - "@types/jest": "^24.0.3", + "@types/jest": "^25.1.0", "@types/node": "~10.17.13", "jest": "^25.1.0", - "jest-cli": "^24.1.0", + "jest-cli": "^25.1.0", "lint-staged": "^10.0.2", "rimraf": "^3.0.0", "ts-jest": "^25.0.0", diff --git a/packages/@ionic/v1-toolkit/CHANGELOG.md b/packages/@ionic/v1-toolkit/CHANGELOG.md index 4d572676e8..8997d46ee4 100644 --- a/packages/@ionic/v1-toolkit/CHANGELOG.md +++ b/packages/@ionic/v1-toolkit/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. +## 3.0.1 (2020-02-03) + +**Note:** Version bump only for package @ionic/v1-toolkit + + + + + # [3.0.0](https://github.com/ionic-team/ionic-cli/compare/@ionic/v1-toolkit@2.0.20...@ionic/v1-toolkit@3.0.0) (2020-01-25) diff --git a/packages/@ionic/v1-toolkit/package.json b/packages/@ionic/v1-toolkit/package.json index 264b8797c7..853cf97227 100644 --- a/packages/@ionic/v1-toolkit/package.json +++ b/packages/@ionic/v1-toolkit/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/v1-toolkit", - "version": "3.0.0", + "version": "3.0.1", "description": "Utility CLI for Ionic 1.x apps, used by Ionic CLI", "bin": { "ionic-v1": "./bin/ionic-v1" @@ -36,8 +36,8 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@ionic/cli-framework": "4.0.0", - "@ionic/utils-fs": "3.0.0", + "@ionic/cli-framework": "4.0.1", + "@ionic/utils-fs": "3.0.1", "chalk": "^3.0.0", "chokidar": "^3.0.1", "debug": "^4.0.0", @@ -53,11 +53,11 @@ "@types/express": "^4.11.0", "@types/gulp": "^3.8.36", "@types/http-proxy-middleware": "^0.19.0", - "@types/jest": "^24.0.3", + "@types/jest": "^25.1.0", "@types/node": "~10.17.13", "@types/ws": "^7.2.0", "jest": "^25.1.0", - "jest-cli": "^24.1.0", + "jest-cli": "^25.1.0", "lint-staged": "^10.0.2", "rimraf": "^3.0.0", "ts-jest": "^25.0.0", diff --git a/packages/cli-scripts/CHANGELOG.md b/packages/cli-scripts/CHANGELOG.md index d08616bfbc..afa12f2207 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. +## 2.0.1 (2020-02-03) + +**Note:** Version bump only for package cli-scripts + + + + + # [2.0.0](https://github.com/ionic-team/ionic-cli/compare/cli-scripts@1.0.31...cli-scripts@2.0.0) (2020-01-25) diff --git a/packages/cli-scripts/package.json b/packages/cli-scripts/package.json index d32ef67ab2..50e3dc3f26 100644 --- a/packages/cli-scripts/package.json +++ b/packages/cli-scripts/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "cli-scripts", - "version": "2.0.0", + "version": "2.0.1", "bin": { "ionic-cli-scripts": "./bin/ionic-cli-scripts" }, @@ -16,9 +16,9 @@ "main": "./dist/index.js", "types": "./dist/index.d.ts", "dependencies": { - "@ionic/cli": "6.0.0", - "@ionic/cli-framework": "4.0.0", - "@ionic/utils-fs": "3.0.0", + "@ionic/cli": "6.0.1", + "@ionic/cli-framework": "4.0.1", + "@ionic/utils-fs": "3.0.1", "ansi-styles": "^4.0.0", "chalk": "^3.0.0", "escape-string-regexp": "^2.0.0", @@ -27,10 +27,10 @@ }, "devDependencies": { "@types/ansi-styles": "^3.2.0", - "@types/jest": "^24.0.3", + "@types/jest": "^25.1.0", "@types/node": "~10.17.13", "jest": "^25.1.0", - "jest-cli": "^24.1.0", + "jest-cli": "^25.1.0", "lint-staged": "^10.0.2", "rimraf": "^3.0.0", "ts-jest": "^25.0.0",