Skip to content

Commit

Permalink
Merge branch 'develop' into fix-live-reload-vue-service-4807
Browse files Browse the repository at this point in the history
  • Loading branch information
liamdebeasi authored Dec 20, 2023
2 parents 57b6c57 + 05d64e9 commit 9dbdc14
Show file tree
Hide file tree
Showing 92 changed files with 713 additions and 253 deletions.
16 changes: 16 additions & 0 deletions packages/@ionic/cli-framework-output/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.2.8](https://github.com/ionic-team/ionic-cli/compare/@ionic/[email protected]...@ionic/[email protected]) (2023-12-19)

**Note:** Version bump only for package @ionic/cli-framework-output





## [2.2.7](https://github.com/ionic-team/ionic-cli/compare/@ionic/[email protected]...@ionic/[email protected]) (2023-11-07)

**Note:** Version bump only for package @ionic/cli-framework-output





## [2.2.6](https://github.com/ionic-team/ionic-cli/compare/@ionic/[email protected]...@ionic/[email protected]) (2023-03-29)

**Note:** Version bump only for package @ionic/cli-framework-output
Expand Down
13 changes: 10 additions & 3 deletions packages/@ionic/cli-framework-output/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ionic/cli-framework-output",
"version": "2.2.6",
"version": "2.2.8",
"description": "The log/tasks/spinners portion of Ionic CLI Framework",
"homepage": "https://ionicframework.com/",
"author": "Ionic Team <[email protected]> (https://ionicframework.com)",
Expand All @@ -14,6 +14,13 @@
"LICENSE",
"README.md"
],
"repository": {
"type": "git",
"url": "https://github.com/ionic-team/ionic-cli.git"
},
"bugs": {
"url": "https://github.com/ionic-team/ionic-cli/issues"
},
"scripts": {
"clean": "rimraf dist",
"lint": "true",
Expand All @@ -24,12 +31,12 @@
},
"license": "MIT",
"dependencies": {
"@ionic/utils-terminal": "2.3.4",
"@ionic/utils-terminal": "2.3.5",
"debug": "^4.0.0",
"tslib": "^2.0.1"
},
"devDependencies": {
"@ionic/utils-stream": "3.1.6",
"@ionic/utils-stream": "3.1.7",
"@types/debug": "^4.1.1",
"@types/inquirer": "0.0.43",
"@types/jest": "^26.0.10",
Expand Down
19 changes: 19 additions & 0 deletions packages/@ionic/cli-framework-prompts/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,25 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [2.1.13](https://github.com/ionic-team/ionic-cli/compare/@ionic/[email protected]...@ionic/[email protected]) (2023-12-19)


### Bug Fixes

* **cli:** resolve vm2 security vulnerability ([#5070](https://github.com/ionic-team/ionic-cli/issues/5070)) ([4050419](https://github.com/ionic-team/ionic-cli/commit/4050419bef70fb92e58b0a83cd4b68b48090e596))





## [2.1.12](https://github.com/ionic-team/ionic-cli/compare/@ionic/[email protected]...@ionic/[email protected]) (2023-11-07)

**Note:** Version bump only for package @ionic/cli-framework-prompts





## [2.1.11](https://github.com/ionic-team/ionic-cli/compare/@ionic/[email protected]...@ionic/[email protected]) (2023-03-29)

**Note:** Version bump only for package @ionic/cli-framework-prompts
Expand Down
11 changes: 9 additions & 2 deletions packages/@ionic/cli-framework-prompts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ionic/cli-framework-prompts",
"version": "2.1.11",
"version": "2.1.13",
"description": "The interactive prompts portion of Ionic CLI Framework",
"homepage": "https://ionicframework.com/",
"author": "Ionic Team <[email protected]> (https://ionicframework.com)",
Expand All @@ -14,6 +14,13 @@
"LICENSE",
"README.md"
],
"repository": {
"type": "git",
"url": "https://github.com/ionic-team/ionic-cli.git"
},
"bugs": {
"url": "https://github.com/ionic-team/ionic-cli/issues"
},
"scripts": {
"clean": "rimraf dist",
"lint": "true",
Expand All @@ -24,7 +31,7 @@
},
"license": "MIT",
"dependencies": {
"@ionic/utils-terminal": "2.3.4",
"@ionic/utils-terminal": "2.3.5",
"debug": "^4.0.0",
"inquirer": "^7.0.0",
"tslib": "^2.0.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/@ionic/cli-framework-prompts/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { TERMINAL_INFO } from '@ionic/utils-terminal';
import * as Debug from 'debug';
import { debug as Debug } from 'debug';

const debug = Debug('ionic:cli-framework-prompts');

Expand Down
57 changes: 57 additions & 0 deletions packages/@ionic/cli-framework/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,63 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [6.0.1](https://github.com/ionic-team/ionic-cli/compare/@ionic/[email protected]...@ionic/[email protected]) (2023-12-19)


### Bug Fixes

* **cli:** resolve vm2 security vulnerability ([#5070](https://github.com/ionic-team/ionic-cli/issues/5070)) ([4050419](https://github.com/ionic-team/ionic-cli/commit/4050419bef70fb92e58b0a83cd4b68b48090e596))





# [6.0.0](https://github.com/ionic-team/ionic-cli/compare/@ionic/[email protected]...@ionic/[email protected]) (2023-11-08)


### Bug Fixes

* use native ES2022 error cause ([#5010](https://github.com/ionic-team/ionic-cli/issues/5010)) ([a97ba2b](https://github.com/ionic-team/ionic-cli/commit/a97ba2bcac4556017ba010692f71fed2bef3f77b))


### BREAKING CHANGES

* `message`, `stack`, and `error` properties removed from `BaseError` and `SubprocessError`





## [5.1.7](https://github.com/ionic-team/ionic-cli/compare/@ionic/[email protected]...@ionic/[email protected]) (2023-11-08)


### Reverts

* use native ES2022 error cause ([#5060](https://github.com/ionic-team/ionic-cli/issues/5060)) ([1e64a1a](https://github.com/ionic-team/ionic-cli/commit/1e64a1ada60545adf8e7c99fbd1f8766cf2416f9))





## [5.1.6](https://github.com/ionic-team/ionic-cli/compare/@ionic/[email protected]...@ionic/[email protected]) (2023-11-07)

**Note:** Version bump only for package @ionic/cli-framework





## [5.1.5](https://github.com/ionic-team/ionic-cli/compare/@ionic/[email protected]...@ionic/[email protected]) (2023-11-07)


### Bug Fixes

* use native ES2022 error cause ([#5010](https://github.com/ionic-team/ionic-cli/issues/5010)) ([0c4cd0f](https://github.com/ionic-team/ionic-cli/commit/0c4cd0f47e00b43e8c0ce4eef072351a846b566c))





## [5.1.4](https://github.com/ionic-team/ionic-cli/compare/@ionic/[email protected]...@ionic/[email protected]) (2023-03-29)

**Note:** Version bump only for package @ionic/cli-framework
Expand Down
19 changes: 13 additions & 6 deletions packages/@ionic/cli-framework/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ionic/cli-framework",
"version": "5.1.4",
"version": "6.0.1",
"description": "The foundation framework of the Ionic CLI",
"homepage": "https://ionicframework.com/",
"author": "Ionic Team <[email protected]> (https://ionicframework.com) ",
Expand All @@ -9,6 +9,13 @@
"engines": {
"node": ">=16.0.0"
},
"repository": {
"type": "git",
"url": "https://github.com/ionic-team/ionic-cli.git"
},
"bugs": {
"url": "https://github.com/ionic-team/ionic-cli/issues"
},
"scripts": {
"clean": "rimraf index.* definitions.* errors.* guards.* lib utils",
"lint": "true",
Expand All @@ -19,14 +26,14 @@
},
"license": "MIT",
"dependencies": {
"@ionic/cli-framework-output": "2.2.6",
"@ionic/cli-framework-output": "2.2.8",
"@ionic/utils-array": "2.1.6",
"@ionic/utils-fs": "3.1.7",
"@ionic/utils-object": "2.1.6",
"@ionic/utils-process": "2.1.11",
"@ionic/utils-stream": "3.1.6",
"@ionic/utils-subprocess": "2.1.12",
"@ionic/utils-terminal": "2.3.4",
"@ionic/utils-process": "2.1.12",
"@ionic/utils-stream": "3.1.7",
"@ionic/utils-subprocess": "3.0.1",
"@ionic/utils-terminal": "2.3.5",
"chalk": "^4.0.0",
"debug": "^4.0.0",
"lodash": "^4.17.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/@ionic/cli-framework/src/errors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export abstract class BaseError extends Error {
exitCode?: number;

toString(): string {
return util.inspect(this);
return util.inspect(this);
}

inspect(): string {
Expand Down
2 changes: 1 addition & 1 deletion packages/@ionic/cli-framework/src/lib/__tests__/options.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as minimist from 'minimist';
import minimist from 'minimist';

import { CommandMetadata } from '../../definitions';
import { OptionFilters, filterCommandLineOptions, filterCommandLineOptionsByGroup, metadataOptionsToParseArgsOptions, separateArgv, stripOptions, unparseArgs } from '../options';
Expand Down
2 changes: 1 addition & 1 deletion packages/@ionic/cli-framework/src/lib/colors.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ColorFunction, Colors as BaseColors } from '@ionic/cli-framework-output';
import * as chalk from 'chalk';
import chalk from 'chalk';
import * as lodash from 'lodash';

import { MetadataGroup } from '../definitions';
Expand Down
4 changes: 2 additions & 2 deletions packages/@ionic/cli-framework/src/lib/help.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { filter, map } from '@ionic/utils-array';
import { generateFillSpaceStringList, stringWidth, wordWrap } from '@ionic/utils-terminal';
import * as Debug from 'debug';
import { debug as Debug } from 'debug';
import * as lodash from 'lodash';

import { CommandMetadata, CommandMetadataInput, CommandMetadataOption, Footnote, HydratedCommandMetadata, HydratedNamespaceMetadata, ICommand, INamespace, LinkFootnote, MetadataGroup, NamespaceLocateResult, NamespaceMetadata } from '../definitions';
Expand Down Expand Up @@ -223,7 +223,7 @@ export class NamespaceStringHelpFormatter<C extends ICommand<C, N, M, I, O>, N e

const filteredCommands = await filter(commands, async cmd => this.filterCommandCallback(cmd));

const [ cmdDetails, nsDetails ] = await Promise.all([
const [cmdDetails, nsDetails] = await Promise.all([
this.getListOfCommandDetails(filteredCommands.filter(cmd => cmd.namespace === this.namespace)),
this.getListOfNamespaceDetails(filteredCommands.filter(cmd => cmd.namespace !== this.namespace)),
]);
Expand Down
14 changes: 7 additions & 7 deletions packages/@ionic/cli-framework/src/lib/options.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as lodash from 'lodash';
import * as minimist from 'minimist';
import minimist from 'minimist';

import { CommandLineOptions, CommandMetadataOption, HydratedParseArgsOptions, ParsedArg } from '../definitions';

Expand All @@ -19,7 +19,7 @@ export { ParsedArgs } from 'minimist';
*/
export function stripOptions(pargv: readonly string[], { includeSeparated = true }: { includeSeparated?: boolean; }): string[] {
const r = /^\-/;
const [ ownArgs, otherArgs ] = separateArgv(pargv);
const [ownArgs, otherArgs] = separateArgv(pargv);
const filteredArgs = ownArgs.filter(arg => !r.test(arg));

if (!includeSeparated) {
Expand Down Expand Up @@ -50,7 +50,7 @@ export function separateArgv(pargv: readonly string[]): [string[], string[]] {
otherArgs.shift(); // strip separator
}

return [ ownArgs, otherArgs ];
return [ownArgs, otherArgs];
}

/**
Expand Down Expand Up @@ -166,8 +166,8 @@ export function filterCommandLineOptions<O extends CommandMetadataOption>(option

const pairs = Object.keys(parsedArgs)
.map((k): [string, O | undefined, ParsedArg | undefined] => [k, mapped.get(k), parsedArgs[k]])
.filter(([ k, opt, value ]) => opt && predicate(opt, value))
.map(([ k, opt, value ]) => [opt ? opt.name : k, value]);
.filter(([k, opt, value]) => opt && predicate(opt, value))
.map(([k, opt, value]) => [opt ? opt.name : k, value]);

return { ...initial, ...lodash.fromPairs(pairs) };
}
Expand Down Expand Up @@ -221,7 +221,7 @@ export function unparseArgs(parsedArgs: minimist.ParsedArgs, { useDoubleQuotes,
const dashKey = (k: string) => (k.length === 1 ? '-' : '--') + k;

const pushPairs = (...pairs: [string, string | undefined][]) => {
for (const [ k, val ] of pairs) {
for (const [k, val] of pairs) {
const key = dashKey(allowCamelCase ? k : k.replace(/[A-Z]/g, '-$&').toLowerCase());

if (useEquals) {
Expand Down Expand Up @@ -274,7 +274,7 @@ export function unparseArgs(parsedArgs: minimist.ParsedArgs, { useDoubleQuotes,
isKnown(k)
);

for (const [ key, val ] of pairedOptions) {
for (const [key, val] of pairedOptions) {
if (val === true) {
pushPairs([key, undefined]);
} else if (val === false && !ignoreFalse) {
Expand Down
2 changes: 1 addition & 1 deletion packages/@ionic/cli-framework/src/lib/validators.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as chalk from 'chalk';
import chalk from 'chalk';

import { ValidationError, Validator, Validators } from '../definitions';
import { InputValidationError } from '../errors';
Expand Down
2 changes: 1 addition & 1 deletion packages/@ionic/cli-framework/src/utils/ipc.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { fork } from '@ionic/utils-subprocess';
import { ChildProcess } from 'child_process';
import * as Debug from 'debug';
import { debug as Debug } from 'debug';
import * as fs from 'fs';

import { ERROR_IPC_UNKNOWN_PROCEDURE, IPCError } from '../errors';
Expand Down
1 change: 1 addition & 0 deletions packages/@ionic/cli/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
!jest.config.js
!lint-staged.config.js
*.d.ts
*.tgz
Loading

0 comments on commit 9dbdc14

Please sign in to comment.