ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2024-12-19 21:57:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update oclif to 4.17.0 and @oclif/core 4.1.0

Browse Source 
Change-type: patch
This commit is contained in:
Otavio Jacobi 2024-12-17 15:17:13 -03:00
parent e5076434c6
commit 362584cbc7
4 changed files with 1906 additions and 750 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2640
npm-shrinkwrap.json generated
View File

File diff suppressed because it is too large Load Diff

4
package.json
View File

@ -180,7 +180,7 @@
"mock-fs": "^5.2.0", "mock-fs": "^5.2.0",
"mock-require": "^3.0.3", "mock-require": "^3.0.3",
"nock": "^13.2.1", "nock": "^13.2.1",
"oclif": "^4.14.0", "oclif": "^4.17.0",
"rewire": "^7.0.0", "rewire": "^7.0.0",
"simple-git": "^3.14.1", "simple-git": "^3.14.1",
"sinon": "^19.0.0", "sinon": "^19.0.0",
@ -193,7 +193,7 @@
"@balena/dockerignore": "^1.0.2", "@balena/dockerignore": "^1.0.2",
"@balena/env-parsing": "^1.1.8", "@balena/env-parsing": "^1.1.8",
"@balena/es-version": "^1.0.1", "@balena/es-version": "^1.0.1",
"@oclif/core": "^4.0.31", "@oclif/core": "^4.1.0",
"@sentry/node": "^6.16.1", "@sentry/node": "^6.16.1",
"balena-config-json": "^4.2.0", "balena-config-json": "^4.2.0",
"balena-device-init": "^7.0.1", "balena-device-init": "^7.0.1",

0
patches/all/@oclif+core+4.0.31.patch → patches/all/@oclif+core+4.1.0.patch
View File

12
patches/all/oclif+4.14.0.dev.patch → patches/all/oclif+4.17.0.dev.patch
View File

@ -1,8 +1,8 @@
diff --git a/node_modules/oclif/lib/commands/pack/win.js b/node_modules/oclif/lib/commands/pack/win.js diff --git a/node_modules/oclif/lib/commands/pack/win.js b/node_modules/oclif/lib/commands/pack/win.js
index ef7f90e..8264b7c 100644 index bfe9205..482519e 100644
--- a/node_modules/oclif/lib/commands/pack/win.js --- a/node_modules/oclif/lib/commands/pack/win.js
+++ b/node_modules/oclif/lib/commands/pack/win.js +++ b/node_modules/oclif/lib/commands/pack/win.js
@@ -76,6 +76,12 @@ InstallDir "\$PROGRAMFILES${arch === 'x64' ? '64' : ''}\\${config.dirname}" @@ -86,6 +86,12 @@ InstallDir "\$PROGRAMFILES${arch === 'x64' ? '64' : ''}\\${config.dirname}"
${customization} ${customization}
Section "${config.name} CLI \${VERSION}" Section "${config.name} CLI \${VERSION}"
@ -16,20 +16,18 @@ index ef7f90e..8264b7c 100644
File /r bin File /r bin
File /r client File /r client
diff --git a/node_modules/oclif/lib/tarballs/build.js b/node_modules/oclif/lib/tarballs/build.js diff --git a/node_modules/oclif/lib/tarballs/build.js b/node_modules/oclif/lib/tarballs/build.js
index 14d5a6e..7b42a6f 100644 index f0c8d95..a72400e 100644
--- a/node_modules/oclif/lib/tarballs/build.js --- a/node_modules/oclif/lib/tarballs/build.js
+++ b/node_modules/oclif/lib/tarballs/build.js +++ b/node_modules/oclif/lib/tarballs/build.js
@@ -200,6 +200,13 @@ const extractCLI = async (tarball, c) => { @@ -218,6 +218,11 @@ const extractCLI = async (tarball, c) => {
(0, promises_1.rm)(path.join(workspace, path.basename(tarball)), { recursive: true }), (0, promises_1.rm)(path.join(workspace, path.basename(tarball)), { recursive: true }),
(0, fs_extra_1.remove)(path.join(workspace, 'bin', 'run.cmd')), (0, fs_extra_1.remove)(path.join(workspace, 'bin', 'run.cmd')),
]); ]);
+
+ // The oclif installers are a production installation, while the source + // The oclif installers are a production installation, while the source
+ // `bin` folder may contain a `.fast-boot.json` file of a dev installation. + // `bin` folder may contain a `.fast-boot.json` file of a dev installation.
+ // This has previously led to issues preventing the CLI from starting, so + // This has previously led to issues preventing the CLI from starting, so
+ // delete `.fast-boot.json` (if any) from the destination folder. + // delete `.fast-boot.json` (if any) from the destination folder.
+ await (0, fs_extra_1.remove)(path.join(workspace, 'bin', '.fast-boot.json')); + await (0, fs_extra_1.remove)(path.join(workspace, 'bin', '.fast-boot.json'));
+
}; };
const buildTarget = async (target, c, options) => { const buildTarget = async (target, c, options) => {
const workspace = c.workspace(target); if (target.platform === 'win32' && target.arch === 'arm64' && (0, semver_1.lt)(c.nodeVersion, '20.0.0')) {