From 27d0d8419eb38672f5b3e49f4007415a2f6042b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Thu, 6 Apr 2023 13:23:47 +0900 Subject: [PATCH] ci(#10336): use TurboSnap --- .github/workflows/storybook.yml | 21 ++--- packages/frontend/.storybook/main.ts | 6 ++ packages/frontend/package.json | 1 + pnpm-lock.yaml | 129 ++++++++++++++------------- 4 files changed, 84 insertions(+), 73 deletions(-) diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml index 9659757c49..06f2bd00e7 100644 --- a/.github/workflows/storybook.yml +++ b/.github/workflows/storybook.yml @@ -2,12 +2,6 @@ name: Storybook on: push: - branches: - - master - - develop - pull_request: - branches-ignore: - - l10n_develop jobs: build: @@ -43,14 +37,17 @@ jobs: uses: chromaui/action@v1 with: exitOnceUploaded: true + externals: | + - "assets/**" + - "fluent-emojis/**" + - "locales/**" + - "misskey-assets/**" + - "packages/frontend/assets/**" + - "packages/frontend/public/**" + onlyChanged: "!(l10n_develop)" projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }} + storybookBaseDir: packages/frontend storybookBuildDir: storybook-static - workingDir: packages/frontend - - name: Compare on Chromatic - if: github.event_name == 'pull_request_target' - run: pnpm --filter frontend chromatic -d storybook-static --exit-once-uploaded --patch-build ${{ github.head_ref }}...${{ github.base_ref }} - env: - CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }} - name: Upload Artifacts uses: actions/upload-artifact@v3 with: diff --git a/packages/frontend/.storybook/main.ts b/packages/frontend/.storybook/main.ts index 1e57c97b67..ec91fdbbcc 100644 --- a/packages/frontend/.storybook/main.ts +++ b/packages/frontend/.storybook/main.ts @@ -1,6 +1,7 @@ import { resolve } from 'node:path'; import type { StorybookConfig } from '@storybook/vue3-vite'; import { mergeConfig } from 'vite'; +import turbosnap from 'vite-plugin-turbosnap'; const config = { stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'], addons: [ @@ -22,6 +23,11 @@ const config = { }, async viteFinal(config, options) { return mergeConfig(config, { + plugins: [ + turbosnap({ + rootDir: config.root ?? process.cwd(), + }), + ], build: { target: [ 'chrome108', diff --git a/packages/frontend/package.json b/packages/frontend/package.json index 2d96d5514e..3b108b555d 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -131,6 +131,7 @@ "storybook": "7.0.2", "storybook-addon-misskey-theme": "github:misskey-dev/storybook-addon-misskey-theme", "summaly": "github:misskey-dev/summaly", + "vite-plugin-turbosnap": "^1.0.1", "vitest": "^0.29.8", "vitest-fetch-mock": "^0.2.2", "vue-eslint-parser": "9.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a130bb12c6..630b09e53b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -934,6 +934,9 @@ importers: summaly: specifier: github:misskey-dev/summaly version: github.com/misskey-dev/summaly/1bab7afee616429b8bbf7a7cbcbb8ebcef66d992 + vite-plugin-turbosnap: + specifier: ^1.0.1 + version: 1.0.1 vitest: specifier: ^0.29.8 version: 0.29.8(happy-dom@8.9.0)(sass@1.60.0) @@ -5337,17 +5340,6 @@ packages: telejson: 7.0.4 dev: true - /@storybook/channel-postmessage@7.0.1: - resolution: {integrity: sha512-wcJfnq49PwqKhfMJciDCJ1P5YcpN43gj9MLXIEprq7escegiM4YHBeOHCsu/YZnaE7pLnYRSxqCoy/MpWZPbIQ==} - dependencies: - '@storybook/channels': 7.0.1 - '@storybook/client-logger': 7.0.1 - '@storybook/core-events': 7.0.1 - '@storybook/global': 5.0.0 - qs: 6.11.1 - telejson: 7.0.4 - dev: true - /@storybook/channel-postmessage@7.0.2: resolution: {integrity: sha512-SZ/KqnZcx10W9hJbrzBKcP9dmgaeTaXugUhcgw1IkmjKWdsKazqFZCPwQWZZKAmhO4wYbyYOhkz3wfSIeB4mFw==} dependencies: @@ -5359,6 +5351,17 @@ packages: telejson: 7.0.4 dev: true + /@storybook/channel-postmessage@7.1.0-alpha.0: + resolution: {integrity: sha512-uNt2+hsf31DT2c/QkwjZFIJ/tE4BLe/JQss721/9xR91WsCestdcJfDhUHLcC+d2q2qoLq29rWrWW2TK+kojKw==} + dependencies: + '@storybook/channels': 7.1.0-alpha.0 + '@storybook/client-logger': 7.1.0-alpha.0 + '@storybook/core-events': 7.1.0-alpha.0 + '@storybook/global': 5.0.0 + qs: 6.11.1 + telejson: 7.0.4 + dev: true + /@storybook/channel-websocket@7.0.2: resolution: {integrity: sha512-YU3lFId6Nsi75ddA+3qfbnLfNUPswboYyx+SALhaLuXqz7zqfzX4ezMgxeS/h0gRlUJ7nf2/yJ5qie/kZaizjw==} dependencies: @@ -5372,14 +5375,14 @@ packages: resolution: {integrity: sha512-adPIkvL4q37dGTWCpSzV8ETLdkxsg7BAgzeT9pustZJjRIZqAHGUAm7krDtGT7jbV4dU0Zw0VpUrnmyfxIkOKQ==} dev: true - /@storybook/channels@7.0.1: - resolution: {integrity: sha512-Hm/vrCkpxvZRIIjs9vwLDvK4TVINj8E3xRBPq29qUs/kdpf3f8+NiYd/gRXN+JNH7Ov1NC4L5khlR1rXh5AUNQ==} - dev: true - /@storybook/channels@7.0.2: resolution: {integrity: sha512-qkI8mFy9c8mxN2f01etayKhCaauL6RAsxRzbX1/pKj6UqhHWqqUbtHwymrv4hG5qDYjV1e9pd7ae5eNF8Kui0g==} dev: true + /@storybook/channels@7.1.0-alpha.0: + resolution: {integrity: sha512-9FGJaJU7FdrsF4O8JmvJe/8L3VoriNFssMGH+zkl4Amk0lpEQ/zB9FnHTaALV2hP5DUdtHhyO81u3YXQrmgOUQ==} + dev: true + /@storybook/cli@7.0.2: resolution: {integrity: sha512-xMM2QdXNGg09wuXzAGroKrbsnaHSFPmtmefX1XGALhHuKVwxOoC2apWMpek6gY/9vh5EIRTog2Dvfd2BzNrT6Q==} hasBin: true @@ -5435,14 +5438,14 @@ packages: '@storybook/global': 5.0.0 dev: true - /@storybook/client-logger@7.0.1: - resolution: {integrity: sha512-yR8tGywLSTY/cmCae9yCmo6CzU+F4QAzA2RqgKRHpM44LHjsD1rG3wQxnBa5cZs7/zopMKYK1Bt7xhp/dSS56g==} + /@storybook/client-logger@7.0.2: + resolution: {integrity: sha512-rv7W2BhzIQHbFpUM5/CP/acS6T5lTmaxT0MbZ9n+9h++9QQU/cFOdkZgSUbLVAb1AeUGoLsk0HYzcqPpV35Xsw==} dependencies: '@storybook/global': 5.0.0 dev: true - /@storybook/client-logger@7.0.2: - resolution: {integrity: sha512-rv7W2BhzIQHbFpUM5/CP/acS6T5lTmaxT0MbZ9n+9h++9QQU/cFOdkZgSUbLVAb1AeUGoLsk0HYzcqPpV35Xsw==} + /@storybook/client-logger@7.1.0-alpha.0: + resolution: {integrity: sha512-NFIFFeKgZxSXvDnd0nTG1MehTw1j7tMCg8rbK4lJ/R5waQkygJ/9QDVXZlZjC9+FU/Gj175iSIf5LNCHQjylAQ==} dependencies: '@storybook/global': 5.0.0 dev: true @@ -5522,14 +5525,14 @@ packages: resolution: {integrity: sha512-pxzNmgEI1p90bHyAYABHDDtB2XM5pffq6CqIHboK6aSCux7Cdc16IjOYq6BJIhCKaaI+qQHaFLR4JfaFAsxwQQ==} dev: true - /@storybook/core-events@7.0.1: - resolution: {integrity: sha512-Q3wBHoahO5d7Zm0S0zvXIqnG/fuf02RNMjTiAMYG55MlPZEmu3ll4VzDtroeku4Zwo9xbHGxgVQH5LFScQncEQ==} - dev: true - /@storybook/core-events@7.0.2: resolution: {integrity: sha512-1DCHCwHRL3+rlvnVVc/BCfReP31XaT2WYgcLeGTmkX1E43Po1MkgcM7PnJPSaa9POvSqZ+6YLZv5Bs1SXbufow==} dev: true + /@storybook/core-events@7.1.0-alpha.0: + resolution: {integrity: sha512-GckKwXy5rcbeLym9yvwziT3KiryLr3uvh2hF9F3Tde1iKvi822Acytg8viVQIUahzdBvlnaRZIIBxhAFPIAu5g==} + dev: true + /@storybook/core-server@7.0.2: resolution: {integrity: sha512-7ipGws8YffVaiwkc+D0+MfZc/Sy52aKenG3nDJdK4Ajmp5LPAlelb/sxIhfRvoHDbDsy2FQNz++Mb55Yh03KkA==} dependencies: @@ -5657,16 +5660,6 @@ packages: '@storybook/preview-api': 7.0.0 dev: true - /@storybook/instrumenter@7.0.1: - resolution: {integrity: sha512-QeM4Jkib9/2KwPiw1dPlvwJ6ld9AZCweeKAH+uQg2BiU4qPINg6SGFoa2SwLxviZZzsMjAU/XvUei1BW2QLaow==} - dependencies: - '@storybook/channels': 7.0.1 - '@storybook/client-logger': 7.0.1 - '@storybook/core-events': 7.0.1 - '@storybook/global': 5.0.0 - '@storybook/preview-api': 7.0.1 - dev: true - /@storybook/instrumenter@7.0.2: resolution: {integrity: sha512-zr9/fuaYtGVUtcL8XgjA4Iq5jtzdcqQyOSH4XLXtz6JtSad3lkRagbJo2Vzbw7dO/4vzjfTMxEzvWjUuPxLOhA==} dependencies: @@ -5677,6 +5670,16 @@ packages: '@storybook/preview-api': 7.0.2 dev: true + /@storybook/instrumenter@7.1.0-alpha.0: + resolution: {integrity: sha512-ySi6SXRAKoY202QZaUQqsdBXV3YhlcIfIkfdrcOOa8+abwxQABrZJeRQi41gGWIiqXDWTfx2BZDlaRU39Kyw5Q==} + dependencies: + '@storybook/channels': 7.1.0-alpha.0 + '@storybook/client-logger': 7.1.0-alpha.0 + '@storybook/core-events': 7.1.0-alpha.0 + '@storybook/global': 5.0.0 + '@storybook/preview-api': 7.1.0-alpha.0 + dev: true + /@storybook/jest@0.1.0: resolution: {integrity: sha512-TmybnEXlv5Fu2/Hq4nRj7alS9mw4CasLR0RDwaAzS+Vpvu1TC4+j9rh+b1BHtmWebbJh0JMT6mgzPqOyJdgtQA==} dependencies: @@ -5752,26 +5755,6 @@ packages: util-deprecate: 1.0.2 dev: true - /@storybook/preview-api@7.0.1: - resolution: {integrity: sha512-7MIDCND5plj1RSuCUnRBlJGkH4lBr3j8fIqqmzkoBaw7sMggtWlgGg6lF9j/OOzirpQeDKf4pjKhF0DdL6UAWw==} - dependencies: - '@storybook/channel-postmessage': 7.0.1 - '@storybook/channels': 7.0.1 - '@storybook/client-logger': 7.0.1 - '@storybook/core-events': 7.0.1 - '@storybook/csf': 0.1.0 - '@storybook/global': 5.0.0 - '@storybook/types': 7.0.1 - '@types/qs': 6.9.7 - dequal: 2.0.3 - lodash: 4.17.21 - memoizerific: 1.11.3 - qs: 6.11.1 - synchronous-promise: 2.0.17 - ts-dedent: 2.2.0 - util-deprecate: 1.0.2 - dev: true - /@storybook/preview-api@7.0.2: resolution: {integrity: sha512-QAlJM/r92+dQe/kB7MTTR9b/1mt9UJjxNjazGdEWipA/nw23kOF3o/hBcvKwBYkit4zGYsX70H+vuzW8hCo/lA==} dependencies: @@ -5792,6 +5775,26 @@ packages: util-deprecate: 1.0.2 dev: true + /@storybook/preview-api@7.1.0-alpha.0: + resolution: {integrity: sha512-wZCEFCpxqjjSGdJKtVYd/ck/Fg/dsU3cPEbjPhUyLQqKnUA/MsR8vVzDtkmugWwupviChfjARvwLdNN8u45OXw==} + dependencies: + '@storybook/channel-postmessage': 7.1.0-alpha.0 + '@storybook/channels': 7.1.0-alpha.0 + '@storybook/client-logger': 7.1.0-alpha.0 + '@storybook/core-events': 7.1.0-alpha.0 + '@storybook/csf': 0.1.0 + '@storybook/global': 5.0.0 + '@storybook/types': 7.1.0-alpha.0 + '@types/qs': 6.9.7 + dequal: 2.0.3 + lodash: 4.17.21 + memoizerific: 1.11.3 + qs: 6.11.1 + synchronous-promise: 2.0.17 + ts-dedent: 2.2.0 + util-deprecate: 1.0.2 + dev: true + /@storybook/preview@7.0.2: resolution: {integrity: sha512-U7MZkDT9bBq7HggLAXmTO9gI4eqhYs26fZS0L6iTE/PCX4Wg2TJBJSq2X8jhDXRqJFOt8SrQ756+V5Vtwrh4Og==} dev: true @@ -5920,8 +5923,8 @@ packages: /@storybook/testing-library@0.0.14-next.1: resolution: {integrity: sha512-1CAl40IKIhcPaCC4pYCG0b9IiYNymktfV/jTrX7ctquRY3akaN7f4A1SippVHosksft0M+rQTFE0ccfWW581fw==} dependencies: - '@storybook/client-logger': 7.0.1 - '@storybook/instrumenter': 7.0.1 + '@storybook/client-logger': 7.1.0-alpha.0 + '@storybook/instrumenter': 7.1.0-alpha.0 '@testing-library/dom': 8.20.0 '@testing-library/user-event': 13.5.0(@testing-library/dom@8.20.0) ts-dedent: 2.2.0 @@ -5950,19 +5953,19 @@ packages: file-system-cache: 2.0.2 dev: true - /@storybook/types@7.0.1: - resolution: {integrity: sha512-Tpmxv0cZzujB6fktjf5hHZk9nBMQ5dA+dez3avGfow3BkSuqSZgNZ3NF5Bb6sDR/ccO2hWh+zttZqfS4SngVvQ==} + /@storybook/types@7.0.2: + resolution: {integrity: sha512-0OCt/kAexa8MCcljxA+yZxGMn0n2U2Ync0KxotItqNbKBKVkaLQUls0+IXTWSCpC/QJvNZ049jxUHHanNi/96w==} dependencies: - '@storybook/channels': 7.0.1 + '@storybook/channels': 7.0.2 '@types/babel__core': 7.20.0 '@types/express': 4.17.17 file-system-cache: 2.0.2 dev: true - /@storybook/types@7.0.2: - resolution: {integrity: sha512-0OCt/kAexa8MCcljxA+yZxGMn0n2U2Ync0KxotItqNbKBKVkaLQUls0+IXTWSCpC/QJvNZ049jxUHHanNi/96w==} + /@storybook/types@7.1.0-alpha.0: + resolution: {integrity: sha512-84VOCC/NEH6B5puWgK9VGjigmAfTU1iJJmly+OaF2lJv6LeHRb4/UOPSeg8fA8uHh3E32jSRKA2B8sUnxCCQrg==} dependencies: - '@storybook/channels': 7.0.2 + '@storybook/channels': 7.1.0-alpha.0 '@types/babel__core': 7.20.0 '@types/express': 4.17.17 file-system-cache: 2.0.2 @@ -19694,6 +19697,10 @@ packages: - terser dev: true + /vite-plugin-turbosnap@1.0.1: + resolution: {integrity: sha512-isVvISdXZyflIsXYrpTMBnyrtZq92ftohL8/xHi1H0kUwXIFDegqedX1kCKIQ04tjUkphB0cFbGzuvOGVwVTnQ==} + dev: true + /vite@4.2.1(@types/node@18.15.11)(sass@1.60.0): resolution: {integrity: sha512-7MKhqdy0ISo4wnvwtqZkjke6XN4taqQ2TBaTccLIpOKv7Vp2h4Y+NpmWCnGDeSvvn45KxvWgGyb0MkHvY1vgbg==} engines: {node: ^14.18.0 || >=16.0.0}