fix

Author: ecraig12345

src/__e2e__/bump.test.ts

@@ -447,10 +447,11 @@ describe('bump command', () => {
   it('bumps dependents with workspace: deps', async () => {
     const monorepo: RepoFixture['folders'] = {
       packages: {
-        'pkg-1': { version: '1.0.0' },
+        // Include some external deps to make sure nothing weird happens there
+        'pkg-1': { version: '1.0.0', dependencies: { extra: '~1.2.3' } },
         'pkg-2': { version: '1.0.0', dependencies: { 'pkg-1': 'workspace:~' } },
         // this workspace version will be updated
-        'pkg-3': { version: '1.0.0', dependencies: { 'pkg-2': 'workspace:^1.0.0' } },
+        'pkg-3': { version: '1.0.0', dependencies: { 'pkg-2': 'workspace:^1.0.0', other: 'npm:lodash' } },
       },
     };
     repositoryFactory = new RepositoryFactory({ folders: monorepo });
@@ -468,12 +469,15 @@ describe('bump command', () => {
     const packageInfos = getPackageInfos(parsedOptions);
 
     // All the dependent packages are bumped despite the workspace: dep specs
-    expect(packageInfos['pkg-1'].version).toBe('1.1.0');
+    expect(packageInfos['pkg-1']).toEqual({ ...originalPackageInfos['pkg-1'], version: '1.1.0' });
     // workspace:~ range isn't changed
     expect(packageInfos['pkg-2']).toEqual({ ...originalPackageInfos['pkg-2'], version: '1.0.1' });
-    expect(packageInfos['pkg-2'].version).toBe('1.0.1');
     // workspace: range with number is updated
-    expect(packageInfos['pkg-3'].dependencies).toEqual({ 'pkg-2': 'workspace:^1.0.1' });
+    expect(packageInfos['pkg-3']).toEqual({
+      ...originalPackageInfos['pkg-3'],
+      version: '1.0.1',
+      dependencies: { 'pkg-2': 'workspace:^1.0.1', other: 'npm:lodash' },
+    });
 
     expect(readChangelogJson(repo.pathTo('packages/pkg-1'))).not.toBeNull();
     const pkg3Changelog = readChangelogJson(repo.pathTo('packages/pkg-3'));

src/__e2e__/publishE2E.test.ts

@@ -339,9 +339,10 @@ describe('publish command (e2e)', () => {
   it('publishes packages with workspace: and catalog: deps and replaces versions', async () => {
     const monorepo: RepoFixture['folders'] = {
       packages: {
-        'pkg-1': { version: '1.0.0' },
+        // Include some external deps to make sure nothing weird happens there
+        'pkg-1': { version: '1.0.0', dependencies: { extra: '~1.2.3' } },
         'pkg-2': { version: '1.0.0', dependencies: { 'pkg-1': 'workspace:~', react: 'catalog:react18' } },
-        'pkg-3': { version: '1.0.0', dependencies: { 'pkg-2': 'workspace:^1.0.0' } },
+        'pkg-3': { version: '1.0.0', dependencies: { 'pkg-2': 'workspace:^1.0.0', other: 'npm:lodash' } },
         'pkg-4': {
           version: '1.0.0',
           dependencies: { 'pkg-1': 'catalog:' },
@@ -372,12 +373,16 @@ describe('publish command (e2e)', () => {
     // All the dependent packages are bumped despite the workspace: dep specs.
     // The literal workspace: specs are preserved in git.
     const packageInfos = getPackageInfos(parsedOptions);
-    expect(packageInfos['pkg-1'].version).toBe('1.1.0');
+    expect(packageInfos['pkg-1']).toEqual({ ...originalPackageInfos['pkg-1'], version: '1.1.0' });
     // workspace:~ and catalog: ranges aren't changed
     expect(packageInfos['pkg-2']).toEqual({ ...originalPackageInfos['pkg-2'], version: '1.0.1' });
     expect(packageInfos['pkg-2'].version).toBe('1.0.1');
     // workspace: range with number is updated
-    expect(packageInfos['pkg-3'].dependencies).toEqual({ 'pkg-2': 'workspace:^1.0.1' });
+    expect(packageInfos['pkg-3']).toEqual({
+      ...originalPackageInfos['pkg-3'],
+      version: '1.0.1',
+      dependencies: { 'pkg-2': 'workspace:^1.0.1', other: 'npm:lodash' },
+    });
     // catalog: range isn't changed
     expect(packageInfos['pkg-4']).toEqual({ ...originalPackageInfos['pkg-4'], version: '1.0.1' });
 
@@ -391,7 +396,7 @@ describe('publish command (e2e)', () => {
     });
     expect(npmMock.getPublishedPackage('pkg-3')).toMatchObject({
       version: '1.0.1',
-      dependencies: { 'pkg-2': '^1.0.1' },
+      dependencies: { 'pkg-2': '^1.0.1', other: 'npm:lodash' },
     });
     expect(npmMock.getPublishedPackage('pkg-4')).toMatchObject({
       version: '1.0.1',

src/__tests__/bump/bumpInMemory.test.ts

@@ -289,9 +289,9 @@ describe('bumpInMemory', () => {
     const { bumpInfo, originalPackageInfos } = gatherBumpInfoWrapper({
       packageFolders: {
         'pkg-1': { version: '1.0.0' },
-        'pkg-2': { version: '1.0.0', dependencies: { 'pkg-1': 'workspace:~' } },
+        'pkg-2': { version: '1.0.0', dependencies: { 'pkg-1': 'workspace:~', extra: '~1.2.3' } },
         // this workspace version will be updated
-        'pkg-3': { version: '1.0.0', dependencies: { 'pkg-2': 'workspace:^1.0.0' } },
+        'pkg-3': { version: '1.0.0', dependencies: { 'pkg-2': 'workspace:^1.0.0', other: 'npm:lodash' } },
       },
       repoOptions: { bumpDeps: true },
       changes: ['pkg-1'],
@@ -313,7 +313,7 @@ describe('bumpInMemory', () => {
     // workspace:~ range isn't changed
     expect(packageInfos['pkg-2']).toEqual({ ...originalPackageInfos['pkg-2'], version: '1.0.1' });
     // workspace: range with number is updated
-    expect(packageInfos['pkg-3'].dependencies).toEqual({ 'pkg-2': 'workspace:^1.0.1' });
+    expect(packageInfos['pkg-3'].dependencies).toEqual({ 'pkg-2': 'workspace:^1.0.1', other: 'npm:lodash' });
   });
 
   it('bumps dependents with catalog: deps', () => {

src/__tests__/packageManager/resolveSpecialVersion.test.ts

@@ -24,6 +24,16 @@ describe('resolveSpecialVersion', () => {
       });
       expect(result).toBeUndefined();
     });
+
+    it('returns undefined for regular version of package not in repo', () => {
+      const result = resolveSpecialVersion({
+        depName: 'bar', // different package
+        depVersion: '^1.0.0',
+        catalogs: undefined,
+        packageInfos: emptyPackageInfos,
+      });
+      expect(result).toBeUndefined();
+    });
   });
 
   describe('workspace protocol', () => {

src/__tests__/publish/performPublishOverrides.test.ts

@@ -228,40 +228,21 @@ describe('performPublishOverrides', () => {
           return cloneObject(packageJsons[pkg.name]);
         }
       }
-      throw new Error(`not found: ${path}`);
+      throw new Error(`Path not mocked for readJson: ${path}`);
     }) as typeof _readJson);
 
     return { packageInfos, packageJsons };
   }
 
-  it('overrides accepted publishConfig keys and preserves values not specified', () => {
-    const publishConfig: PublishConfig = {
-      main: 'lib/index.js',
-      types: 'lib/index.d.ts',
-    };
-    const { packageInfos, packageJsons } = createFullFixture({ foo: { publishConfig } });
-    expect(packageJsons.foo).not.toMatchObject(publishConfig);
+  it('does not write package.json if no overrides needed', () => {
+    const { packageInfos } = createFullFixture({ foo: {} });
 
     performPublishOverrides(['foo'], packageInfos, undefined);
 
-    expect(mockWriteJson).toHaveBeenCalledTimes(1);
-    expect(publishConfig).toEqual({
-      main: 'lib/index.js',
-      types: 'lib/index.d.ts',
-    });
-    expect(mockWriteJson).toHaveBeenCalledWith(
-      packageInfos.foo.packageJsonPath,
-      // package.json data with publishConfig values promoted to root,
-      // and any original values not specified in publishConfig preserved
-      {
-        ...packageJsons.foo,
-        ...publishConfig,
-        publishConfig: {},
-      }
-    );
+    expect(mockWriteJson).not.toHaveBeenCalled();
   });
 
-  it('does not override non-accepted publishConfig keys', () => {
+  it('does not write package.json if publishConfig has only non-accepted keys', () => {
     const publishConfig = { version: '1.2.3', extra: 'nope' } as unknown as PublishConfig;
     const { packageInfos, packageJsons } = createFullFixture({ foo: { publishConfig } });
     expect(packageJsons.foo).not.toMatchObject(publishConfig);
@@ -271,23 +252,27 @@ describe('performPublishOverrides', () => {
     expect(mockWriteJson).not.toHaveBeenCalled();
   });
 
-  it('performs overrides for multiple packages', () => {
+  it('writes package.json for multiple packages with publishConfig overrides', () => {
+    const unsupportedConfig = { version: '1.2.3', extra: 'nope' } as unknown as PublishConfig;
     const { packageInfos, packageJsons } = createFullFixture({
-      foo: { publishConfig: { main: 'lib/index.js' } },
+      foo: { bin: './bin.js', publishConfig: { main: 'lib/index.js', ...unsupportedConfig } },
       bar: { publishConfig: { types: 'lib/index.d.ts' } },
+      baz: {},
     });
-    const originalFoo = packageJsons.foo;
-    const originalBar = packageJsons.bar;
+    const { foo: originalFoo, bar: originalBar } = packageJsons;
     expect(originalFoo).not.toMatchObject(originalFoo.publishConfig!);
     expect(originalBar).not.toMatchObject(originalBar.publishConfig!);
 
-    performPublishOverrides(['foo', 'bar'], packageInfos, undefined);
+    performPublishOverrides(['foo', 'bar', 'baz'], packageInfos, undefined);
 
+    // only called for packages that need updates, not baz
     expect(mockWriteJson).toHaveBeenCalledTimes(2);
     expect(mockWriteJson).toHaveBeenCalledWith(packageInfos.foo.packageJsonPath, {
+      // package.json data with publishConfig values promoted to root,
+      // and any original values not specified in publishConfig preserved
       ...originalFoo,
-      ...originalFoo.publishConfig,
-      publishConfig: {},
+      main: 'lib/index.js',
+      publishConfig: unsupportedConfig, // unsupported keys remain in publishConfig
     });
     expect(mockWriteJson).toHaveBeenCalledWith(packageInfos.bar.packageJsonPath, {
       ...originalBar,
@@ -296,26 +281,44 @@ describe('performPublishOverrides', () => {
     });
   });
 
-  it.each([
+  it.each<[string, string]>([
     ['workspace:*', '1.0.0'],
-    ['workspace:~', '~1.0.0'],
-    ['workspace:^', '^1.0.0'],
-    ['workspace:~1.0.0', '~1.0.0'],
     ['workspace:^1.0.0', '^1.0.0'],
-  ])('overrides %s dependency versions', (dependencyVersion, expectedPublishVersion) => {
+  ])('writes package.json with %s dependency version updates', (depVersion, expectedVersion) => {
     const { packageInfos, packageJsons } = createFullFixture({
       foo: { version: '1.0.0' },
-      bar: { version: '2.0.0', dependencies: { foo: dependencyVersion } },
+      bar: { version: '2.0.0', dependencies: { foo: depVersion } },
     });
-    expect(packageJsons.bar.dependencies!.foo).toBe(dependencyVersion);
+    expect(packageJsons.bar.dependencies!.foo).toBe(depVersion);
 
     performPublishOverrides(['bar'], packageInfos, undefined);
 
     expect(mockWriteJson).toHaveBeenCalledTimes(1);
     expect(mockWriteJson).toHaveBeenCalledWith(
       packageInfos.bar.packageJsonPath,
       expect.objectContaining({
-        dependencies: { foo: expectedPublishVersion },
+        dependencies: { foo: expectedVersion },
+      })
+    );
+  });
+
+  it('writes package.json with catalog dependency version updates', () => {
+    const { packageInfos, packageJsons } = createFullFixture({
+      foo: { version: '1.0.0' },
+      bar: { version: '2.0.0', dependencies: { foo: 'catalog:', react: 'catalog:', extra: '~1.2.3' } },
+    });
+    expect(packageJsons.bar.dependencies!.react).toBe('catalog:');
+    const catalogs: Catalogs = {
+      default: { foo: 'workspace:^', react: '^18.0.0' },
+    };
+
+    performPublishOverrides(['bar'], packageInfos, catalogs);
+
+    expect(mockWriteJson).toHaveBeenCalledTimes(1);
+    expect(mockWriteJson).toHaveBeenCalledWith(
+      packageInfos.bar.packageJsonPath,
+      expect.objectContaining({
+        dependencies: { foo: '^1.0.0', react: '^18.0.0', extra: '~1.2.3' },
       })
     );
   });

src/packageManager/resolveSpecialVersion.ts

@@ -26,24 +26,25 @@ export function resolveSpecialVersion(params: {
     }
   }
 
-  // If the dependency comes from within the repo, check if the version is specified with workspace:
-  const packageInfo = packageInfos[depName];
-  if (packageInfo) {
-    // Check for a workspace: version (there's a slight chance one could be nested inside a catalog)
-    const workspaceRange =
-      getWorkspaceRange(depVersion) || (versionFromCatalog && getWorkspaceRange(versionFromCatalog));
-    if (workspaceRange) {
-      // Resolve to actual version per specs
-      // https://pnpm.io/workspaces#workspace-protocol-workspace
-      // https://yarnpkg.com/features/workspaces#publishing-workspaces
-      return workspaceRange === '*'
-        ? packageInfo.version
-        : workspaceRange === '^' || workspaceRange === '~'
-        ? `${workspaceRange}${packageInfo.version}`
-        : workspaceRange;
+  // Check for a workspace: version (there's a slight chance one could be nested inside a catalog)
+  const workspaceRange = getWorkspaceRange(depVersion) || (versionFromCatalog && getWorkspaceRange(versionFromCatalog));
+  if (workspaceRange) {
+    const packageInfo = packageInfos[depName];
+    if (!packageInfo) {
+      // workspace: version referenced a package that isn't in the repo
+      const referenceVersion = versionFromCatalog ? `"${depVersion}" -> "${versionFromCatalog}"` : `"${depVersion}"`;
+      throw new Error(
+        `Package "${depName}" (referenced by version ${referenceVersion}) not found in workspace packages`
+      );
     }
-  } else {
-    const referenceVersion = versionFromCatalog ? `"${depVersion}" -> "${versionFromCatalog}"` : `"${depVersion}"`;
-    throw new Error(`Package "${depName}" (referenced by version ${referenceVersion}) not found in workspace packages`);
+
+    // Resolve to actual version per specs
+    // https://pnpm.io/workspaces#workspace-protocol-workspace
+    // https://yarnpkg.com/features/workspaces#publishing-workspaces
+    return workspaceRange === '*'
+      ? packageInfo.version
+      : workspaceRange === '^' || workspaceRange === '~'
+      ? `${workspaceRange}${packageInfo.version}`
+      : workspaceRange;
   }
 }