mirror of
https://github.com/balena-io/balena-cli.git
synced 2024-12-24 07:46:39 +00:00
Bump oclif to v4
Change-type: patch
This commit is contained in:
parent
f7233c5d42
commit
e659e3577a
7766
npm-shrinkwrap.json
generated
7766
npm-shrinkwrap.json
generated
File diff suppressed because it is too large
Load Diff
@ -186,7 +186,7 @@
|
|||||||
"mocha": "^10.6.0",
|
"mocha": "^10.6.0",
|
||||||
"mock-require": "^3.0.3",
|
"mock-require": "^3.0.3",
|
||||||
"nock": "^13.2.1",
|
"nock": "^13.2.1",
|
||||||
"oclif": "^3.17.1",
|
"oclif": "^4.14.0",
|
||||||
"parse-link-header": "^2.0.0",
|
"parse-link-header": "^2.0.0",
|
||||||
"rewire": "^5.0.0",
|
"rewire": "^5.0.0",
|
||||||
"simple-git": "^3.14.1",
|
"simple-git": "^3.14.1",
|
||||||
|
@ -1,44 +0,0 @@
|
|||||||
diff --git a/node_modules/oclif/lib/commands/pack/win.js b/node_modules/oclif/lib/commands/pack/win.js
|
|
||||||
index c0926bd..e4f645c 100644
|
|
||||||
--- a/node_modules/oclif/lib/commands/pack/win.js
|
|
||||||
+++ b/node_modules/oclif/lib/commands/pack/win.js
|
|
||||||
@@ -59,6 +59,12 @@ InstallDir "\$PROGRAMFILES${arch === 'x64' ? '64' : ''}\\${config.dirname}"
|
|
||||||
${customization}
|
|
||||||
|
|
||||||
Section "${config.name} CLI \${VERSION}"
|
|
||||||
+ ; First remove any old client files.
|
|
||||||
+ ; (Remnants of old versions were causing CLI errors)
|
|
||||||
+ ; Initially tried running the Uninstall.exe, but was
|
|
||||||
+ ; unable to make script wait for completion (despite using _?)
|
|
||||||
+ DetailPrint "Removing files from previous version."
|
|
||||||
+ RMDir /r "$INSTDIR\\client"
|
|
||||||
SetOutPath $INSTDIR
|
|
||||||
File /r bin
|
|
||||||
File /r client
|
|
||||||
diff --git a/node_modules/oclif/lib/tarballs/build.js b/node_modules/oclif/lib/tarballs/build.js
|
|
||||||
index 384ea4b..c9607f3 100644
|
|
||||||
--- a/node_modules/oclif/lib/tarballs/build.js
|
|
||||||
+++ b/node_modules/oclif/lib/tarballs/build.js
|
|
||||||
@@ -30,7 +30,9 @@ async function build(c, options = {}) {
|
|
||||||
await fs.emptyDir(c.workspace());
|
|
||||||
const tarballNewLocation = path.join(c.workspace(), path.basename(tarball));
|
|
||||||
await fs.move(tarball, tarballNewLocation);
|
|
||||||
- await exec(`tar -xzf "${tarballNewLocation}"`, { cwd: c.workspace() });
|
|
||||||
+ let tarCmd = `tar -xzf "${tarballNewLocation}"`;
|
|
||||||
+ if (process.platform === 'win32') tarCmd += ' --force-local';
|
|
||||||
+ await exec(tarCmd, { cwd: c.workspace() });
|
|
||||||
await Promise.all((await fs.promises.readdir(path.join(c.workspace(), 'package'), { withFileTypes: true }))
|
|
||||||
.map(i => fs.move(path.join(c.workspace(), 'package', i.name), path.join(c.workspace(), i.name))));
|
|
||||||
await Promise.all([
|
|
||||||
@@ -38,6 +40,11 @@ async function build(c, options = {}) {
|
|
||||||
fs.promises.rm(path.join(c.workspace(), path.basename(tarball)), { recursive: true }),
|
|
||||||
fs.remove(path.join(c.workspace(), 'bin', 'run.cmd')),
|
|
||||||
]);
|
|
||||||
+ // The oclif installers are a production installation, while the source
|
|
||||||
+ // `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
|
|
||||||
+ // delete `.fast-boot.json` (if any) from the destination folder.
|
|
||||||
+ await fs.promises.rm(path.join(c.workspace(), 'bin', '.fast-boot.json'));
|
|
||||||
};
|
|
||||||
const updatePJSON = async () => {
|
|
||||||
const pjsonPath = path.join(c.workspace(), 'package.json');
|
|
35
patches/all/oclif+4.14.0.patch
Normal file
35
patches/all/oclif+4.14.0.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
diff --git a/node_modules/oclif/lib/commands/pack/win.js b/node_modules/oclif/lib/commands/pack/win.js
|
||||||
|
index ef7f90e..8264b7c 100644
|
||||||
|
--- a/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}"
|
||||||
|
${customization}
|
||||||
|
|
||||||
|
Section "${config.name} CLI \${VERSION}"
|
||||||
|
+ ; First remove any old client files.
|
||||||
|
+ ; (Remnants of old versions were causing CLI errors)
|
||||||
|
+ ; Initially tried running the Uninstall.exe, but was
|
||||||
|
+ ; unable to make script wait for completion (despite using _?)
|
||||||
|
+ DetailPrint "Removing files from previous version."
|
||||||
|
+ RMDir /r "$INSTDIR\\client"
|
||||||
|
SetOutPath $INSTDIR
|
||||||
|
File /r bin
|
||||||
|
File /r client
|
||||||
|
diff --git a/node_modules/oclif/lib/tarballs/build.js b/node_modules/oclif/lib/tarballs/build.js
|
||||||
|
index 14d5a6e..07050bc 100644
|
||||||
|
--- a/node_modules/oclif/lib/tarballs/build.js
|
||||||
|
+++ b/node_modules/oclif/lib/tarballs/build.js
|
||||||
|
@@ -200,6 +200,13 @@ const extractCLI = async (tarball, c) => {
|
||||||
|
(0, promises_1.rm)(path.join(workspace, path.basename(tarball)), { recursive: true }),
|
||||||
|
(0, fs_extra_1.remove)(path.join(workspace, 'bin', 'run.cmd')),
|
||||||
|
]);
|
||||||
|
+
|
||||||
|
+ // The oclif installers are a production installation, while the source
|
||||||
|
+ // `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
|
||||||
|
+ // delete `.fast-boot.json` (if any) from the destination folder.
|
||||||
|
+ await fs.promises.rm(path.join(c.workspace(), 'bin', '.fast-boot.json'));
|
||||||
|
+
|
||||||
|
};
|
||||||
|
const buildTarget = async (target, c, options) => {
|
||||||
|
const workspace = c.workspace(target);
|
Loading…
Reference in New Issue
Block a user