From 276e3d4ec1f8dfd178976961b1c94b68c228960e Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Tue, 10 Jan 2023 12:26:10 +0100 Subject: [PATCH 1/5] CLI: overhaul repro command - sb repro as it was is entirely removed - sb repro-next becomes sb repro --- .github/workflows/generate-repros-next.yml | 42 --- .github/workflows/generate-repros.yml | 29 +- code/lib/cli/src/generate.ts | 23 +- code/lib/cli/src/repro-next.ts | 219 ------------- code/lib/cli/src/repro-templates.ts | 2 +- code/lib/cli/src/repro.ts | 289 ++++++++++-------- code/package.json | 3 +- .../next-repro-generators/utils/template.ts | 2 +- scripts/utils/cli-step.ts | 2 +- 9 files changed, 187 insertions(+), 424 deletions(-) delete mode 100644 .github/workflows/generate-repros-next.yml delete mode 100644 code/lib/cli/src/repro-next.ts diff --git a/.github/workflows/generate-repros-next.yml b/.github/workflows/generate-repros-next.yml deleted file mode 100644 index 8d84278b2eeb..000000000000 --- a/.github/workflows/generate-repros-next.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: Generate and push repros to the next branch - -on: - schedule: - - cron: '2 2 */1 * *' - workflow_dispatch: - # To remove when the branch will be merged - push: - branches: - - vite-frameworks-xyz - -jobs: - generate: - runs-on: ubuntu-latest - env: - YARN_ENABLE_IMMUTABLE_INSTALLS: false - CLEANUP_REPRO_NODE_MODULES: true - steps: - - uses: actions/setup-node@v3 - with: - node-version: 16 - - uses: actions/checkout@v3 - - name: Setup git user - run: | - git config --global user.name "Storybook Bot" - git config --global user.email "bot@storybook.js.org" - - name: Install dependencies - run: node ./scripts/check-dependencies.js - - name: Compile Storybook libraries - run: yarn task --task publish --start-from=auto --no-link - - name: Running local registry - run: yarn local-registry --open & - working-directory: ./code - - name: Wait for registry - run: yarn wait-on http://localhost:6001 - working-directory: ./code - - name: Generate repros - run: yarn generate-repros-next --local-registry - working-directory: ./code - - name: Publish repros to GitHub - run: yarn publish-repros --remote=https://storybook-bot:${{ secrets.PAT_STORYBOOK_BOT}}@github.com/storybookjs/repro-templates-temp.git --push - working-directory: ./code diff --git a/.github/workflows/generate-repros.yml b/.github/workflows/generate-repros.yml index 4981d8e76da1..742ebc419ed6 100644 --- a/.github/workflows/generate-repros.yml +++ b/.github/workflows/generate-repros.yml @@ -1,4 +1,4 @@ -name: Generate And Push Repros +name: Generate and push repros to Github on: schedule: @@ -7,13 +7,14 @@ on: # To remove when the branch will be merged push: branches: - - generate-repros + - vite-frameworks-xyz jobs: - update: + generate: runs-on: ubuntu-latest env: YARN_ENABLE_IMMUTABLE_INSTALLS: false + CLEANUP_REPRO_NODE_MODULES: true steps: - uses: actions/setup-node@v3 with: @@ -23,11 +24,19 @@ jobs: run: | git config --global user.name "Storybook Bot" git config --global user.email "bot@storybook.js.org" - - name: Change directory - run: cd code - name: Install dependencies - run: yarn install - - name: Generate repros with Latest Storybook CLI - run: yarn generate-repros --remote=https://storybook-bot:${{ secrets.PAT_STORYBOOK_BOT}}@github.com/storybookjs/repro-templates.git --push --force-push - - name: Generate repros with Next Storybook CLI - run: yarn generate-repros --next --remote=https://storybook-bot:${{ secrets.PAT_STORYBOOK_BOT}}@github.com/storybookjs/repro-templates.git --push --force-push + run: node ./scripts/check-dependencies.js + - name: Compile Storybook libraries + run: yarn task --task publish --start-from=auto --no-link + - name: Running local registry + run: yarn local-registry --open & + working-directory: ./code + - name: Wait for registry + run: yarn wait-on http://localhost:6001 + working-directory: ./code + - name: Generate repros + run: yarn generate-repros --local-registry + working-directory: ./code + - name: Publish repros to GitHub + run: yarn publish-repros --remote=https://storybook-bot:${{ secrets.PAT_STORYBOOK_BOT}}@github.com/storybookjs/repro-sandboxes.git --push + working-directory: ./code diff --git a/code/lib/cli/src/generate.ts b/code/lib/cli/src/generate.ts index 5637d5ffb09e..8d187361b2d1 100644 --- a/code/lib/cli/src/generate.ts +++ b/code/lib/cli/src/generate.ts @@ -14,7 +14,6 @@ import { migrate } from './migrate'; import { extract } from './extract'; import { upgrade, type UpgradeOptions } from './upgrade'; import { repro } from './repro'; -import { reproNext } from './repro-next'; import { link } from './link'; import { automigrate } from './automigrate'; import { generateStorybookBabelConfigInCWD } from './babel-config'; @@ -142,31 +141,13 @@ program ); program - .command('repro [outputDirectory]') - .description('Create a reproduction from a set of possible templates') - .option('-f --renderer ', 'Filter on given renderer') - .option('-t --template