Merge branch 'develop' into deprecate-ssl

ionic-team · Dec 20, 2023 · a933dcd · a933dcd
2 parents 5480ba2 + 05d64e9
commit a933dcd
Show file tree

Hide file tree

Showing 91 changed files with 508 additions and 250 deletions.
diff --git a/packages/@ionic/cli-framework-output/CHANGELOG.md b/packages/@ionic/cli-framework-output/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.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

diff --git a/packages/@ionic/cli-framework-output/package.json b/packages/@ionic/cli-framework-output/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ionic/cli-framework-output",
-  "version": "2.2.7",
+  "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)",
@@ -31,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",

diff --git a/packages/@ionic/cli-framework-prompts/CHANGELOG.md b/packages/@ionic/cli-framework-prompts/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.
 
+## [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

diff --git 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.1.12",
+  "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)",
@@ -31,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"

diff --git a/packages/@ionic/cli-framework-prompts/src/index.ts b/packages/@ionic/cli-framework-prompts/src/index.ts
@@ -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');
 

diff --git a/packages/@ionic/cli-framework/CHANGELOG.md b/packages/@ionic/cli-framework/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.
 
+## [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)
 
 

diff --git a/packages/@ionic/cli-framework/package.json b/packages/@ionic/cli-framework/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ionic/cli-framework",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "The foundation framework of the Ionic CLI",
   "homepage": "https://ionicframework.com/",
   "author": "Ionic Team <[email protected]> (https://ionicframework.com) ",
@@ -26,14 +26,14 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@ionic/cli-framework-output": "2.2.7",
+    "@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": "3.0.0",
-    "@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",

diff --git a/packages/@ionic/cli-framework/src/lib/__tests__/options.ts b/packages/@ionic/cli-framework/src/lib/__tests__/options.ts
@@ -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';

diff --git a/packages/@ionic/cli-framework/src/lib/colors.ts b/packages/@ionic/cli-framework/src/lib/colors.ts
@@ -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';

diff --git a/packages/@ionic/cli-framework/src/lib/help.ts b/packages/@ionic/cli-framework/src/lib/help.ts
@@ -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';
@@ -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)),
     ]);

diff --git a/packages/@ionic/cli-framework/src/lib/options.ts b/packages/@ionic/cli-framework/src/lib/options.ts
@@ -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';
 
@@ -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) {
@@ -50,7 +50,7 @@ export function separateArgv(pargv: readonly string[]): [string[], string[]] {
     otherArgs.shift(); // strip separator
   }
 
-  return [ ownArgs, otherArgs ];
+  return [ownArgs, otherArgs];
 }
 
 /**
@@ -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) };
 }
@@ -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) {
@@ -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) {

diff --git a/packages/@ionic/cli-framework/src/lib/validators.ts b/packages/@ionic/cli-framework/src/lib/validators.ts
@@ -1,4 +1,4 @@
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 
 import { ValidationError, Validator, Validators } from '../definitions';
 import { InputValidationError } from '../errors';

diff --git a/packages/@ionic/cli-framework/src/utils/ipc.ts b/packages/@ionic/cli-framework/src/utils/ipc.ts
@@ -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';

diff --git a/packages/@ionic/cli/.gitignore b/packages/@ionic/cli/.gitignore
@@ -3,3 +3,4 @@
 !jest.config.js
 !lint-staged.config.js
 *.d.ts
+*.tgz
diff --git a/packages/@ionic/cli/CHANGELOG.md b/packages/@ionic/cli/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.
 
+## [7.1.6](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))
+
+
+
+
+
 ## [7.1.5](https://github.com/ionic-team/ionic-cli/compare/@ionic/[email protected]...@ionic/[email protected]) (2023-11-08)
 
 

diff --git a/packages/@ionic/cli/package.json b/packages/@ionic/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ionic/cli",
-  "version": "7.1.5",
+  "version": "7.1.6",
   "description": "A tool for creating and developing Ionic Framework mobile apps.",
   "homepage": "https://ionicframework.com",
   "author": "Ionic Team <[email protected]> (https://ionicframework.com) ",
@@ -40,16 +40,16 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@ionic/cli-framework": "6.0.0",
-    "@ionic/cli-framework-output": "2.2.7",
-    "@ionic/cli-framework-prompts": "2.1.12",
+    "@ionic/cli-framework": "6.0.1",
+    "@ionic/cli-framework-output": "2.2.8",
+    "@ionic/cli-framework-prompts": "2.1.13",
     "@ionic/utils-array": "2.1.6",
     "@ionic/utils-fs": "3.1.7",
-    "@ionic/utils-network": "2.1.6",
-    "@ionic/utils-process": "2.1.11",
-    "@ionic/utils-stream": "3.1.6",
-    "@ionic/utils-subprocess": "3.0.0",
-    "@ionic/utils-terminal": "2.3.4",
+    "@ionic/utils-network": "2.1.7",
+    "@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",
     "diff": "^4.0.1",
@@ -58,12 +58,12 @@
     "lodash": "^4.17.5",
     "open": "^7.0.4",
     "os-name": "^4.0.0",
+    "proxy-agent": "^6.3.0",
     "semver": "^7.1.1",
     "split2": "^3.0.0",
     "ssh-config": "^1.1.1",
     "stream-combiner2": "^1.1.1",
     "superagent": "^8.0.9",
-    "superagent-proxy": "^3.0.0",
     "tar": "^6.0.1",
     "tslib": "^2.0.1"
   },
@@ -77,7 +77,6 @@
     "@types/semver": "^7.1.0",
     "@types/split2": "^2.1.6",
     "@types/superagent": "4.1.3",
-    "@types/superagent-proxy": "^3.0.0",
     "@types/tar": "^6.1.2",
     "jest": "^26.4.2",
     "jest-cli": "^26.0.1",

diff --git a/packages/@ionic/cli/src/bootstrap.ts b/packages/@ionic/cli/src/bootstrap.ts
@@ -1,5 +1,5 @@
 import { compileNodeModulesPaths, readPackageJsonFile } from '@ionic/cli-framework/utils/node';
-import * as Debug from 'debug';
+import { debug as Debug } from 'debug';
 import * as path from 'path';
 import * as semver from 'semver';
 

diff --git a/packages/@ionic/cli/src/commands/capacitor/run.ts b/packages/@ionic/cli/src/commands/capacitor/run.ts
@@ -1,8 +1,8 @@
 import { BaseError, Footnote, validators } from '@ionic/cli-framework';
 import { sleepForever } from '@ionic/utils-process';
 import { columnar } from '@ionic/utils-terminal';
-import * as chalk from 'chalk';
-import * as Debug from 'debug';
+import chalk from 'chalk';
+import { debug as Debug } from 'debug';
 import * as lodash from 'lodash';
 import * as semver from 'semver';
 
@@ -233,7 +233,7 @@ For Android and iOS, you can setup Remote Debugging on your device with browser
       throw new FatalException(`Cannot run ${input('ionic capacitor run')} outside a project directory.`);
     }
 
-    const [ platform ] = inputs;
+    const [platform] = inputs;
 
     const doLiveReload = !!options['livereload'];
     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
       throw new FatalException(`Cannot run ${input('ionic capacitor run')} outside a project directory.`);
     }
 
-    const [ platform ] = inputs;
+    const [platform] = inputs;
 
     await this.runCapacitorRunHook('capacitor:run:before', inputs, options, { ...this.env, project: this.project });
 
@@ -326,7 +326,7 @@ For Android and iOS, you can setup Remote Debugging on your device with browser
       throw new FatalException(`Cannot run ${input('ionic capacitor run')} outside a project directory.`);
     }
 
-    const [ platform ] = inputs;
+    const [platform] = inputs;
 
     await this.runCapacitorRunHook('capacitor:run:before', inputs, options, { ...this.env, project: this.project });
     await this.runCapacitor(['run', platform, ...(shouldSync ? [] : ['--no-sync']), '--target', String(options['target'])]);

diff --git a/packages/@ionic/cli/src/commands/config/get.ts b/packages/@ionic/cli/src/commands/config/get.ts
@@ -1,7 +1,7 @@
 import { MetadataGroup } from '@ionic/cli-framework';
 import { strcmp } from '@ionic/cli-framework/utils/string';
 import { columnar, prettyPath } from '@ionic/utils-terminal';
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 import * as lodash from 'lodash';
 import * as util from 'util';
 

diff --git a/packages/@ionic/cli/src/commands/cordova/run.ts b/packages/@ionic/cli/src/commands/cordova/run.ts
@@ -1,6 +1,6 @@
 import { Footnote, MetadataGroup, validators } from '@ionic/cli-framework';
 import { onBeforeExit, sleepForever } from '@ionic/utils-process';
-import * as Debug from 'debug';
+import { debug as Debug } from 'debug';
 import * as lodash from 'lodash';
 
 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
       inputs[0] = p.trim();
     }
 
-    const [ platform ] = inputs;
+    const [platform] = inputs;
 
     if (platform && options['native-run'] && !SUPPORTED_PLATFORMS.includes(platform)) {
       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
     buildOpts.stdio = options['verbose'] ? 'inherit' : ['pipe', 'ignore', 'pipe'];
 
     if (options['native-run']) {
-      const [ platform ] = inputs;
+      const [platform] = inputs;
 
       await this.runCordova(filterArgumentsForCordova({ ...metadata, name: 'build' }, options), buildOpts);
 
@@ -336,7 +336,7 @@ Just like with ${input('ionic cordova build')}, you can pass additional options
 
     if (options['native-run']) {
       const conf = await loadCordovaConfig(this.integration);
-      const [ platform ] = inputs;
+      const [platform] = inputs;
 
       await this.runCordova(filterArgumentsForCordova({ ...metadata, name: 'build' }, options), { stdio: 'inherit' });
 

diff --git a/packages/@ionic/cli/src/commands/integrations/list.ts b/packages/@ionic/cli/src/commands/integrations/list.ts
@@ -1,5 +1,5 @@
 import { columnar } from '@ionic/utils-terminal';
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 
 import { CommandLineInputs, CommandLineOptions, CommandMetadata, IntegrationName } from '../../definitions';
 import { input, strong } from '../../lib/color';