diff --git a/package.json b/package.json index e62ceff..ede675f 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "textlint": "^11.3.1", "textlint-filter-rule-whitelist": "^2.0.0", "textlint-rule-no-todo": "^2.0.1", - "textlint-rule-preset-ja-spacing": "^2.0.1", + "textlint-rule-preset-ja-spacing": "^3.0.0", "textlint-rule-preset-jtf-style": "^2.3.3" } } diff --git a/yarn.lock b/yarn.lock index 3af4452..423d5dd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -30,6 +30,11 @@ esutils "^2.0.2" js-tokens "^4.0.0" +"@textlint/ast-node-types@^15.2.1": + version "15.7.1" + resolved "https://registry.yarnpkg.com/@textlint/ast-node-types/-/ast-node-types-15.7.1.tgz#20f3f9111d735be70831be61ccb3e8d4420a8c71" + integrity sha512-Wii5UgUKFEh9Uv6wbq1zr4/Kf+dtjiUuzPrrXzKp8H+ifkvKNzi23V4Nz+6wVyHQn5T28AFuc8VH8OtzvGYecA== + "@textlint/ast-node-types@^4.0.2", "@textlint/ast-node-types@^4.2.1", "@textlint/ast-node-types@^4.2.4": version "4.2.4" resolved "https://registry.yarnpkg.com/@textlint/ast-node-types/-/ast-node-types-4.2.4.tgz#ae569bd76364040939044d057d5a56284563a7af" @@ -138,6 +143,16 @@ lodash.uniqwith "^4.5.0" to-regex "^3.0.2" +"@textlint/regexp-string-matcher@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@textlint/regexp-string-matcher/-/regexp-string-matcher-2.0.2.tgz#cef4d8353dac624086069e290d9631ca285df34d" + integrity sha512-OXLD9XRxMhd3S0LWuPHpiARQOI7z9tCOs0FsynccW2lmyZzHHFJ9/eR6kuK9xF459Qf+740qI5h+/0cx+NljzA== + dependencies: + escape-string-regexp "^4.0.0" + lodash.sortby "^4.7.0" + lodash.uniq "^4.5.0" + lodash.uniqwith "^4.5.0" + "@textlint/text-to-ast@^3.1.5": version "3.1.5" resolved "https://registry.yarnpkg.com/@textlint/text-to-ast/-/text-to-ast-3.1.5.tgz#927d971712ac24d6056a0a178cc154c177427e4c" @@ -181,6 +196,11 @@ resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== +"@types/unist@^2.0.0": + version "2.0.11" + resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.11.tgz#11af57b127e32487774841f7a4e54eab166d03c4" + integrity sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA== + abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" @@ -412,6 +432,11 @@ boundary@^1.0.1: resolved "https://registry.yarnpkg.com/boundary/-/boundary-1.0.1.tgz#4d67dc2602c0cc16dd9bce7ebf87e948290f5812" integrity sha1-TWfcJgLAzBbdm85+v4fpSCkPWBI= +boundary@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/boundary/-/boundary-2.0.0.tgz#169c8b1f0d44cf2c25938967a328f37e0a4e5efc" + integrity sha512-rJKn5ooC9u8q13IMCrW0RSp31pxBCHE3y9V/tp3TdWSLf8Em3p6Di4NBpfzbJge9YjjFEsD0RtFEjtvHL5VyEA== + boxen@^1.2.1: version "1.3.0" resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b" @@ -1044,6 +1069,11 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + esprima@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" @@ -3497,6 +3527,13 @@ structured-source@^3.0.2: dependencies: boundary "^1.0.1" +structured-source@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/structured-source/-/structured-source-4.0.0.tgz#0c9e59ee43dedd8fc60a63731f60e358102a4948" + integrity sha512-qGzRFNJDjFieQkl/sVOI2dUjHKRyL9dAJi2gCPGJLbJHBIkyOHxjuocpIEfbLioX+qSJpvbYdT49/YCdMznKxA== + dependencies: + boundary "^2.0.0" + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" @@ -3566,62 +3603,93 @@ textlint-rule-helper@^2.0.0, textlint-rule-helper@^2.1.1: structured-source "^3.0.2" unist-util-visit "^1.1.0" -textlint-rule-ja-nakaguro-or-halfwidth-space-between-katakana@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/textlint-rule-ja-nakaguro-or-halfwidth-space-between-katakana/-/textlint-rule-ja-nakaguro-or-halfwidth-space-between-katakana-2.0.1.tgz#ea6f94cb9ced758fb2553dea2e9fe714f31f0aed" - integrity sha1-6m+Uy5ztdY+yVT3qLp/nFPMfCu0= +textlint-rule-helper@^2.2.4: + version "2.5.0" + resolved "https://registry.yarnpkg.com/textlint-rule-helper/-/textlint-rule-helper-2.5.0.tgz#d31ff25a6de66ccb9d1a473a114f5d411f305b90" + integrity sha512-QIbFPtyqLy0g5BJn8mryk9iHzGYicNaFIpLFPiEnb4RXxrEGeQ2W2aARQ9yEXLIAqo+OwK4ndWBAWkbgJEPzTQ== dependencies: - match-index "^1.0.1" - textlint-rule-helper "^2.0.0" + "@textlint/ast-node-types" "^15.2.1" + structured-source "^4.0.0" + unist-util-visit "^2.0.3" -textlint-rule-ja-no-space-around-parentheses@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/textlint-rule-ja-no-space-around-parentheses/-/textlint-rule-ja-no-space-around-parentheses-2.0.1.tgz#556a60e679da9b4c98244c67e7961ac2e540bec1" - integrity sha1-VWpg5nnam0yYJExn55YawuVAvsE= +textlint-rule-ja-nakaguro-or-halfwidth-space-between-katakana@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/textlint-rule-ja-nakaguro-or-halfwidth-space-between-katakana/-/textlint-rule-ja-nakaguro-or-halfwidth-space-between-katakana-3.0.2.tgz#c5ab57236372a0bd043f605adc6588ed90ad270e" + integrity sha512-jeWjD7gwV1zzO/el0fHaLP5Hu9ihvCJp5yjisaKk5s4w7jgoDKcT0aqyP2HFZd99bOrFWea0GecCFvJt6/B8ew== dependencies: - match-index "^1.0.1" - textlint-rule-helper "^2.0.0" + textlint-rule-helper "^2.2.4" -textlint-rule-ja-no-space-between-full-width@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/textlint-rule-ja-no-space-between-full-width/-/textlint-rule-ja-no-space-between-full-width-2.0.1.tgz#921f78561564dd00c8733c230254acd8a55ded67" - integrity sha1-kh94VhVk3QDIczwjAlSs2KVd7Wc= +textlint-rule-ja-no-space-around-parentheses@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/textlint-rule-ja-no-space-around-parentheses/-/textlint-rule-ja-no-space-around-parentheses-3.0.2.tgz#b0225f42e8360327454a2543bb6807d6fd87de46" + integrity sha512-/G1MNHo65kIhFFD+2/0CIZ5HuKa+GXkpHkUr3EREa2HQP52rzP8L6cwYfl+gtlEKZ8iCQMfN0SbPulodALVErw== + dependencies: + textlint-rule-helper "^2.2.4" + +textlint-rule-ja-no-space-around-slash@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/textlint-rule-ja-no-space-around-slash/-/textlint-rule-ja-no-space-around-slash-3.0.2.tgz#3e904d30f932ede7d6bbb5e403d1ff14c56b86d5" + integrity sha512-OdgDIh1AXxv8idIsWI6pN8xwTal+1Zb4033XKqxq7sZ7clk3CNqC5p+BUORUNMA/KeloYUo6o1lSGWPePmD+GQ== + dependencies: + textlint-rule-helper "^2.2.4" + +textlint-rule-ja-no-space-between-full-width@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/textlint-rule-ja-no-space-between-full-width/-/textlint-rule-ja-no-space-between-full-width-3.0.2.tgz#4c13390455283219f55163568d903a084722d028" + integrity sha512-fQ1z01IgrG4HCuZUZ2YZiOXdBA4hQE92gbe+SXXKGjOYD+99mVq0nmqdjjRY3HPSy7IAcqlefKdK9DQ32FH85A== dependencies: - match-index "^1.0.1" regx "^1.0.4" - textlint-rule-helper "^2.0.0" + textlint-rule-helper "^2.2.4" -textlint-rule-ja-space-after-exclamation@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/textlint-rule-ja-space-after-exclamation/-/textlint-rule-ja-space-after-exclamation-2.0.1.tgz#3bc5d48c13269bd9cb1b18eb82e3d4eae44dfba3" - integrity sha1-O8XUjBMmm9nLGxjrguPU6uRN+6M= +textlint-rule-ja-space-after-exclamation@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/textlint-rule-ja-space-after-exclamation/-/textlint-rule-ja-space-after-exclamation-3.0.2.tgz#9b327656cd4dba04b47e04a789f81aae33537ed5" + integrity sha512-EiKXAD43vNVR7sWlCP1+QvMJQYSDpwxXodLOFHKWEYnUJACTm/54YBb8943oMhDbdWXPOVaBzU6XtX5lmBkIrw== dependencies: - match-index "^1.0.1" - textlint-rule-helper "^2.0.0" + textlint-rule-helper "^2.2.4" -textlint-rule-ja-space-after-question@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/textlint-rule-ja-space-after-question/-/textlint-rule-ja-space-after-question-2.0.1.tgz#122260cb97d203768820276b4d09bf5270b11dfa" - integrity sha1-EiJgy5fSA3aIICdrTQm/UnCxHfo= +textlint-rule-ja-space-after-question@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/textlint-rule-ja-space-after-question/-/textlint-rule-ja-space-after-question-3.0.2.tgz#abe0d8b9dcadb976c5d57ff5053166218aa5649e" + integrity sha512-t3aTXVX1ma/3V8E6G2mwkrHoLfu/3bTV4l6p6yySfOdb2wNiahmD08Cy71sD20CHzHxk57Ocx2OXFKKJx+9s2A== dependencies: - match-index "^1.0.1" - textlint-rule-helper "^2.0.0" + textlint-rule-helper "^2.2.4" -textlint-rule-ja-space-around-code@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/textlint-rule-ja-space-around-code/-/textlint-rule-ja-space-around-code-2.0.1.tgz#6b7011dab69488f1eddd445554e7cddeaf1a90d3" - integrity sha1-a3AR2raUiPHt3URVVOfN3q8akNM= +textlint-rule-ja-space-around-code@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/textlint-rule-ja-space-around-code/-/textlint-rule-ja-space-around-code-3.0.2.tgz#32d96ce54c35fe7fbc961276f92e0ca11e792d6c" + integrity sha512-n9q9IBRie6ck3Bkapj+XMUT+lDD8lx0jH7YjIrDTzNRdIE76COF3NycMyhZm/o1i7tyQMggGarCmNaK1xcUKWg== dependencies: - match-index "^1.0.1" - textlint-rule-helper "^2.0.0" + textlint-rule-helper "^2.2.4" -textlint-rule-ja-space-between-half-and-full-width@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/textlint-rule-ja-space-between-half-and-full-width/-/textlint-rule-ja-space-between-half-and-full-width-2.0.1.tgz#a527f83bd833149763e4043965f796c9ec2192ba" - integrity sha1-pSf4O9gzFJdj5AQ5ZfeWyewhkro= +textlint-rule-ja-space-around-emphasis@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/textlint-rule-ja-space-around-emphasis/-/textlint-rule-ja-space-around-emphasis-3.0.2.tgz#9b300abe1d8772b82401b48333a9dea18ef9d1a6" + integrity sha512-Oxut/HrzeamAaCw9Ll1vnYTi5YOKfWwL+dgnVeRKkJkDGIvpPgIer510HaovNHHAv2d3FzEkW3PxPKva4N3WUA== dependencies: - match-index "^1.0.1" - textlint-rule-helper "^2.0.0" + textlint-rule-helper "^2.2.4" + +textlint-rule-ja-space-around-link@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/textlint-rule-ja-space-around-link/-/textlint-rule-ja-space-around-link-3.0.2.tgz#603e8c78bbc2559193cced511b32b24e272521f4" + integrity sha512-lh+7girFo0gt706/0bT3Yyf+QHdAnyaC8ybidbDN+NlDfkFi31qPdiFPrdTlQXwD9FfZelwBGAHVFAz22eoG4g== + dependencies: + textlint-rule-helper "^2.2.4" + +textlint-rule-ja-space-around-strong@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/textlint-rule-ja-space-around-strong/-/textlint-rule-ja-space-around-strong-3.0.2.tgz#09aa9df3677f46c84d1e1d19a520978912091603" + integrity sha512-uKxjaikPv8BuznFS7kPu8eqPGtOTiSpKw2+P8vf+bNbN2FzJq4RHXDjhhj2R5rUmIPPFgAcurDHPZ/A1WE66HQ== + dependencies: + textlint-rule-helper "^2.2.4" + +textlint-rule-ja-space-between-half-and-full-width@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/textlint-rule-ja-space-between-half-and-full-width/-/textlint-rule-ja-space-between-half-and-full-width-3.0.2.tgz#0e0fa5819f11b5c0b24ad55e4888be8f9a198482" + integrity sha512-wdX0fCy7K7IBfxcflnEbkgx0j4mNQ7XRPGP7DFMHxJhqigZBkbrV/+uu2UwoBMxHd5CDJrPdxllrcrfNZoe4Ew== + dependencies: + "@textlint/regexp-string-matcher" "^2.0.2" + textlint-rule-helper "^2.2.4" textlint-rule-no-todo@^2.0.1: version "2.0.1" @@ -3630,18 +3698,22 @@ textlint-rule-no-todo@^2.0.1: dependencies: textlint-rule-helper "^2.0.0" -textlint-rule-preset-ja-spacing@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/textlint-rule-preset-ja-spacing/-/textlint-rule-preset-ja-spacing-2.0.1.tgz#4426e812b2fd525ed4c39d07ede2984ee9bf89d9" - integrity sha1-RCboErL9Ul7Uw50H7eKYTum/idk= - dependencies: - textlint-rule-ja-nakaguro-or-halfwidth-space-between-katakana "^2.0.1" - textlint-rule-ja-no-space-around-parentheses "^2.0.1" - textlint-rule-ja-no-space-between-full-width "^2.0.1" - textlint-rule-ja-space-after-exclamation "^2.0.1" - textlint-rule-ja-space-after-question "^2.0.1" - textlint-rule-ja-space-around-code "^2.0.1" - textlint-rule-ja-space-between-half-and-full-width "^2.0.1" +textlint-rule-preset-ja-spacing@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/textlint-rule-preset-ja-spacing/-/textlint-rule-preset-ja-spacing-3.0.2.tgz#b65246066cc00baeeaed9b903cf7a15534f9d019" + integrity sha512-6uFVfqSBHjexMfTLO2jq/QOczSgYuPRVPgOsTrh60RItQiznk2oHAKL5rLdn0STty3fxqTx+6cFnkjqw4VaEkA== + dependencies: + textlint-rule-ja-nakaguro-or-halfwidth-space-between-katakana "^3.0.2" + textlint-rule-ja-no-space-around-parentheses "^3.0.2" + textlint-rule-ja-no-space-around-slash "^3.0.2" + textlint-rule-ja-no-space-between-full-width "^3.0.2" + textlint-rule-ja-space-after-exclamation "^3.0.2" + textlint-rule-ja-space-after-question "^3.0.2" + textlint-rule-ja-space-around-code "^3.0.2" + textlint-rule-ja-space-around-emphasis "^3.0.2" + textlint-rule-ja-space-around-link "^3.0.2" + textlint-rule-ja-space-around-strong "^3.0.2" + textlint-rule-ja-space-between-half-and-full-width "^3.0.2" textlint-rule-preset-jtf-style@^2.3.3: version "2.3.3" @@ -3860,6 +3932,11 @@ unist-util-is@^3.0.0: resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-3.0.0.tgz#d9e84381c2468e82629e4a5be9d7d05a2dd324cd" integrity sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A== +unist-util-is@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.1.0.tgz#976e5f462a7a5de73d94b706bac1b90671b57797" + integrity sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg== + unist-util-remove-position@^1.0.0: version "1.1.3" resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.3.tgz#d91aa8b89b30cb38bad2924da11072faa64fd972" @@ -3879,6 +3956,14 @@ unist-util-visit-parents@^2.0.0: dependencies: unist-util-is "^3.0.0" +unist-util-visit-parents@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz#65a6ce698f78a6b0f56aa0e88f13801886cdaef6" + integrity sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg== + dependencies: + "@types/unist" "^2.0.0" + unist-util-is "^4.0.0" + unist-util-visit@^1.1.0: version "1.4.1" resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.4.1.tgz#4724aaa8486e6ee6e26d7ff3c8685960d560b1e3" @@ -3886,6 +3971,15 @@ unist-util-visit@^1.1.0: dependencies: unist-util-visit-parents "^2.0.0" +unist-util-visit@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" + integrity sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q== + dependencies: + "@types/unist" "^2.0.0" + unist-util-is "^4.0.0" + unist-util-visit-parents "^3.0.0" + unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"