From 86a10e0e10783b37bbba3754ae5c1497220d94e4 Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Fri, 17 Nov 2023 06:56:33 -0700 Subject: [PATCH 01/37] changed button color --- src/stories/button.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stories/button.css b/src/stories/button.css index a22e95e..cc690b9 100644 --- a/src/stories/button.css +++ b/src/stories/button.css @@ -9,7 +9,7 @@ } .storybook-button--primary { color: white; - background-color: #affd1e; + background-color: blueviolet; } .storybook-button--secondary { color: #333; From 21a7314cf5975ca92d43263d49ad4553ae53249d Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Fri, 17 Nov 2023 06:59:56 -0700 Subject: [PATCH 02/37] Fix github action to use node 16 --- .github/workflows/chromatic.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index 28ee451..1568f8e 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -8,11 +8,14 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 + - uses: actions/setup-node@v3 + with: + node-version: 16 - name: install run: yarn install --frozen-lockfile - name: Run Chromatic id: run-chromatic-action - uses: chromaui/action-next@v1 + uses: chromaui/action@v1 with: onlyChanged: true traceChanged: true From 247ebb9e641182bc35fce201fb7d09845d536636 Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Mon, 20 Nov 2023 15:57:27 -0700 Subject: [PATCH 03/37] Update color and add skip --- .github/workflows/chromatic.yml | 1 + src/stories/button.css | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index 1568f8e..8982805 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -23,6 +23,7 @@ jobs: exitZeroOnChanges: true exitOnceUploaded: true autoAcceptChanges: "main" + skip: "test-chromatic" env: CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }} STORYBOOK_GITHUB_SHA: ${{ github.event.pull_request.head.sha }} diff --git a/src/stories/button.css b/src/stories/button.css index cc690b9..af23b48 100644 --- a/src/stories/button.css +++ b/src/stories/button.css @@ -9,7 +9,7 @@ } .storybook-button--primary { color: white; - background-color: blueviolet; + background-color: blue; } .storybook-button--secondary { color: #333; From ac878108839f417b620cad808e7662a1fe03dc32 Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Wed, 22 Nov 2023 09:28:16 -0700 Subject: [PATCH 04/37] Update to canary version --- .github/workflows/chromatic.yml | 30 ++++++++++++++++-------------- package.json | 1 + yarn.lock | 17 +++++++++++------ 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index 8982805..21ddc29 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -13,17 +13,19 @@ jobs: node-version: 16 - name: install run: yarn install --frozen-lockfile - - name: Run Chromatic - id: run-chromatic-action - uses: chromaui/action@v1 - with: - onlyChanged: true - traceChanged: true - diagnostics: true - exitZeroOnChanges: true - exitOnceUploaded: true - autoAcceptChanges: "main" - skip: "test-chromatic" - env: - CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }} - STORYBOOK_GITHUB_SHA: ${{ github.event.pull_request.head.sha }} + - name: run chromatic + run: npx chromatic --only-changed --trace-changed 'expanded' --exit-zero-on-changes --diagnostics --exit-once-uploaded --auto-accept-changes 'main' + # - name: Run Chromatic + # id: run-chromatic-action + # uses: chromaui/action@v1 + # with: + # onlyChanged: true + # traceChanged: true + # diagnostics: true + # exitZeroOnChanges: true + # exitOnceUploaded: true + # autoAcceptChanges: "main" + # skip: "test-chromatic" + # env: + # CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }} + # STORYBOOK_GITHUB_SHA: ${{ github.event.pull_request.head.sha }} diff --git a/package.json b/package.json index 9e8fb94..f43869c 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "chromatic": "npx chromatic@latest --only-changed --trace-changed 'expanded' --auto-accept-changes main --exit-zero-on-changes --exit-once-uploaded --project-token=b7e18a53b1f3" }, "dependencies": { + "chromatic": "9.0.1--canary.857.6894441504.0", "react": "^18.2.0", "react-dom": "^18.2.0" }, diff --git a/yarn.lock b/yarn.lock index a662661..c6241ba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2817,9 +2817,9 @@ acorn@^8.6.0, acorn@^8.8.0: integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w== acorn@^8.8.2: - version "8.11.0" - resolved "https://registry.npmjs.org/acorn/-/acorn-8.11.0.tgz" - integrity sha512-hNiSyky+cuYVALBrsjB7f9gMN9P4u09JyAiMNMLaVfsmkDJuH84M1T/0pfDX/OJfGWcobd2A7ecXYzygn8wibA== + version "8.11.2" + resolved "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz" + integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w== address@^1.0.1: version "1.2.0" @@ -3756,6 +3756,11 @@ chownr@^2.0.0: resolved "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz" integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== +chromatic@9.0.1--canary.857.6894441504.0: + version "9.0.1--canary.857.6894441504.0" + resolved "https://registry.yarnpkg.com/chromatic/-/chromatic-9.0.1--canary.857.6894441504.0.tgz#6d1e42f06a3dc3f4fa0e085513fd6371b7b68a12" + integrity sha512-nKFILWuRsAOFUSheTNOb1OXM0ZgsQHe4Mk8+T0Ia2l36/YVBlEGCl+6feL86BFJNQHkHtvdX2wCsZ54gSrPajA== + chrome-trace-event@^1.0.2: version "1.0.3" resolved "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz" @@ -9354,9 +9359,9 @@ terser@^4.1.2, terser@^4.6.3: source-map-support "~0.5.12" terser@^5.3.4: - version "5.22.0" - resolved "https://registry.npmjs.org/terser/-/terser-5.22.0.tgz" - integrity sha512-hHZVLgRA2z4NWcN6aS5rQDc+7Dcy58HOf2zbYwmFcQ+ua3h6eEFf5lIDKTzbWwlazPyOZsFQO8V80/IjVNExEw== + version "5.24.0" + resolved "https://registry.npmjs.org/terser/-/terser-5.24.0.tgz" + integrity sha512-ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw== dependencies: "@jridgewell/source-map" "^0.3.3" acorn "^8.8.2" From 6a60b56342ee449eea517eeda0944e36553346b7 Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Wed, 22 Nov 2023 09:29:35 -0700 Subject: [PATCH 05/37] Add token --- .github/workflows/chromatic.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index 21ddc29..cde3c5d 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -15,6 +15,9 @@ jobs: run: yarn install --frozen-lockfile - name: run chromatic run: npx chromatic --only-changed --trace-changed 'expanded' --exit-zero-on-changes --diagnostics --exit-once-uploaded --auto-accept-changes 'main' + env: + CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }} + STORYBOOK_GITHUB_SHA: ${{ github.event.pull_request.head.sha }} # - name: Run Chromatic # id: run-chromatic-action # uses: chromaui/action@v1 From 1ad5b07b695d0b438066325e52be09567dc1552b Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Wed, 22 Nov 2023 09:32:55 -0700 Subject: [PATCH 06/37] Add a debug flag --- .github/workflows/chromatic.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index cde3c5d..6a31683 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -14,7 +14,7 @@ jobs: - name: install run: yarn install --frozen-lockfile - name: run chromatic - run: npx chromatic --only-changed --trace-changed 'expanded' --exit-zero-on-changes --diagnostics --exit-once-uploaded --auto-accept-changes 'main' + run: npx chromatic --only-changed --debug --trace-changed 'expanded' --exit-zero-on-changes --diagnostics --exit-once-uploaded --auto-accept-changes 'main' env: CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }} STORYBOOK_GITHUB_SHA: ${{ github.event.pull_request.head.sha }} From 7ecaf3e5ce28d78a74a27568c872888655f4f895 Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Mon, 27 Nov 2023 07:45:34 -0700 Subject: [PATCH 07/37] Updated to latest canary --- .github/workflows/chromatic.yml | 29 +++++++++++++++++++---------- package.json | 1 + yarn.lock | 5 +++++ 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index 28ee451..6a31683 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -8,18 +8,27 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 + - uses: actions/setup-node@v3 + with: + node-version: 16 - name: install run: yarn install --frozen-lockfile - - name: Run Chromatic - id: run-chromatic-action - uses: chromaui/action-next@v1 - with: - onlyChanged: true - traceChanged: true - diagnostics: true - exitZeroOnChanges: true - exitOnceUploaded: true - autoAcceptChanges: "main" + - name: run chromatic + run: npx chromatic --only-changed --debug --trace-changed 'expanded' --exit-zero-on-changes --diagnostics --exit-once-uploaded --auto-accept-changes 'main' env: CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }} STORYBOOK_GITHUB_SHA: ${{ github.event.pull_request.head.sha }} + # - name: Run Chromatic + # id: run-chromatic-action + # uses: chromaui/action@v1 + # with: + # onlyChanged: true + # traceChanged: true + # diagnostics: true + # exitZeroOnChanges: true + # exitOnceUploaded: true + # autoAcceptChanges: "main" + # skip: "test-chromatic" + # env: + # CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }} + # STORYBOOK_GITHUB_SHA: ${{ github.event.pull_request.head.sha }} diff --git a/package.json b/package.json index 9e8fb94..f43869c 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "chromatic": "npx chromatic@latest --only-changed --trace-changed 'expanded' --auto-accept-changes main --exit-zero-on-changes --exit-once-uploaded --project-token=b7e18a53b1f3" }, "dependencies": { + "chromatic": "9.0.1--canary.857.6894441504.0", "react": "^18.2.0", "react-dom": "^18.2.0" }, diff --git a/yarn.lock b/yarn.lock index a662661..005e327 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3756,6 +3756,11 @@ chownr@^2.0.0: resolved "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz" integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== +chromatic@9.0.1--canary.857.6894441504.0: + version "9.0.1--canary.857.6894441504.0" + resolved "https://registry.yarnpkg.com/chromatic/-/chromatic-9.0.1--canary.857.6894441504.0.tgz#6d1e42f06a3dc3f4fa0e085513fd6371b7b68a12" + integrity sha512-nKFILWuRsAOFUSheTNOb1OXM0ZgsQHe4Mk8+T0Ia2l36/YVBlEGCl+6feL86BFJNQHkHtvdX2wCsZ54gSrPajA== + chrome-trace-event@^1.0.2: version "1.0.3" resolved "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz" From 82d1246bee95ffcc796e6d1e2a51c5da99868334 Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Mon, 27 Nov 2023 08:04:05 -0700 Subject: [PATCH 08/37] Updated to the latest canary --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f43869c..a929430 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "chromatic": "npx chromatic@latest --only-changed --trace-changed 'expanded' --auto-accept-changes main --exit-zero-on-changes --exit-once-uploaded --project-token=b7e18a53b1f3" }, "dependencies": { - "chromatic": "9.0.1--canary.857.6894441504.0", + "chromatic": "9.1.1--canary.857.7006504909.0", "react": "^18.2.0", "react-dom": "^18.2.0" }, diff --git a/yarn.lock b/yarn.lock index 005e327..1071193 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3756,10 +3756,10 @@ chownr@^2.0.0: resolved "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz" integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== -chromatic@9.0.1--canary.857.6894441504.0: - version "9.0.1--canary.857.6894441504.0" - resolved "https://registry.yarnpkg.com/chromatic/-/chromatic-9.0.1--canary.857.6894441504.0.tgz#6d1e42f06a3dc3f4fa0e085513fd6371b7b68a12" - integrity sha512-nKFILWuRsAOFUSheTNOb1OXM0ZgsQHe4Mk8+T0Ia2l36/YVBlEGCl+6feL86BFJNQHkHtvdX2wCsZ54gSrPajA== +chromatic@9.1.1--canary.857.7006504909.0: + version "9.1.1--canary.857.7006504909.0" + resolved "https://registry.yarnpkg.com/chromatic/-/chromatic-9.1.1--canary.857.7006504909.0.tgz#98b4b606cae5def874142febe5d8da9000a7ef83" + integrity sha512-Xl7lJXKoICJ7kBtIBiglkgRTx4HTSpDIJQiHQ9MBhUbDT9OR8THIiwtNKPqZHkuzkn3utweGZYJbV9Oqdz88GA== chrome-trace-event@^1.0.2: version "1.0.3" From db01ab1e1a44506ea9f32cc65e6644dc1a3bdfd5 Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Wed, 29 Nov 2023 11:40:05 -0700 Subject: [PATCH 09/37] Updated css --- src/stories/button.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stories/button.css b/src/stories/button.css index a22e95e..af23b48 100644 --- a/src/stories/button.css +++ b/src/stories/button.css @@ -9,7 +9,7 @@ } .storybook-button--primary { color: white; - background-color: #affd1e; + background-color: blue; } .storybook-button--secondary { color: #333; From 27a5bab9ee110d3f31d53c75866eb78b092f9e27 Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Wed, 29 Nov 2023 11:50:37 -0700 Subject: [PATCH 10/37] change style --- src/stories/button.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stories/button.css b/src/stories/button.css index af23b48..46252d5 100644 --- a/src/stories/button.css +++ b/src/stories/button.css @@ -9,7 +9,7 @@ } .storybook-button--primary { color: white; - background-color: blue; + background-color: magenta; } .storybook-button--secondary { color: #333; From a7a9b1889ea6441303c96708f71e7eac966416d1 Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Wed, 29 Nov 2023 11:55:34 -0700 Subject: [PATCH 11/37] changed to green --- src/stories/button.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stories/button.css b/src/stories/button.css index 46252d5..ef4d213 100644 --- a/src/stories/button.css +++ b/src/stories/button.css @@ -9,7 +9,7 @@ } .storybook-button--primary { color: white; - background-color: magenta; + background-color: green; } .storybook-button--secondary { color: #333; From 26e54119434ca783e8c3560c225a81894ee83e0b Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Wed, 29 Nov 2023 12:18:57 -0700 Subject: [PATCH 12/37] changed to purple --- src/stories/button.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stories/button.css b/src/stories/button.css index ef4d213..03e2cc0 100644 --- a/src/stories/button.css +++ b/src/stories/button.css @@ -9,7 +9,7 @@ } .storybook-button--primary { color: white; - background-color: green; + background-color: purple; } .storybook-button--secondary { color: #333; From df1bd93c27e4c8772f58f1fe0f8e564e972411b5 Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Wed, 29 Nov 2023 12:29:46 -0700 Subject: [PATCH 13/37] updated yaml --- .github/workflows/chromatic.yml | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index 28ee451..a5cfc2d 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -10,16 +10,21 @@ jobs: fetch-depth: 0 - name: install run: yarn install --frozen-lockfile - - name: Run Chromatic - id: run-chromatic-action - uses: chromaui/action-next@v1 - with: - onlyChanged: true - traceChanged: true - diagnostics: true - exitZeroOnChanges: true - exitOnceUploaded: true - autoAcceptChanges: "main" + - name: run chromatic + run: CHROMATIC_INDEX_URL=https://index.staging-chromatic.com npx chromatic --only-changed --debug --trace-changed 'expanded' --exit-zero-on-changes --diagnostics --exit-once-uploaded --auto-accept-changes 'main' env: - CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }} + CHROMATIC_PROJECT_TOKEN: chpt_8adcafffd1b8cdc STORYBOOK_GITHUB_SHA: ${{ github.event.pull_request.head.sha }} + # - name: Run Chromatic + # id: run-chromatic-action + # uses: chromaui/action-next@v1 + # with: + # onlyChanged: true + # traceChanged: true + # diagnostics: true + # exitZeroOnChanges: true + # exitOnceUploaded: true + # autoAcceptChanges: "main" + # env: + # CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }} + # STORYBOOK_GITHUB_SHA: ${{ github.event.pull_request.head.sha }} From c0aeaecf13da59f9501dab7a722c227069efa646 Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Wed, 29 Nov 2023 12:35:00 -0700 Subject: [PATCH 14/37] Update script --- .github/workflows/chromatic.yml | 3 ++- package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index a5cfc2d..e52a81c 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -11,9 +11,10 @@ jobs: - name: install run: yarn install --frozen-lockfile - name: run chromatic - run: CHROMATIC_INDEX_URL=https://index.staging-chromatic.com npx chromatic --only-changed --debug --trace-changed 'expanded' --exit-zero-on-changes --diagnostics --exit-once-uploaded --auto-accept-changes 'main' + run: CHROMATIC_INDEX_URL=https://index.staging-chromatic.com npx chromatic --project-token=chpt_8adcafffd1b8cdc --only-changed --debug --trace-changed 'expanded' --exit-zero-on-changes --diagnostics --exit-once-uploaded --auto-accept-changes 'main' env: CHROMATIC_PROJECT_TOKEN: chpt_8adcafffd1b8cdc + CHROMATIC_INDEX_URL: https://index.staging-chromatic.com STORYBOOK_GITHUB_SHA: ${{ github.event.pull_request.head.sha }} # - name: Run Chromatic # id: run-chromatic-action diff --git a/package.json b/package.json index 9e8fb94..9d84c1f 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "preview": "vite preview", "storybook": "start-storybook -p 6006", "build-storybook": "build-storybook", - "chromatic": "npx chromatic@latest --only-changed --trace-changed 'expanded' --auto-accept-changes main --exit-zero-on-changes --exit-once-uploaded --project-token=b7e18a53b1f3" + "chromatic": "CHROMATIC_INDEX_URL=https://index.staging-chromatic.com npx chromatic --project-token=chpt_8adcafffd1b8cdc --only-changed --debug --trace-changed 'expanded' --exit-zero-on-changes --diagnostics --exit-once-uploaded --auto-accept-changes 'main'" }, "dependencies": { "react": "^18.2.0", From 34a1c403b00273107cae8cd671185954f58c9dc2 Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Wed, 29 Nov 2023 13:00:41 -0700 Subject: [PATCH 15/37] update to violet --- src/stories/button.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stories/button.css b/src/stories/button.css index 03e2cc0..cc690b9 100644 --- a/src/stories/button.css +++ b/src/stories/button.css @@ -9,7 +9,7 @@ } .storybook-button--primary { color: white; - background-color: purple; + background-color: blueviolet; } .storybook-button--secondary { color: #333; From e86b61089170af2ad61023db58afbd717bc6eae6 Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Wed, 29 Nov 2023 13:54:41 -0700 Subject: [PATCH 16/37] add gray --- src/stories/button.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stories/button.css b/src/stories/button.css index cc690b9..695bdea 100644 --- a/src/stories/button.css +++ b/src/stories/button.css @@ -9,7 +9,7 @@ } .storybook-button--primary { color: white; - background-color: blueviolet; + background-color: gray; } .storybook-button--secondary { color: #333; From 69aa77c8deaa301878ea99e8ebe14baecc52818c Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Wed, 29 Nov 2023 15:16:41 -0700 Subject: [PATCH 17/37] add pink --- src/stories/button.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stories/button.css b/src/stories/button.css index 695bdea..5f493b3 100644 --- a/src/stories/button.css +++ b/src/stories/button.css @@ -9,7 +9,7 @@ } .storybook-button--primary { color: white; - background-color: gray; + background-color: pink; } .storybook-button--secondary { color: #333; From 976f646f658aa5cb51f22f5727fdd6c424c3cacb Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Thu, 30 Nov 2023 08:34:14 -0700 Subject: [PATCH 18/37] Changed to green --- src/stories/button.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stories/button.css b/src/stories/button.css index 5f493b3..ef4d213 100644 --- a/src/stories/button.css +++ b/src/stories/button.css @@ -9,7 +9,7 @@ } .storybook-button--primary { color: white; - background-color: pink; + background-color: green; } .storybook-button--secondary { color: #333; From a80312d6245e305682ee6d9ea4d1741145419953 Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Thu, 30 Nov 2023 15:38:27 -0700 Subject: [PATCH 19/37] removed interruptible --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ca11750..d1214ac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,4 +20,3 @@ chromatic_publish: stage: test script: - yarn chromatic - interruptible: true From 6054c685c447eee87e5532162260f507e32de1eb Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Thu, 30 Nov 2023 15:46:46 -0700 Subject: [PATCH 20/37] changed my background color --- src/stories/button.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stories/button.css b/src/stories/button.css index ef4d213..af23b48 100644 --- a/src/stories/button.css +++ b/src/stories/button.css @@ -9,7 +9,7 @@ } .storybook-button--primary { color: white; - background-color: green; + background-color: blue; } .storybook-button--secondary { color: #333; From dffa518316d03aa0f5977b4092887d55551e7507 Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Mon, 4 Dec 2023 17:29:25 -0700 Subject: [PATCH 21/37] Update style --- src/stories/button.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stories/button.css b/src/stories/button.css index af23b48..8e7edee 100644 --- a/src/stories/button.css +++ b/src/stories/button.css @@ -9,7 +9,7 @@ } .storybook-button--primary { color: white; - background-color: blue; + background-color: greenyellow; } .storybook-button--secondary { color: #333; From 1c553090626e5e4a80804d58286e734889cfe05e Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Mon, 4 Dec 2023 18:05:20 -0700 Subject: [PATCH 22/37] add purple --- src/stories/button.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stories/button.css b/src/stories/button.css index 8e7edee..03e2cc0 100644 --- a/src/stories/button.css +++ b/src/stories/button.css @@ -9,7 +9,7 @@ } .storybook-button--primary { color: white; - background-color: greenyellow; + background-color: purple; } .storybook-button--secondary { color: #333; From 714f2b4d4cc88bae49afa3617df7ad3ecfa03d32 Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Mon, 4 Dec 2023 18:25:29 -0700 Subject: [PATCH 23/37] Update to red --- src/stories/button.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stories/button.css b/src/stories/button.css index 03e2cc0..326541c 100644 --- a/src/stories/button.css +++ b/src/stories/button.css @@ -9,7 +9,7 @@ } .storybook-button--primary { color: white; - background-color: purple; + background-color: red; } .storybook-button--secondary { color: #333; From df2cc1c50adf3411c2a7f5904fe35222cbefaff8 Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Mon, 4 Dec 2023 18:41:02 -0700 Subject: [PATCH 24/37] test again --- src/stories/button.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stories/button.css b/src/stories/button.css index 326541c..88bff48 100644 --- a/src/stories/button.css +++ b/src/stories/button.css @@ -9,7 +9,7 @@ } .storybook-button--primary { color: white; - background-color: red; + background-color: yellow; } .storybook-button--secondary { color: #333; From 5eacba96321e656f2f2715c01cced131953e3117 Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Tue, 5 Dec 2023 12:36:50 -0700 Subject: [PATCH 25/37] Update gitlab script --- package.json | 2 +- src/stories/button.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9d84c1f..4653dd8 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "preview": "vite preview", "storybook": "start-storybook -p 6006", "build-storybook": "build-storybook", - "chromatic": "CHROMATIC_INDEX_URL=https://index.staging-chromatic.com npx chromatic --project-token=chpt_8adcafffd1b8cdc --only-changed --debug --trace-changed 'expanded' --exit-zero-on-changes --diagnostics --exit-once-uploaded --auto-accept-changes 'main'" + "chromatic": "npx chromatic --project-token=b7e18a53b1f3 --only-changed --debug --trace-changed 'expanded' --exit-zero-on-changes --diagnostics --exit-once-uploaded --auto-accept-changes 'main'" }, "dependencies": { "react": "^18.2.0", diff --git a/src/stories/button.css b/src/stories/button.css index 88bff48..af23b48 100644 --- a/src/stories/button.css +++ b/src/stories/button.css @@ -9,7 +9,7 @@ } .storybook-button--primary { color: white; - background-color: yellow; + background-color: blue; } .storybook-button--secondary { color: #333; From adcc05ae9599fbd6c3a28c3f431a135c4143f169 Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Tue, 5 Dec 2023 12:42:02 -0700 Subject: [PATCH 26/37] Update color --- src/stories/button.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stories/button.css b/src/stories/button.css index af23b48..6c30c77 100644 --- a/src/stories/button.css +++ b/src/stories/button.css @@ -9,7 +9,7 @@ } .storybook-button--primary { color: white; - background-color: blue; + background-color: paleturquoise; } .storybook-button--secondary { color: #333; From 982d5f2af8c929a5c6154779db8ebf61263af0a9 Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Tue, 5 Dec 2023 13:21:06 -0700 Subject: [PATCH 27/37] Change to violet --- src/stories/button.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stories/button.css b/src/stories/button.css index 6c30c77..4b9f2c3 100644 --- a/src/stories/button.css +++ b/src/stories/button.css @@ -9,7 +9,7 @@ } .storybook-button--primary { color: white; - background-color: paleturquoise; + background-color: violet; } .storybook-button--secondary { color: #333; From e439076972c7ae3e859762d19cd629ad9a24b241 Mon Sep 17 00:00:00 2001 From: Reuben Ellis Date: Thu, 11 Jan 2024 07:59:52 -0700 Subject: [PATCH 28/37] Update test for merge queue --- .storybook/main.cjs | 34 - .storybook/main.ts | 37 + .storybook/{preview.cjs => preview.ts} | 8 +- package.json | 21 +- src/stories/Button.stories.tsx | 47 +- src/stories/Header.stories.tsx | 23 +- src/stories/Page.stories.tsx | 14 +- tsconfig.json | 43 +- tsconfig.node.json | 9 - yarn.lock | 10378 ++++++++--------------- 10 files changed, 3817 insertions(+), 6797 deletions(-) delete mode 100644 .storybook/main.cjs create mode 100644 .storybook/main.ts rename .storybook/{preview.cjs => preview.ts} (51%) delete mode 100644 tsconfig.node.json diff --git a/.storybook/main.cjs b/.storybook/main.cjs deleted file mode 100644 index e64c973..0000000 --- a/.storybook/main.cjs +++ /dev/null @@ -1,34 +0,0 @@ -const { mergeConfig } = require('vite'); -const turbosnap = require('vite-plugin-turbosnap'); - - -module.exports = { - "stories": [ - "../src/**/*.stories.mdx", - "../src/**/*.stories.@(js|jsx|ts|tsx)" - ], - "addons": [ - "@storybook/addon-links", - "@storybook/addon-essentials", - "@storybook/addon-interactions" - ], - "framework": "@storybook/react", - "core": { - "builder": "@storybook/builder-vite" - }, - "features": { - "storyStoreV7": true - }, - async viteFinal(config, { configType }) { - // return the customized config - if (configType === 'PRODUCTION') { - config.plugins.push(turbosnap({ rootDir: config.root })); - } - return mergeConfig(config, { - // customize the Vite config here - resolve: { - alias: { foo: 'bar' }, - }, - }); - }, -} \ No newline at end of file diff --git a/.storybook/main.ts b/.storybook/main.ts new file mode 100644 index 0000000..b6de1c5 --- /dev/null +++ b/.storybook/main.ts @@ -0,0 +1,37 @@ +import type { StorybookConfig } from '@storybook/react-vite'; +const { mergeConfig } = require('vite'); +const turbosnap = require('vite-plugin-turbosnap'); + +const config: StorybookConfig = { + stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'], + + addons: [ + '@storybook/addon-links', + '@storybook/addon-essentials', + '@storybook/addon-interactions', + ], + + framework: { + name: '@storybook/react-vite', + options: {}, + }, + + async viteFinal(config, { configType }) { + // return the customized config + if (configType === 'PRODUCTION') { + config?.plugins?.push(turbosnap({ rootDir: config.root })); + } + return mergeConfig(config, { + // customize the Vite config here + resolve: { + alias: { foo: 'bar' }, + }, + }); + }, + + docs: { + autodocs: true, + }, +}; + +export default config; diff --git a/.storybook/preview.cjs b/.storybook/preview.ts similarity index 51% rename from .storybook/preview.cjs rename to .storybook/preview.ts index 48afd56..d298585 100644 --- a/.storybook/preview.cjs +++ b/.storybook/preview.ts @@ -1,9 +1,11 @@ -export const parameters = { - actions: { argTypesRegex: "^on[A-Z].*" }, +const parameters = { + actions: { argTypesRegex: '^on[A-Z].*' }, controls: { matchers: { color: /(background|color)$/i, date: /Date$/, }, }, -} \ No newline at end of file +}; + +export default parameters; diff --git a/package.json b/package.json index 4653dd8..02a0447 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,8 @@ "dev": "vite", "build": "tsc && vite build", "preview": "vite preview", - "storybook": "start-storybook -p 6006", - "build-storybook": "build-storybook", + "storybook": "storybook dev -p 6006", + "build-storybook": "storybook build", "chromatic": "npx chromatic --project-token=b7e18a53b1f3 --only-changed --debug --trace-changed 'expanded' --exit-zero-on-changes --diagnostics --exit-once-uploaded --auto-accept-changes 'main'" }, "dependencies": { @@ -17,18 +17,19 @@ }, "devDependencies": { "@babel/core": "^7.18.13", - "@storybook/addon-actions": "^6.5.10", - "@storybook/addon-essentials": "^6.5.10", - "@storybook/addon-interactions": "^6.5.10", - "@storybook/addon-links": "^6.5.10", - "@storybook/builder-vite": "^0.2.2", - "@storybook/react": "^6.5.10", - "@storybook/testing-library": "0.0.13", + "@storybook/addon-actions": "^7.6.3", + "@storybook/addon-essentials": "^7.6.3", + "@storybook/addon-interactions": "^7.6.3", + "@storybook/addon-links": "^7.6.3", + "@storybook/react": "^7.6.3", + "@storybook/react-vite": "^7.6.3", + "@storybook/testing-library": "0.2.2", "@types/react": "^18.0.17", "@types/react-dom": "^18.0.6", "@vitejs/plugin-react": "^2.0.1", "babel-loader": "^8.2.5", - "typescript": "^4.6.4", + "storybook": "^7.6.3", + "typescript": "5.0.4", "vite": "^3.0.7", "vite-plugin-turbosnap": "^1.0.1" }, diff --git a/src/stories/Button.stories.tsx b/src/stories/Button.stories.tsx index c331bd4..fb30945 100644 --- a/src/stories/Button.stories.tsx +++ b/src/stories/Button.stories.tsx @@ -1,41 +1,44 @@ -import React from 'react'; -import { ComponentStory, ComponentMeta } from '@storybook/react'; +import type { Meta, StoryObj } from '@storybook/react'; import { Button } from './Button'; // More on default export: https://storybook.js.org/docs/react/writing-stories/introduction#default-export -export default { +const meta = { title: 'Example/Button', component: Button, // More on argTypes: https://storybook.js.org/docs/react/api/argtypes argTypes: { backgroundColor: { control: 'color' }, }, -} as ComponentMeta; +} satisfies Meta; -// More on component templates: https://storybook.js.org/docs/react/writing-stories/introduction#using-args -const Template: ComponentStory = (args) =>