chore: fix beachball pre-commit after yarn v4 (#36465)

Author: mainframev

scripts/beachball/src/config.test.ts

@@ -1,12 +1,30 @@
+import { execSync } from 'child_process';
+
 import headlessConfig from './release-headless.config';
 import toolsConfig from './release-tools.config';
 import v8Config from './release-v8.config';
 import vNextConfig from './release-vNext.config';
 import webComponentsConfig from './release-web-components.config';
 import { config as sharedConfig } from './shared.config';
 
+jest.mock('child_process', () => ({
+  ...jest.requireActual<typeof import('child_process')>('child_process'),
+  execSync: jest.fn(),
+}));
+
 describe(`beachball configs`, () => {
   const excludedPackagesFromReleaseProcess = ['!packages/fluentui/*'];
+  const execSyncMock = jest.mocked(execSync);
+  const precommit = sharedConfig.hooks.precommit;
+
+  if (!precommit) {
+    throw new Error('Expected the shared Beachball config to define a precommit hook');
+  }
+
+  beforeEach(() => {
+    execSyncMock.mockReset();
+    execSyncMock.mockReturnValue(Buffer.from(''));
+  });
 
   it(`should generate shared config`, () => {
     expect(sharedConfig).toEqual({
@@ -48,6 +66,30 @@ describe(`beachball configs`, () => {
     });
   });
 
+  it(`should normalize package dependencies and update the lockfile before committing`, () => {
+    precommit(process.cwd());
+
+    expect(execSyncMock.mock.calls).toEqual([
+      ['yarn nx g @fluentui/workspace-plugin:dependency-mismatch'],
+      ['yarn nx g @fluentui/workspace-plugin:normalize-package-dependencies'],
+      ['yarn install --mode=update-lockfile'],
+    ]);
+  });
+
+  it(`should log precommit finalization failures`, () => {
+    const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation();
+    const error = new Error('dependency normalization failed');
+    execSyncMock.mockImplementationOnce(() => {
+      throw error;
+    });
+
+    expect(() => precommit(process.cwd())).not.toThrow();
+    expect(consoleErrorSpy).toHaveBeenCalledWith(error);
+    expect(execSyncMock).toHaveBeenCalledTimes(1);
+
+    consoleErrorSpy.mockRestore();
+  });
+
   it(`should generate v8 release config`, () => {
     expect(v8Config.scope).toEqual(
       expect.arrayContaining([

scripts/beachball/src/shared.config.ts

@@ -33,6 +33,9 @@ export const config: typeof baseConfig & Required<Pick<BeachballConfig, 'changel
           const out = execSync(cmd);
           console.log(out.toString());
         });
+
+        const out = execSync('yarn install --mode=update-lockfile');
+        console.log(out.toString());
       } catch (err) {
         console.error(err);
       }

yarn.lock

@@ -2534,7 +2534,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@fluentui/babel-preset-storybook-full-source@npm:^0.1.2, @fluentui/babel-preset-storybook-full-source@workspace:packages/react-components/babel-preset-storybook-full-source":
+"@fluentui/babel-preset-storybook-full-source@npm:^0.1.3, @fluentui/babel-preset-storybook-full-source@workspace:packages/react-components/babel-preset-storybook-full-source":
   version: 0.0.0-use.local
   resolution: "@fluentui/babel-preset-storybook-full-source@workspace:packages/react-components/babel-preset-storybook-full-source"
   dependencies:
@@ -5409,11 +5409,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@fluentui/react-storybook-addon-export-to-sandbox@npm:*, @fluentui/react-storybook-addon-export-to-sandbox@npm:^0.3.0, @fluentui/react-storybook-addon-export-to-sandbox@workspace:packages/react-components/react-storybook-addon-export-to-sandbox":
+"@fluentui/react-storybook-addon-export-to-sandbox@npm:*, @fluentui/react-storybook-addon-export-to-sandbox@npm:^0.3.1, @fluentui/react-storybook-addon-export-to-sandbox@workspace:packages/react-components/react-storybook-addon-export-to-sandbox":
   version: 0.0.0-use.local
   resolution: "@fluentui/react-storybook-addon-export-to-sandbox@workspace:packages/react-components/react-storybook-addon-export-to-sandbox"
   dependencies:
-    "@fluentui/babel-preset-storybook-full-source": "npm:^0.1.2"
+    "@fluentui/babel-preset-storybook-full-source": "npm:^0.1.3"
     "@swc/helpers": "npm:^0.5.1"
     babel-loader: "npm:^9.1.3"
     codesandbox-import-utils: "npm:^2.2.3"
@@ -6331,7 +6331,7 @@ __metadata:
     "@fluentui/react-components": "npm:^9.74.4"
     "@fluentui/react-context-selector": "npm:^9.2.18"
     "@fluentui/react-icons": "npm:^2.0.245"
-    "@fluentui/react-storybook-addon-export-to-sandbox": "npm:^0.3.0"
+    "@fluentui/react-storybook-addon-export-to-sandbox": "npm:^0.3.1"
     "@fluentui/react-theme": "npm:^9.2.1"
     "@fluentui/react-utilities": "npm:^9.26.5"
     "@griffel/react": "npm:^1.5.32"