From 13df905619a39672e51c90e047c4d4e219c238f3 Mon Sep 17 00:00:00 2001
From: Emily <emily.morgan@code.berlin>
Date: Tue, 9 Jul 2024 11:35:47 +0200
Subject: [PATCH 1/2] fix pack

---
 scripts/release-cli.ts | 51 ++++++++++--------------------------------
 1 file changed, 12 insertions(+), 39 deletions(-)

diff --git a/scripts/release-cli.ts b/scripts/release-cli.ts
index e5bfaf3b7..f54c4b709 100644
--- a/scripts/release-cli.ts
+++ b/scripts/release-cli.ts
@@ -7,12 +7,6 @@ import fs from 'fs';
 import * as util from 'util';
 const exec = util.promisify(execRaw);
 
-const PATH_TO_CLI = process.cwd() + '/cli';
-const PATH_TO_CLIENT = process.cwd() + '/packages/client';
-const PATH_TO_CODEGEN = process.cwd() + '/packages/codegen';
-const PATH_TO_IMPORTER = process.cwd() + '/packages/importer';
-const PATH_TO_PGROLL = process.cwd() + '/packages/pgroll';
-
 const base = {
   owner: 'xataio',
   repo: 'client-ts',
@@ -49,45 +43,24 @@ async function main() {
 
   const operatingSystem = matrixToOclif(process.env.MATRIX_OS);
 
+  const PATH_TO_CLI = process.cwd() + '/cli';
   const { manifest, fileName } = await readProjectManifest(PATH_TO_CLI);
-  const {
-    manifest: { version: clientVersion }
-  } = await readProjectManifest(PATH_TO_CLIENT);
-  const {
-    manifest: { version: codegenVersion }
-  } = await readProjectManifest(PATH_TO_CODEGEN);
-  const {
-    manifest: { version: importerVersion }
-  } = await readProjectManifest(PATH_TO_IMPORTER);
-  const {
-    manifest: { version: pgrollVersion }
-  } = await readProjectManifest(PATH_TO_PGROLL);
-
-  if (!clientVersion || !codegenVersion || !importerVersion || !pgrollVersion)
-    throw new Error('Missing package versions.');
-
-  // Assume changeset version has been called and all the
-  // versions in package jsons are up to date
-
-  const workspaceProtocolPackageManifest = await createExportableManifest(PATH_TO_CLI, {
-    ...manifest,
-    dependencies: {
-      ...manifest.dependencies,
-      '@xata.io/client': clientVersion,
-      '@xata.io/codegen': codegenVersion,
-      '@xata.io/importer': importerVersion,
-      '@xata.io/pgroll': pgrollVersion
-    }
-  });
+
+  // Oclif pack expects a npm-shrinkwrap.json file and errors if it is not present.
+  execFile('rm', ['-rf', `${PATH_TO_CLI}/npm-shrinkwrap.json`]);
+  exec(`pnpm ls --prod --json >> ${PATH_TO_CLI}/npm-shrinkwrap.json`);
+
+  delete manifest.dependencies?.['@xata.io/client'];
+  delete manifest.dependencies?.['@xata.io/codegen'];
+  delete manifest.dependencies?.['@xata.io/importer'];
+  delete manifest.dependencies?.['@xata.io/pgroll'];
+
+  const workspaceProtocolPackageManifest = await createExportableManifest(PATH_TO_CLI, manifest, { catalogs: {} });
 
   await writeProjectManifest(`${PATH_TO_CLI}/${fileName}`, workspaceProtocolPackageManifest);
 
   process.chdir(PATH_TO_CLI);
 
-  // Oclif pack expects a npm-shrinkwrap.json file and errors if it is not present.
-  execFile('rm', ['-rf', `${PATH_TO_CLI}/npm-shrinkwrap.json`]);
-  execFile('touch', [`${PATH_TO_CLI}/npm-shrinkwrap.json`]);
-
   await exec(`pnpm oclif pack ${operatingSystem}`);
 
   const octokit = new Octokit({

From ed7114fd49dc85f2de06feb71fd73d6c6dadaa94 Mon Sep 17 00:00:00 2001
From: Emily <emily.morgan@code.berlin>
Date: Wed, 10 Jul 2024 10:10:40 +0200
Subject: [PATCH 2/2] fix

---
 scripts/release-cli.ts | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/scripts/release-cli.ts b/scripts/release-cli.ts
index f54c4b709..8120ab8de 100644
--- a/scripts/release-cli.ts
+++ b/scripts/release-cli.ts
@@ -1,6 +1,4 @@
-import { createExportableManifest } from '@pnpm/exportable-manifest';
 import { readProjectManifest } from '@pnpm/read-project-manifest';
-import { writeProjectManifest } from '@pnpm/write-project-manifest';
 import { execFile, exec as execRaw } from 'child_process';
 import { Octokit } from '@octokit/core';
 import fs from 'fs';
@@ -44,24 +42,19 @@ async function main() {
   const operatingSystem = matrixToOclif(process.env.MATRIX_OS);
 
   const PATH_TO_CLI = process.cwd() + '/cli';
-  const { manifest, fileName } = await readProjectManifest(PATH_TO_CLI);
+  const { manifest } = await readProjectManifest(PATH_TO_CLI);
 
   // Oclif pack expects a npm-shrinkwrap.json file and errors if it is not present.
   execFile('rm', ['-rf', `${PATH_TO_CLI}/npm-shrinkwrap.json`]);
-  exec(`pnpm ls --prod --json >> ${PATH_TO_CLI}/npm-shrinkwrap.json`);
 
-  delete manifest.dependencies?.['@xata.io/client'];
-  delete manifest.dependencies?.['@xata.io/codegen'];
-  delete manifest.dependencies?.['@xata.io/importer'];
-  delete manifest.dependencies?.['@xata.io/pgroll'];
-
-  const workspaceProtocolPackageManifest = await createExportableManifest(PATH_TO_CLI, manifest, { catalogs: {} });
+  process.chdir(PATH_TO_CLI);
 
-  await writeProjectManifest(`${PATH_TO_CLI}/${fileName}`, workspaceProtocolPackageManifest);
+  await exec(`pnpm ls --prod --json >> npm-shrinkwrap.json`);
 
-  process.chdir(PATH_TO_CLI);
+  // Build tarball with pnpm. Oclif uses npm which fails
+  await exec(`pnpm pack`);
 
-  await exec(`pnpm oclif pack ${operatingSystem}`);
+  await exec(`pnpm oclif pack ${operatingSystem} -t xata.io-cli-${manifest.version}.tgz`);
 
   const octokit = new Octokit({
     auth: process.env.GITHUB_TOKEN