Merge branch 'refs/heads/main' into HEAD

.github/workflows/PullRequestAndExportAirtable.yml

@@ -9,10 +9,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup NodeJS
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
 
       - name: Create .env file
         run: |
@@ -26,6 +26,9 @@ jobs:
       - run: yarn export:airtable
       - run: yarn build
 
+      - name: Test
+        run: yarn test
+
       - name: craete pull request
         uses: peter-evans/create-pull-request@v3
         with:

.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@v2
+      - uses: actions/checkout@v3
       - name: delete branch
         run: git push origin :release-candidate

.github/workflows/publishRelease.yml

@@ -13,11 +13,11 @@ jobs:
       CHANGELOG_PATH: /tmp/CHANGELOG.md
       IS_PRERELEASE: ${{ contains(github.event.issue.labels.*.name, 'prerelease') }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: release-candidate
           fetch-depth: 0
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 14
           registry-url: "https://registry.npmjs.org"

.github/workflows/startRelease.yml

@@ -23,10 +23,10 @@ jobs:
       IS_PRERELEASE: ${{ github.event.inputs.mode == 'prerelease' }}
       NO_BRANCH_PREPARATION: ${{ github.event.inputs.branch_preparation == 'manual' }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 14
       - name: git config

.github/workflows/test.yml

@@ -11,12 +11,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Setup NodeJS 14
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: 14
 

dict/prh-idiomatic-usage.yml

@@ -175,6 +175,22 @@ rules:
     specs:
       - from: 出来る
         to: できる
+  - expected: のなかで
+    pattern:
+      - の中で
+    prh: >-
+      平仮名にしたほうが読みやすい漢字は平仮名にする
+      https://smarthr.design/products/writing/idiomatic-usage/usage/
+  - expected: CSVファイル
+    pattern:
+      - csvファイル
+    prh: 拡張子を付けず「CSVファイル」「Excelファイル」と表記とする
+  - expected: PDFファイル
+    pattern:
+      - pdfファイル
+  - expected: ZIPファイル
+    pattern:
+      - zipファイル
   - expected: あとで
     pattern:
       - /(?<![始了直])後で/
@@ -255,6 +271,55 @@ rules:
   - expected: '??'
     pattern:
       - ？？
+  - expected: ごと$1
+    pattern:
+      - /毎([にので])/
+    prh: 平仮名にしたほうが読みやすい漢字は平仮名にする
+    specs:
+      - from: 口座毎に
+        to: 口座ごとに
+      - from: 項目毎の
+        to: 項目ごとの
+      - from: フォーム毎で
+        to: フォームごとで
+  - expected: ころ
+    pattern:
+      - 頃
+    prh: 平仮名にしたほうが読みやすい漢字は平仮名にする
+    specs:
+      - from: 頃に送信されます
+        to: ころに送信されます
+  - expected: 問い合わせ
+    pattern:
+      - 問合せ
+    prh: 送りがなは基本的につける
+  - expected: ひな形
+    pattern:
+      - 雛形
+  - expected: 紐づ$1
+    pattern:
+      - /紐付([いかきけく])/
+    specs:
+      - from: 紐付いて
+        to: 紐づいて
+      - from: 紐付かない
+        to: 紐づかない
+      - from: 紐付きをhoge
+        to: 紐づきをhoge
+      - from: 紐付けて
+        to: 紐づけて
+      - from: 紐付くhoge
+        to: 紐づくhoge
+  - expected: 見積もり
+    pattern:
+      - 見積り
+    prh: 送りがなは基本的につける
+  - expected: よろしく
+    pattern:
+      - 宜しく
+    prh: >-
+      平仮名にしたほうが読みやすい漢字は平仮名にする
+      https://smarthr.design/products/writing/idiomatic-usage/usage/
   - expected: ⓪
     pattern:
       - /[🄋⓿🄌]/

package.json

@@ -33,7 +33,7 @@
     "@textlint/types": "^12.1.0",
     "@types/js-yaml": "^4.0.5",
     "@types/node": "^15.14.9",
-    "airtable": "^0.11.1",
+    "airtable": "^0.11.2",
     "dotenv": "^16.0.0",
     "fs": "^0.0.1-security",
     "husky": "^7.0.4",
@@ -42,7 +42,7 @@
     "standard-version": "^9.3.2",
     "textlint-scripts": "^12.1.0",
     "textlint-tester": "^12.1.0",
-    "ts-node": "^10.5.0",
+    "ts-node": "^10.7.0",
     "typescript": "^4.5.5"
   },
   "dependencies": {

yarn.lock

@@ -1564,16 +1564,16 @@ add-stream@^1.0.0:
   resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
   integrity sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=
 
-airtable@^0.11.1:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/airtable/-/airtable-0.11.1.tgz#2fda51da04f5e4be7092351ea7be3cfdcf308347"
-  integrity sha512-33zBuUDhLl+FWWAFxFjS1a+vJr/b+UK//EV943nuiimChWph6YykQjYPmu/GucQ30g7mgaqq+98uPD4rfDHOgg==
+airtable@^0.11.2:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/airtable/-/airtable-0.11.2.tgz#509ee68bb83b6f04d1f2cf8c3699ae742194ce83"
+  integrity sha512-2kYULLdnqa7ZpaWXXfLTNKMzU+BTUBOZ6TPGahpH3KfJB9Sl18ih0v0zV1PIvpDxTWq+u76jGMAya9NDVZJT/Q==
   dependencies:
     "@types/node" ">=8.0.0 <15"
     abort-controller "^3.0.0"
     abortcontroller-polyfill "^1.4.0"
     lodash "^4.17.21"
-    node-fetch "^2.6.1"
+    node-fetch "^2.6.7"
 
 ajv@^6.12.6:
   version "6.12.6"
@@ -3951,10 +3951,10 @@ neo-async@^2.6.0:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-node-fetch@^2.6.1:
-  version "2.6.6"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89"
-  integrity sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==
+node-fetch@^2.6.7:
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
+  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
   dependencies:
     whatwg-url "^5.0.0"
 
@@ -5474,10 +5474,10 @@ ts-node@^10.4.0:
     make-error "^1.1.1"
     yn "3.1.1"
 
-ts-node@^10.5.0:
-  version "10.5.0"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.5.0.tgz#618bef5854c1fbbedf5e31465cbb224a1d524ef9"
-  integrity sha512-6kEJKwVxAJ35W4akuiysfKwKmjkbYxwQMTBaAxo9KKAx/Yd26mPUyhGz3ji+EsJoAgrLqVsYHNuuYwQe22lbtw==
+ts-node@^10.7.0:
+  version "10.7.0"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.7.0.tgz#35d503d0fab3e2baa672a0e94f4b40653c2463f5"
+  integrity sha512-TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A==
   dependencies:
     "@cspotcode/source-map-support" "0.7.0"
     "@tsconfig/node10" "^1.0.7"