Merge branch 'refs/heads/master' into HEAD

kufu · May 21, 2024 · 1151b4f · 1151b4f
2 parents 68de81c + 58609b6
commit 1151b4f
Show file tree

Hide file tree

Showing 39 changed files with 11,743 additions and 9,276 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,19 +3,19 @@ version: 2.1
 executors:
   node-maintenance:
     docker:
-      - image: cimg/node:22.1.0
+      - image: cimg/node:22.2.0
         auth:
           username: smarthrinc
           password: $DOCKER_HUB_ACCESS_TOKEN
   node-active-lts:
     docker:
-      - image: cimg/node:22.1.0
+      - image: cimg/node:22.2.0
         auth:
           username: smarthrinc
           password: $DOCKER_HUB_ACCESS_TOKEN
   node-active-lts-browsers:
     docker:
-      - image: cimg/node:22.1.0-browsers
+      - image: cimg/node:22.2.0-browsers
         auth:
           username: smarthrinc
           password: $DOCKER_HUB_ACCESS_TOKEN
@@ -29,7 +29,10 @@ commands:
             - dependencies-test-{{ checksum "package.json" }}-{{ checksum "pnpm-lock.yaml" }}
             # fallback to using the latest cache if no exact match is found
             - modules-cache-
-      - run: pnpm install
+      - run: |
+          sudo corepack enable
+          sudo corepack prepare
+          pnpm ui install
       - save_cache:
           paths:
             - node_modules
@@ -44,16 +47,7 @@ commands:
       - run: pnpm ui test:build-assets
   run-a11y-test:
     steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - pnpm-packages-reg-{{ checksum "pnpm-lock.yaml" }}
-      - run: pnpm ui install
       - run: pnpm ui exec playwright install
-      - save_cache:
-          paths:
-            - ~/.cache/pnpm
-          key: pnpm-packages-reg-{{ checksum "pnpm-lock.yaml" }}
       - run:
           command: pnpm ui build-storybook
       - run:
@@ -103,6 +97,7 @@ jobs:
     working_directory: ~/repo
     resource_class: medium+
     steps:
+      - setup-for-test
       - install-noto-sans-cjk-jp
       - run-a11y-test
   chromatic-deployment:

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -14,16 +14,14 @@ jobs:
         browser: [chrome]
     steps:
       - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 8
       - uses: actions/setup-node@v4
         with:
           node-version: 20
-          cache: 'pnpm'
       - name: run
         run: |
-          pnpm install
+          corepack enable
+          corepack prepare
+          pnpm ui install
           pnpm ui e2e
         env:
           TESTCAFE_BROWSER: ${{ matrix.browser }}
diff --git a/.github/workflows/publishRelease.yml b/.github/workflows/publishRelease.yml
@@ -17,9 +17,6 @@ jobs:
         with:
           ref: release-candidate
           fetch-depth: 0
-      - uses: pnpm/action-setup@v3
-        with:
-          version: 8
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.node-version'
@@ -28,7 +25,11 @@ jobs:
         run: |
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git config user.name "github-actions[bot]"
-      - run: pnpm install
+      - name: pnpm install
+        run: |
+          corepack enable
+          corepack prepare
+          pnpm ui install
       - run: pnpm ui release
         if: ${{ env.IS_PRERELEASE == 'false' }}
       - run: pnpm ui release --prerelease

diff --git a/.github/workflows/startRelease.yml b/.github/workflows/startRelease.yml
@@ -39,7 +39,7 @@ jobs:
           BASE_TAG=v$(cat ./packages/smarthr-ui/package.json | grep "\"version\"" | cut -d "\"" -f 4)
           git checkout $BASE_TAG
           git merge --no-edit ${{ github.ref }}
-      - run: pnpm install
+      - run: pnpm ui install
       - name: release dry run
         if: ${{ env.IS_PRERELEASE == 'false' }}
         run: pnpm ui release:dryrun > ${{ env.RESULT_PATH }}

diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-20.13.0
+20.13.1
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -9,21 +9,23 @@ Thank you for reading this!
 We use `pnpm` for the package manager.
 
 ```sh
-$ pnpm
+$ corepack enable
+$ corepack prepare
+$ pnpm install
 ```
 
 ## Test
 
 ```sh
-$ pnpm test
+$ pnpm ui test
 ```
 
 `smarthr-ui` uses Jest's snapshot testing.
 
 If the test results are what you expect, you can update the snapshot with the following command.
 
 ```sh
-$ pnpm test:update-snapshot
+$ pnpm ui test:update-snapshot
 ```
 
 ## Commit

diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "@commitlint/cli": "^19.3.0",
     "@commitlint/config-conventional": "^19.2.2",
     "eslint": "^8.57.0",
-    "eslint-config-smarthr": "^6.30.0",
+    "eslint-config-smarthr": "^6.30.1",
     "eslint-plugin-storybook": "^0.8.0",
     "husky": "^9.0.11",
     "lint-staged": "^15.2.2",
@@ -27,6 +27,7 @@
     "commitmsg": "commitlint -e $GIT_PARAMS",
     "prepare": "husky"
   },
+  "packageManager": "[email protected]",
   "pnpm": {
     "overrides": {
       "@babel/helper-compilation-targets": "^7.23.6",

diff --git a/packages/smarthr-ui/e2e/components/ComboBox/MultiComboBox.test.ts b/packages/smarthr-ui/e2e/components/ComboBox/MultiComboBox.test.ts
@@ -2,7 +2,7 @@ import { Selector } from 'testcafe'
 
 fixture('MultiComboBox')
   .page(
-    'http://localhost:6006/iframe.html?args=&id=forms（フォーム）-combobox--multi&viewMode=story',
+    'http://localhost:6006/iframe.html?args=&id=forms（フォーム）-multicombobox--multi-combobox&viewMode=story',
   )
   .beforeEach(async (t) => {
     await t.maximizeWindow()

diff --git a/packages/smarthr-ui/e2e/components/ComboBox/SingleComboBox.test.ts b/packages/smarthr-ui/e2e/components/ComboBox/SingleComboBox.test.ts
@@ -2,7 +2,7 @@ import { Selector } from 'testcafe'
 
 fixture('SingleComboBox')
   .page(
-    'http://localhost:6006/iframe.html?args=&id=forms（フォーム）-combobox--single&viewMode=story',
+    'http://localhost:6006/iframe.html?args=&id=forms（フォーム）-singlecombobox--single-combobox&viewMode=story',
   )
   .beforeEach(async (t) => {
     await t.maximizeWindow()

diff --git a/packages/smarthr-ui/package.json b/packages/smarthr-ui/package.json
@@ -40,15 +40,15 @@
     "@storybook/react-webpack5": "^8.0.10",
     "@storybook/source-loader": "^8.0.10",
     "@storybook/test": "^8.0.10",
-    "@storybook/test-runner": "^0.18.0",
+    "@storybook/test-runner": "^0.18.1",
     "@storybook/theming": "^8.0.10",
-    "@swc/core": "^1.5.5",
+    "@swc/core": "^1.5.7",
     "@swc/jest": "^0.2.36",
     "@testing-library/react": "^15.0.7",
     "@types/jest": "^29.5.12",
     "@types/lodash.merge": "^4.6.9",
     "@types/lodash.range": "^3.2.9",
-    "@types/node": "^20.12.11",
+    "@types/node": "^20.12.12",
     "@types/react": "^18.3.2",
     "@types/react-dom": "^18.3.0",
     "@types/react-test-renderer": "^17.0.9",
@@ -59,7 +59,7 @@
     "babel-loader": "^9.1.3",
     "babel-plugin-polyfill-corejs2": "^0.4.11",
     "babel-plugin-polyfill-regenerator": "^0.6.2",
-    "chromatic": "^11.3.2",
+    "chromatic": "^11.3.5",
     "ecma-version-validator-webpack-plugin": "^1.2.1",
     "fs-extra": "^11.2.0",
     "glob": "10.3.15",
@@ -73,7 +73,7 @@
     "postcss": "^8.4.38",
     "postcss-styled-syntax": "^0.6.4",
     "postcss-syntax": "^0.36.2",
-    "puppeteer": "^22.8.0",
+    "puppeteer": "^22.8.2",
     "react": "^18.3.1",
     "react-docgen-typescript": "^2.2.2",
     "react-dom": "^18.3.1",

diff --git a/packages/smarthr-ui/src/components/CheckBox/CheckBox.stories.tsx b/packages/smarthr-ui/src/components/CheckBox/CheckBox.stories.tsx
@@ -86,7 +86,13 @@ export const All: StoryFn = () => {
           </li>
 
           <li>
-            <CheckBox name="mixed_error" mixed error onChange={handleChange}>
+            <CheckBox
+              name="mixed_error"
+              checked={checkedName.includes('mixed_error')}
+              mixed
+              error
+              onChange={handleChange}
+            >
               CheckBox / mixed / error
             </CheckBox>
           </li>