Use Yarn's makePublishBody

nicolo-ribaudo · Dec 6, 2020 · e56bcef · e56bcef
1 parent feb600c
commit e56bcef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 86 deletions.
diff --git a/bundles/@yarnpkg/plugin-babel-release-tool.js b/bundles/@yarnpkg/plugin-babel-release-tool.js
diff --git a/sources/utils/npm-publish.ts b/sources/utils/npm-publish.ts
@@ -1,6 +1,7 @@
 import { Workspace, structUtils, miscUtils } from "@yarnpkg/core";
 import { createHash } from "crypto";
 import { packUtils } from "@yarnpkg/plugin-pack";
+import { npmPublishUtils } from "@yarnpkg/plugin-npm";
 import ssri from "ssri";
 
 // Copied from https://github.com/yarnpkg/berry/blob/c34934033d4c2ce1d2b30afdae8638a38d2ba9d9/packages/plugin-npm-cli/sources/commands/npm/publish.ts#L92-L104
@@ -13,91 +14,9 @@ export async function generateTarballBody(
   const pack = await packUtils.genPackStream(workspace, files);
   const buffer = await miscUtils.bufferStream(pack);
 
-  return makePublishBody(workspace, buffer, {
+  return npmPublishUtils.makePublishBody(workspace, buffer, {
     access: undefined,
     tag,
     registry,
   });
 }
-
-// Copied from https://github.com/yarnpkg/berry/blob/c34934033d4c2ce1d2b30afdae8638a38d2ba9d9/packages/plugin-npm-cli/sources/commands/npm/publish.ts#L135
-async function makePublishBody(
-  workspace: Workspace,
-  buffer: Buffer,
-  {
-    access,
-    tag,
-    registry,
-  }: { access: string | undefined; tag: string; registry: string }
-) {
-  const configuration = workspace.project.configuration;
-
-  const ident = workspace.manifest.name!;
-  const version = workspace.manifest.version!;
-
-  const name = structUtils.stringifyIdent(ident);
-
-  const shasum = createHash(`sha1`).update(buffer).digest(`hex`);
-  const integrity = ssri.fromData(buffer).toString();
-
-  if (typeof access === `undefined`) {
-    if (
-      workspace.manifest.publishConfig &&
-      typeof workspace.manifest.publishConfig.access === `string`
-    ) {
-      access = workspace.manifest.publishConfig.access;
-    } else if (configuration.get<string>(`npmPublishAccess`) !== null) {
-      access = configuration.get<string>(`npmPublishAccess`)!;
-    } else if (ident.scope) {
-      access = `restricted`;
-    } else {
-      access = `public`;
-    }
-  }
-
-  const raw = await packUtils.genPackageManifest(workspace);
-
-  // This matches Lerna's logic:
-  // https://github.com/evocateur/libnpmpublish/blob/latest/publish.js#L142
-  // While the npm registry ignores the provided tarball URL, it's used by
-  // other registries such as verdaccio.
-  const tarballName = `${name}-${version}.tgz`;
-  const tarballURL = new URL(`${name}/-/${tarballName}`, registry);
-
-  return {
-    _id: name,
-    _attachments: {
-      [tarballName]: {
-        [`content_type`]: `application/octet-stream`,
-        data: buffer.toString(`base64`),
-        length: buffer.length,
-      },
-    },
-
-    name,
-    access,
-
-    [`dist-tags`]: {
-      [tag]: version,
-    },
-
-    versions: {
-      [version]: {
-        ...raw,
-
-        _id: `${name}@${version}`,
-
-        name,
-        version,
-
-        dist: {
-          shasum,
-          integrity,
-
-          // the npm registry requires a tarball path, but it seems useless 🤷
-          tarball: tarballURL.toString(),
-        },
-      },
-    },
-  };
-}