textlint · azu · Jan 12, 2018 · Jan 11, 2018 · Jan 11, 2018 · Jan 11, 2018
diff --git a/.babelrc b/.babelrc
@@ -1,6 +1,6 @@
 {
-  "presets": ["es2015"],
+  "presets": ["env"],
   "plugins": [
     ["transform-react-jsx", {"pragma": "element"}]
   ]
-}
+}
diff --git a/css/base/font.css b/css/base/font.css
@@ -9,4 +9,4 @@ code {
     color: #c7254e;
     background-color: #f9f2f4;
     border-radius: 4px;
-}
+}
diff --git a/css/base/margin-padding.css b/css/base/margin-padding.css
@@ -16,4 +16,4 @@ p {
 ul {
     margin: 0;
     padding: auto 0;
-}
+}
diff --git a/css/color.css b/css/color.css
@@ -2,7 +2,7 @@
     --MainBackgroundColor: white;
     --BackgroundColor: #f4f4f4;
     --AccentColor: #5acbe3;
-    --MenuLinkColor: #0F0F0F;
-    --LeadingTextColor: #3D454E;
-    --TextColor: #30363D;
-}
+    --MenuLinkColor: #0f0f0f;
+    --LeadingTextColor: #3d454e;
+    --TextColor: #30363d;
+}
diff --git a/css/components/AddTextlintRule.css b/css/components/AddTextlintRule.css
@@ -4,4 +4,4 @@
 
 .AddTextlintRule input {
     margin: 0 0.2rem;
-}
+}
diff --git a/css/components/App.css b/css/components/App.css
@@ -1,5 +1,6 @@
 @import "../color.css";
 
-html, body {
+html,
+body {
     background-color: var(--BackgroundColor);
-}
+}
diff --git a/css/components/DisabledTextlintRuleList.css b/css/components/DisabledTextlintRuleList.css
@@ -1,7 +1,8 @@
-.DisabledTextlintRuleListBox, .DisabledTextlintRuleList {
+.DisabledTextlintRuleListBox,
+.DisabledTextlintRuleList {
     margin: 0;
 }
 
 .DisabledTextlintRuleList {
     padding-left: 32px;
-}
+}
diff --git a/css/components/EnabledTextlintRuleList.css b/css/components/EnabledTextlintRuleList.css
@@ -1,7 +1,8 @@
-.EnabledTextlintRuleListBox, .EnabledTextlintRuleList {
+.EnabledTextlintRuleListBox,
+.EnabledTextlintRuleList {
     margin: 0;
 }
 
 .EnabledTextlintRuleList {
     padding-left: 32px;
-}
+}
diff --git a/css/components/Footer.css b/css/components/Footer.css
@@ -12,4 +12,4 @@
 
 .Footer-list-item a {
     color: var(--MenuLinkColor);
-}
+}
diff --git a/css/components/Header.css b/css/components/Header.css
@@ -1,7 +1,7 @@
 @import "../color.css";
 @import "./_var-layout.css";
 .Header {
-    background-color: #FBFBFB;
+    background-color: #fbfbfb;
     padding: 5px 0;
     display: flex;
 }
@@ -23,7 +23,8 @@
     padding-right: var(--right-end-padding);
 }
 
-.HeaderMenus, .HeaderMenuItem {
+.HeaderMenus,
+.HeaderMenuItem {
     display: inline-block;
 }
 
@@ -54,4 +55,4 @@
 
 .Logo-img {
     height: 40px;
-}
+}
diff --git a/css/components/Leading.css b/css/components/Leading.css
@@ -1,7 +1,7 @@
 @import "../color.css";
 
-:root{
-    --leadingColor : white;
+:root {
+    --leadingColor: white;
 }
 .Leading {
     background-color: var(--AccentColor);
@@ -34,6 +34,6 @@
 .Leading-downloadButton:hover {
     color: var(--AccentColor);
     text-shadow: none;
-    background-color: #FFF;
-    border-color: #FFF;
+    background-color: #fff;
+    border-color: #fff;
 }
diff --git a/css/components/TextlintDemo.css b/css/components/TextlintDemo.css
@@ -1,16 +1,23 @@
 @import "./_var-layout.css";
 @import "../color.css";
 
+:root {
+    --TextlintDemo-height: 100%;
+}
+
 .TextlintDemo {
     background-color: var(--MainBackgroundColor);
+    height: 100%;
 }
 
-.TextlintDemo-title, .TextlintDemo-lead {
+.TextlintDemo-title,
+.TextlintDemo-lead {
     padding-left: var(--left-start-padding);
     padding-right: var(--right-end-padding);
 }
 
-.TextlintDemo-ruleBox, .TextlintDemo-errorBox {
+.TextlintDemo-ruleBox,
+.TextlintDemo-errorBox {
     padding-bottom: 1rem;
 }
 
@@ -22,37 +29,41 @@
 }
 
 .TextlintDemo-Editor {
-    border-right: 1px solid #ddd
+    border-right: 1px solid #ddd;
 }
 
 .TextlintDemo-Setting {
-    border-left: 1px solid #ddd
+    border-left: 1px solid #ddd;
 }
 
-.TextlintDemo-Editor, .TextlintEditor .TextlintDemo-Setting, .TextlintErrorList {
+.TextlintDemo-Editor,
+.TextlintEditor .TextlintDemo-Setting,
+.TextlintErrorList {
     width: 100%;
 }
 
+.TextlintDemo-errorBox,
+.TextlintDemo-ruleBox {
+    overflow: scroll;
+}
+
 /*TextlintDemo-Editor | TextlintDemo-Setting*/
-.TextlintDemo-Editor, .TextlintEditor, .TextlintDemo-Setting {
-    height: 100%;
+.TextlintEditor,
+.TextlintDemo-Setting {
+    height: var(--TextlintDemo-height);
 }
 
-.TextlintDemo-Editor h3, .TextlintDemo-Setting h3 {
-    /* 縦位置をめにゅーと揃える */
-    padding: 0;
+.TextlintDemo-Editor h3,
+.TextlintDemo-Setting h3 {
     margin: 0;
-    padding-right: var(--right-end-padding);
+    padding: 0 var(--right-end-padding) 0 0;
     text-align: right;
     background-color: #f4f4f4;
     color: var(--TextColor);
 }
 
-.CodeMirrorEditor {
-    height: 100%;
-}
-
-.CodeMirror {
-    height: auto;
+.CodeMirrorEditor,
+.CodeMirrorEditor .CodeMirror {
+    height: var(--TextlintDemo-height);
     font-size: 14px;
-}
+}
diff --git a/css/components/TextlintRuleListItem.css b/css/components/TextlintRuleListItem.css
@@ -5,4 +5,4 @@
 .TextLintRuleListItem p {
     padding: 0;
     margin: 0;
-}
+}
diff --git a/css/components/TextlintRuleListSet.css b/css/components/TextlintRuleListSet.css
@@ -1,3 +1,3 @@
 .TextlintRuleListSet {
     margin: 0.5rem 0;
-}
+}
diff --git a/css/components/WhatIsTextLint.css b/css/components/WhatIsTextLint.css
@@ -14,5 +14,5 @@
 }
 
 .WhatIsTextLint-philosophy-list {
-    padding-left: calc(var(--left-start-padding) + 1em)
-}
+    padding-left: calc(var(--left-start-padding) + 1em);
+}
diff --git a/css/components/_shared_header.css b/css/components/_shared_header.css
@@ -1,6 +1,6 @@
 .header-has-icon:before {
-    content:"";
+    content: "";
     background: url("../img/textlint-icon_black-white-128x128.png") no-repeat left center;
     background-size: 0.8em;
     padding-right: 1em;
-}
+}
diff --git a/css/components/_var-layout.css b/css/components/_var-layout.css
@@ -7,4 +7,4 @@
 :root {
     --right-end-padding: 1.5rem;
     --left-start-padding: 1.5rem;
-}
+}
diff --git a/css/index.css b/css/index.css
@@ -22,4 +22,4 @@
 @import "./components/_shared_header.css";
 /* Utils */
 @import "./utils/padding.css";
-@import "./utils/image.css";
+@import "./utils/image.css";
diff --git a/css/layout/Body.css b/css/layout/Body.css
@@ -1,4 +1,5 @@
-html, body {
+html,
+body {
     padding: 0;
     margin: 0;
 }
@@ -9,4 +10,4 @@ html, body {
 
 .MainContent {
     padding: 0 5px;
-}
+}
diff --git a/css/utils/image.css b/css/utils/image.css
@@ -1,4 +1,4 @@
 .u-inline-icon {
     display: inline !important;
     height: 1em !important;
-}
+}
diff --git a/package.json b/package.json
@@ -19,43 +19,66 @@
     "test": "test"
   },
   "scripts": {
+    "start": "npm-run-all clean --parallel watch:css server",
     "build:css": "suitcss --import-root css/ css/index.css bundle/build.css",
     "build:js": "webpack -p",
     "build": "npm-run-all --parallel build:*",
-    "watch:css": "suitcss --watch --import-root css/ css/index.css bundle/build.css",
+    "watch:css": "suitcss --watch --import-root css/ css/index.css public/build/build.css",
     "watch:js": "webpack -d --watch",
     "watch": "npm-run-all --parallel watch:*",
-    "deploy": "gh-pages -b master -d ./ --repo [email protected]:textlint/textlint.github.io.git"
+    "deploy": "gh-pages -b master -d ./public --repo [email protected]:textlint/textlint.github.io.git",
+    "server": "cross-env NODE_ENV=development webpack-dev-server --hot --content-base ./public --open",
+    "prettier": "prettier --write \"**/*.{js,jsx,ts,tsx,css}\"",
+    "precommit": "lint-staged",
+    "postcommit": "git reset",
+    "clean": "rimraf public/build/"
   },
   "dependencies": {
-    "camelcase": "^2.0.1",
-    "codemirror": "^5.10.0",
-    "codemirror-textlint": "^1.0.1",
-    "decca": "^2.0.1",
+    "@textlint/kernel": "^2.0.3",
+    "camelcase": "^4.1.0",
+    "codemirror": "^5.33.0",
+    "decca": "^2.3.0",
     "isomorphic-fetch": "^2.2.1",
     "lodash.debounce": "^4.0.0",
-    "redux": "^3.0.5",
-    "redux-logger": "^2.3.1",
-    "textlint": "^7.2.2",
+    "redux": "^3.7.2",
+    "redux-logger": "^3.0.6",
     "textlint-message-to-codemirror": "^1.0.0",
+    "textlint-plugin-markdown": "^4.0.4",
     "textlint-rule-alex": "^1.0.1",
-    "textlint-rule-no-todo": "^1.0.3",
+    "textlint-rule-no-todo": "^2.0.0",
     "textlint-rule-rousseau": "^1.3.2",
     "textlint-rule-sjsj": "^1.0.5",
     "textlint-rule-unexpanded-acronym": "^1.2.1"
   },
   "devDependencies": {
-    "babel-loader": "^6.2.1",
-    "babel-plugin-transform-react-jsx": "^6.3.13",
-    "babel-preset-es2015": "^6.3.13",
-    "css-loader": "0.26.1",
-    "gh-pages": "0.12.0",
-    "json-loader": "^0.5.4",
-    "npm-run-all": "4.0.1",
+    "babel-core": "^6.26.0",
+    "babel-loader": "^7.1.2",
+    "babel-plugin-transform-react-jsx": "^6.24.1",
+    "babel-preset-env": "^1.6.1",
+    "cross-env": "^5.1.3",
+    "css-loader": "0.28.8",
+    "gh-pages": "1.1.0",
+    "husky": "^0.14.3",
+    "lint-staged": "^6.0.0",
+    "npm-run-all": "4.1.2",
+    "prettier": "^1.10.2",
+    "rimraf": "^2.6.2",
     "shebang-loader": "^0.0.1",
-    "style-loader": "^0.13.0",
-    "suitcss-preprocessor": "3.0.1",
-    "suitcss-utils": "2.0.0",
-    "webpack": "^2.2.0"
+    "style-loader": "^0.19.1",
+    "suitcss-preprocessor": "4.0.0",
+    "suitcss-utils": "3.0.0",
+    "webpack": "^3.10.0",
+    "webpack-dev-server": "^2.10.1"
+  },
+  "prettier": {
+    "singleQuote": false,
+    "printWidth": 120,
+    "tabWidth": 4
+  },
+  "lint-staged": {
+    "*.{js,jsx,ts,tsx,css}": [
+      "prettier --write",
+      "git add"
+    ]
   }
 }
diff --git a/img/banner_1420x512.png → public/img/banner_1420x512.png b/img/banner_1420x512.png → public/img/banner_1420x512.png
diff --git a/img/textlint-icon-no-circle_128x128.png → ...c/img/textlint-icon-no-circle_128x128.png b/img/textlint-icon-no-circle_128x128.png → ...c/img/textlint-icon-no-circle_128x128.png
diff --git a/img/textlint-icon_256x256.png → public/img/textlint-icon_256x256.png b/img/textlint-icon_256x256.png → public/img/textlint-icon_256x256.png
diff --git a/img/textlint-icon_black-white-128x128.png → ...img/textlint-icon_black-white-128x128.png b/img/textlint-icon_black-white-128x128.png → ...img/textlint-icon_black-white-128x128.png
diff --git a/img/textlint-logo.png → public/img/textlint-logo.png b/img/textlint-logo.png → public/img/textlint-logo.png
diff --git a/index.html → public/index.html b/index.html → public/index.html
@@ -7,17 +7,17 @@
     <meta name="author" content="azu">
     <title>textlint - pluggable linting tool for text and markdown</title>
 
-    <link rel="icon" type="image/x-icon" href="./img/textlint-icon_256x256.png">
-    <link rel="shortcut icon" type="image/x-icon" href="./img/textlint-icon_256x256.png">
+    <link rel="icon" type="image/x-icon" href="img/textlint-icon_256x256.png">
+    <link rel="shortcut icon" type="image/x-icon" href="img/textlint-icon_256x256.png">
 
     <meta property="og:title" content="textlint - pluggable linting tool for text and markdown"/>
     <meta property="og:type" content="website"/>
     <meta property="og:url" content="http://textlint.github.io/"/>
     <meta property="og:image" content="http://textlint.github.io/img/banner_1420x512.png"/>
 
-    <link rel="stylesheet" href="./bundle/build.css">
+    <link rel="stylesheet" href="./build/build.css">
 </head>
 <body>
-<script src="./bundle/build.js"></script>
+<script src="./build/bundle.js"></script>
 </body>
-</html>
+</html>
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,4 +16,4 @@ p { @@
     ul {
         margin: 0;
         padding: auto 0;
-    }
+    }