diff --git a/.circleci/config.yml b/.circleci/config.yml index 20743cf2ad..70d52bd159 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 index da3591f530..a425199cb2 100644 --- 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 index ade2dc7742..aaefda370d 100644 --- 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 index 4898adb17c..ffa876fa3e 100644 --- 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/CONTRIBUTING.md b/CONTRIBUTING.md index ddbb24cc0e..230fc08228 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,13 +9,15 @@ 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. @@ -23,7 +25,7 @@ $ pnpm test 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 index f94a6d5c18..6fdd3259d0 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "commitmsg": "commitlint -e $GIT_PARAMS", "prepare": "husky" }, + "packageManager": "pnpm@8.15.8+sha256.691fe176eea9a8a80df20e4976f3dfb44a04841ceb885638fe2a26174f81e65e", "pnpm": { "overrides": { "@babel/helper-compilation-targets": "^7.23.6",