From e2a04bbed1d58d9d11d343d2bf10c15daf09d1f9 Mon Sep 17 00:00:00 2001 From: Valentin Palkovic Date: Wed, 10 Jul 2024 11:39:57 +0200 Subject: [PATCH 01/69] Build: Update git push commands in publish.yml --- .github/workflows/publish.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c48b3a2df59d..73d56f904f4a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -163,8 +163,8 @@ jobs: run: | git checkout next git pull - git push --force origin latest-release - git push --force origin main + git push origin --force next:latest-release + git push origin --force next:main - name: Sync CHANGELOG.md from `main` to `next` if: steps.target.outputs.target == 'main' @@ -178,6 +178,7 @@ jobs: git commit -m "Update CHANGELOG.md for v${{ steps.version.outputs.current-version }} [skip ci]" || true git push origin next + # TODO: remove this step - @JReinhold - name: Sync version JSONs from `next-release` to `main` if: github.ref_name == 'next-release' working-directory: . From 3ac991538f1903499bf6fa2aba9f90e974769c30 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Sat, 3 Aug 2024 13:25:14 +0200 Subject: [PATCH 02/69] Build: Add packageManager property --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 8328557199b0..f782b5a070a6 100644 --- a/package.json +++ b/package.json @@ -15,5 +15,6 @@ "vite-ecosystem-ci:before-test": "node ./scripts/vite-ecosystem-ci/before-test.js && cd ./sandbox/react-vite-default-ts && yarn install", "vite-ecosystem-ci:build": "yarn task --task sandbox --template react-vite/default-ts", "vite-ecosystem-ci:test": "yarn task --task test-runner-dev --template react-vite/default-ts --start-from=dev" - } + }, + "packageManager": "yarn@1.22.19" } From 517e869aecfd39b6aa42366acbc0c1d2f3a8ea87 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Sat, 3 Aug 2024 13:31:07 +0200 Subject: [PATCH 03/69] update yarn --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f782b5a070a6..10d365dd855d 100644 --- a/package.json +++ b/package.json @@ -16,5 +16,5 @@ "vite-ecosystem-ci:build": "yarn task --task sandbox --template react-vite/default-ts", "vite-ecosystem-ci:test": "yarn task --task test-runner-dev --template react-vite/default-ts --start-from=dev" }, - "packageManager": "yarn@1.22.19" + "packageManager": "yarn@4.4.0+sha512.91d93b445d9284e7ed52931369bc89a663414e5582d00eea45c67ddc459a2582919eece27c412d6ffd1bd0793ff35399381cb229326b961798ce4f4cc60ddfdb" } From 0545c3c86830cd4d12da6428210be02cbac60832 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Sat, 3 Aug 2024 13:52:07 +0200 Subject: [PATCH 04/69] Add packageManager also to scripts --- scripts/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/package.json b/scripts/package.json index 1d1e1662a7b2..d308a3ea5fd7 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -188,6 +188,7 @@ "verdaccio": "^5.31.1", "verdaccio-auth-memory": "^10.2.2" }, + "packageManager": "yarn@4.4.0+sha512.91d93b445d9284e7ed52931369bc89a663414e5582d00eea45c67ddc459a2582919eece27c412d6ffd1bd0793ff35399381cb229326b961798ce4f4cc60ddfdb", "engines": { "node": ">=18.0.0" } From 7e10dd7fdac5e53896ddf0f25f1225909fcdbc68 Mon Sep 17 00:00:00 2001 From: Mikhail Shipov Date: Wed, 7 Aug 2024 12:12:22 +0300 Subject: [PATCH 05/69] Fix docs scroll for non-ascii anchors --- code/lib/blocks/src/blocks/DocsContainer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/lib/blocks/src/blocks/DocsContainer.tsx b/code/lib/blocks/src/blocks/DocsContainer.tsx index e5ad466f7f6a..a18f0cc4ad06 100644 --- a/code/lib/blocks/src/blocks/DocsContainer.tsx +++ b/code/lib/blocks/src/blocks/DocsContainer.tsx @@ -38,7 +38,7 @@ export const DocsContainer: FC> = ({ try { url = new URL(globalWindow.parent.location.toString()); if (url.hash) { - const element = document.getElementById(url.hash.substring(1)); + const element = document.getElementById(decodeURIComponent(url.hash.substring(1))); if (element) { // Introducing a delay to ensure scrolling works when it's a full refresh. setTimeout(() => { From aec16d5b490d238050b6bdec3d169c77ed70498d Mon Sep 17 00:00:00 2001 From: 43081j <43081j@users.noreply.github.com> Date: Sat, 10 Aug 2024 00:44:22 +0100 Subject: [PATCH 06/69] chore: upgrade `commander` dependency Upgrades `commander` to latest version across the repo. --- code/core/package.json | 2 +- code/core/src/cli/bin/index.ts | 9 ++++---- code/lib/cli-storybook/package.json | 2 +- code/lib/cli-storybook/src/bin/index.ts | 5 ++--- code/lib/create-storybook/package.json | 2 +- code/lib/create-storybook/src/bin/index.ts | 2 +- code/yarn.lock | 20 ++++++++--------- scripts/build-package.ts | 2 +- scripts/check-package.ts | 2 +- scripts/package.json | 2 +- scripts/release/cancel-preparation-runs.ts | 2 +- scripts/release/generate-pr-description.ts | 2 +- scripts/release/is-pr-frozen.ts | 2 +- scripts/release/is-prerelease.ts | 2 +- scripts/release/is-version-published.ts | 2 +- scripts/release/label-patches.ts | 2 +- scripts/release/pick-patches.ts | 2 +- scripts/release/publish.ts | 2 +- scripts/release/unreleased-changes-exists.ts | 2 +- scripts/release/version.ts | 2 +- scripts/release/write-changelog.ts | 2 +- scripts/run-registry.ts | 2 +- scripts/sandbox/publish.ts | 2 +- scripts/utils/options.ts | 14 ++++++++---- scripts/yarn.lock | 23 +++++++------------- 25 files changed, 54 insertions(+), 57 deletions(-) diff --git a/code/core/package.json b/code/core/package.json index 400c9c392e52..fe8864a9e4d1 100644 --- a/code/core/package.json +++ b/code/core/package.json @@ -337,7 +337,7 @@ "chai": "^4.4.1", "chalk": "^5.3.0", "cli-table3": "^0.6.1", - "commander": "^6.2.1", + "commander": "^12.1.0", "comment-parser": "^1.4.1", "compression": "^1.7.4", "copy-to-clipboard": "^3.3.1", diff --git a/code/core/src/cli/bin/index.ts b/code/core/src/cli/bin/index.ts index 38cbce23efb1..20cc55c1d809 100644 --- a/code/core/src/cli/bin/index.ts +++ b/code/core/src/cli/bin/index.ts @@ -4,7 +4,7 @@ import { addToGlobalContext } from '@storybook/core/telemetry'; import { logger } from '@storybook/core/node-logger'; import chalk from 'chalk'; -import program from 'commander'; +import { program } from 'commander'; import { findPackageSync } from 'fd-package-json'; import leven from 'leven'; import invariant from 'tiny-invariant'; @@ -69,7 +69,7 @@ command('dev') 'URL path to be appended when visiting Storybook for the first time' ) .action(async (options) => { - logger.setLevel(program.loglevel); + logger.setLevel(options.loglevel); consoleLogger.log(chalk.bold(`${pkg.name} v${pkg.version}`) + chalk.reset('\n')); // The key is the field created in `options` variable for @@ -109,7 +109,7 @@ command('build') .option('--test', 'Build stories optimized for testing purposes.') .action(async (options) => { process.env.NODE_ENV = process.env.NODE_ENV || 'production'; - logger.setLevel(program.loglevel); + logger.setLevel(options.loglevel); consoleLogger.log(chalk.bold(`${pkg.name} v${pkg.version}\n`)); // The key is the field created in `options` variable for @@ -132,8 +132,7 @@ program.on('command:*', ([invalidCmd]) => { ' Invalid command: %s.\n See --help for a list of available commands.', invalidCmd ); - // eslint-disable-next-line no-underscore-dangle - const availableCommands = program.commands.map((cmd) => cmd._name); + const availableCommands = program.commands.map((cmd) => cmd.name()); const suggestion = availableCommands.find((cmd) => leven(cmd, invalidCmd) < 3); if (suggestion) { consoleLogger.info(`\n Did you mean ${suggestion}?`); diff --git a/code/lib/cli-storybook/package.json b/code/lib/cli-storybook/package.json index 9e46b26fabd6..307d56c0f688 100644 --- a/code/lib/cli-storybook/package.json +++ b/code/lib/cli-storybook/package.json @@ -45,7 +45,7 @@ "@storybook/codemod": "workspace:*", "@types/semver": "^7.3.4", "chalk": "^4.1.0", - "commander": "^6.2.1", + "commander": "^12.1.0", "create-storybook": "workspace:*", "cross-spawn": "^7.0.3", "envinfo": "^7.7.3", diff --git a/code/lib/cli-storybook/src/bin/index.ts b/code/lib/cli-storybook/src/bin/index.ts index de33b71dbc62..34f70b540a0b 100644 --- a/code/lib/cli-storybook/src/bin/index.ts +++ b/code/lib/cli-storybook/src/bin/index.ts @@ -8,7 +8,7 @@ import { logger } from 'storybook/internal/node-logger'; import { addToGlobalContext, telemetry } from 'storybook/internal/telemetry'; import chalk from 'chalk'; -import program from 'commander'; +import { program } from 'commander'; import envinfo from 'envinfo'; import { findPackageSync } from 'fd-package-json'; import leven from 'leven'; @@ -186,8 +186,7 @@ program.on('command:*', ([invalidCmd]) => { ' Invalid command: %s.\n See --help for a list of available commands.', invalidCmd ); - // eslint-disable-next-line no-underscore-dangle - const availableCommands = program.commands.map((cmd) => cmd._name); + const availableCommands = program.commands.map((cmd) => cmd.name()); const suggestion = availableCommands.find((cmd) => leven(cmd, invalidCmd) < 3); if (suggestion) { consoleLogger.info(`\n Did you mean ${suggestion}?`); diff --git a/code/lib/create-storybook/package.json b/code/lib/create-storybook/package.json index 778c28b8d975..8ae33bc65441 100644 --- a/code/lib/create-storybook/package.json +++ b/code/lib/create-storybook/package.json @@ -57,7 +57,7 @@ "dependencies": { "@types/semver": "^7.3.4", "chalk": "^4.1.0", - "commander": "^6.2.1", + "commander": "^12.1.0", "execa": "^5.0.0", "fd-package-json": "^1.2.0", "find-up": "^5.0.0", diff --git a/code/lib/create-storybook/src/bin/index.ts b/code/lib/create-storybook/src/bin/index.ts index 758365d3b1ca..187e2811c38f 100644 --- a/code/lib/create-storybook/src/bin/index.ts +++ b/code/lib/create-storybook/src/bin/index.ts @@ -1,7 +1,7 @@ import { versions } from 'storybook/internal/common'; import { addToGlobalContext } from 'storybook/internal/telemetry'; -import program from 'commander'; +import { program } from 'commander'; import { findPackageSync } from 'fd-package-json'; import invariant from 'tiny-invariant'; diff --git a/code/yarn.lock b/code/yarn.lock index 48f25f218799..a5c4beca95d8 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5664,7 +5664,7 @@ __metadata: "@types/semver": "npm:^7.3.4" boxen: "npm:^7.1.1" chalk: "npm:^4.1.0" - commander: "npm:^6.2.1" + commander: "npm:^12.1.0" create-storybook: "workspace:*" cross-spawn: "npm:^7.0.3" envinfo: "npm:^7.7.3" @@ -5838,7 +5838,7 @@ __metadata: chai: "npm:^4.4.1" chalk: "npm:^5.3.0" cli-table3: "npm:^0.6.1" - commander: "npm:^6.2.1" + commander: "npm:^12.1.0" comment-parser: "npm:^1.4.1" compression: "npm:^1.7.4" copy-to-clipboard: "npm:^3.3.1" @@ -11657,6 +11657,13 @@ __metadata: languageName: node linkType: hard +"commander@npm:^12.1.0": + version: 12.1.0 + resolution: "commander@npm:12.1.0" + checksum: 10c0/6e1996680c083b3b897bfc1cfe1c58dfbcd9842fd43e1aaf8a795fbc237f65efcc860a3ef457b318e73f29a4f4a28f6403c3d653d021d960e4632dd45bde54a9 + languageName: node + linkType: hard + "commander@npm:^2.18.0, commander@npm:^2.19.0, commander@npm:^2.20.0": version: 2.20.3 resolution: "commander@npm:2.20.3" @@ -11671,13 +11678,6 @@ __metadata: languageName: node linkType: hard -"commander@npm:^6.2.1": - version: 6.2.1 - resolution: "commander@npm:6.2.1" - checksum: 10c0/85748abd9d18c8bc88febed58b98f66b7c591d9b5017cad459565761d7b29ca13b7783ea2ee5ce84bf235897333706c4ce29adf1ce15c8252780e7000e2ce9ea - languageName: node - linkType: hard - "commander@npm:^8.3.0": version: 8.3.0 resolution: "commander@npm:8.3.0" @@ -12066,7 +12066,7 @@ __metadata: "@types/util-deprecate": "npm:^1.0.0" boxen: "npm:^7.1.1" chalk: "npm:^4.1.0" - commander: "npm:^6.2.1" + commander: "npm:^12.1.0" execa: "npm:^5.0.0" fd-package-json: "npm:^1.2.0" find-up: "npm:^5.0.0" diff --git a/scripts/build-package.ts b/scripts/build-package.ts index dda542237300..2e54ea02a19a 100644 --- a/scripts/build-package.ts +++ b/scripts/build-package.ts @@ -1,5 +1,5 @@ import chalk from 'chalk'; -import program from 'commander'; +import { program } from 'commander'; import { execaCommand } from 'execa'; import { readJSON } from 'fs-extra'; import { posix, resolve, sep } from 'path'; diff --git a/scripts/check-package.ts b/scripts/check-package.ts index 4a54ef43a897..eed9a442b6c4 100644 --- a/scripts/check-package.ts +++ b/scripts/check-package.ts @@ -2,7 +2,7 @@ // without having to build dts files for all packages in the monorepo. // It is not implemented yet for angular, svelte and vue. import chalk from 'chalk'; -import program from 'commander'; +import { program } from 'commander'; import { execaCommand } from 'execa'; import { readJSON } from 'fs-extra'; import { resolve } from 'path'; diff --git a/scripts/package.json b/scripts/package.json index 61ae03ea736e..e08aeb213c6b 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -100,7 +100,7 @@ "chalk": "^4.1.0", "chromatic": "^11.5.5", "codecov": "^3.8.1", - "commander": "^6.2.1", + "commander": "^12.1.0", "cross-env": "^7.0.3", "cross-spawn": "^7.0.3", "danger": "^12.3.3", diff --git a/scripts/release/cancel-preparation-runs.ts b/scripts/release/cancel-preparation-runs.ts index 86cc0fb1d476..8359be287b92 100644 --- a/scripts/release/cancel-preparation-runs.ts +++ b/scripts/release/cancel-preparation-runs.ts @@ -3,7 +3,7 @@ * It will fetch all active runs for the preparation workflows, and cancel them. */ import chalk from 'chalk'; -import program from 'commander'; +import { program } from 'commander'; import { dedent } from 'ts-dedent'; import { esMain } from '../utils/esmain'; diff --git a/scripts/release/generate-pr-description.ts b/scripts/release/generate-pr-description.ts index 38f6a9639d01..f1a79da2d6db 100644 --- a/scripts/release/generate-pr-description.ts +++ b/scripts/release/generate-pr-description.ts @@ -1,6 +1,6 @@ import { setOutput } from '@actions/core'; import chalk from 'chalk'; -import program from 'commander'; +import { program } from 'commander'; import semver from 'semver'; import { dedent } from 'ts-dedent'; import { z } from 'zod'; diff --git a/scripts/release/is-pr-frozen.ts b/scripts/release/is-pr-frozen.ts index fd632e10bce9..304e00d41b62 100644 --- a/scripts/release/is-pr-frozen.ts +++ b/scripts/release/is-pr-frozen.ts @@ -1,6 +1,6 @@ import { setOutput } from '@actions/core'; import chalk from 'chalk'; -import program from 'commander'; +import { program } from 'commander'; import { readJson } from 'fs-extra'; import path from 'path'; diff --git a/scripts/release/is-prerelease.ts b/scripts/release/is-prerelease.ts index d154991b27cc..d92f17279b82 100644 --- a/scripts/release/is-prerelease.ts +++ b/scripts/release/is-prerelease.ts @@ -1,6 +1,6 @@ import { setOutput } from '@actions/core'; import chalk from 'chalk'; -import program from 'commander'; +import { program } from 'commander'; import semver from 'semver'; import { esMain } from '../utils/esmain'; diff --git a/scripts/release/is-version-published.ts b/scripts/release/is-version-published.ts index 90d46399ab90..6af757eb654c 100644 --- a/scripts/release/is-version-published.ts +++ b/scripts/release/is-version-published.ts @@ -1,6 +1,6 @@ import { setOutput } from '@actions/core'; import chalk from 'chalk'; -import program from 'commander'; +import { program } from 'commander'; import { esMain } from '../utils/esmain'; import { getCurrentVersion } from './get-current-version'; diff --git a/scripts/release/label-patches.ts b/scripts/release/label-patches.ts index a0d82f44fe60..c1d8fa945e11 100644 --- a/scripts/release/label-patches.ts +++ b/scripts/release/label-patches.ts @@ -1,4 +1,4 @@ -import program from 'commander'; +import { program } from 'commander'; import ora from 'ora'; import { v4 as uuidv4 } from 'uuid'; diff --git a/scripts/release/pick-patches.ts b/scripts/release/pick-patches.ts index 49bb55317529..824f8c6d0cd9 100644 --- a/scripts/release/pick-patches.ts +++ b/scripts/release/pick-patches.ts @@ -1,6 +1,6 @@ import { setOutput } from '@actions/core'; import chalk from 'chalk'; -import program from 'commander'; +import { program } from 'commander'; import ora from 'ora'; import invariant from 'tiny-invariant'; diff --git a/scripts/release/publish.ts b/scripts/release/publish.ts index 0e0136107649..976a1670d393 100644 --- a/scripts/release/publish.ts +++ b/scripts/release/publish.ts @@ -1,5 +1,5 @@ import chalk from 'chalk'; -import program from 'commander'; +import { program } from 'commander'; import { execaCommand } from 'execa'; import { readJson } from 'fs-extra'; import pRetry from 'p-retry'; diff --git a/scripts/release/unreleased-changes-exists.ts b/scripts/release/unreleased-changes-exists.ts index e52dd198b05c..49c50ccd7d42 100644 --- a/scripts/release/unreleased-changes-exists.ts +++ b/scripts/release/unreleased-changes-exists.ts @@ -1,6 +1,6 @@ import { setOutput } from '@actions/core'; import chalk from 'chalk'; -import program from 'commander'; +import { program } from 'commander'; import { intersection } from 'lodash'; import { z } from 'zod'; diff --git a/scripts/release/version.ts b/scripts/release/version.ts index 6574e4609ec9..9659f84f6e95 100644 --- a/scripts/release/version.ts +++ b/scripts/release/version.ts @@ -1,6 +1,6 @@ import { setOutput } from '@actions/core'; import chalk from 'chalk'; -import program from 'commander'; +import { program } from 'commander'; import { execaCommand } from 'execa'; import { readFile, readJson, writeFile, writeJson } from 'fs-extra'; import path from 'path'; diff --git a/scripts/release/write-changelog.ts b/scripts/release/write-changelog.ts index 43a03c8c497f..cacbb9bfa507 100644 --- a/scripts/release/write-changelog.ts +++ b/scripts/release/write-changelog.ts @@ -1,5 +1,5 @@ import chalk from 'chalk'; -import program from 'commander'; +import { program } from 'commander'; import { readFile, writeFile, writeJson } from 'fs-extra'; import path from 'path'; import semver from 'semver'; diff --git a/scripts/run-registry.ts b/scripts/run-registry.ts index bb8aa97048fc..415c7695eb39 100755 --- a/scripts/run-registry.ts +++ b/scripts/run-registry.ts @@ -1,6 +1,6 @@ import chalk from 'chalk'; import { exec } from 'child_process'; -import program from 'commander'; +import { program } from 'commander'; import { execa, execaSync } from 'execa'; import { pathExists, readJSON, remove } from 'fs-extra'; import { mkdir } from 'fs/promises'; diff --git a/scripts/sandbox/publish.ts b/scripts/sandbox/publish.ts index ad8f5f11fcd8..7ddb549c3900 100755 --- a/scripts/sandbox/publish.ts +++ b/scripts/sandbox/publish.ts @@ -1,4 +1,4 @@ -import program from 'commander'; +import { program } from 'commander'; import { execaCommand } from 'execa'; import { existsSync } from 'fs'; import { copy, emptyDir, remove, writeFile } from 'fs-extra'; diff --git a/scripts/utils/options.ts b/scripts/utils/options.ts index a36f286b4141..3f9ce68fa4de 100644 --- a/scripts/utils/options.ts +++ b/scripts/utils/options.ts @@ -2,7 +2,7 @@ * Use commander and prompts to gather a list of options for a script */ import chalk from 'chalk'; -import program from 'commander'; +import { program } from 'commander'; // eslint-disable-next-line import/extensions import kebabCase from 'lodash/kebabCase.js'; import prompts from 'prompts'; @@ -116,8 +116,14 @@ function longFlag(key: OptionId, option: Option) { return inverse ? `no-${kebabCase(key)}` : kebabCase(key); } -function optionFlags(key: OptionId, option: Option) { - const base = `-${shortFlag(key, option)}, --${longFlag(key, option)}`; +function optionFlags(key: OptionId, option: Option, existingOptions: program.Option[]) { + const optionShortFlag = `-${shortFlag(key, option)}`; + let base; + if (existingOptions.some((opt) => opt.short === optionShortFlag)) { + base = `--${longFlag(key, option)}`; + } else { + base = `${optionShortFlag}, --${longFlag(key, option)}`; + } if (option.type === 'string' || option.type === 'string[]') { return `${base} <${key}>`; } @@ -131,7 +137,7 @@ export function getOptions( ): MaybeOptionValues { Object.entries(options) .reduce((acc, [key, option]) => { - const flags = optionFlags(key, option); + const flags = optionFlags(key, option, acc.options); if (option.type === 'boolean') { return acc.option(flags, option.description, !!option.inverse); diff --git a/scripts/yarn.lock b/scripts/yarn.lock index a12ddedfc07e..fb4f6de2cdfc 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -1536,7 +1536,7 @@ __metadata: chalk: "npm:^4.1.0" chromatic: "npm:^11.5.5" codecov: "npm:^3.8.1" - commander: "npm:^6.2.1" + commander: "npm:^12.1.0" cross-env: "npm:^7.0.3" cross-spawn: "npm:^7.0.3" danger: "npm:^12.3.3" @@ -4124,6 +4124,13 @@ __metadata: languageName: node linkType: hard +"commander@npm:^12.1.0, commander@npm:~12.1.0": + version: 12.1.0 + resolution: "commander@npm:12.1.0" + checksum: 10c0/6e1996680c083b3b897bfc1cfe1c58dfbcd9842fd43e1aaf8a795fbc237f65efcc860a3ef457b318e73f29a4f4a28f6403c3d653d021d960e4632dd45bde54a9 + languageName: node + linkType: hard + "commander@npm:^2.18.0, commander@npm:^2.8.1": version: 2.20.3 resolution: "commander@npm:2.20.3" @@ -4138,20 +4145,6 @@ __metadata: languageName: node linkType: hard -"commander@npm:^6.2.1": - version: 6.2.1 - resolution: "commander@npm:6.2.1" - checksum: 10c0/85748abd9d18c8bc88febed58b98f66b7c591d9b5017cad459565761d7b29ca13b7783ea2ee5ce84bf235897333706c4ce29adf1ce15c8252780e7000e2ce9ea - languageName: node - linkType: hard - -"commander@npm:~12.1.0": - version: 12.1.0 - resolution: "commander@npm:12.1.0" - checksum: 10c0/6e1996680c083b3b897bfc1cfe1c58dfbcd9842fd43e1aaf8a795fbc237f65efcc860a3ef457b318e73f29a4f4a28f6403c3d653d021d960e4632dd45bde54a9 - languageName: node - linkType: hard - "compare-versions@npm:^3.6.0": version: 3.6.0 resolution: "compare-versions@npm:3.6.0" From fdf569b7e4bfd657fa52b324d97e77ce43be693d Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 13 Aug 2024 09:27:01 +0200 Subject: [PATCH 07/69] fixes --- scripts/utils/options.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/utils/options.ts b/scripts/utils/options.ts index 3f9ce68fa4de..6c6a6e4b2dd1 100644 --- a/scripts/utils/options.ts +++ b/scripts/utils/options.ts @@ -2,7 +2,7 @@ * Use commander and prompts to gather a list of options for a script */ import chalk from 'chalk'; -import { program } from 'commander'; +import { type Command, type Option as CommanderOption, program } from 'commander'; // eslint-disable-next-line import/extensions import kebabCase from 'lodash/kebabCase.js'; import prompts from 'prompts'; @@ -116,7 +116,7 @@ function longFlag(key: OptionId, option: Option) { return inverse ? `no-${kebabCase(key)}` : kebabCase(key); } -function optionFlags(key: OptionId, option: Option, existingOptions: program.Option[]) { +function optionFlags(key: OptionId, option: Option, existingOptions: CommanderOption[]) { const optionShortFlag = `-${shortFlag(key, option)}`; let base; if (existingOptions.some((opt) => opt.short === optionShortFlag)) { @@ -131,7 +131,7 @@ function optionFlags(key: OptionId, option: Option, existingOptions: program.Opt } export function getOptions( - command: program.Command, + command: Command, options: TOptions, argv: string[] ): MaybeOptionValues { From 0f6a2d36751592a8915e0937591a918d9e96fcf7 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 13 Aug 2024 13:14:04 +0200 Subject: [PATCH 08/69] fixes --- scripts/build-package.ts | 5 +++-- scripts/check-package.ts | 5 +++-- scripts/run-registry.ts | 6 ++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/build-package.ts b/scripts/build-package.ts index 2e54ea02a19a..60ac5b012e13 100644 --- a/scripts/build-package.ts +++ b/scripts/build-package.ts @@ -70,9 +70,10 @@ async function run() { .parse(process.argv); Object.keys(tasks).forEach((key) => { + const opts = program.opts(); // checks if a flag is passed e.g. yarn build --@storybook/addon-docs --watch - const containsFlag = program.rawArgs.includes(tasks[key].suffix); - tasks[key].value = containsFlag || program.all; + const containsFlag = program.args.includes(tasks[key].suffix); + tasks[key].value = containsFlag || opts.all; }); let selection; diff --git a/scripts/check-package.ts b/scripts/check-package.ts index eed9a442b6c4..c8873e6cf846 100644 --- a/scripts/check-package.ts +++ b/scripts/check-package.ts @@ -60,9 +60,10 @@ async function run() { .parse(process.argv); Object.keys(tasks).forEach((key) => { + const opts = program.opts(); // checks if a flag is passed e.g. yarn check --@storybook/addon-docs --watch - const containsFlag = program.rawArgs.includes(tasks[key].suffix); - tasks[key].value = containsFlag || program.all; + const containsFlag = program.args.includes(tasks[key].suffix); + tasks[key].value = containsFlag || opts.all; }); let selection; diff --git a/scripts/run-registry.ts b/scripts/run-registry.ts index aef5cf34ff9c..c01191f838a9 100755 --- a/scripts/run-registry.ts +++ b/scripts/run-registry.ts @@ -25,6 +25,8 @@ const logger = console; const root = resolvePath(__dirname, '..'); +const opts = program.opts(); + const startVerdaccio = async () => { const ready = { proxy: false, @@ -193,13 +195,13 @@ const run = async () => { logger.log(`📦 found ${packages.length} storybook packages at version ${chalk.blue(version)}`); - if (program.publish) { + if (opts.publish) { await publish(packages, 'http://localhost:6002'); } await execa('npx', ['rimraf', '.npmrc'], { cwd: root }); - if (!program.open) { + if (!opts.open) { verdaccioServer.close(); process.exit(0); } From a80b43fca917738b29194364374576e74516e567 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 14 Aug 2024 09:20:59 +0200 Subject: [PATCH 09/69] dedupe and ignore ts error --- code/yarn.lock | 348 +-------------------------------------- scripts/utils/options.ts | 2 +- 2 files changed, 4 insertions(+), 346 deletions(-) diff --git a/code/yarn.lock b/code/yarn.lock index c287ebf96f37..065f16d15192 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -2459,15 +2459,6 @@ __metadata: languageName: node linkType: hard -"@emnapi/runtime@npm:^1.1.0": - version: 1.1.1 - resolution: "@emnapi/runtime@npm:1.1.1" - dependencies: - tslib: "npm:^2.4.0" - checksum: 10c0/c11ee57abf0ec643e64ccdace4b4fcc0b0c7b1117a191f969e84ae3669841aa90d2c17fa35b73f5a66fc0c843c8caca7bf11187faaeaa526bcfb7dbfb9b85de9 - languageName: node - linkType: hard - "@emnapi/runtime@npm:^1.1.1": version: 1.2.0 resolution: "@emnapi/runtime@npm:1.2.0" @@ -3390,18 +3381,6 @@ __metadata: languageName: node linkType: hard -"@img/sharp-darwin-arm64@npm:0.33.3": - version: 0.33.3 - resolution: "@img/sharp-darwin-arm64@npm:0.33.3" - dependencies: - "@img/sharp-libvips-darwin-arm64": "npm:1.0.2" - dependenciesMeta: - "@img/sharp-libvips-darwin-arm64": - optional: true - conditions: os=darwin & cpu=arm64 - languageName: node - linkType: hard - "@img/sharp-darwin-arm64@npm:0.33.4": version: 0.33.4 resolution: "@img/sharp-darwin-arm64@npm:0.33.4" @@ -3414,18 +3393,6 @@ __metadata: languageName: node linkType: hard -"@img/sharp-darwin-x64@npm:0.33.3": - version: 0.33.3 - resolution: "@img/sharp-darwin-x64@npm:0.33.3" - dependencies: - "@img/sharp-libvips-darwin-x64": "npm:1.0.2" - dependenciesMeta: - "@img/sharp-libvips-darwin-x64": - optional: true - conditions: os=darwin & cpu=x64 - languageName: node - linkType: hard - "@img/sharp-darwin-x64@npm:0.33.4": version: 0.33.4 resolution: "@img/sharp-darwin-x64@npm:0.33.4" @@ -3494,18 +3461,6 @@ __metadata: languageName: node linkType: hard -"@img/sharp-linux-arm64@npm:0.33.3": - version: 0.33.3 - resolution: "@img/sharp-linux-arm64@npm:0.33.3" - dependencies: - "@img/sharp-libvips-linux-arm64": "npm:1.0.2" - dependenciesMeta: - "@img/sharp-libvips-linux-arm64": - optional: true - conditions: os=linux & cpu=arm64 & libc=glibc - languageName: node - linkType: hard - "@img/sharp-linux-arm64@npm:0.33.4": version: 0.33.4 resolution: "@img/sharp-linux-arm64@npm:0.33.4" @@ -3518,18 +3473,6 @@ __metadata: languageName: node linkType: hard -"@img/sharp-linux-arm@npm:0.33.3": - version: 0.33.3 - resolution: "@img/sharp-linux-arm@npm:0.33.3" - dependencies: - "@img/sharp-libvips-linux-arm": "npm:1.0.2" - dependenciesMeta: - "@img/sharp-libvips-linux-arm": - optional: true - conditions: os=linux & cpu=arm & libc=glibc - languageName: node - linkType: hard - "@img/sharp-linux-arm@npm:0.33.4": version: 0.33.4 resolution: "@img/sharp-linux-arm@npm:0.33.4" @@ -3542,18 +3485,6 @@ __metadata: languageName: node linkType: hard -"@img/sharp-linux-s390x@npm:0.33.3": - version: 0.33.3 - resolution: "@img/sharp-linux-s390x@npm:0.33.3" - dependencies: - "@img/sharp-libvips-linux-s390x": "npm:1.0.2" - dependenciesMeta: - "@img/sharp-libvips-linux-s390x": - optional: true - conditions: os=linux & cpu=s390x & libc=glibc - languageName: node - linkType: hard - "@img/sharp-linux-s390x@npm:0.33.4": version: 0.33.4 resolution: "@img/sharp-linux-s390x@npm:0.33.4" @@ -3566,18 +3497,6 @@ __metadata: languageName: node linkType: hard -"@img/sharp-linux-x64@npm:0.33.3": - version: 0.33.3 - resolution: "@img/sharp-linux-x64@npm:0.33.3" - dependencies: - "@img/sharp-libvips-linux-x64": "npm:1.0.2" - dependenciesMeta: - "@img/sharp-libvips-linux-x64": - optional: true - conditions: os=linux & cpu=x64 & libc=glibc - languageName: node - linkType: hard - "@img/sharp-linux-x64@npm:0.33.4": version: 0.33.4 resolution: "@img/sharp-linux-x64@npm:0.33.4" @@ -3590,18 +3509,6 @@ __metadata: languageName: node linkType: hard -"@img/sharp-linuxmusl-arm64@npm:0.33.3": - version: 0.33.3 - resolution: "@img/sharp-linuxmusl-arm64@npm:0.33.3" - dependencies: - "@img/sharp-libvips-linuxmusl-arm64": "npm:1.0.2" - dependenciesMeta: - "@img/sharp-libvips-linuxmusl-arm64": - optional: true - conditions: os=linux & cpu=arm64 & libc=musl - languageName: node - linkType: hard - "@img/sharp-linuxmusl-arm64@npm:0.33.4": version: 0.33.4 resolution: "@img/sharp-linuxmusl-arm64@npm:0.33.4" @@ -3614,18 +3521,6 @@ __metadata: languageName: node linkType: hard -"@img/sharp-linuxmusl-x64@npm:0.33.3": - version: 0.33.3 - resolution: "@img/sharp-linuxmusl-x64@npm:0.33.3" - dependencies: - "@img/sharp-libvips-linuxmusl-x64": "npm:1.0.2" - dependenciesMeta: - "@img/sharp-libvips-linuxmusl-x64": - optional: true - conditions: os=linux & cpu=x64 & libc=musl - languageName: node - linkType: hard - "@img/sharp-linuxmusl-x64@npm:0.33.4": version: 0.33.4 resolution: "@img/sharp-linuxmusl-x64@npm:0.33.4" @@ -3638,15 +3533,6 @@ __metadata: languageName: node linkType: hard -"@img/sharp-wasm32@npm:0.33.3": - version: 0.33.3 - resolution: "@img/sharp-wasm32@npm:0.33.3" - dependencies: - "@emnapi/runtime": "npm:^1.1.0" - conditions: cpu=wasm32 - languageName: node - linkType: hard - "@img/sharp-wasm32@npm:0.33.4": version: 0.33.4 resolution: "@img/sharp-wasm32@npm:0.33.4" @@ -3656,13 +3542,6 @@ __metadata: languageName: node linkType: hard -"@img/sharp-win32-ia32@npm:0.33.3": - version: 0.33.3 - resolution: "@img/sharp-win32-ia32@npm:0.33.3" - conditions: os=win32 & cpu=ia32 - languageName: node - linkType: hard - "@img/sharp-win32-ia32@npm:0.33.4": version: 0.33.4 resolution: "@img/sharp-win32-ia32@npm:0.33.4" @@ -3670,13 +3549,6 @@ __metadata: languageName: node linkType: hard -"@img/sharp-win32-x64@npm:0.33.3": - version: 0.33.3 - resolution: "@img/sharp-win32-x64@npm:0.33.3" - conditions: os=win32 & cpu=x64 - languageName: node - linkType: hard - "@img/sharp-win32-x64@npm:0.33.4": version: 0.33.4 resolution: "@img/sharp-win32-x64@npm:0.33.4" @@ -3939,13 +3811,6 @@ __metadata: languageName: node linkType: hard -"@next/env@npm:14.1.0": - version: 14.1.0 - resolution: "@next/env@npm:14.1.0" - checksum: 10c0/f45ce1e3dad87cdbddc58b06bd411f44a6d21dfc2c344d02a5e1b07f56fbc9a39e192c0b0917df9f2e9e4e2156306a8c78f173ca4b53932c2793e67797462a23 - languageName: node - linkType: hard - "@next/env@npm:14.2.5, @next/env@npm:^14.2.5": version: 14.2.5 resolution: "@next/env@npm:14.2.5" @@ -3953,13 +3818,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-darwin-arm64@npm:14.1.0": - version: 14.1.0 - resolution: "@next/swc-darwin-arm64@npm:14.1.0" - conditions: os=darwin & cpu=arm64 - languageName: node - linkType: hard - "@next/swc-darwin-arm64@npm:14.2.5": version: 14.2.5 resolution: "@next/swc-darwin-arm64@npm:14.2.5" @@ -3967,13 +3825,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-darwin-x64@npm:14.1.0": - version: 14.1.0 - resolution: "@next/swc-darwin-x64@npm:14.1.0" - conditions: os=darwin & cpu=x64 - languageName: node - linkType: hard - "@next/swc-darwin-x64@npm:14.2.5": version: 14.2.5 resolution: "@next/swc-darwin-x64@npm:14.2.5" @@ -3981,13 +3832,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-linux-arm64-gnu@npm:14.1.0": - version: 14.1.0 - resolution: "@next/swc-linux-arm64-gnu@npm:14.1.0" - conditions: os=linux & cpu=arm64 & libc=glibc - languageName: node - linkType: hard - "@next/swc-linux-arm64-gnu@npm:14.2.5": version: 14.2.5 resolution: "@next/swc-linux-arm64-gnu@npm:14.2.5" @@ -3995,13 +3839,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-linux-arm64-musl@npm:14.1.0": - version: 14.1.0 - resolution: "@next/swc-linux-arm64-musl@npm:14.1.0" - conditions: os=linux & cpu=arm64 & libc=musl - languageName: node - linkType: hard - "@next/swc-linux-arm64-musl@npm:14.2.5": version: 14.2.5 resolution: "@next/swc-linux-arm64-musl@npm:14.2.5" @@ -4009,13 +3846,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-linux-x64-gnu@npm:14.1.0": - version: 14.1.0 - resolution: "@next/swc-linux-x64-gnu@npm:14.1.0" - conditions: os=linux & cpu=x64 & libc=glibc - languageName: node - linkType: hard - "@next/swc-linux-x64-gnu@npm:14.2.5": version: 14.2.5 resolution: "@next/swc-linux-x64-gnu@npm:14.2.5" @@ -4023,13 +3853,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-linux-x64-musl@npm:14.1.0": - version: 14.1.0 - resolution: "@next/swc-linux-x64-musl@npm:14.1.0" - conditions: os=linux & cpu=x64 & libc=musl - languageName: node - linkType: hard - "@next/swc-linux-x64-musl@npm:14.2.5": version: 14.2.5 resolution: "@next/swc-linux-x64-musl@npm:14.2.5" @@ -4037,13 +3860,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-win32-arm64-msvc@npm:14.1.0": - version: 14.1.0 - resolution: "@next/swc-win32-arm64-msvc@npm:14.1.0" - conditions: os=win32 & cpu=arm64 - languageName: node - linkType: hard - "@next/swc-win32-arm64-msvc@npm:14.2.5": version: 14.2.5 resolution: "@next/swc-win32-arm64-msvc@npm:14.2.5" @@ -4051,13 +3867,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-win32-ia32-msvc@npm:14.1.0": - version: 14.1.0 - resolution: "@next/swc-win32-ia32-msvc@npm:14.1.0" - conditions: os=win32 & cpu=ia32 - languageName: node - linkType: hard - "@next/swc-win32-ia32-msvc@npm:14.2.5": version: 14.2.5 resolution: "@next/swc-win32-ia32-msvc@npm:14.2.5" @@ -4065,13 +3874,6 @@ __metadata: languageName: node linkType: hard -"@next/swc-win32-x64-msvc@npm:14.1.0": - version: 14.1.0 - resolution: "@next/swc-win32-x64-msvc@npm:14.1.0" - conditions: os=win32 & cpu=x64 - languageName: node - linkType: hard - "@next/swc-win32-x64-msvc@npm:14.2.5": version: 14.2.5 resolution: "@next/swc-win32-x64-msvc@npm:14.2.5" @@ -7238,15 +7040,6 @@ __metadata: languageName: node linkType: hard -"@swc/helpers@npm:0.5.2": - version: 0.5.2 - resolution: "@swc/helpers@npm:0.5.2" - dependencies: - tslib: "npm:^2.4.0" - checksum: 10c0/b6fa49bcf6c00571d0eb7837b163f8609960d4d77538160585e27ed167361e9776bd6e5eb9646ffac2fb4d43c58df9ca50dab9d96ab097e6591bc82a75fd1164 - languageName: node - linkType: hard - "@swc/helpers@npm:0.5.5": version: 0.5.5 resolution: "@swc/helpers@npm:0.5.5" @@ -17020,18 +16813,7 @@ __metadata: languageName: node linkType: hard -"image-size@npm:^1.0.0": - version: 1.0.2 - resolution: "image-size@npm:1.0.2" - dependencies: - queue: "npm:6.0.2" - bin: - image-size: bin/image-size.js - checksum: 10c0/df518606c75d0ee12a6d7e822a64ef50d9eabbb303dcee8c9df06bad94e49b4d4680b9003968203f239ff39a9cc51d4ff1781cd331cc0a4b3b858d9fc9836c68 - languageName: node - linkType: hard - -"image-size@npm:^1.1.1": +"image-size@npm:^1.0.0, image-size@npm:^1.1.1": version: 1.1.1 resolution: "image-size@npm:1.1.1" dependencies: @@ -20907,62 +20689,7 @@ __metadata: languageName: node linkType: hard -"next@npm:^14.1.0": - version: 14.1.0 - resolution: "next@npm:14.1.0" - dependencies: - "@next/env": "npm:14.1.0" - "@next/swc-darwin-arm64": "npm:14.1.0" - "@next/swc-darwin-x64": "npm:14.1.0" - "@next/swc-linux-arm64-gnu": "npm:14.1.0" - "@next/swc-linux-arm64-musl": "npm:14.1.0" - "@next/swc-linux-x64-gnu": "npm:14.1.0" - "@next/swc-linux-x64-musl": "npm:14.1.0" - "@next/swc-win32-arm64-msvc": "npm:14.1.0" - "@next/swc-win32-ia32-msvc": "npm:14.1.0" - "@next/swc-win32-x64-msvc": "npm:14.1.0" - "@swc/helpers": "npm:0.5.2" - busboy: "npm:1.6.0" - caniuse-lite: "npm:^1.0.30001579" - graceful-fs: "npm:^4.2.11" - postcss: "npm:8.4.31" - styled-jsx: "npm:5.1.1" - peerDependencies: - "@opentelemetry/api": ^1.1.0 - react: ^18.2.0 - react-dom: ^18.2.0 - sass: ^1.3.0 - dependenciesMeta: - "@next/swc-darwin-arm64": - optional: true - "@next/swc-darwin-x64": - optional: true - "@next/swc-linux-arm64-gnu": - optional: true - "@next/swc-linux-arm64-musl": - optional: true - "@next/swc-linux-x64-gnu": - optional: true - "@next/swc-linux-x64-musl": - optional: true - "@next/swc-win32-arm64-msvc": - optional: true - "@next/swc-win32-ia32-msvc": - optional: true - "@next/swc-win32-x64-msvc": - optional: true - peerDependenciesMeta: - "@opentelemetry/api": - optional: true - sass: - optional: true - bin: - next: dist/bin/next - checksum: 10c0/dbb1ef8d22eec29a9127d28ed46eb34f14e3f7f7b4e4b91dc96027feb4d9ead554a804275484d9a54026e6e55d632d3997561e598c1fb8e8956e77614f39765f - languageName: node - linkType: hard - -"next@npm:^14.2.5": +"next@npm:^14.1.0, next@npm:^14.2.5": version: 14.2.5 resolution: "next@npm:14.2.5" dependencies: @@ -25191,76 +24918,7 @@ __metadata: languageName: node linkType: hard -"sharp@npm:^0.33.3": - version: 0.33.3 - resolution: "sharp@npm:0.33.3" - dependencies: - "@img/sharp-darwin-arm64": "npm:0.33.3" - "@img/sharp-darwin-x64": "npm:0.33.3" - "@img/sharp-libvips-darwin-arm64": "npm:1.0.2" - "@img/sharp-libvips-darwin-x64": "npm:1.0.2" - "@img/sharp-libvips-linux-arm": "npm:1.0.2" - "@img/sharp-libvips-linux-arm64": "npm:1.0.2" - "@img/sharp-libvips-linux-s390x": "npm:1.0.2" - "@img/sharp-libvips-linux-x64": "npm:1.0.2" - "@img/sharp-libvips-linuxmusl-arm64": "npm:1.0.2" - "@img/sharp-libvips-linuxmusl-x64": "npm:1.0.2" - "@img/sharp-linux-arm": "npm:0.33.3" - "@img/sharp-linux-arm64": "npm:0.33.3" - "@img/sharp-linux-s390x": "npm:0.33.3" - "@img/sharp-linux-x64": "npm:0.33.3" - "@img/sharp-linuxmusl-arm64": "npm:0.33.3" - "@img/sharp-linuxmusl-x64": "npm:0.33.3" - "@img/sharp-wasm32": "npm:0.33.3" - "@img/sharp-win32-ia32": "npm:0.33.3" - "@img/sharp-win32-x64": "npm:0.33.3" - color: "npm:^4.2.3" - detect-libc: "npm:^2.0.3" - semver: "npm:^7.6.0" - dependenciesMeta: - "@img/sharp-darwin-arm64": - optional: true - "@img/sharp-darwin-x64": - optional: true - "@img/sharp-libvips-darwin-arm64": - optional: true - "@img/sharp-libvips-darwin-x64": - optional: true - "@img/sharp-libvips-linux-arm": - optional: true - "@img/sharp-libvips-linux-arm64": - optional: true - "@img/sharp-libvips-linux-s390x": - optional: true - "@img/sharp-libvips-linux-x64": - optional: true - "@img/sharp-libvips-linuxmusl-arm64": - optional: true - "@img/sharp-libvips-linuxmusl-x64": - optional: true - "@img/sharp-linux-arm": - optional: true - "@img/sharp-linux-arm64": - optional: true - "@img/sharp-linux-s390x": - optional: true - "@img/sharp-linux-x64": - optional: true - "@img/sharp-linuxmusl-arm64": - optional: true - "@img/sharp-linuxmusl-x64": - optional: true - "@img/sharp-wasm32": - optional: true - "@img/sharp-win32-ia32": - optional: true - "@img/sharp-win32-x64": - optional: true - checksum: 10c0/12f5203426595b4e64c807162a6d52358b591d25fbb414a51fe38861584759fba38485be951ed98d15be3dfe21f2def5336f78ca35bf8bbd22d88cc78ca03f2a - languageName: node - linkType: hard - -"sharp@npm:^0.33.4": +"sharp@npm:^0.33.3, sharp@npm:^0.33.4": version: 0.33.4 resolution: "sharp@npm:0.33.4" dependencies: diff --git a/scripts/utils/options.ts b/scripts/utils/options.ts index 6c6a6e4b2dd1..2c6f63ff00d6 100644 --- a/scripts/utils/options.ts +++ b/scripts/utils/options.ts @@ -137,7 +137,7 @@ export function getOptions( ): MaybeOptionValues { Object.entries(options) .reduce((acc, [key, option]) => { - const flags = optionFlags(key, option, acc.options); + const flags = optionFlags(key, option, acc.options as any); if (option.type === 'boolean') { return acc.option(flags, option.description, !!option.inverse); From 296dfd2622a5366c60ce85bda2b0215f18e3380e Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 14 Aug 2024 11:07:48 +0200 Subject: [PATCH 10/69] fix some nextjs failure, maybe due to some dep dedupe --- code/frameworks/nextjs/src/routing/app-router-provider.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/code/frameworks/nextjs/src/routing/app-router-provider.tsx b/code/frameworks/nextjs/src/routing/app-router-provider.tsx index 5685ec8bbf85..9f37f5768e15 100644 --- a/code/frameworks/nextjs/src/routing/app-router-provider.tsx +++ b/code/frameworks/nextjs/src/routing/app-router-provider.tsx @@ -101,6 +101,7 @@ export const AppRouterProvider: React.FC {children} From a042cc59d8fe0534ad912e0a6a8a20c34e0018f1 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 14 Aug 2024 19:54:28 +0200 Subject: [PATCH 11/69] add more formatting plugins --- code/package.json | 5 ++ code/yarn.lock | 115 +++++++++++++++++++++++++++++++- scripts/package.json | 5 ++ scripts/prettier.config.js | 13 +++- scripts/yarn.lock | 132 +++++++++++++++++++++++++++++++++++-- 5 files changed, 261 insertions(+), 9 deletions(-) diff --git a/code/package.json b/code/package.json index 0deb9562f337..412f78c1ddd6 100644 --- a/code/package.json +++ b/code/package.json @@ -202,6 +202,11 @@ "mock-require": "^3.0.3", "nx": "18.0.6", "prettier": "^3.1.1", + "prettier-plugin-brace-style": "^0.6.2", + "prettier-plugin-css-order": "^2.1.2", + "prettier-plugin-curly": "^0.2.2", + "prettier-plugin-jsdoc": "^1.3.0", + "prettier-plugin-merge": "^0.7.0", "process": "^0.11.10", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/code/yarn.lock b/code/yarn.lock index 79ab5ea664a5..34cf0e23881e 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -788,7 +788,7 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.11.5, @babel/parser@npm:^7.13.16, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.5, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.23.0, @babel/parser@npm:^7.23.5, @babel/parser@npm:^7.23.6, @babel/parser@npm:^7.23.9, @babel/parser@npm:^7.24.0, @babel/parser@npm:^7.24.4, @babel/parser@npm:^7.24.7, @babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.3, @babel/parser@npm:^7.4.5, @babel/parser@npm:^7.6.0, @babel/parser@npm:^7.9.6": +"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.11.5, @babel/parser@npm:^7.13.16, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.5, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.5, @babel/parser@npm:^7.23.0, @babel/parser@npm:^7.23.5, @babel/parser@npm:^7.23.6, @babel/parser@npm:^7.23.9, @babel/parser@npm:^7.24.0, @babel/parser@npm:^7.24.4, @babel/parser@npm:^7.24.7, @babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.3, @babel/parser@npm:^7.4.5, @babel/parser@npm:^7.6.0, @babel/parser@npm:^7.9.6": version: 7.25.3 resolution: "@babel/parser@npm:7.25.3" dependencies: @@ -2276,7 +2276,7 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.16.0, @babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.23.9, @babel/traverse@npm:^7.24.0, @babel/traverse@npm:^7.24.1, @babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.25.2, @babel/traverse@npm:^7.4.5": +"@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.16.0, @babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.22.5, @babel/traverse@npm:^7.23.9, @babel/traverse@npm:^7.24.0, @babel/traverse@npm:^7.24.1, @babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.25.2, @babel/traverse@npm:^7.4.5": version: 7.25.3 resolution: "@babel/traverse@npm:7.25.3" dependencies: @@ -6796,6 +6796,11 @@ __metadata: mock-require: "npm:^3.0.3" nx: "npm:18.0.6" prettier: "npm:^3.1.1" + prettier-plugin-brace-style: "npm:^0.6.2" + prettier-plugin-css-order: "npm:^2.1.2" + prettier-plugin-curly: "npm:^0.2.2" + prettier-plugin-jsdoc: "npm:^1.3.0" + prettier-plugin-merge: "npm:^0.7.0" process: "npm:^0.11.10" react: "npm:^18.2.0" react-dom: "npm:^18.2.0" @@ -10594,6 +10599,13 @@ __metadata: languageName: node linkType: hard +"binary-searching@npm:^2.0.5": + version: 2.0.5 + resolution: "binary-searching@npm:2.0.5" + checksum: 10c0/914ccf15d4c989a8900e5617e2b6ec77a016f894b3833eaa5720a310214420dbd5d8eb577c158f99d25769968225c522cc37580c8d2ed46cc469f9d0365b7f15 + languageName: node + linkType: hard + "binaryextensions@npm:1 || 2": version: 2.3.0 resolution: "binaryextensions@npm:2.3.0" @@ -11957,7 +11969,7 @@ __metadata: languageName: node linkType: hard -"comment-parser@npm:^1.4.1": +"comment-parser@npm:^1.4.0, comment-parser@npm:^1.4.1": version: 1.4.1 resolution: "comment-parser@npm:1.4.1" checksum: 10c0/d6c4be3f5be058f98b24f2d557f745d8fe1cc9eb75bebbdccabd404a0e1ed41563171b16285f593011f8b6a5ec81f564fb1f2121418ac5cbf0f49255bf0840dd @@ -12442,6 +12454,15 @@ __metadata: languageName: node linkType: hard +"css-declaration-sorter@npm:^7.1.1": + version: 7.2.0 + resolution: "css-declaration-sorter@npm:7.2.0" + peerDependencies: + postcss: ^8.0.9 + checksum: 10c0/d8516be94f8f2daa233ef021688b965c08161624cbf830a4d7ee1099429437c0ee124d35c91b1c659cfd891a68e8888aa941726dab12279bc114aaed60a94606 + languageName: node + linkType: hard + "css-loader@npm:6.10.0, css-loader@npm:^6.7.1, css-loader@npm:^6.7.3": version: 6.10.0 resolution: "css-loader@npm:6.10.0" @@ -13070,6 +13091,13 @@ __metadata: languageName: node linkType: hard +"diff@npm:5.1.0": + version: 5.1.0 + resolution: "diff@npm:5.1.0" + checksum: 10c0/77a0d9beb9ed54796154ac2511872288432124ac90a1cabb1878783c9b4d81f1847f3b746a0630b1e836181461d2c76e1e6b95559bef86ed16294d114862e364 + languageName: node + linkType: hard + "diff@npm:^4.0.1": version: 4.0.2 resolution: "diff@npm:4.0.2" @@ -22673,6 +22701,15 @@ __metadata: languageName: node linkType: hard +"postcss-less@npm:^6.0.0": + version: 6.0.0 + resolution: "postcss-less@npm:6.0.0" + peerDependencies: + postcss: ^8.3.5 + checksum: 10c0/09869ba66e1340f03d6ffd34cba2721f48d1c4a71314af5b10d8a3cc4f78c15f22da809442bf5e50d04eff2a96389d6a0fdb9f0c20a191945aacfb1747fd47ca + languageName: node + linkType: hard + "postcss-loader@npm:8.1.1, postcss-loader@npm:^8.1.1": version: 8.1.1 resolution: "postcss-loader@npm:8.1.1" @@ -22802,6 +22839,15 @@ __metadata: languageName: node linkType: hard +"postcss-scss@npm:^4.0.9": + version: 4.0.9 + resolution: "postcss-scss@npm:4.0.9" + peerDependencies: + postcss: ^8.4.29 + checksum: 10c0/f917ecfd4b9113a6648e966a41f027ff7e14238393914978d44596e227a50f084667dc8818742348dc7d8b20130b30d4259aca1d4db86754a9c141202ae03714 + languageName: node + linkType: hard + "postcss-selector-parser@npm:^6.0.0, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4": version: 6.0.13 resolution: "postcss-selector-parser@npm:6.0.13" @@ -22885,6 +22931,69 @@ __metadata: languageName: node linkType: hard +"prettier-plugin-brace-style@npm:^0.6.2": + version: 0.6.2 + resolution: "prettier-plugin-brace-style@npm:0.6.2" + peerDependencies: + prettier: ^2 || ^3 + prettier-plugin-astro: "*" + peerDependenciesMeta: + prettier-plugin-astro: + optional: true + checksum: 10c0/cd64e2b6c01f267ec4a286f035cb26fcf5563c8ce9e46745c4150118bbc3e954ff7cc80d3753de4a5d880083eb82242be26abca21ed42cba9eb1b48aa80f2a9e + languageName: node + linkType: hard + +"prettier-plugin-css-order@npm:^2.1.2": + version: 2.1.2 + resolution: "prettier-plugin-css-order@npm:2.1.2" + dependencies: + css-declaration-sorter: "npm:^7.1.1" + postcss-less: "npm:^6.0.0" + postcss-scss: "npm:^4.0.9" + peerDependencies: + prettier: 3.x + checksum: 10c0/e6e8230048fb9d994cde207796b35e0e074cb83420b0c17c764353da290bb2b3d099265bf65537a70c03e60a0854bfa4ce2576b436933d8b4b0d86bdd61a6e73 + languageName: node + linkType: hard + +"prettier-plugin-curly@npm:^0.2.2": + version: 0.2.2 + resolution: "prettier-plugin-curly@npm:0.2.2" + dependencies: + "@babel/generator": "npm:^7.23.6" + "@babel/parser": "npm:^7.22.5" + "@babel/traverse": "npm:^7.22.5" + peerDependencies: + prettier: ^2 || ^3 + checksum: 10c0/2354c0b22d16f4177b20028aff973c1630fd273001835ecc4af177805ebaa7ad165cf1238191d47393a31a62daba74336475fd724a8a84ec257c1c51530dad0f + languageName: node + linkType: hard + +"prettier-plugin-jsdoc@npm:^1.3.0": + version: 1.3.0 + resolution: "prettier-plugin-jsdoc@npm:1.3.0" + dependencies: + binary-searching: "npm:^2.0.5" + comment-parser: "npm:^1.4.0" + mdast-util-from-markdown: "npm:^2.0.0" + peerDependencies: + prettier: ^3.0.0 + checksum: 10c0/c716ba9257765a33a9e8e3e9302724287f50efccba47602bc73b20a873dc2bb68244e8c600ed993580d5a9948d1db5b5c72766f89e11fe40da43b190fbcc52e1 + languageName: node + linkType: hard + +"prettier-plugin-merge@npm:^0.7.0": + version: 0.7.0 + resolution: "prettier-plugin-merge@npm:0.7.0" + dependencies: + diff: "npm:5.1.0" + peerDependencies: + prettier: ^2 || ^3 + checksum: 10c0/4c4fbb50596d731b9a8942aa97848c8f20b13e69b17cb10ea0d53cf069ea13a197342daafecc533009c16fc778c157d407e9a1dcda1b8a7ab60be8b9b01c6a4f + languageName: node + linkType: hard + "prettier@npm:*, prettier@npm:^3.1.1, prettier@npm:^3.2.5": version: 3.2.5 resolution: "prettier@npm:3.2.5" diff --git a/scripts/package.json b/scripts/package.json index fef126cfb4bf..a85ca1935fd8 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -146,6 +146,11 @@ "playwright": "1.46.0", "playwright-core": "1.46.0", "prettier": "^3.3.2", + "prettier-plugin-brace-style": "^0.6.2", + "prettier-plugin-css-order": "^2.1.2", + "prettier-plugin-curly": "^0.2.2", + "prettier-plugin-jsdoc": "^1.3.0", + "prettier-plugin-merge": "^0.7.0", "pretty-bytes": "^6.1.1", "pretty-hrtime": "^1.0.3", "pretty-ms": "^8.0.0", diff --git a/scripts/prettier.config.js b/scripts/prettier.config.js index e3d2af6af7d5..f2a2045bff72 100644 --- a/scripts/prettier.config.js +++ b/scripts/prettier.config.js @@ -4,6 +4,8 @@ export default { bracketSpacing: true, trailingComma: 'es5', singleQuote: true, + arrowParens: 'always', + overrides: [ { files: '*.html', @@ -25,7 +27,14 @@ export default { }, }, ], - plugins: ['@trivago/prettier-plugin-sort-imports'], + plugins: [ + '@trivago/prettier-plugin-sort-imports', + // 'prettier-plugin-brace-style', + // 'prettier-plugin-curly', + 'prettier-plugin-jsdoc', + 'prettier-plugin-css-order', + 'prettier-plugin-merge', + ], importOrder: [ '^node:', @@ -41,5 +50,5 @@ export default { importOrderSeparation: true, importOrderSortSpecifiers: true, - arrowParens: 'always', + // braceStyle: '1tbs', }; diff --git a/scripts/yarn.lock b/scripts/yarn.lock index 62e1e87f23f8..ad7f7dc69e67 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -70,7 +70,7 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.23.0": +"@babel/generator@npm:^7.23.0, @babel/generator@npm:^7.23.6, @babel/generator@npm:^7.25.0": version: 7.25.0 resolution: "@babel/generator@npm:7.25.0" dependencies: @@ -145,7 +145,7 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.20.5, @babel/parser@npm:^7.23.0, @babel/parser@npm:^7.24.4, @babel/parser@npm:^7.25.0": +"@babel/parser@npm:^7.20.5, @babel/parser@npm:^7.22.5, @babel/parser@npm:^7.23.0, @babel/parser@npm:^7.24.4, @babel/parser@npm:^7.25.0, @babel/parser@npm:^7.25.3": version: 7.25.3 resolution: "@babel/parser@npm:7.25.3" dependencies: @@ -165,7 +165,7 @@ __metadata: languageName: node linkType: hard -"@babel/template@npm:^7.24.7": +"@babel/template@npm:^7.24.7, @babel/template@npm:^7.25.0": version: 7.25.0 resolution: "@babel/template@npm:7.25.0" dependencies: @@ -194,6 +194,21 @@ __metadata: languageName: node linkType: hard +"@babel/traverse@npm:^7.22.5": + version: 7.25.3 + resolution: "@babel/traverse@npm:7.25.3" + dependencies: + "@babel/code-frame": "npm:^7.24.7" + "@babel/generator": "npm:^7.25.0" + "@babel/parser": "npm:^7.25.3" + "@babel/template": "npm:^7.25.0" + "@babel/types": "npm:^7.25.2" + debug: "npm:^4.3.1" + globals: "npm:^11.1.0" + checksum: 10c0/4c8a1966fa90b53a783a4afd2fcdaa6ab1a912e6621dca9fcc6633e80ccb9491620e88caf73b537da4e16cefd537b548c87d7087868d5b0066414dea375c0e9b + languageName: node + linkType: hard + "@babel/types@npm:7.17.0": version: 7.17.0 resolution: "@babel/types@npm:7.17.0" @@ -1583,6 +1598,11 @@ __metadata: playwright: "npm:1.46.0" playwright-core: "npm:1.46.0" prettier: "npm:^3.3.2" + prettier-plugin-brace-style: "npm:^0.6.2" + prettier-plugin-css-order: "npm:^2.1.2" + prettier-plugin-curly: "npm:^0.2.2" + prettier-plugin-jsdoc: "npm:^1.3.0" + prettier-plugin-merge: "npm:^0.7.0" pretty-bytes: "npm:^6.1.1" pretty-hrtime: "npm:^1.0.3" pretty-ms: "npm:^8.0.0" @@ -3567,6 +3587,13 @@ __metadata: languageName: node linkType: hard +"binary-searching@npm:^2.0.5": + version: 2.0.5 + resolution: "binary-searching@npm:2.0.5" + checksum: 10c0/914ccf15d4c989a8900e5617e2b6ec77a016f894b3833eaa5720a310214420dbd5d8eb577c158f99d25769968225c522cc37580c8d2ed46cc469f9d0365b7f15 + languageName: node + linkType: hard + "bl@npm:^1.0.0": version: 1.2.3 resolution: "bl@npm:1.2.3" @@ -4152,6 +4179,13 @@ __metadata: languageName: node linkType: hard +"comment-parser@npm:^1.4.0": + version: 1.4.1 + resolution: "comment-parser@npm:1.4.1" + checksum: 10c0/d6c4be3f5be058f98b24f2d557f745d8fe1cc9eb75bebbdccabd404a0e1ed41563171b16285f593011f8b6a5ec81f564fb1f2121418ac5cbf0f49255bf0840dd + languageName: node + linkType: hard + "compare-versions@npm:^3.6.0": version: 3.6.0 resolution: "compare-versions@npm:3.6.0" @@ -4333,6 +4367,15 @@ __metadata: languageName: node linkType: hard +"css-declaration-sorter@npm:^7.1.1": + version: 7.2.0 + resolution: "css-declaration-sorter@npm:7.2.0" + peerDependencies: + postcss: ^8.0.9 + checksum: 10c0/d8516be94f8f2daa233ef021688b965c08161624cbf830a4d7ee1099429437c0ee124d35c91b1c659cfd891a68e8888aa941726dab12279bc114aaed60a94606 + languageName: node + linkType: hard + "css.escape@npm:^1.5.1": version: 1.5.1 resolution: "css.escape@npm:1.5.1" @@ -4739,7 +4782,7 @@ __metadata: languageName: node linkType: hard -"diff@npm:^5.0.0": +"diff@npm:5.1.0, diff@npm:^5.0.0": version: 5.1.0 resolution: "diff@npm:5.1.0" checksum: 10c0/77a0d9beb9ed54796154ac2511872288432124ac90a1cabb1878783c9b4d81f1847f3b746a0630b1e836181461d2c76e1e6b95559bef86ed16294d114862e364 @@ -10854,6 +10897,15 @@ __metadata: languageName: node linkType: hard +"postcss-less@npm:^6.0.0": + version: 6.0.0 + resolution: "postcss-less@npm:6.0.0" + peerDependencies: + postcss: ^8.3.5 + checksum: 10c0/09869ba66e1340f03d6ffd34cba2721f48d1c4a71314af5b10d8a3cc4f78c15f22da809442bf5e50d04eff2a96389d6a0fdb9f0c20a191945aacfb1747fd47ca + languageName: node + linkType: hard + "postcss-load-config@npm:^3.0.1": version: 3.1.4 resolution: "postcss-load-config@npm:3.1.4" @@ -10872,6 +10924,15 @@ __metadata: languageName: node linkType: hard +"postcss-scss@npm:^4.0.9": + version: 4.0.9 + resolution: "postcss-scss@npm:4.0.9" + peerDependencies: + postcss: ^8.4.29 + checksum: 10c0/f917ecfd4b9113a6648e966a41f027ff7e14238393914978d44596e227a50f084667dc8818742348dc7d8b20130b30d4259aca1d4db86754a9c141202ae03714 + languageName: node + linkType: hard + "postcss@npm:^8.4.35": version: 8.4.35 resolution: "postcss@npm:8.4.35" @@ -10899,6 +10960,69 @@ __metadata: languageName: node linkType: hard +"prettier-plugin-brace-style@npm:^0.6.2": + version: 0.6.2 + resolution: "prettier-plugin-brace-style@npm:0.6.2" + peerDependencies: + prettier: ^2 || ^3 + prettier-plugin-astro: "*" + peerDependenciesMeta: + prettier-plugin-astro: + optional: true + checksum: 10c0/cd64e2b6c01f267ec4a286f035cb26fcf5563c8ce9e46745c4150118bbc3e954ff7cc80d3753de4a5d880083eb82242be26abca21ed42cba9eb1b48aa80f2a9e + languageName: node + linkType: hard + +"prettier-plugin-css-order@npm:^2.1.2": + version: 2.1.2 + resolution: "prettier-plugin-css-order@npm:2.1.2" + dependencies: + css-declaration-sorter: "npm:^7.1.1" + postcss-less: "npm:^6.0.0" + postcss-scss: "npm:^4.0.9" + peerDependencies: + prettier: 3.x + checksum: 10c0/e6e8230048fb9d994cde207796b35e0e074cb83420b0c17c764353da290bb2b3d099265bf65537a70c03e60a0854bfa4ce2576b436933d8b4b0d86bdd61a6e73 + languageName: node + linkType: hard + +"prettier-plugin-curly@npm:^0.2.2": + version: 0.2.2 + resolution: "prettier-plugin-curly@npm:0.2.2" + dependencies: + "@babel/generator": "npm:^7.23.6" + "@babel/parser": "npm:^7.22.5" + "@babel/traverse": "npm:^7.22.5" + peerDependencies: + prettier: ^2 || ^3 + checksum: 10c0/2354c0b22d16f4177b20028aff973c1630fd273001835ecc4af177805ebaa7ad165cf1238191d47393a31a62daba74336475fd724a8a84ec257c1c51530dad0f + languageName: node + linkType: hard + +"prettier-plugin-jsdoc@npm:^1.3.0": + version: 1.3.0 + resolution: "prettier-plugin-jsdoc@npm:1.3.0" + dependencies: + binary-searching: "npm:^2.0.5" + comment-parser: "npm:^1.4.0" + mdast-util-from-markdown: "npm:^2.0.0" + peerDependencies: + prettier: ^3.0.0 + checksum: 10c0/c716ba9257765a33a9e8e3e9302724287f50efccba47602bc73b20a873dc2bb68244e8c600ed993580d5a9948d1db5b5c72766f89e11fe40da43b190fbcc52e1 + languageName: node + linkType: hard + +"prettier-plugin-merge@npm:^0.7.0": + version: 0.7.0 + resolution: "prettier-plugin-merge@npm:0.7.0" + dependencies: + diff: "npm:5.1.0" + peerDependencies: + prettier: ^2 || ^3 + checksum: 10c0/4c4fbb50596d731b9a8942aa97848c8f20b13e69b17cb10ea0d53cf069ea13a197342daafecc533009c16fc778c157d407e9a1dcda1b8a7ab60be8b9b01c6a4f + languageName: node + linkType: hard + "prettier@npm:*, prettier@npm:^3.3.2": version: 3.3.2 resolution: "prettier@npm:3.3.2" From 5d7b05c476bde718079597f96856a2a7b84b2f60 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 14 Aug 2024 21:51:42 +0200 Subject: [PATCH 12/69] lint jsdoc comments --- code/.storybook/preview.tsx | 22 +- .../stories/docspage/error.stories.ts | 4 +- .../src/utils/process-preview-annotation.ts | 7 +- code/builders/builder-webpack5/src/index.ts | 8 +- code/core/src/builder-manager/index.ts | 8 +- .../builder-manager/utils/managerEntries.ts | 17 +- code/core/src/channels/postmessage/index.ts | 5 +- code/core/src/cli/helpers.ts | 21 +- code/core/src/cli/project_types.ts | 12 +- .../js-package-manager/JsPackageManager.ts | 76 +++--- .../JsPackageManagerFactory.ts | 8 +- .../src/common/js-package-manager/NPMProxy.ts | 1 - code/core/src/common/presets.ts | 15 +- code/core/src/common/utils/cli.ts | 74 +++--- .../src/common/utils/get-framework-name.ts | 14 +- code/core/src/common/utils/remove.ts | 7 +- .../src/components/components/bar/button.tsx | 5 +- .../src/core-server/presets/common-preset.ts | 20 +- code/core/src/csf-tools/ConfigFile.ts | 73 +++--- code/core/src/csf-tools/CsfFile.ts | 20 +- code/core/src/manager-api/lib/stories.ts | 6 +- code/core/src/manager-api/modules/refs.ts | 7 + code/core/src/manager-api/modules/stories.ts | 52 +++-- code/core/src/manager-api/root.tsx | 14 +- .../src/preview-api/modules/addons/hooks.ts | 194 +++++++++------- .../modules/addons/make-decorator.ts | 24 +- .../preview-web/render/CsfDocsRender.ts | 9 +- .../preview-web/render/MdxDocsRender.ts | 7 +- .../modules/preview-web/render/Render.ts | 5 +- .../modules/preview-web/render/StoryRender.ts | 9 +- .../preview-api/modules/store/decorators.ts | 10 +- code/core/src/router/router.tsx | 18 +- code/core/src/types/modules/addons.ts | 179 +++++++-------- code/core/src/types/modules/api.ts | 25 +- code/core/src/types/modules/core-common.ts | 217 ++++++++---------- .../angular-beta/utils/PropertyExtractor.ts | 2 - code/frameworks/angular/src/types.ts | 4 +- .../template/components/pre.component.ts | 12 +- .../angular-src/service.component.ts | 10 +- .../experimental-nextjs-vite/src/types.ts | 5 +- .../src/babel/plugins/next-page-config.ts | 3 +- .../src/babel/plugins/next-ssg-transform.ts | 3 +- code/frameworks/svelte-vite/src/utils.ts | 6 +- code/lib/blocks/src/blocks/Canvas.tsx | 26 +-- code/lib/blocks/src/blocks/Description.tsx | 4 +- code/lib/blocks/src/blocks/Primary.tsx | 4 +- code/lib/blocks/src/blocks/Source.tsx | 23 +- code/lib/blocks/src/blocks/Story.tsx | 26 +-- code/lib/blocks/src/blocks/Subtitle.tsx | 4 +- code/lib/blocks/src/blocks/Title.tsx | 8 +- code/lib/blocks/src/components/Preview.tsx | 5 +- code/lib/blocks/src/components/Story.tsx | 5 +- .../blocks/src/components/TableOfContents.tsx | 20 +- .../blocks/src/controls/options/Options.tsx | 13 +- code/lib/cli-storybook/src/add.ts | 23 +- .../src/automigrate/fixes/autodocs-true.ts | 4 +- .../src/automigrate/fixes/new-frameworks.ts | 20 +- .../src/automigrate/helpers/mainConfigFile.ts | 17 +- code/lib/cli-storybook/src/migrate.ts | 8 +- code/lib/instrumenter/src/instrumenter.ts | 12 +- .../src/svelte-docgen-loader.ts | 5 +- .../preact/template/stories/React.jsx | 2 + code/renderers/svelte/src/render.ts | 12 +- .../web-components/src/framework-api.ts | 4 +- scripts/prettier.config.js | 3 + 65 files changed, 703 insertions(+), 783 deletions(-) diff --git a/code/.storybook/preview.tsx b/code/.storybook/preview.tsx index 3fbae06f064f..f08bb92f1b70 100644 --- a/code/.storybook/preview.tsx +++ b/code/.storybook/preview.tsx @@ -16,7 +16,7 @@ import { import { DocsContext } from '@storybook/blocks'; import { global } from '@storybook/global'; -import type { Decorator, ReactRenderer } from '@storybook/react'; +import type { Decorator, Loader, ReactRenderer } from '@storybook/react'; import { MINIMAL_VIEWPORTS } from '@storybook/addon-viewport'; @@ -95,7 +95,6 @@ const StackContainer = ({ children, layout }) => ( height: '100%', display: 'flex', flexDirection: 'column', - // margin: layout === 'fullscreen' ? 0 : '-1rem', }} >