From 2885091ced1792531e7e87b4d53938eac46d24ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
=?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
=?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
<netroy@users.noreply.github.com>
Date: Thu, 27 Jun 2024 17:26:19 +0200
Subject: [PATCH] feat(core): Upgrade oclif (no-changelog) (#9881)
---
packages/cli/package.json | 2 +-
packages/cli/src/commands/BaseCommand.ts | 5 +-
packages/node-dev/package.json | 2 +-
pnpm-lock.yaml | 141 +++++++----------------
4 files changed, 46 insertions(+), 104 deletions(-)
diff --git a/packages/cli/package.json b/packages/cli/package.json
index b8f3df4687..c419e82fd1 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -100,7 +100,7 @@
"@n8n/permissions": "workspace:*",
"@n8n/typeorm": "0.3.20-10",
"@n8n_io/license-sdk": "2.13.0",
- "@oclif/core": "3.26.6",
+ "@oclif/core": "4.0.7",
"@pinecone-database/pinecone": "2.1.0",
"@rudderstack/rudder-sdk-node": "2.0.7",
"@sentry/integrations": "7.87.0",
diff --git a/packages/cli/src/commands/BaseCommand.ts b/packages/cli/src/commands/BaseCommand.ts
index 61db09f3a5..09c8bca13e 100644
--- a/packages/cli/src/commands/BaseCommand.ts
+++ b/packages/cli/src/commands/BaseCommand.ts
@@ -1,7 +1,6 @@
import 'reflect-metadata';
import { Container } from 'typedi';
-import { Command } from '@oclif/core';
-import { ExitError } from '@oclif/core/lib/errors';
+import { Command, Errors } from '@oclif/core';
import { ApplicationError, ErrorReporterProxy as ErrorReporter, sleep } from 'n8n-workflow';
import { BinaryDataService, InstanceSettings, ObjectStoreService } from 'n8n-core';
import type { AbstractServer } from '@/AbstractServer';
@@ -308,7 +307,7 @@ export abstract class BaseCommand extends Command {
await sleep(100); // give any in-flight query some time to finish
await Db.close();
}
- const exitCode = error instanceof ExitError ? error.oclif.exit : error ? 1 : 0;
+ const exitCode = error instanceof Errors.ExitError ? error.oclif.exit : error ? 1 : 0;
this.exit(exitCode);
}
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 001278f820..0c98f846b7 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -48,7 +48,7 @@
"@types/inquirer": "^6.5.0"
},
"dependencies": {
- "@oclif/core": "3.26.6",
+ "@oclif/core": "4.0.7",
"change-case": "^4.1.1",
"fast-glob": "^3.2.5",
"inquirer": "^7.0.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 52151bd98b..c4f3c38bf6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -554,8 +554,8 @@ importers:
specifier: 2.13.0
version: 2.13.0
'@oclif/core':
- specifier: 3.26.6
- version: 3.26.6
+ specifier: 4.0.7
+ version: 4.0.7
'@pinecone-database/pinecone':
specifier: 2.1.0
version: 2.1.0
@@ -1323,8 +1323,8 @@ importers:
packages/node-dev:
dependencies:
'@oclif/core':
- specifier: 3.26.6
- version: 3.26.6
+ specifier: 4.0.7
+ version: 4.0.7
change-case:
specifier: ^4.1.1
version: 4.1.2
@@ -4165,8 +4165,8 @@ packages:
engines: {node: '>=10'}
deprecated: This functionality has been moved to @npmcli/fs
- '@oclif/core@3.26.6':
- resolution: {integrity: sha512-+FiTw1IPuJTF9tSAlTsY8bGK4sgthehjz7c2SvYdgQncTkxI2xvUch/8QpjNYGLEmUneNygvYMRBax2KJcLccA==}
+ '@oclif/core@4.0.7':
+ resolution: {integrity: sha512-sU4Dx+RXCWAkrMw8tQFYAL6VfcHYKLPxVC9iKfgTXr4aDhcCssDwrbgpx0Di1dnNxvQlDGUhuCEInZuIY/nNfw==}
engines: {node: '>=18.0.0'}
'@one-ini/wasm@0.1.1':
@@ -5420,9 +5420,6 @@ packages:
'@types/cheerio@0.22.31':
resolution: {integrity: sha512-Kt7Cdjjdi2XWSfrZ53v4Of0wG3ZcmaegFXjMmz9tfNrZSkzzo36G0AL1YqSdcIA78Etjt6E609pt5h1xnQkPUw==}
- '@types/cli-progress@3.11.5':
- resolution: {integrity: sha512-D4PbNRbviKyppS5ivBGyFO29POlySLmA2HyUFE4p5QGazAMM3CwkKWcvTl8gvElSuxRh6FPKL8XmidX873ou4g==}
-
'@types/compression@1.0.1':
resolution: {integrity: sha512-GuoIYzD70h+4JUqUabsm31FGqvpCYHGKcLtor7nQ/YvUyNX0o9SJZ9boFI5HjFfbOda5Oe/XOvNK6FES8Y/79w==}
@@ -6305,8 +6302,9 @@ packages:
resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==}
engines: {node: '>=12'}
- ansicolors@0.3.2:
- resolution: {integrity: sha512-QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg==}
+ ansis@3.2.0:
+ resolution: {integrity: sha512-Yk3BkHH9U7oPyCN3gL5Tc7CpahG/+UFv/6UG03C311Vy9lzRmA5uoxDTpU9CO3rGHL6KzJz/pdDeXZCZ5Mu/Sg==}
+ engines: {node: '>=15'}
any-promise@1.3.0:
resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==}
@@ -6789,10 +6787,6 @@ packages:
capital-case@1.0.4:
resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
- cardinal@2.1.1:
- resolution: {integrity: sha512-JSr5eOgoEymtYHBjNWyjrMqet9Am2miJhlfKNdqLp6zoeAh0KN5dRAcxlecj5mAJrmQomgiOBj35xHLrFjqBpw==}
- hasBin: true
-
caseless@0.12.0:
resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
@@ -6923,14 +6917,14 @@ packages:
resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}
engines: {node: '>=8'}
- cli-progress@3.12.0:
- resolution: {integrity: sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A==}
- engines: {node: '>=4'}
-
cli-spinners@2.9.0:
resolution: {integrity: sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g==}
engines: {node: '>=6'}
+ cli-spinners@2.9.2:
+ resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==}
+ engines: {node: '>=6'}
+
cli-table3@0.6.3:
resolution: {integrity: sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==}
engines: {node: 10.* || >= 12.*}
@@ -7002,10 +6996,6 @@ packages:
color@3.2.1:
resolution: {integrity: sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==}
- color@4.2.3:
- resolution: {integrity: sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==}
- engines: {node: '>=12.5.0'}
-
colord@2.9.3:
resolution: {integrity: sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==}
@@ -7434,6 +7424,15 @@ packages:
supports-color:
optional: true
+ debug@4.3.5:
+ resolution: {integrity: sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==}
+ engines: {node: '>=6.0'}
+ peerDependencies:
+ supports-color: '*'
+ peerDependenciesMeta:
+ supports-color:
+ optional: true
+
decamelize@1.2.0:
resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
engines: {node: '>=0.10.0'}
@@ -8839,10 +8838,6 @@ packages:
humanize-ms@1.2.1:
resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==}
- hyperlinker@1.0.0:
- resolution: {integrity: sha512-Ty8UblRWFEcfSuIaajM34LdPXIhbs1ajEX/BBPv24J+enSVaEVY63xQ6lTO9VRYS5LAoghIG0IDJ+p+IPzKUQQ==}
- engines: {node: '>=4'}
-
iconv-lite@0.4.24:
resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
engines: {node: '>=0.10.0'}
@@ -9852,6 +9847,10 @@ packages:
resolution: {integrity: sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==}
engines: {node: '>=14'}
+ lilconfig@3.1.2:
+ resolution: {integrity: sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==}
+ engines: {node: '>=14'}
+
lines-and-columns@1.2.4:
resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
@@ -10496,9 +10495,6 @@ packages:
natural-compare@1.4.0:
resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
- natural-orderby@2.0.3:
- resolution: {integrity: sha512-p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q==}
-
negotiator@0.6.3:
resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}
engines: {node: '>= 0.6'}
@@ -10721,10 +10717,6 @@ packages:
resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
engines: {node: '>= 0.4'}
- object-treeify@1.1.33:
- resolution: {integrity: sha512-EFVjAYfzWqWsBMRHPMAXLCDIJnpMhdWAqR7xG6M6a2cs6PMFpl/+Z20w9zDW4vkxOFfddegBKq9Rehd0bxWE7A==}
- engines: {node: '>= 10'}
-
object.assign@4.1.4:
resolution: {integrity: sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==}
engines: {node: '>= 0.4'}
@@ -10930,9 +10922,6 @@ packages:
pascal-case@3.1.2:
resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
- password-prompt@1.1.3:
- resolution: {integrity: sha512-HkrjG2aJlvF0t2BMH0e2LB/EHf3Lcq3fNMzy4GYHcQblAvOl+QQji1Lx7WRBMqpVK8p+KR7bCg7oqAMXtdgqyw==}
-
path-browserify@1.0.1:
resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
@@ -11750,9 +11739,6 @@ packages:
resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
engines: {node: '>=8'}
- redeyed@2.1.1:
- resolution: {integrity: sha512-FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ==}
-
redis-errors@1.2.0:
resolution: {integrity: sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==}
engines: {node: '>=4'}
@@ -12548,10 +12534,6 @@ packages:
resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
engines: {node: '>=10'}
- supports-hyperlinks@2.3.0:
- resolution: {integrity: sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==}
- engines: {node: '>=8'}
-
supports-preserve-symlinks-flag@1.0.0:
resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
engines: {node: '>= 0.4'}
@@ -17189,33 +17171,22 @@ snapshots:
rimraf: 3.0.2
optional: true
- '@oclif/core@3.26.6':
+ '@oclif/core@4.0.7':
dependencies:
- '@types/cli-progress': 3.11.5
ansi-escapes: 4.3.2
- ansi-styles: 4.3.0
- cardinal: 2.1.1
- chalk: 4.1.2
+ ansis: 3.2.0
clean-stack: 3.0.1
- cli-progress: 3.12.0
- color: 4.2.3
- debug: 4.3.4(supports-color@8.1.1)
+ cli-spinners: 2.9.2
+ debug: 4.3.5(supports-color@8.1.1)
ejs: 3.1.10
get-package-type: 0.1.0
globby: 11.1.0
- hyperlinker: 1.0.0
indent-string: 4.0.0
is-wsl: 2.2.0
- js-yaml: 3.14.1
+ lilconfig: 3.1.2
minimatch: 9.0.4
- natural-orderby: 2.0.3
- object-treeify: 1.1.33
- password-prompt: 1.1.3
- slice-ansi: 4.0.0
string-width: 4.2.3
- strip-ansi: 6.0.1
supports-color: 8.1.1
- supports-hyperlinks: 2.3.0
widest-line: 3.1.0
wordwrap: 1.0.0
wrap-ansi: 7.0.0
@@ -19232,10 +19203,6 @@ snapshots:
dependencies:
'@types/node': 18.16.16
- '@types/cli-progress@3.11.5':
- dependencies:
- '@types/node': 18.16.16
-
'@types/compression@1.0.1':
dependencies:
'@types/express': 4.17.21
@@ -20315,7 +20282,7 @@ snapshots:
ansi-styles@6.2.1: {}
- ansicolors@0.3.2: {}
+ ansis@3.2.0: {}
any-promise@1.3.0: {}
@@ -20898,11 +20865,6 @@ snapshots:
tslib: 2.6.2
upper-case-first: 2.0.2
- cardinal@2.1.1:
- dependencies:
- ansicolors: 0.3.2
- redeyed: 2.1.1
-
caseless@0.12.0: {}
chai@4.3.10:
@@ -21058,12 +21020,10 @@ snapshots:
dependencies:
restore-cursor: 3.1.0
- cli-progress@3.12.0:
- dependencies:
- string-width: 4.2.3
-
cli-spinners@2.9.0: {}
+ cli-spinners@2.9.2: {}
+
cli-table3@0.6.3:
dependencies:
string-width: 4.2.3
@@ -21156,11 +21116,6 @@ snapshots:
color-convert: 1.9.3
color-string: 1.9.1
- color@4.2.3:
- dependencies:
- color-convert: 2.0.1
- color-string: 1.9.1
-
colord@2.9.3: {}
colorette@1.4.0: {}
@@ -21652,6 +21607,12 @@ snapshots:
optionalDependencies:
supports-color: 8.1.1
+ debug@4.3.5(supports-color@8.1.1):
+ dependencies:
+ ms: 2.1.2
+ optionalDependencies:
+ supports-color: 8.1.1
+
decamelize@1.2.0: {}
decimal.js@10.4.3: {}
@@ -23463,8 +23424,6 @@ snapshots:
dependencies:
ms: 2.1.3
- hyperlinker@1.0.0: {}
-
iconv-lite@0.4.24:
dependencies:
safer-buffer: 2.1.2
@@ -24675,6 +24634,8 @@ snapshots:
lilconfig@3.0.0: {}
+ lilconfig@3.1.2: {}
+
lines-and-columns@1.2.4: {}
linkify-it@3.0.3:
@@ -25334,8 +25295,6 @@ snapshots:
natural-compare@1.4.0: {}
- natural-orderby@2.0.3: {}
-
negotiator@0.6.3: {}
neo-async@2.6.2: {}
@@ -25576,8 +25535,6 @@ snapshots:
object-keys@1.1.1: {}
- object-treeify@1.1.33: {}
-
object.assign@4.1.4:
dependencies:
call-bind: 1.0.7
@@ -25828,11 +25785,6 @@ snapshots:
no-case: 3.0.4
tslib: 2.6.2
- password-prompt@1.1.3:
- dependencies:
- ansi-escapes: 4.3.2
- cross-spawn: 7.0.3
-
path-browserify@1.0.1: {}
path-case@3.0.4:
@@ -26686,10 +26638,6 @@ snapshots:
indent-string: 4.0.0
strip-indent: 3.0.0
- redeyed@2.1.1:
- dependencies:
- esprima: 4.0.1
-
redis-errors@1.2.0: {}
redis-parser@3.0.0:
@@ -27699,11 +27647,6 @@ snapshots:
dependencies:
has-flag: 4.0.0
- supports-hyperlinks@2.3.0:
- dependencies:
- has-flag: 4.0.0
- supports-color: 7.2.0
-
supports-preserve-symlinks-flag@1.0.0: {}
svgo@3.1.0: