From dd1760ef05d29c7f0b65a04c2fd0ec01e82e29c2 Mon Sep 17 00:00:00 2001 From: Shane McLaughlin Date: Mon, 5 Dec 2022 11:13:56 -0600 Subject: [PATCH] fix: json output formatting (#1051) * fix: json output formatting * fix: don't format on memfs * refactor: use native fs in cli.ts --- src/tarballs/build.ts | 4 ++-- test/integration/deb.test.ts | 4 ++-- test/integration/macos.test.ts | 4 ++-- test/integration/publish.test.ts | 4 ++-- test/integration/win.test.ts | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/tarballs/build.ts b/src/tarballs/build.ts index f3c150a30..048bbbffa 100644 --- a/src/tarballs/build.ts +++ b/src/tarballs/build.ts @@ -59,7 +59,7 @@ export async function build(c: BuildConfig, options: { pjson.oclif.update = pjson.oclif.update || {} pjson.oclif.update.s3 = pjson.oclif.update.s3 || {} pjson.oclif.update.s3.bucket = c.s3Config.bucket - await fs.writeJSON(pjsonPath, pjson) + await fs.writeJSON(pjsonPath, pjson, {spaces: 2}) } const addDependencies = async () => { @@ -162,7 +162,7 @@ export async function build(c: BuildConfig, options: { sha: c.gitSha, version: config.version, })) - await fs.writeJSON(manifestFilepath, manifest) + await fs.writeJSON(manifestFilepath, manifest, {spaces: 2}) } log(`gathering workspace for ${config.bin} to ${c.workspace()}`) diff --git a/test/integration/deb.test.ts b/test/integration/deb.test.ts index 371e4c876..758c2cb97 100644 --- a/test/integration/deb.test.ts +++ b/test/integration/deb.test.ts @@ -26,13 +26,13 @@ describe('publish:deb', () => { bucket = pjson.oclif.update.s3.bucket basePrefix = pjson.oclif.update.s3.folder await deleteFolder(bucket, `${basePrefix}/versions/${pjson.version}/`) - await fs.writeJSON(pjsonPath, pjson) + await fs.writeJSON(pjsonPath, pjson, {spaces: 2}) await fs.emptyDir(root) }) afterEach(async () => { await deleteFolder(bucket, `${basePrefix}/versions/${pjson.version}/`) pjson.version = originalVersion - await fs.writeJSON(pjsonPath, pjson) + await fs.writeJSON(pjsonPath, pjson, {spaces: 2}) }) onlyLinux diff --git a/test/integration/macos.test.ts b/test/integration/macos.test.ts index 8e8550d6f..e5676a653 100644 --- a/test/integration/macos.test.ts +++ b/test/integration/macos.test.ts @@ -28,13 +28,13 @@ describe('publish:macos', () => { bucket = pjson.oclif.update.s3.bucket basePrefix = pjson.oclif.update.s3.folder await deleteFolder(bucket, `${basePrefix}/versions/${pjson.version}/`) - await fs.writeJSON(pjsonPath, pjson) + await fs.writeJSON(pjsonPath, pjson, {spaces: 2}) await fs.emptyDir(root) }) afterEach(async () => { await deleteFolder(bucket, `${basePrefix}/versions/${pjson.version}/`) pjson.version = originalVersion - await fs.writeJSON(pjsonPath, pjson) + await fs.writeJSON(pjsonPath, pjson, {spaces: 2}) }) onlyMacos diff --git a/test/integration/publish.test.ts b/test/integration/publish.test.ts index 0416fda42..02e9ff222 100644 --- a/test/integration/publish.test.ts +++ b/test/integration/publish.test.ts @@ -72,13 +72,13 @@ const folderCleanup = async () => Promise.all([ describe('upload tarballs', async () => { beforeEach(async () => { await folderCleanup() - await fs.writeJSON(pjsonPath, pjson) + await fs.writeJSON(pjsonPath, pjson, {spaces: 2}) await fs.emptyDir(root) }) afterEach(async () => { await folderCleanup() pjson.version = originalVersion - await fs.writeJSON(pjsonPath, pjson) + await fs.writeJSON(pjsonPath, pjson, {spaces: 2}) }) skipIfWindows diff --git a/test/integration/win.test.ts b/test/integration/win.test.ts index a202b5630..14e27501b 100644 --- a/test/integration/win.test.ts +++ b/test/integration/win.test.ts @@ -30,13 +30,13 @@ describe('publish:win', () => { bucket = pjson.oclif.update.s3.bucket basePrefix = pjson.oclif.update.s3.folder await deleteFolder(bucket, `${basePrefix}/versions/${pjson.version}/`) - await fs.writeJSON(pjsonPath, pjson) + await fs.writeJSON(pjsonPath, pjson, {spaces: 2}) await fs.emptyDir(root) }) afterEach(async () => { await deleteFolder(bucket, `${basePrefix}/versions/${pjson.version}/`) pjson.version = originalVersion - await fs.writeJSON(pjsonPath, pjson) + await fs.writeJSON(pjsonPath, pjson, {spaces: 2}) }) skipIfWindows