Merge pull request #28855 from storybookjs/version-patch-from-8.2.8

Release: Patch 8.2.9

Author: shilman

.circleci/config.yml

@@ -594,6 +594,23 @@ jobs:
                   IN_STORYBOOK_SANDBOX: true
                   STORYBOOK_INIT_EMPTY_TYPE: << parameters.template >>
                   STORYBOOK_DISABLE_TELEMETRY: true
+      - when:
+          condition:
+            equal: ["react-vite-ts", << parameters.template >>]
+          steps:
+            - run:
+                name: Storybook init from empty directory (--skip-install)
+                command: |
+                  cd code
+                  yarn local-registry --open &
+                  cd ../../
+                  mkdir empty-<< parameters.template >>-no-install
+                  cd empty-<< parameters.template >>-no-install
+                  npx storybook init --yes --skip-install
+                environment:
+                  IN_STORYBOOK_SANDBOX: true
+                  STORYBOOK_INIT_EMPTY_TYPE: << parameters.template >>
+                  STORYBOOK_DISABLE_TELEMETRY: true
       - report-workflow-on-failure
   test-portable-stories:
     parameters:

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 8.2.9
+
+- CLI: Fix `init --skip-install` - [#28853](https://github.com/storybookjs/storybook/pull/28853), thanks @ndelangen!
+- Telemetry: Disable save-from-controls logs for example stories - [#28870](https://github.com/storybookjs/storybook/pull/28870), thanks @shilman!
+
 ## 8.2.8
 
 - CLI: Parse more Yarn Berry errors - [#28816](https://github.com/storybookjs/storybook/pull/28816), thanks @yannbf!

code/core/src/core-server/utils/doTelemetry.ts

@@ -1,5 +1,5 @@
 import invariant from 'tiny-invariant';
-import type { CoreConfig, Options, StoryIndex } from '@storybook/core/types';
+import type { CoreConfig, Options } from '@storybook/core/types';
 import { telemetry, getPrecedingUpgrade } from '@storybook/core/telemetry';
 import { useStorybookMetadata } from './metadata';
 import type { StoryIndexGenerator } from './StoryIndexGenerator';

code/core/src/core-server/utils/save-story/save-story.ts

@@ -16,7 +16,7 @@ import { storyNameFromExport, toId } from '@storybook/csf';
 import { printCsf, readCsf } from '@storybook/core/csf-tools';
 import { logger } from '@storybook/core/node-logger';
 import type { CoreConfig, Options } from '@storybook/core/types';
-import { telemetry } from '@storybook/core/telemetry';
+import { isExampleStoryId, telemetry } from '@storybook/core/telemetry';
 
 import { basename, join } from 'node:path';
 import { updateArgsInCsfFile } from './update-args-in-csf-file';
@@ -120,7 +120,9 @@ export function initializeSaveStory(channel: Channel, options: Options, coreConf
         error: null,
       } satisfies ResponseData<SaveStoryResponsePayload>);
 
-      if (!coreConfig.disableTelemetry) {
+      // don't take credit for save-from-controls actions against CLI example stories
+      const isCLIExample = isExampleStoryId(newStoryId ?? csfId);
+      if (!coreConfig.disableTelemetry && !isCLIExample) {
         await telemetry('save-story', {
           action: name ? 'createStory' : 'updateStory',
           success: true,

code/core/src/core-server/utils/summarizeIndex.ts

@@ -1,3 +1,4 @@
+import { isExampleStoryId } from '@storybook/core/telemetry';
 import type { IndexEntry, StoryIndex } from '@storybook/core/types';
 
 import { isMdxEntry, AUTODOCS_TAG, PLAY_FN_TAG } from './StoryIndexGenerator';
@@ -25,15 +26,6 @@ const isCLIExampleEntry = (entry: IndexEntry) =>
     'example-page--logged-out',
   ].includes(entry.id);
 
-/**
- * Is this story part of the CLI generated examples,
- * including user-created stories in those files
- */
-const isAnyExampleEntry = (entry: IndexEntry) =>
-  entry.id.startsWith('example-button--') ||
-  entry.id.startsWith('example-header--') ||
-  entry.id.startsWith('example-page--');
-
 export function summarizeIndex(storyIndex: StoryIndex) {
   let storyCount = 0;
   const componentTitles = new Set<string>();
@@ -49,7 +41,7 @@ export function summarizeIndex(storyIndex: StoryIndex) {
     if (isCLIExampleEntry(entry)) {
       if (entry.type === 'story') exampleStoryCount += 1;
       if (entry.type === 'docs') exampleDocsCount += 1;
-    } else if (isAnyExampleEntry(entry)) {
+    } else if (isExampleStoryId(entry.id)) {
       if (entry.type === 'story') onboardingStoryCount += 1;
       if (entry.type === 'docs') onboardingDocsCount += 1;
     } else if (entry.type === 'story') {

code/core/src/telemetry/index.ts

@@ -15,6 +15,15 @@ export { getPrecedingUpgrade } from './event-cache';
 
 export { addToGlobalContext } from './telemetry';
 
+/**
+ * Is this story part of the CLI generated examples,
+ * including user-created stories in those files
+ */
+export const isExampleStoryId = (storyId: string) =>
+  storyId.startsWith('example-button--') ||
+  storyId.startsWith('example-header--') ||
+  storyId.startsWith('example-page--');
+
 export const telemetry = async (
   eventType: EventType,
   payload: Payload = {},

code/lib/cli/src/dirs.ts

@@ -1,7 +1,7 @@
 import { dirname, join } from 'path';
 
-import downloadTarball from '@ndelangen/get-tarball';
-import getNpmTarballUrl from 'get-npm-tarball-url';
+import downloadTarballDefault from '@ndelangen/get-tarball';
+import getNpmTarballUrlDefault from 'get-npm-tarball-url';
 
 import invariant from 'tiny-invariant';
 import { externalFrameworks } from './project_types';
@@ -22,6 +22,12 @@ const resolveUsingBranchInstall = async (packageManager: JsPackageManager, reque
   // FIXME: this might not be the right version for community packages
   const version = versions[name] || (await packageManager.latestVersion(request));
 
+  // an artifact of esbuild + type=commonjs + exportmap
+  // @ts-expect-error (default export)
+  const getNpmTarballUrl = getNpmTarballUrlDefault.default || getNpmTarballUrlDefault;
+  // @ts-expect-error (default export)
+  const downloadTarball = downloadTarballDefault.default || downloadTarballDefault;
+
   const url = getNpmTarballUrl(request, version, {
     registry: await packageManager.getRegistryURL(),
   });

code/package.json

@@ -278,5 +278,6 @@
         "Dependency Upgrades"
       ]
     ]
-  }
+  },
+  "deferredNextVersion": "8.2.9"
 }

docs/versions/latest.json

@@ -1 +1 @@
-{"version":"8.2.8","info":{"plain":"- CLI: Parse more Yarn Berry errors - [#28816](https://github.com/storybookjs/storybook/pull/28816), thanks @yannbf!\n- Fix: Invariant failed: Expected package.json#version to be defined in the \\\"undefined\\\" package - [#28752](https://github.com/storybookjs/storybook/pull/28752), thanks @abcdmku!"}}
+{"version":"8.2.9","info":{"plain":"- CLI: Fix `init --skip-install` - [#28853](https://github.com/storybookjs/storybook/pull/28853), thanks @ndelangen!\n- Telemetry: Disable save-from-controls logs for example stories - [#28870](https://github.com/storybookjs/storybook/pull/28870), thanks @shilman!"}}