Merge pull request #31580 from storybookjs/version-non-patch-from-9.0.0-rc.5

Release: Major 9.0.0

Author: ghengeveld

CHANGELOG.md

@@ -1,4 +1,4 @@
-import { getEnvConfig, parseList, versions } from 'storybook/internal/common';
+import { getEnvConfig, parseList } from 'storybook/internal/common';
 import { logger } from 'storybook/internal/node-logger';
 import { addToGlobalContext } from 'storybook/internal/telemetry';
 
@@ -14,7 +14,7 @@ import { buildIndex as index } from '../buildIndex';
 import { dev } from '../dev';
 import { globalSettings } from '../globalSettings';
 
-addToGlobalContext('cliVersion', versions.storybook);
+addToGlobalContext('cliVersion', version);
 
 const consoleLogger = console;
 

code/core/src/cli/bin/index.ts

@@ -7,15 +7,18 @@ import React, {
   useEffect,
   useMemo,
   useRef,
+  useState,
 } from 'react';
 
 import type { Listener } from 'storybook/internal/channels';
 import { deprecate } from 'storybook/internal/client-logger';
 import {
+  DOCS_PREPARED,
   SET_STORIES,
   SHARED_STATE_CHANGED,
   SHARED_STATE_SET,
   STORY_CHANGED,
+  STORY_PREPARED,
 } from 'storybook/internal/core-events';
 import type { RouterData } from 'storybook/internal/router';
 import type {
@@ -337,9 +340,22 @@ export function useStoryPrepared(storyId?: StoryId) {
 
 export function useParameter<S>(parameterKey: string, defaultValue?: S) {
   const api = useStorybookApi();
+  const [parameter, setParameter] = useState(api.getCurrentParameter<S>(parameterKey));
 
-  const result = api.getCurrentParameter<S>(parameterKey);
-  return orDefault<S>(result, defaultValue!);
+  const handleParameterChange = useCallback(() => {
+    const newParameter = api.getCurrentParameter<S>(parameterKey);
+    setParameter(newParameter);
+  }, [api, parameterKey]);
+
+  useChannel(
+    {
+      [STORY_PREPARED]: handleParameterChange,
+      [DOCS_PREPARED]: handleParameterChange,
+    },
+    [handleParameterChange]
+  );
+
+  return orDefault<S>(parameter, defaultValue!);
 }
 
 // cache for taking care of HMR

code/core/src/manager-api/root.tsx

@@ -13,6 +13,7 @@ import type { PackageJson, StorybookConfig } from 'storybook/internal/types';
 import { findPackage, findPackagePath } from 'fd-package-json';
 import { detect } from 'package-manager-detector';
 
+import { version } from '../../package.json';
 import { globalSettings } from '../cli/globalSettings';
 import { getApplicationFileCount } from './get-application-file-count';
 import { getChromaticVersionSpecifier } from './get-chromatic-version';
@@ -227,7 +228,6 @@ export const computeStorybookMetadata = async ({
     // gracefully handle error, as it's not critical information and AST parsing can cause trouble
   }
 
-  const storybookVersion = storybookPackages[storybookInfo.frameworkPackage]?.version;
   const portableStoriesFileCount = await getPortableStoriesFileCount();
   const applicationFileCount = await getApplicationFileCount(dirname(packageJsonPath));
 
@@ -236,7 +236,7 @@ export const computeStorybookMetadata = async ({
     ...frameworkInfo,
     portableStoriesFileCount,
     applicationFileCount,
-    storybookVersion,
+    storybookVersion: version,
     storybookVersionSpecifier: storybookInfo.version,
     language,
     storybookPackages,

code/core/src/telemetry/storybook-metadata.ts

@@ -4,6 +4,7 @@ import * as os from 'node:os';
 import retry from 'fetch-retry';
 import { nanoid } from 'nanoid';
 
+import { version } from '../../package.json';
 import { getAnonymousProjectId } from './anonymous-id';
 import { set as saveToCache } from './event-cache';
 import { fetch } from './fetch';
@@ -48,6 +49,7 @@ const globalContext = {
   isTTY: process.stdout.isTTY,
   platform: getOperatingSystem(),
   nodeVersion: process.versions.node,
+  storybookVersion: version,
 } as Record<string, any>;
 
 const prepareRequest = async (data: TelemetryData, context: Record<string, any>, options: any) => {

code/core/src/telemetry/telemetry.ts

@@ -59,7 +59,9 @@ export const traverseArgs = (value: unknown, depth = 0, key?: string): unknown =
     // we loop instead of map to prevent this lit issue:
     // https://github.com/storybookjs/storybook/issues/25651
     for (let i = 0; i < value.length; i++) {
-      value[i] = traverseArgs(value[i], depth);
+      if (Object.getOwnPropertyDescriptor(value, i)?.writable) {
+        value[i] = traverseArgs(value[i], depth);
+      }
     }
     return value;
   }

code/core/src/test/preview.ts

@@ -283,5 +283,6 @@
         "Dependency Upgrades"
       ]
     ]
-  }
+  },
+  "deferredNextVersion": "9.0.0"
 }

code/package.json

@@ -1 +1 @@
-{"version":"8.6.0","info":{"plain":""}}
+{"version":"9.0.0","info":{"plain":"This is a huge release focused on testing and bundle size.\n\n- Component testing\n  - 👆 Interactions\n  - ♿️ Accessibility\n  - 👁️ Visual changes\n  - 🛡️ Coverage\n- 🪶 48% lighter bundle\n- 🏷️ Tags-based organization\n- 🌐 Story globals\n- 🏗️ Major upgrades: Svelte, Next, React Native, Angular\n\nPlease checkout our [Migration guide](https://storybook.js.org/docs/9/migration-guide) to upgrade from earlier versions of Storybook. To see a comprehensive list of changes that went into 9.0, you can refer to the [9.0 prerelease changelogs](./CHANGELOG.prerelease.md)"}}

docs/versions/latest.json

@@ -55,10 +55,18 @@ async function run() {
 
     const [bootEvent, mainEvent] = events;
 
-    test(`both events should have cliVersion in context`, () => {
-      const cliVersion = versions.storybook;
-      assert.equal(bootEvent.context.cliVersion, cliVersion);
-      assert.equal(mainEvent.context.cliVersion, cliVersion);
+    const storybookVersion = versions.storybook;
+    test('boot event should have cliVersion and storybookVersion in context', () => {
+      assert.equal(bootEvent.context.cliVersion, storybookVersion);
+      assert.equal(bootEvent.context.storybookVersion, storybookVersion);
+    });
+
+    test(`main event should have storybookVersion in context`, () => {
+      assert.equal(mainEvent.context.storybookVersion, storybookVersion);
+    });
+
+    test(`main event should have storybookVersion in metadata`, () => {
+      assert.equal(mainEvent.metadata.storybookVersion, storybookVersion);
     });
 
     test(`Should log a boot event with a payload of type ${eventType}`, () => {