🎉 令和

otofu-square · Apr 1, 2019 · d71d365 · d71d365
1 parent 7e20fbf
commit d71d365
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/src/__tests__/no-heisei-in-literal.test.ts b/src/__tests__/no-heisei-in-literal.test.ts
@@ -5,7 +5,8 @@ const ruleTester = new RuleTester({
   parser: "@typescript-eslint/parser"
 });
 
-const message = "Do not use heisei or 平成 in string literal, use new era.";
+const message =
+  "Do not use 'heisei' or '平成' in string literal, use 'reiwa' or '令和'";
 
 ruleTester.run("no-heisei", noHeiseiInLiteral, {
   valid: [],

diff --git a/src/__tests__/no-heisei-in-variable-name.test.ts b/src/__tests__/no-heisei-in-variable-name.test.ts
@@ -5,7 +5,8 @@ const ruleTester = new RuleTester({
   parser: "@typescript-eslint/parser"
 });
 
-const message = "Do not use heisei or 平成 in variable name, use new era.";
+const message =
+  "Do not use 'heisei' or '平成' in variable name, use 'reiwa' or '令和'";
 
 ruleTester.run("no-heisei", noHeiseiInVariableName, {
   valid: [],

diff --git a/src/index.ts b/src/index.ts
@@ -1,16 +1,19 @@
 import { noHeiseiInLiteral } from "./no-heisei-in-literal";
+import { noHeiseiInVariableName } from "./no-heisei-in-variable-name";
 
 const allRules = {
-  "no-heisei-in-literal": noHeiseiInLiteral
+  "no-heisei-in-literal": noHeiseiInLiteral,
+  "no-heisei-in-variable-name": noHeiseiInVariableName
 };
 
 export default {
   rules: allRules,
   configs: {
     recommended: {
-      plugins: ["new-gengo"],
+      plugins: ["reiwa"],
       rules: {
-        "new-gengo/no-heisei-in-literal": "error"
+        "reiwa/no-heisei-in-literal": "error",
+        "reiwa/no-heisei-in-variable-name": "error"
       }
     }
   }

diff --git a/src/no-heisei-in-literal.ts b/src/no-heisei-in-literal.ts
@@ -17,7 +17,8 @@ export const noHeiseiInLiteral: Rule.RuleModule = {
       if (node.value.match(/平成|heisei/i)) {
         context.report({
           node,
-          message: "Do not use heisei or 平成 in string literal, use new era."
+          message:
+            "Do not use 'heisei' or '平成' in string literal, use 'reiwa' or '令和'"
         });
       }
     }

diff --git a/src/no-heisei-in-variable-name.ts b/src/no-heisei-in-variable-name.ts
@@ -18,7 +18,8 @@ export const noHeiseiInVariableName: Rule.RuleModule = {
       if (node.id.name.match(/平成|heisei/i)) {
         context.report({
           node,
-          message: "Do not use heisei or 平成 in variable name, use new era."
+          message:
+            "Do not use 'heisei' or '平成' in variable name, use 'reiwa' or '令和'"
         });
       }
     }