Merge branch 'refs/heads/main' into HEAD

.github/workflows/PullRequestAndExportAirtable.yml

@@ -9,10 +9,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup NodeJS
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
 
       - name: Create .env file
         run: |
@@ -30,6 +30,6 @@ jobs:
         run: yarn test
 
       - name: craete pull request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           title: 'feat: Airtableの最新ルールを反映'

.github/workflows/closeReleaseCandidate.yml

@@ -10,6 +10,6 @@ jobs:
     if: contains(github.event.issue.labels.*.name, 'release candidate')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: delete branch
         run: git push origin :release-candidate

.github/workflows/publishRelease.yml

@@ -13,13 +13,13 @@ jobs:
       CHANGELOG_PATH: /tmp/CHANGELOG.md
       IS_PRERELEASE: ${{ contains(github.event.issue.labels.*.name, 'prerelease') }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: release-candidate
           fetch-depth: 0
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
           registry-url: "https://registry.npmjs.org"
       - name: git config
         run: |
@@ -60,7 +60,7 @@ jobs:
           git checkout main
           git cherry-pick $NEW_TAG
       - name: craete pull request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
         with:
           title: "chore(release): ${{ env.NEW_TAG }}"
           branch: "merge-release-${{ env.NEW_TAG }}"

.github/workflows/startRelease.yml

@@ -23,12 +23,12 @@ jobs:
       IS_PRERELEASE: ${{ github.event.inputs.mode == 'prerelease' }}
       NO_BRANCH_PREPARATION: ${{ github.event.inputs.branch_preparation == 'manual' }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
       - name: git config
         run: |
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
@@ -63,7 +63,7 @@ jobs:
         if: ${{ env.IS_PRERELEASE == 'true' }}
         run: echo ISSUE_LABELS='release candidate, prerelease' >> $GITHUB_ENV
       - name: create issue
-        uses: peter-evans/create-issue-from-file@v4
+        uses: peter-evans/create-issue-from-file@v5
         with:
           title: Release candidate
           content-filepath: ${{ env.RESULT_PATH }}

.github/workflows/test.yml

@@ -11,14 +11,14 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Setup NodeJS 16
-        uses: actions/setup-node@v3
+      - name: Setup NodeJS 18
+        uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
 
       - name: Install dependencies
         run: yarn install

dict/prh-idiomatic-usage.yml

@@ -17,15 +17,19 @@ rules:
     specs:
       - from: 致します
         to: いたします
-  - expected: いただく
+  - expected: いただ$1
     pattern:
-      - 頂く
+      - /頂([きくけ])/
     prh: >-
       平仮名にしたほうが読みやすい漢字は平仮名にする
       https://smarthr.design/products/contents/writing-style/
     specs:
       - from: 頂く
         to: いただく
+      - from: 頂き
+        to: いただき
+      - from: 頂け
+        to: いただけ
   - expected: および
     pattern:
       - 及び
@@ -314,6 +318,23 @@ rules:
         to: あれば
       - from: 有ろう
         to: あろう
+  - expected: な$1
+    pattern:
+      - /無(い|く|し|か|け)/
+    prh: |-
+      平仮名にしたほうが読みやすい漢字は平仮名にする
+      https://smarthr.design/products/contents/writing-style/
+    specs:
+      - from: 無い
+        to: ない
+      - from: 無く
+        to: なく
+      - from: 無し
+        to: なし
+      - from: 無かった
+        to: なかった
+      - from: 無ければ
+        to: なければ
   - expected: あわせて
     pattern:
       - /(?<![を|と|に|へ|は|も|組み|問い|掛け])(合わせて|併せて)/
@@ -844,7 +865,7 @@ rules:
         to: ポリシー
   - expected: マスターデータ
     pattern:
-      - /(?<!部署|役職|雇用形態|］|スキル|資格|研修|カスタム|システム標準|SmartHR ?|ドメイン)マスタ(?!ー)(データ)?/
+      - /(?<!部署|役職|雇用形態|等級|］|スキル|資格|研修|カスタム|システム標準|SmartHR ?|ドメイン)マスタ(?!ー)(データ)?/
     prh: >-
       マスターデータの総称は「マスターデータ」、総称以外は「◯◯マスター」と表記するhttps://smarthr.design/products/contents/idiomatic-usage/usage/
     specs:
@@ -858,6 +879,8 @@ rules:
         to: 役職マスター
       - from: 雇用形態マスター
         to: 雇用形態マスター
+      - from: 等級マスター
+        to: 等級マスター
       - from: SmartHRマスター
         to: SmartHRマスター
   - expected: マネージャー
@@ -1352,7 +1375,7 @@ rules:
         to: 並び順
   - expected: マスターデータ
     pattern:
-      - /(?<!部署|役職|雇用形態|］|スキル|資格|研修|カスタム|システム標準|SmartHR ?|ドメイン)マスター(?!データ)/
+      - /(?<!部署|役職|雇用形態|等級|］|スキル|資格|研修|カスタム|システム標準|SmartHR ?|ドメイン)マスター(?!データ)/
     prh: >-
       マスターデータの総称は「マスターデータ」、総称以外は「◯◯マスター」と表記するhttps://smarthr.design/products/contents/idiomatic-usage/usage/
     specs:
@@ -1364,6 +1387,8 @@ rules:
         to: 役職マスター
       - from: 雇用形態マスター
         to: 雇用形態マスター
+      - from: 等級マスター
+        to: 等級マスター
       - from: SmartHRマスター
         to: SmartHRマスター
   - expected: 詳し
@@ -1380,7 +1405,7 @@ rules:
         to: 検索フォームに入力
   - expected: にもかかわらず
     pattern:
-      - /(にも関わらず|にも拘らず)/
+      - /(にも関わらず|にも拘らず|にも係わらず)/
     prh: >-
       「にもかかわらず」と平仮名で表記する
       https://smarthr.design/products/contents/idiomatic-usage/usage/
@@ -1424,3 +1449,15 @@ rules:
         to: サンプルデータ
       - from: ダミーテキスト
         to: サンプルテキスト
+  - expected: 文書配付
+    pattern:
+      - 文書配布
+    specs:
+      - from: 文書配布
+        to: 文書配付
+  - expected: シミュレーション
+    pattern:
+      - シュミレーション
+    specs:
+      - from: シュミレーション
+        to: シミュレーション

example/package.json

@@ -7,7 +7,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "textlint": "^13.3.3",
+    "textlint": "^14.0.4",
     "textlint-rule-preset-smarthr": "file:.."
   }
 }

package.json

@@ -28,52 +28,52 @@
     "export:airtable": "ts-node ./scripts/export-airtable-rules.ts"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.8.0",
-    "@commitlint/config-conventional": "^17.8.0",
-    "@textlint/types": "^13.3.3",
-    "@types/js-yaml": "^4.0.8",
-    "@types/node": "^16.18.59",
+    "@commitlint/cli": "^19.2.2",
+    "@commitlint/config-conventional": "^19.2.2",
+    "@textlint/types": "^14.0.4",
+    "@types/js-yaml": "^4.0.9",
+    "@types/node": "^18.19.31",
     "airtable": "^0.12.2",
-    "dotenv": "^16.3.1",
+    "dotenv": "^16.4.5",
     "fs": "^0.0.1-security",
-    "husky": "^8.0.3",
+    "husky": "^9.0.11",
     "js-yaml": "^4.1.0",
-    "prettier": "^3.0.3",
+    "prettier": "^3.2.5",
     "standard-version": "^9.3.2",
-    "textlint-tester": "^13.3.3",
-    "textlint-scripts": "^13.3.3",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.2.2",
-    "textlint": "^13.3.3"
+    "textlint-tester": "^14.0.4",
+    "textlint-scripts": "^14.0.4",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.4.5",
+    "textlint": "^14.0.4"
   },
   "dependencies": {
-    "@textlint-rule/textlint-rule-no-unmatched-pair": "^1.0.9",
-    "@textlint/module-interop": "^13.3.3",
+    "@textlint-rule/textlint-rule-no-unmatched-pair": "^2.0.2",
+    "@textlint/module-interop": "^14.0.4",
     "textlint-rule-ja-hiragana-daimeishi": "^1.0.0",
     "textlint-rule-ja-hiragana-hojodoushi": "^1.1.0",
     "textlint-rule-ja-keishikimeishi": "^1.0.5",
-    "textlint-rule-ja-nakaguro-or-halfwidth-space-between-katakana": "^2.2.0",
+    "textlint-rule-ja-nakaguro-or-halfwidth-space-between-katakana": "^2.4.1",
     "textlint-rule-ja-no-abusage": "^3.0.0",
     "textlint-rule-ja-no-mixed-period": "^3.0.1",
     "textlint-rule-ja-no-redundant-expression": "^4.0.1",
-    "textlint-rule-ja-no-space-around-parentheses": "^2.2.0",
-    "textlint-rule-ja-no-space-between-full-width": "^2.2.0",
-    "textlint-rule-ja-space-after-exclamation": "^2.2.0",
-    "textlint-rule-ja-space-after-question": "^2.2.0",
-    "textlint-rule-ja-space-around-code": "^2.2.0",
-    "textlint-rule-ja-space-between-half-and-full-width": "^2.3.0",
-    "textlint-rule-max-ten": "^4.0.4",
+    "textlint-rule-ja-no-space-around-parentheses": "^2.4.1",
+    "textlint-rule-ja-no-space-between-full-width": "^2.4.1",
+    "textlint-rule-ja-space-after-exclamation": "^2.4.1",
+    "textlint-rule-ja-space-after-question": "^2.4.1",
+    "textlint-rule-ja-space-around-code": "^2.4.1",
+    "textlint-rule-ja-space-between-half-and-full-width": "^2.4.1",
+    "textlint-rule-max-ten": "^5.0.0",
     "textlint-rule-no-double-negative-ja": "^2.0.1",
-    "textlint-rule-no-doubled-conjunction": "^2.0.4",
-    "textlint-rule-no-doubled-conjunctive-particle-ga": "^2.0.5",
-    "textlint-rule-no-doubled-joshi": "^4.1.0",
+    "textlint-rule-no-doubled-conjunction": "^3.0.0",
+    "textlint-rule-no-doubled-conjunctive-particle-ga": "^3.0.0",
+    "textlint-rule-no-doubled-joshi": "^5.1.0",
     "textlint-rule-no-dropping-the-ra": "^3.0.0",
     "textlint-rule-no-hankaku-kana": "^2.0.1",
-    "textlint-rule-no-mix-dearu-desumasu": "^5.0.0",
+    "textlint-rule-no-mix-dearu-desumasu": "^6.0.2",
     "textlint-rule-no-mixed-zenkaku-and-hankaku-alphabet": "^1.0.1",
     "textlint-rule-no-nfd": "^2.0.2",
-    "textlint-rule-prh": "^5.3.0",
-    "textlint-rule-sentence-length": "^4.0.2"
+    "textlint-rule-prh": "^6.0.0",
+    "textlint-rule-sentence-length": "^5.0.0"
   },
   "name": "textlint-rule-preset-smarthr",
   "directories": {

renovate.json

@@ -1,44 +1,24 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "local>kufu/renovate-config"
-  ],
+  "extends": ["local>kufu/renovate-config"],
   "npm": {
+    "postUpdateOptions": ["yarnDedupeHighest"],
     "packageRules": [
       {
         "groupName": "textlint rules",
-        "matchPackageNames": [
-          "@textlint-rule/textlint-rule-no-unmatched-pair"
-        ],
-        "matchPackagePatterns": [
-          "^textlint-rule-*"
-        ],
-        "matchUpdateTypes": [
-          "minor",
-          "patch"
-        ],
+        "matchPackageNames": ["@textlint-rule/textlint-rule-no-unmatched-pair"],
+        "matchPackagePatterns": ["^textlint-rule-*"],
+        "matchUpdateTypes": ["minor", "patch"],
         "automerge": true
       },
       {
         "groupName": "textlint family",
-        "matchPackageNames": [
-          "textlint",
-          "@textlint/types",
-          "textlint-scripts",
-          "textlint-tester",
-          "@textlint/module-interop"
-        ],
-        "matchUpdateTypes": [
-          "minor",
-          "patch"
-        ],
+        "matchPackageNames": ["textlint", "@textlint/types", "textlint-scripts", "textlint-tester", "@textlint/module-interop"],
+        "matchUpdateTypes": ["minor", "patch"],
         "automerge": true
       },
       {
-        "matchUpdateTypes": [
-          "minor",
-          "patch"
-        ],
+        "matchUpdateTypes": ["minor", "patch"],
         "automerge": true
       }
     ]

src/@type/textlint-rule-prh.d.ts

@@ -0,0 +1 @@
+declare module 'textlint-rule-prh'

src/prh-rules.ts

@@ -1,5 +1,5 @@
-const fs = require('fs')
-const prh = require('textlint-rule-prh')
+import fs from 'fs'
+import prh from 'textlint-rule-prh'
 
 const reporter = (context: any) => {
   const idiomaticUsage = fs.readFileSync(__dirname + '/../dict/prh-idiomatic-usage.yml', 'utf-8')