Skip to content

Commit af93668

Browse files
Merge pull request #5804 from Countly/eslint-ecma-change
Upgrade to es2023 for backend and tests
2 parents 41308cf + 40ee4a5 commit af93668

File tree

2 files changed

+58
-8
lines changed

2 files changed

+58
-8
lines changed

.eslintrc.json

+56-8
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,55 @@
121121
]
122122
},
123123
"overrides": [
124+
{
125+
"files": [
126+
"plugins/content/frontend/vite.config.js",
127+
"plugins/journey_engine/frontend/vite.config.js",
128+
"plugins/journey_engine/frontend/vite-manifest.js"
129+
],
130+
"rules": {
131+
"no-console": "off"
132+
},
133+
"parserOptions": {
134+
"ecmaVersion": 2023,
135+
"sourceType": "module"
136+
},
137+
"env": {
138+
"node": true,
139+
"es2023": true
140+
}
141+
},
142+
{
143+
"files": [
144+
"plugins/content/frontend/content-blocks/**/*.js",
145+
"plugins/journey_engine/frontend/builder/**/*.js"
146+
],
147+
"extends": [
148+
"eslint:recommended",
149+
"plugin:vue/vue3-essential",
150+
"plugin:vue/vue3-strongly-recommended",
151+
"plugin:vue/vue3-recommended"
152+
],
153+
"rules": {
154+
"no-console": ["error"],
155+
"@stylistic/quotes": ["error", "single"],
156+
"@stylistic/quote-props": ["error", "as-needed"]
157+
},
158+
"plugins": [
159+
"vue",
160+
"@stylistic"
161+
],
162+
"parserOptions": {
163+
"ecmaVersion": 2023,
164+
"sourceType": "module",
165+
"extraFileExtensions": [".vue"]
166+
},
167+
"env": {
168+
"node": true,
169+
"es2023": true,
170+
"es6": true
171+
}
172+
},
124173
{
125174
"files": [
126175
"frontend/express/public/javascripts/countly/*.js",
@@ -208,7 +257,7 @@
208257
],
209258
"excludedFiles": "plugins/*/frontend/public/**/*.js",
210259
"env": {
211-
"es2020": true,
260+
"es2023": true,
212261
"node": true
213262
},
214263
"parserOptions": {
@@ -285,11 +334,11 @@
285334
],
286335
"excludedFiles": "plugins/*/tests.js",
287336
"env": {
288-
"es2020": true,
337+
"es2023": true,
289338
"node": true
290339
},
291340
"parserOptions": {
292-
"ecmaVersion": 2020
341+
"ecmaVersion": 2023
293342
},
294343
"rules": {
295344
"no-console": "off"
@@ -302,13 +351,12 @@
302351
"plugins/*/tests.js"
303352
],
304353
"env": {
305-
"es2020": true,
354+
"es2023": true,
306355
"node": true,
307356
"mocha": true
308357
},
309358
"parserOptions": {
310-
"ecmaVersion": 2020,
311-
"sourceType": "module"
359+
"ecmaVersion": 2023
312360
},
313361
"rules": {
314362
"no-console": "off",
@@ -321,7 +369,7 @@
321369
"ui-tests/**/*.js"
322370
],
323371
"env": {
324-
"es2020": true,
372+
"es2023": true,
325373
"node": true,
326374
"mocha": true
327375
},
@@ -330,7 +378,7 @@
330378
"cy": "readonly"
331379
},
332380
"parserOptions": {
333-
"ecmaVersion": 2020,
381+
"ecmaVersion": 2023,
334382
"sourceType": "module"
335383
},
336384
"rules": {

package.json

+2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@
1414
"url": "git://github.com/countly/countly-server.git"
1515
},
1616
"devDependencies": {
17+
"@stylistic/eslint-plugin": "^2.11.0",
1718
"apidoc": "^1.0.1",
1819
"apidoc-template": "^0.0.2",
1920
"docdash": "^2.0.1",
21+
"eslint-plugin-vue": "^9.31.0",
2022
"grunt-contrib-watch": "1.1.0",
2123
"grunt-eslint": "24.3.0",
2224
"grunt-mocha-nyc": "1.0.3",

0 commit comments

Comments
 (0)