diff --git a/.editorconfig b/.editorconfig index 6744aa1e32e..ea4cd631fe7 100644 --- a/.editorconfig +++ b/.editorconfig @@ -4,6 +4,6 @@ root = true end_of_line = lf insert_final_newline = false -[*.{js,html,scss,json}] +[*.{js,html,scss,json,vue}] indent_style = space indent_size = 4 diff --git a/.eslintrc.json b/.eslintrc.json index 3ece0622897..ce496cb3e45 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -142,7 +142,13 @@ { "files": [ "plugins/content/frontend/content-blocks/**/*.js", - "plugins/journey_engine/frontend/builder/**/*.js" + "plugins/journey_engine/frontend/builder/**/*.js", + "plugins/content/frontend/content-blocks/**/*.vue", + "plugins/journey_engine/frontend/builder/**/*.vue" + ], + "plugins": [ + "vue", + "@stylistic" ], "extends": [ "eslint:recommended", @@ -151,14 +157,15 @@ "plugin:vue/vue3-recommended" ], "rules": { + // override these post initial content release, to make them fit with countly convention "no-console": ["error"], "@stylistic/quotes": ["error", "single"], - "@stylistic/quote-props": ["error", "as-needed"] + "@stylistic/quote-props": ["error", "as-needed"], + "no-unused-vars": "off", + "vue/no-unused-vars": ["error", { + "ignorePattern": "^_" + }] }, - "plugins": [ - "vue", - "@stylistic" - ], "parserOptions": { "ecmaVersion": 2023, "sourceType": "module", @@ -255,7 +262,13 @@ "plugins/*/frontend/**/*.js", "plugins/*/extend/**/*.js" ], - "excludedFiles": "plugins/*/frontend/public/**/*.js", + "excludedFiles": [ + "plugins/*/frontend/public/**/*.js", + "plugins/content/frontend/content-blocks/**/*.js", + "plugins/journey_engine/frontend/builder/**/*.js", + "plugins/content/frontend/content-blocks/**/*.vue", + "plugins/journey_engine/frontend/builder/**/*.vue" + ], "env": { "es2023": true, "node": true diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2f3e5fee7d4..613658e1512 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -105,7 +105,7 @@ jobs: - name: ESLint shell: bash run: | - npm install eslint@8.57.0 + npm install eslint@8.57.0 eslint-plugin-vue@9.31.0 @stylistic/eslint-plugin@2.11.0 npx eslint . - name: NPM install diff --git a/.gitignore b/.gitignore index 117de747049..a6b3e862aa7 100644 --- a/.gitignore +++ b/.gitignore @@ -43,4 +43,5 @@ frontend/express/public/stylesheets/vue/clyvue.css.map log/ log/supervisord/ plugins/plugins.json.* -.sdk \ No newline at end of file +.sdk +dump \ No newline at end of file