Skip to content

Commit 1a50c03

Browse files
authored
Merge pull request #34773 from storybookjs/version-non-patch-from-10.4.0-alpha.18
Release: Prerelease alpha 10.4.0-alpha.19
2 parents 488dd08 + c9673cf commit 1a50c03

70 files changed

Lines changed: 1282 additions & 297 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
import * as core from '@actions/core';
2+
import * as github from '@actions/github';
3+
4+
async function main() {
5+
const token = core.getInput('token', { required: true });
6+
const org = core.getInput('org', { required: true });
7+
const username = core.getInput('username', { required: true });
8+
9+
const octokit = github.getOctokit(token);
10+
11+
let isOrgMember = false;
12+
13+
try {
14+
await octokit.rest.orgs.checkMembershipForUser({
15+
org,
16+
username,
17+
});
18+
19+
isOrgMember = true;
20+
} catch (error) {
21+
if (error.status === 404) {
22+
} else if (error.status === 302 || error.status === 403) {
23+
core.warning(
24+
`Unable to verify org membership for ${username}; GitHub API returned ${error.status}. Falling back to scanning this fork PR.`
25+
);
26+
} else {
27+
throw error;
28+
}
29+
}
30+
31+
core.setOutput('is-org-member', String(isOrgMember));
32+
core.setOutput('should-scan', String(!isOrgMember));
33+
}
34+
35+
main().catch((error) => {
36+
core.setFailed(error.message);
37+
});

.github/workflows/agent-scan.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@ jobs:
1717
agentscan:
1818
if: |
1919
github.repository_owner == 'storybookjs' &&
20+
github.event.pull_request.head.repo.full_name != github.repository &&
2021
!contains(
21-
fromJSON('["OWNER","MEMBER","COLLABORATOR"]'),
22-
github.event.pull_request.author_association
23-
) && !contains(
2422
fromJSON('["dependabot[bot]", "github-actions[bot]","storybook-bot"]'),
2523
github.event.pull_request.user.login
2624
)
@@ -31,21 +29,30 @@ jobs:
3129
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
3230
- name: Install script dependencies
3331
run: npm install --prefix .github/scripts
32+
- name: Check author org membership
33+
id: membership
34+
env:
35+
INPUT_TOKEN: ${{ secrets.GITHUB_TOKEN }}
36+
INPUT_ORG: ${{ github.repository_owner }}
37+
INPUT_USERNAME: ${{ github.event.pull_request.user.login }}
38+
run: node .github/scripts/agent-scan-check-org-membership.mjs
3439
- name: Cache AgentScan analysis
40+
if: steps.membership.outputs.should-scan == 'true'
3541
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7
3642
with:
3743
path: .agentscan-cache
3844
key: agentscan-cache-${{ github.actor }}
3945
restore-keys: agentscan-cache-
4046
- name: AgentScan
47+
if: steps.membership.outputs.should-scan == 'true'
4148
id: agentscan
4249
uses: MatteoGabriele/agentscan-action@a584774dd15cabe6df4c6ab45fc43514a3b56b2d
4350
with:
4451
github-token: ${{ secrets.GITHUB_TOKEN }}
4552
agent-scan-comment: false
4653
cache-path: .agentscan-cache
4754
- name: Label PR with classification
48-
if: steps.agentscan.outputs
55+
if: steps.membership.outputs.should-scan == 'true' && steps.agentscan.outputs.classification
4956
env:
5057
INPUT_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5158
INPUT_CLASSIFICATION: ${{ steps.agentscan.outputs.classification }}

CHANGELOG.prerelease.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
## 10.4.0-alpha.19
2+
3+
- Agentic Setup: Add --extensive for an extra prompt - [#34730](https://github.com/storybookjs/storybook/pull/34730), thanks @Sidnioulz!
4+
- Agentic Setup: Rework ai-init-opt-in logic - [#34739](https://github.com/storybookjs/storybook/pull/34739), thanks @Sidnioulz!
5+
- CLI: Improve package incompatibility detection and warning - [#34559](https://github.com/storybookjs/storybook/pull/34559), thanks @copilot-swe-agent!
6+
- CLI: Remove extensive prompt option - [#34740](https://github.com/storybookjs/storybook/pull/34740), thanks @yannbf!
7+
- Cli: Set ai prompt to yes if yes flag for react-vite to tanstack migration - [#34743](https://github.com/storybookjs/storybook/pull/34743), thanks @huang-julien!
8+
- Core: Fix "Open In Editor" support for VSCode - [#34747](https://github.com/storybookjs/storybook/pull/34747), thanks @JReinhold!
9+
- Core: Quiet change-detection regex warning and swap clear icon - [#34758](https://github.com/storybookjs/storybook/pull/34758), thanks @valentinpalkovic!
10+
- ReactNative: AppRegistry component name in template - [#34742](https://github.com/storybookjs/storybook/pull/34742), thanks @ndelangen!
11+
- Sidebar: Fix clear filter button not refreshing story list - [#34737](https://github.com/storybookjs/storybook/pull/34737), thanks @valentinpalkovic!
12+
- Sidebar: Show same status icon at story and group level - [#34702](https://github.com/storybookjs/storybook/pull/34702), thanks @valentinpalkovic!
13+
- Tanstack: Treeshake top-level unused functions - [#34760](https://github.com/storybookjs/storybook/pull/34760), thanks @huang-julien!
14+
115
## 10.4.0-alpha.18
216

317
- Agentic Setup: Allow failed stories to persist - [#34717](https://github.com/storybookjs/storybook/pull/34717), thanks @Sidnioulz!

code/addons/vitest/src/vitest-plugin/agent-telemetry-reporter.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { isExampleStoryId, telemetry } from 'storybook/internal/telemetry';
1010
import type { AgentInfo } from 'storybook/internal/telemetry';
1111

1212
import { mergeAndWriteStoryHistory } from './agent-story-history-cache.ts';
13+
import { getAiSetupRunId } from '../../../../core/src/shared/utils/ai-checklist-flags.ts';
1314

1415
interface AgentTelemetryReporterOptions {
1516
configDir: string;
@@ -75,6 +76,8 @@ export class AgentTelemetryReporter implements Reporter {
7576
const testModulesErrors = testModules.flatMap((t) => t.errors());
7677
const unhandledErrorCount = unhandledErrors.length + testModulesErrors.length;
7778

79+
const runId = await getAiSetupRunId(this.configDir);
80+
7881
// Fire and forget — same pattern as the existing test-run telemetry
7982
telemetry(
8083
'ai-setup-self-healing-scoring',
@@ -84,6 +87,7 @@ export class AgentTelemetryReporter implements Reporter {
8487
unhandledErrorCount,
8588
duration,
8689
watch: this.ctx.config.watch,
90+
runId,
8791
},
8892
{ configDir: this.configDir, stripMetadata: true }
8993
);

code/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@
336336
"jiti": "^2.6.1",
337337
"js-yaml": "^4.1.0",
338338
"jsdoc-type-pratt-parser": "^4.0.0",
339-
"launch-editor": "^2.11.1",
339+
"launch-editor": "^2.13.2",
340340
"lazy-universal-dotenv": "^4.0.0",
341341
"leven": "^4.0.0",
342342
"mdast-util-from-markdown": "^2.0.0",

code/core/src/core-server/change-detection/dependency-graph/ResolverFactory.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class AliasNormalizer {
5656
for (const p of newPatterns) {
5757
this.warnedRegexAliases.add(p);
5858
}
59-
logger.warn(
59+
logger.debug(
6060
`Change detection: ignored ${skippedRegex.length} regex alias(es); related modules tracked as opaque-leaf.`
6161
);
6262
logger.debug(

0 commit comments

Comments
 (0)