fix(publishable): limit badge creation to the lifter

Author: travi

src/project-type/cli/scaffolder.js

@@ -8,7 +8,6 @@ import {scaffold as scaffoldBundler} from '../publishable/bundler/index.js';
 const defaultBuildDirectory = 'bin';
 
 export default async function scaffoldCli({
-  packageName,
   visibility,
   projectRoot,
   dialect,
@@ -19,7 +18,7 @@ export default async function scaffoldCli({
   const packageAccessLevel = determinePackageAccessLevelFromProjectVisibility({projectVisibility: visibility});
   const [bundlerResults, publishableResults] = await Promise.all([
     scaffoldBundler({bundlers: packageBundlers, projectRoot, dialect, decisions, projectType: projectTypes.CLI}),
-    scaffoldPublishable({packageName, packageAccessLevel}),
+    scaffoldPublishable(),
     mergeIntoExistingPackageJson({
       projectRoot,
       config: {

src/project-type/cli/scaffolder.test.js

@@ -16,7 +16,6 @@ vi.mock('../publishable');
 
 describe('cli project-type scaffolder', () => {
   const projectRoot = any.string();
-  const packageName = any.word();
   const publishableResults = any.simpleObject();
   const configs = any.simpleObject();
   const visibility = any.word();
@@ -30,7 +29,7 @@ describe('cli project-type scaffolder', () => {
     when(determinePackageAccessLevelFromProjectVisibility)
       .calledWith({projectVisibility: visibility})
       .thenReturn(packageAccessLevel);
-    when(scaffoldPublishable).calledWith({packageName, packageAccessLevel}).thenReturn(publishableResults);
+    when(scaffoldPublishable).calledWith().thenReturn(publishableResults);
     when(scaffoldBundler)
       .calledWith({bundlers: packageBundlers, decisions, projectRoot, dialect, projectType: projectTypes.CLI})
       .thenResolve(bundlerResults);
@@ -44,7 +43,6 @@ describe('cli project-type scaffolder', () => {
     const results = await scaffoldCli({
       projectRoot,
       configs,
-      packageName,
       visibility,
       dialect,
       decisions,
@@ -80,7 +78,6 @@ describe('cli project-type scaffolder', () => {
     await scaffoldCli({
       projectRoot,
       configs,
-      packageName,
       visibility,
       publishRegistry,
       dialect,

src/project-type/package/scaffolder.js

@@ -32,7 +32,7 @@ export default async function scaffoldPackageProjectType({
       provideExample,
       decisions
     }),
-    scaffoldPublishable({packageName, packageAccessLevel}),
+    scaffoldPublishable(),
     mergeIntoExistingPackageJson({
       projectRoot,
       config: {

src/project-type/package/scaffolder.test.js

@@ -43,11 +43,11 @@ describe('package project-type scaffolder', () => {
     when(determinePackageAccessLevelFromProjectVisibility)
       .calledWith({projectVisibility: visibility})
       .thenReturn(packageAccessLevel);
+    when(scaffoldPublishable).calledWith().thenReturn(publishableResults);
   });
 
   it('should scaffold details specific to a modern-js package', async () => {
     const dialect = dialects.BABEL;
-    when(scaffoldPublishable).calledWith({packageName, packageAccessLevel}).thenReturn(publishableResults);
     when(buildDetails.default).calledWith({
       projectRoot,
       projectName,
@@ -93,7 +93,6 @@ describe('package project-type scaffolder', () => {
 
   it('should scaffold details specific to an esm-only package', async () => {
     const dialect = dialects.ESM;
-    when(scaffoldPublishable).calledWith({packageName, packageAccessLevel}).thenReturn(publishableResults);
     when(buildDetails.default).calledWith({
       projectRoot,
       projectName,
@@ -134,7 +133,6 @@ describe('package project-type scaffolder', () => {
 
   it('should scaffold details specific to a typescript package', async () => {
     const dialect = dialects.TYPESCRIPT;
-    when(scaffoldPublishable).calledWith({packageName, packageAccessLevel}).thenReturn(publishableResults);
     when(buildDetails.default).calledWith({
       projectRoot,
       projectName,
@@ -181,7 +179,6 @@ describe('package project-type scaffolder', () => {
 
   it('should not include build details when the project will not be scaffolded', async () => {
     const dialect = dialects.COMMON_JS;
-    when(scaffoldPublishable).calledWith({packageName, packageAccessLevel}).thenReturn(publishableResults);
     when(buildDetails.default).calledWith({
       projectRoot,
       projectName,
@@ -221,7 +218,6 @@ describe('package project-type scaffolder', () => {
   it('should define the registry to publish to when provided', async () => {
     const publishRegistry = any.url();
     const dialect = dialects.BABEL;
-    when(scaffoldPublishable).calledWith({packageName, packageAccessLevel}).thenReturn(publishableResults);
     when(buildDetails.default).calledWith({
       projectRoot,
       projectName,

src/project-type/publishable/lifter.js

@@ -7,8 +7,8 @@ import {lift as liftProvenance} from './provenance/index.js';
 
 export default async function liftPublishable({projectRoot, packageDetails, configs}) {
   const {name: packageName, publishConfig: {access: packageAccessLevel}} = packageDetails;
-  const homepage = `https://npm.im/${packageName}`;
   const customRegistry = resolveRegistry(packageName, configs.registries);
+  const homepage = `https://npm.im/${packageName}`;
 
   await mergeIntoExistingPackageJson({projectRoot, config: {homepage}});
 

src/project-type/publishable/scaffolder.js

@@ -1,7 +1,3 @@
-import defineBadges from './badges.js';
-
-export default async function scaffoldPublishable({packageName, packageAccessLevel}) {
-  return {
-    badges: await defineBadges(packageName, packageAccessLevel)
-  };
+export default async function scaffoldPublishable() {
+  return {};
 }

src/project-type/publishable/scaffolder.test.js

@@ -1,23 +1,9 @@
-import {afterEach, describe, expect, it, vi} from 'vitest';
-import any from '@travi/any';
-import {when} from 'vitest-when';
+import {describe, expect, it} from 'vitest';
 
-import scaffoldBadges from './badges.js';
 import scaffoldPublishable from './scaffolder.js';
 
-vi.mock('./badges');
-
 describe('publishable project-type scaffolder', () => {
-  afterEach(() => {
-    vi.clearAllMocks();
-  });
-
   it('should scaffold common details of a package project', async () => {
-    const packageName = any.word();
-    const packageAccessLevel = any.word();
-    const badgesResults = any.simpleObject();
-    when(scaffoldBadges).calledWith(packageName, packageAccessLevel).thenReturn(badgesResults);
-
-    expect(await scaffoldPublishable({packageName, packageAccessLevel})).toEqual({badges: badgesResults});
+    expect(await scaffoldPublishable()).toEqual({});
   });
 });

src/project-type/scaffolder.js

@@ -38,7 +38,6 @@ export default async function scaffoldProjectType({
       return scaffoldApplicationType({projectRoot});
     case projectTypes.CLI:
       return scaffoldCliType({
-        packageName,
         visibility,
         projectRoot,
         dialect,

src/project-type/scaffolder.test.js

@@ -80,12 +80,11 @@ describe('project-type scaffolder', () => {
 
   it('should apply the cli-type scaffolder when the project-type is `CLI`', async () => {
     when(scaffoldCliType)
-      .calledWith({packageName, visibility, projectRoot, dialect, publishRegistry, decisions, packageBundlers})
+      .calledWith({visibility, projectRoot, dialect, publishRegistry, decisions, packageBundlers})
       .thenResolve(results);
 
     expect(await projectTypeScaffolder({
       projectType: projectTypes.CLI,
-      packageName,
       visibility,
       projectRoot,
       dialect,