Skip to content

Commit a933dcd

Browse files
liamdebeasiliamdebeasi
authored
Merge branch 'develop' into deprecate-ssl
2 parents 5480ba2 + 05d64e9 commit a933dcd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+508
-250
lines changed

‎packages/@ionic/cli-framework-output/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [2.2.8](https://github.com/ionic-team/ionic-cli/compare/@ionic/cli-framework-output@2.2.7...@ionic/cli-framework-output@2.2.8) (2023-12-19)
7+
8+
**Note:** Version bump only for package @ionic/cli-framework-output
9+
10+
11+
12+
13+
614
## [2.2.7](https://github.com/ionic-team/ionic-cli/compare/@ionic/cli-framework-output@2.2.6...@ionic/cli-framework-output@2.2.7) (2023-11-07)
715

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

‎packages/@ionic/cli-framework-output/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ionic/cli-framework-output",
3-
"version": "2.2.7",
3+
"version": "2.2.8",
44
"description": "The log/tasks/spinners portion of Ionic CLI Framework",
55
"homepage": "https://ionicframework.com/",
66
"author": "Ionic Team <hi@ionic.io> (https://ionicframework.com)",
@@ -31,12 +31,12 @@
3131
},
3232
"license": "MIT",
3333
"dependencies": {
34-
"@ionic/utils-terminal": "2.3.4",
34+
"@ionic/utils-terminal": "2.3.5",
3535
"debug": "^4.0.0",
3636
"tslib": "^2.0.1"
3737
},
3838
"devDependencies": {
39-
"@ionic/utils-stream": "3.1.6",
39+
"@ionic/utils-stream": "3.1.7",
4040
"@types/debug": "^4.1.1",
4141
"@types/inquirer": "0.0.43",
4242
"@types/jest": "^26.0.10",

‎packages/@ionic/cli-framework-prompts/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [2.1.13](https://github.com/ionic-team/ionic-cli/compare/@ionic/cli-framework-prompts@2.1.12...@ionic/cli-framework-prompts@2.1.13) (2023-12-19)
7+
8+
9+
### Bug Fixes
10+
11+
* **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))
12+
13+
14+
15+
16+
617
## [2.1.12](https://github.com/ionic-team/ionic-cli/compare/@ionic/cli-framework-prompts@2.1.11...@ionic/cli-framework-prompts@2.1.12) (2023-11-07)
718

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

‎packages/@ionic/cli-framework-prompts/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ionic/cli-framework-prompts",
3-
"version": "2.1.12",
3+
"version": "2.1.13",
44
"description": "The interactive prompts portion of Ionic CLI Framework",
55
"homepage": "https://ionicframework.com/",
66
"author": "Ionic Team <hi@ionic.io> (https://ionicframework.com)",
@@ -31,7 +31,7 @@
3131
},
3232
"license": "MIT",
3333
"dependencies": {
34-
"@ionic/utils-terminal": "2.3.4",
34+
"@ionic/utils-terminal": "2.3.5",
3535
"debug": "^4.0.0",
3636
"inquirer": "^7.0.0",
3737
"tslib": "^2.0.1"

‎packages/@ionic/cli-framework-prompts/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { TERMINAL_INFO } from '@ionic/utils-terminal';
2-
import * as Debug from 'debug';
2+
import { debug as Debug } from 'debug';
33

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

‎packages/@ionic/cli-framework/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [6.0.1](https://github.com/ionic-team/ionic-cli/compare/@ionic/cli-framework@6.0.0...@ionic/cli-framework@6.0.1) (2023-12-19)
7+
8+
9+
### Bug Fixes
10+
11+
* **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))
12+
13+
14+
15+
16+
617
# [6.0.0](https://github.com/ionic-team/ionic-cli/compare/@ionic/cli-framework@5.1.7...@ionic/cli-framework@6.0.0) (2023-11-08)
718

819

‎packages/@ionic/cli-framework/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ionic/cli-framework",
3-
"version": "6.0.0",
3+
"version": "6.0.1",
44
"description": "The foundation framework of the Ionic CLI",
55
"homepage": "https://ionicframework.com/",
66
"author": "Ionic Team <hi@ionic.io> (https://ionicframework.com) ",
@@ -26,14 +26,14 @@
2626
},
2727
"license": "MIT",
2828
"dependencies": {
29-
"@ionic/cli-framework-output": "2.2.7",
29+
"@ionic/cli-framework-output": "2.2.8",
3030
"@ionic/utils-array": "2.1.6",
3131
"@ionic/utils-fs": "3.1.7",
3232
"@ionic/utils-object": "2.1.6",
33-
"@ionic/utils-process": "2.1.11",
34-
"@ionic/utils-stream": "3.1.6",
35-
"@ionic/utils-subprocess": "3.0.0",
36-
"@ionic/utils-terminal": "2.3.4",
33+
"@ionic/utils-process": "2.1.12",
34+
"@ionic/utils-stream": "3.1.7",
35+
"@ionic/utils-subprocess": "3.0.1",
36+
"@ionic/utils-terminal": "2.3.5",
3737
"chalk": "^4.0.0",
3838
"debug": "^4.0.0",
3939
"lodash": "^4.17.5",

‎packages/@ionic/cli-framework/src/lib/__tests__/options.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as minimist from 'minimist';
1+
import minimist from 'minimist';
22

33
import { CommandMetadata } from '../../definitions';
44
import { OptionFilters, filterCommandLineOptions, filterCommandLineOptionsByGroup, metadataOptionsToParseArgsOptions, separateArgv, stripOptions, unparseArgs } from '../options';

‎packages/@ionic/cli-framework/src/lib/colors.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ColorFunction, Colors as BaseColors } from '@ionic/cli-framework-output';
2-
import * as chalk from 'chalk';
2+
import chalk from 'chalk';
33
import * as lodash from 'lodash';
44

55
import { MetadataGroup } from '../definitions';

‎packages/@ionic/cli-framework/src/lib/help.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { filter, map } from '@ionic/utils-array';
22
import { generateFillSpaceStringList, stringWidth, wordWrap } from '@ionic/utils-terminal';
3-
import * as Debug from 'debug';
3+
import { debug as Debug } from 'debug';
44
import * as lodash from 'lodash';
55

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

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

226-
const [ cmdDetails, nsDetails ] = await Promise.all([
226+
const [cmdDetails, nsDetails] = await Promise.all([
227227
this.getListOfCommandDetails(filteredCommands.filter(cmd => cmd.namespace === this.namespace)),
228228
this.getListOfNamespaceDetails(filteredCommands.filter(cmd => cmd.namespace !== this.namespace)),
229229
]);

‎packages/@ionic/cli-framework/src/lib/options.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as lodash from 'lodash';
2-
import * as minimist from 'minimist';
2+
import minimist from 'minimist';
33

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

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

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

53-
return [ ownArgs, otherArgs ];
53+
return [ownArgs, otherArgs];
5454
}
5555

5656
/**
@@ -166,8 +166,8 @@ export function filterCommandLineOptions<O extends CommandMetadataOption>(option
166166

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

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

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

227227
if (useEquals) {
@@ -274,7 +274,7 @@ export function unparseArgs(parsedArgs: minimist.ParsedArgs, { useDoubleQuotes,
274274
isKnown(k)
275275
);
276276

277-
for (const [ key, val ] of pairedOptions) {
277+
for (const [key, val] of pairedOptions) {
278278
if (val === true) {
279279
pushPairs([key, undefined]);
280280
} else if (val === false && !ignoreFalse) {

‎packages/@ionic/cli-framework/src/lib/validators.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as chalk from 'chalk';
1+
import chalk from 'chalk';
22

33
import { ValidationError, Validator, Validators } from '../definitions';
44
import { InputValidationError } from '../errors';

‎packages/@ionic/cli-framework/src/utils/ipc.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { fork } from '@ionic/utils-subprocess';
22
import { ChildProcess } from 'child_process';
3-
import * as Debug from 'debug';
3+
import { debug as Debug } from 'debug';
44
import * as fs from 'fs';
55

66
import { ERROR_IPC_UNKNOWN_PROCEDURE, IPCError } from '../errors';

‎packages/@ionic/cli/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
!jest.config.js
44
!lint-staged.config.js
55
*.d.ts
6+
*.tgz

‎packages/@ionic/cli/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [7.1.6](https://github.com/ionic-team/ionic-cli/compare/@ionic/cli@7.1.5...@ionic/cli@7.1.6) (2023-12-19)
7+
8+
9+
### Bug Fixes
10+
11+
* **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))
12+
13+
14+
15+
16+
617
## [7.1.5](https://github.com/ionic-team/ionic-cli/compare/@ionic/cli@7.1.4...@ionic/cli@7.1.5) (2023-11-08)
718

819

‎packages/@ionic/cli/package.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ionic/cli",
3-
"version": "7.1.5",
3+
"version": "7.1.6",
44
"description": "A tool for creating and developing Ionic Framework mobile apps.",
55
"homepage": "https://ionicframework.com",
66
"author": "Ionic Team <hi@ionic.io> (https://ionicframework.com) ",
@@ -40,16 +40,16 @@
4040
},
4141
"license": "MIT",
4242
"dependencies": {
43-
"@ionic/cli-framework": "6.0.0",
44-
"@ionic/cli-framework-output": "2.2.7",
45-
"@ionic/cli-framework-prompts": "2.1.12",
43+
"@ionic/cli-framework": "6.0.1",
44+
"@ionic/cli-framework-output": "2.2.8",
45+
"@ionic/cli-framework-prompts": "2.1.13",
4646
"@ionic/utils-array": "2.1.6",
4747
"@ionic/utils-fs": "3.1.7",
48-
"@ionic/utils-network": "2.1.6",
49-
"@ionic/utils-process": "2.1.11",
50-
"@ionic/utils-stream": "3.1.6",
51-
"@ionic/utils-subprocess": "3.0.0",
52-
"@ionic/utils-terminal": "2.3.4",
48+
"@ionic/utils-network": "2.1.7",
49+
"@ionic/utils-process": "2.1.12",
50+
"@ionic/utils-stream": "3.1.7",
51+
"@ionic/utils-subprocess": "3.0.1",
52+
"@ionic/utils-terminal": "2.3.5",
5353
"chalk": "^4.0.0",
5454
"debug": "^4.0.0",
5555
"diff": "^4.0.1",
@@ -58,12 +58,12 @@
5858
"lodash": "^4.17.5",
5959
"open": "^7.0.4",
6060
"os-name": "^4.0.0",
61+
"proxy-agent": "^6.3.0",
6162
"semver": "^7.1.1",
6263
"split2": "^3.0.0",
6364
"ssh-config": "^1.1.1",
6465
"stream-combiner2": "^1.1.1",
6566
"superagent": "^8.0.9",
66-
"superagent-proxy": "^3.0.0",
6767
"tar": "^6.0.1",
6868
"tslib": "^2.0.1"
6969
},
@@ -77,7 +77,6 @@
7777
"@types/semver": "^7.1.0",
7878
"@types/split2": "^2.1.6",
7979
"@types/superagent": "4.1.3",
80-
"@types/superagent-proxy": "^3.0.0",
8180
"@types/tar": "^6.1.2",
8281
"jest": "^26.4.2",
8382
"jest-cli": "^26.0.1",

‎packages/@ionic/cli/src/bootstrap.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { compileNodeModulesPaths, readPackageJsonFile } from '@ionic/cli-framework/utils/node';
2-
import * as Debug from 'debug';
2+
import { debug as Debug } from 'debug';
33
import * as path from 'path';
44
import * as semver from 'semver';
55

‎packages/@ionic/cli/src/commands/capacitor/run.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { BaseError, Footnote, validators } from '@ionic/cli-framework';
22
import { sleepForever } from '@ionic/utils-process';
33
import { columnar } from '@ionic/utils-terminal';
4-
import * as chalk from 'chalk';
5-
import * as Debug from 'debug';
4+
import chalk from 'chalk';
5+
import { debug as Debug } from 'debug';
66
import * as lodash from 'lodash';
77
import * as semver from 'semver';
88

@@ -233,7 +233,7 @@ For Android and iOS, you can setup Remote Debugging on your device with browser
233233
throw new FatalException(`Cannot run ${input('ionic capacitor run')} outside a project directory.`);
234234
}
235235

236-
const [ platform ] = inputs;
236+
const [platform] = inputs;
237237

238238
const doLiveReload = !!options['livereload'];
239239
const doOpenFlow = (await this.isOldCapacitor()) || options['open'] === true;
@@ -297,7 +297,7 @@ For Android and iOS, you can setup Remote Debugging on your device with browser
297297
throw new FatalException(`Cannot run ${input('ionic capacitor run')} outside a project directory.`);
298298
}
299299

300-
const [ platform ] = inputs;
300+
const [platform] = inputs;
301301

302302
await this.runCapacitorRunHook('capacitor:run:before', inputs, options, { ...this.env, project: this.project });
303303

@@ -326,7 +326,7 @@ For Android and iOS, you can setup Remote Debugging on your device with browser
326326
throw new FatalException(`Cannot run ${input('ionic capacitor run')} outside a project directory.`);
327327
}
328328

329-
const [ platform ] = inputs;
329+
const [platform] = inputs;
330330

331331
await this.runCapacitorRunHook('capacitor:run:before', inputs, options, { ...this.env, project: this.project });
332332
await this.runCapacitor(['run', platform, ...(shouldSync ? [] : ['--no-sync']), '--target', String(options['target'])]);

‎packages/@ionic/cli/src/commands/config/get.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { MetadataGroup } from '@ionic/cli-framework';
22
import { strcmp } from '@ionic/cli-framework/utils/string';
33
import { columnar, prettyPath } from '@ionic/utils-terminal';
4-
import * as chalk from 'chalk';
4+
import chalk from 'chalk';
55
import * as lodash from 'lodash';
66
import * as util from 'util';
77

‎packages/@ionic/cli/src/commands/cordova/run.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Footnote, MetadataGroup, validators } from '@ionic/cli-framework';
22
import { onBeforeExit, sleepForever } from '@ionic/utils-process';
3-
import * as Debug from 'debug';
3+
import { debug as Debug } from 'debug';
44
import * as lodash from 'lodash';
55

66
import { CommandInstanceInfo, CommandLineInputs, CommandLineOptions, CommandMetadata, CommandMetadataOption, CommandPreRun, IShellRunOptions, ServeDetails } from '../../definitions';
@@ -212,7 +212,7 @@ Just like with ${input('ionic cordova build')}, you can pass additional options
212212
inputs[0] = p.trim();
213213
}
214214

215-
const [ platform ] = inputs;
215+
const [platform] = inputs;
216216

217217
if (platform && options['native-run'] && !SUPPORTED_PLATFORMS.includes(platform)) {
218218
this.env.log.warn(`${input(platform)} is not supported by ${input('native-run')}. Using Cordova to run the app.`);
@@ -298,7 +298,7 @@ Just like with ${input('ionic cordova build')}, you can pass additional options
298298
buildOpts.stdio = options['verbose'] ? 'inherit' : ['pipe', 'ignore', 'pipe'];
299299

300300
if (options['native-run']) {
301-
const [ platform ] = inputs;
301+
const [platform] = inputs;
302302

303303
await this.runCordova(filterArgumentsForCordova({ ...metadata, name: 'build' }, options), buildOpts);
304304

@@ -336,7 +336,7 @@ Just like with ${input('ionic cordova build')}, you can pass additional options
336336

337337
if (options['native-run']) {
338338
const conf = await loadCordovaConfig(this.integration);
339-
const [ platform ] = inputs;
339+
const [platform] = inputs;
340340

341341
await this.runCordova(filterArgumentsForCordova({ ...metadata, name: 'build' }, options), { stdio: 'inherit' });
342342

‎packages/@ionic/cli/src/commands/integrations/list.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { columnar } from '@ionic/utils-terminal';
2-
import * as chalk from 'chalk';
2+
import chalk from 'chalk';
33

44
import { CommandLineInputs, CommandLineOptions, CommandMetadata, IntegrationName } from '../../definitions';
55
import { input, strong } from '../../lib/color';

0 commit comments

Comments
 (0)