From a1fdf3549ace7db10517cdd379142214ddb3537b Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Wed, 22 May 2024 23:57:41 +0800 Subject: [PATCH 1/3] Merge pull request #27226 from storybookjs/shilman/test-package-telemetry Telemetry: Add test packages (cherry picked from commit e812f77def55aa7aeda70dddcc378c736412472d) --- code/lib/telemetry/src/storybook-metadata.ts | 28 ++++++++++++++++++++ code/lib/telemetry/src/types.ts | 1 + docs/configure/telemetry.md | 1 + 3 files changed, 30 insertions(+) diff --git a/code/lib/telemetry/src/storybook-metadata.ts b/code/lib/telemetry/src/storybook-metadata.ts index e9ff8d844954..d3367ccbca14 100644 --- a/code/lib/telemetry/src/storybook-metadata.ts +++ b/code/lib/telemetry/src/storybook-metadata.ts @@ -69,6 +69,34 @@ export const computeStorybookMetadata = async ({ }; } + const testPackages = [ + 'playwright', + 'vitest', + 'jest', + 'cypress', + 'nightwatch', + 'webdriver', + '@web/test-runner', + 'puppeteer', + 'karma', + 'jasmine', + 'chai', + 'testing-library', + '@ngneat/spectator', + 'wdio', + 'msw', + 'miragejs', + 'sinon', + ]; + const testPackageDeps = Object.keys(allDependencies).filter((dep) => + testPackages.find((pkg) => dep.includes(pkg)) + ); + metadata.testPackages = Object.fromEntries( + await Promise.all( + testPackageDeps.map(async (dep) => [dep, (await getActualPackageVersion(dep))?.version]) + ) + ); + const monorepoType = getMonorepoType(); if (monorepoType) { metadata.monorepo = monorepoType; diff --git a/code/lib/telemetry/src/types.ts b/code/lib/telemetry/src/types.ts index c6372084c2c8..35be60a4e893 100644 --- a/code/lib/telemetry/src/types.ts +++ b/code/lib/telemetry/src/types.ts @@ -54,6 +54,7 @@ export type StorybookMetadata = { packageName: string; version: string; }; + testPackages?: Record; hasStorybookEslint?: boolean; hasStaticDirs?: boolean; hasCustomWebpack?: boolean; diff --git a/docs/configure/telemetry.md b/docs/configure/telemetry.md index ff3298ac86fd..291fa53e18d3 100644 --- a/docs/configure/telemetry.md +++ b/docs/configure/telemetry.md @@ -35,6 +35,7 @@ Specifically, we track the following information in our telemetry events: - Builder (e.g., Webpack5, Vite). - Meta framework (e.g., [Next](https://nextjs.org/), [Gatsby](https://www.gatsbyjs.com/), [CRA](https://create-react-app.dev/)). - [Addons](https://storybook.js.org/integrations) (e.g., [Essentials](../essentials/index.md), [Accessibility](https://storybook.js.org/addons/@storybook/addon-a11y/)). + - Testing tools (e.g. [Jest](https://jestjs.io/), [Vitest](https://vitest.dev/), [Playwright](https://playwright.dev/)). - Package manager information (e.g., `npm`, `yarn`). - Monorepo information (e.g., [NX](https://nx.dev/), [Turborepo](https://turborepo.org/)). - In-app events (e.g., [Storybook guided tour](https://github.com/storybookjs/addon-onboarding)). From 7cce7d33ff56c7e81968e3174455a75326083da8 Mon Sep 17 00:00:00 2001 From: Valentin Palkovic Date: Thu, 23 May 2024 11:14:03 +0200 Subject: [PATCH 2/3] Merge pull request #27237 from storybookjs/valentin/support-angular-18 Angular: Support v18 (cherry picked from commit f2a0cc2d6879df942d43c88b96c570690717620a) --- code/frameworks/angular/package.json | 22 +++++++++++----------- code/yarn.lock | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/code/frameworks/angular/package.json b/code/frameworks/angular/package.json index 455f00312695..a5af18989f05 100644 --- a/code/frameworks/angular/package.json +++ b/code/frameworks/angular/package.json @@ -87,17 +87,17 @@ "zone.js": "^0.14.2" }, "peerDependencies": { - "@angular-devkit/architect": ">=0.1500.0 < 0.1800.0", - "@angular-devkit/build-angular": ">=15.0.0 < 18.0.0", - "@angular-devkit/core": ">=15.0.0 < 18.0.0", - "@angular/cli": ">=15.0.0 < 18.0.0", - "@angular/common": ">=15.0.0 < 18.0.0", - "@angular/compiler": ">=15.0.0 < 18.0.0", - "@angular/compiler-cli": ">=15.0.0 < 18.0.0", - "@angular/core": ">=15.0.0 < 18.0.0", - "@angular/forms": ">=15.0.0 < 18.0.0", - "@angular/platform-browser": ">=15.0.0 < 18.0.0", - "@angular/platform-browser-dynamic": ">=15.0.0 < 18.0.0", + "@angular-devkit/architect": ">=0.1500.0 < 0.1900.0", + "@angular-devkit/build-angular": ">=15.0.0 < 19.0.0", + "@angular-devkit/core": ">=15.0.0 < 19.0.0", + "@angular/cli": ">=15.0.0 < 19.0.0", + "@angular/common": ">=15.0.0 < 19.0.0", + "@angular/compiler": ">=15.0.0 < 19.0.0", + "@angular/compiler-cli": ">=15.0.0 < 19.0.0", + "@angular/core": ">=15.0.0 < 19.0.0", + "@angular/forms": ">=15.0.0 < 19.0.0", + "@angular/platform-browser": ">=15.0.0 < 19.0.0", + "@angular/platform-browser-dynamic": ">=15.0.0 < 19.0.0", "rxjs": "^6.0.0 || ^7.4.0", "typescript": "^4.0.0 || ^5.0.0", "zone.js": ">= 0.11.1 < 1.0.0" diff --git a/code/yarn.lock b/code/yarn.lock index 33f0944c6efd..2a3ec738c4e6 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5537,17 +5537,17 @@ __metadata: webpack: "npm:5" zone.js: "npm:^0.14.2" peerDependencies: - "@angular-devkit/architect": ">=0.1500.0 < 0.1800.0" - "@angular-devkit/build-angular": ">=15.0.0 < 18.0.0" - "@angular-devkit/core": ">=15.0.0 < 18.0.0" - "@angular/cli": ">=15.0.0 < 18.0.0" - "@angular/common": ">=15.0.0 < 18.0.0" - "@angular/compiler": ">=15.0.0 < 18.0.0" - "@angular/compiler-cli": ">=15.0.0 < 18.0.0" - "@angular/core": ">=15.0.0 < 18.0.0" - "@angular/forms": ">=15.0.0 < 18.0.0" - "@angular/platform-browser": ">=15.0.0 < 18.0.0" - "@angular/platform-browser-dynamic": ">=15.0.0 < 18.0.0" + "@angular-devkit/architect": ">=0.1500.0 < 0.1900.0" + "@angular-devkit/build-angular": ">=15.0.0 < 19.0.0" + "@angular-devkit/core": ">=15.0.0 < 19.0.0" + "@angular/cli": ">=15.0.0 < 19.0.0" + "@angular/common": ">=15.0.0 < 19.0.0" + "@angular/compiler": ">=15.0.0 < 19.0.0" + "@angular/compiler-cli": ">=15.0.0 < 19.0.0" + "@angular/core": ">=15.0.0 < 19.0.0" + "@angular/forms": ">=15.0.0 < 19.0.0" + "@angular/platform-browser": ">=15.0.0 < 19.0.0" + "@angular/platform-browser-dynamic": ">=15.0.0 < 19.0.0" rxjs: ^6.0.0 || ^7.4.0 typescript: ^4.0.0 || ^5.0.0 zone.js: ">= 0.11.1 < 1.0.0" From 3789286f12c114c7d069b724bf527071f2059c91 Mon Sep 17 00:00:00 2001 From: storybook-bot <32066757+storybook-bot@users.noreply.github.com> Date: Thu, 23 May 2024 09:16:32 +0000 Subject: [PATCH 3/3] Write changelog for 8.1.3 [skip ci] --- CHANGELOG.md | 5 +++++ code/package.json | 3 ++- docs/versions/latest.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3856fc8a65de..66d87cccc4c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 8.1.3 + +- Angular: Support v18 - [#27237](https://github.com/storybookjs/storybook/pull/27237), thanks @valentinpalkovic! +- Telemetry: Add test packages - [#27226](https://github.com/storybookjs/storybook/pull/27226), thanks @shilman! + ## 8.1.2 - Angular: Fix filtering of workspace config styles - [#27108](https://github.com/storybookjs/storybook/pull/27108), thanks @valentinpalkovic! diff --git a/code/package.json b/code/package.json index 1a958c3d6b5a..0fc68f558202 100644 --- a/code/package.json +++ b/code/package.json @@ -299,5 +299,6 @@ "Dependency Upgrades" ] ] - } + }, + "deferredNextVersion": "8.1.3" } diff --git a/docs/versions/latest.json b/docs/versions/latest.json index 1ad7c60a4ae3..3b98ee49f639 100644 --- a/docs/versions/latest.json +++ b/docs/versions/latest.json @@ -1 +1 @@ -{"version":"8.1.2","info":{"plain":"- Angular: Fix filtering of workspace config styles - [#27108](https://github.com/storybookjs/storybook/pull/27108), thanks @valentinpalkovic!\n- Next.js: Avoid interfering with the svgr loader - [#27198](https://github.com/storybookjs/storybook/pull/27198), thanks @seanparmelee!"}} +{"version":"8.1.3","info":{"plain":"- Angular: Support v18 - [#27237](https://github.com/storybookjs/storybook/pull/27237), thanks @valentinpalkovic!\n- Telemetry: Add test packages - [#27226](https://github.com/storybookjs/storybook/pull/27226), thanks @shilman!"}}