From 5c1e9f0ead1841c626d8255fe3e9d300a06c112f Mon Sep 17 00:00:00 2001 From: Kenji Okimoto Date: Mon, 5 Nov 2018 11:09:00 +0900 Subject: [PATCH 1/4] Add missing semi colons Signed-off-by: Kenji Okimoto --- app/javascript/packs/grep_container.js | 2 +- app/javascript/packs/grep_pattern.js | 2 +- app/javascript/packs/settings.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/javascript/packs/grep_container.js b/app/javascript/packs/grep_container.js index 2554cc0..90640c6 100644 --- a/app/javascript/packs/grep_container.js +++ b/app/javascript/packs/grep_container.js @@ -16,7 +16,7 @@ const GrepContainer = { return { grepType: "regexp", patterns: [true], - } + }; }, filters: { humanize: function(value) { diff --git a/app/javascript/packs/grep_pattern.js b/app/javascript/packs/grep_pattern.js index 5e8c715..0d73f89 100644 --- a/app/javascript/packs/grep_pattern.js +++ b/app/javascript/packs/grep_pattern.js @@ -14,7 +14,7 @@ const GrepPattern = { return { key: null, pattern: null, - } + }; }, filters: { diff --git a/app/javascript/packs/settings.js b/app/javascript/packs/settings.js index 6482417..c3f6efb 100644 --- a/app/javascript/packs/settings.js +++ b/app/javascript/packs/settings.js @@ -141,7 +141,7 @@ window.addEventListener("load", () => { if (_.isEmpty(data[label])) { this.$delete(this.sections, label); } - }) + }); if (_.isEmpty(data["ROOT"])) { this.$set(this.sections, "ROOT", []); } From 202200b9f61fd4b1764ce63bc3a6020a45e8ba6e Mon Sep 17 00:00:00 2001 From: Kenji Okimoto Date: Mon, 5 Nov 2018 11:09:57 +0900 Subject: [PATCH 2/4] Use double quotes instead of single quotes Signed-off-by: Kenji Okimoto --- app/javascript/packs/store/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/packs/store/index.js b/app/javascript/packs/store/index.js index 7cd970f..da4cfcc 100644 --- a/app/javascript/packs/store/index.js +++ b/app/javascript/packs/store/index.js @@ -5,7 +5,7 @@ import createLogger from "vuex/dist/logger"; Vue.use(Vuex); -const debug = process.env.NODE_ENV !== 'production'; +const debug = process.env.NODE_ENV !== "production"; import parserParams from "./modules/parser_params"; From e814a01f831f1d2b398d3589228450d8be7050c2 Mon Sep 17 00:00:00 2001 From: Kenji Okimoto Date: Mon, 5 Nov 2018 11:12:56 +0900 Subject: [PATCH 3/4] Fix ESLint error > 47:11 error Unexpected lexical declaration in case block no-case-declarations Signed-off-by: Kenji Okimoto --- app/javascript/packs/codemirror.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/javascript/packs/codemirror.js b/app/javascript/packs/codemirror.js index f5433f8..ee56818 100644 --- a/app/javascript/packs/codemirror.js +++ b/app/javascript/packs/codemirror.js @@ -43,7 +43,7 @@ CodeMirror.defineMode("fluentd", function() { stream.eatWhile(/[^ \t#]/); state.context = "inner-definition-keyword-appeared"; return "variable"; - case "inner-definition-keyword-appeared": + case "inner-definition-keyword-appeared": { let eatBuiltin = function(stream, state) { stream.eatWhile(/[^#]/); if (stream.current().match(/\\$/)) { @@ -55,6 +55,7 @@ CodeMirror.defineMode("fluentd", function() { eatBuiltin(stream, state); state.context = "inner-definition"; return "builtin"; + } default: stream.eat(/[^<>#]+/); return "string"; From a769b7437b0531647cac4788852325f51133cd6c Mon Sep 17 00:00:00 2001 From: Kenji Okimoto Date: Mon, 5 Nov 2018 11:17:04 +0900 Subject: [PATCH 4/4] Treat some variables as global Signed-off-by: Kenji Okimoto --- .eslintrc.js | 3 ++- app/javascript/packs/store/index.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index b47545f..6f3416f 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -14,7 +14,8 @@ module.exports = { "globals": { "$": true, "Rails": true, - "Vue": true + "Vue": true, + "relativeUrlRoot": true }, "rules": { "indent": [ diff --git a/app/javascript/packs/store/index.js b/app/javascript/packs/store/index.js index da4cfcc..7ce3f74 100644 --- a/app/javascript/packs/store/index.js +++ b/app/javascript/packs/store/index.js @@ -1,3 +1,4 @@ +/* global process:true */ import Vue from "vue/dist/vue.esm"; import Vuex from "vuex/dist/vuex.esm"; import { createNamespaceHelpers } from "vuex/dist/vuex.esm";