Skip to content

Commit 5890b94

Browse files
ArtursKadikisArtursKadikis
authored
Merge pull request #6022 from Countly/release.24.12
Release.24.12 -> master
2 parents e4a02ed + 8e02f37 commit 5890b94

File tree

463 files changed

+27107
-6989
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

463 files changed

+27107
-6989
lines changed

‎.editorconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ root = true
44
end_of_line = lf
55
insert_final_newline = false
66

7-
[*.{js,html,scss,json}]
7+
[*.{js,html,scss,json,vue}]
88
indent_style = space
99
indent_size = 4

‎.eslintrc.json‎

Lines changed: 94 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,62 @@
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+
"plugins/content/frontend/content-blocks/**/*.vue",
147+
"plugins/journey_engine/frontend/builder/**/*.vue"
148+
],
149+
"plugins": [
150+
"vue",
151+
"@stylistic"
152+
],
153+
"extends": [
154+
"eslint:recommended",
155+
"plugin:vue/vue3-essential",
156+
"plugin:vue/vue3-strongly-recommended",
157+
"plugin:vue/vue3-recommended"
158+
],
159+
"rules": {
160+
// override these post initial content release, to make them fit with countly convention
161+
"no-console": ["error"],
162+
"@stylistic/quotes": ["error", "single"],
163+
"@stylistic/quote-props": ["error", "as-needed"],
164+
"no-unused-vars": "off",
165+
"vue/no-unused-vars": ["error", {
166+
"ignorePattern": "^_"
167+
}]
168+
},
169+
"parserOptions": {
170+
"ecmaVersion": 2023,
171+
"sourceType": "module",
172+
"extraFileExtensions": [".vue"]
173+
},
174+
"env": {
175+
"node": true,
176+
"es2023": true,
177+
"es6": true
178+
}
179+
},
124180
{
125181
"files": [
126182
"frontend/express/public/javascripts/countly/*.js",
@@ -195,6 +251,28 @@
195251
]
196252
}
197253
},
254+
{
255+
"files": [ "plugins/content/api/positioning/**/*.js" ],
256+
"parserOptions": {
257+
"ecmaVersion": 2023,
258+
"sourceType": "module"
259+
},
260+
"env": {
261+
"node": true,
262+
"es2023": true
263+
}
264+
},
265+
{
266+
"files": [ "plugins/content/api/positioning/**/*.cjs" ],
267+
"parserOptions": {
268+
"ecmaVersion": 2023,
269+
"sourceType": "commonjs"
270+
},
271+
"env": {
272+
"node": true,
273+
"es2023": true
274+
}
275+
},
198276
{
199277
"files": [
200278
"api/**/*.js",
@@ -206,13 +284,19 @@
206284
"plugins/*/frontend/**/*.js",
207285
"plugins/*/extend/**/*.js"
208286
],
209-
"excludedFiles": "plugins/*/frontend/public/**/*.js",
287+
"excludedFiles": [
288+
"plugins/*/frontend/public/**/*.js",
289+
"plugins/content/frontend/content-blocks/**/*.js",
290+
"plugins/journey_engine/frontend/builder/**/*.js",
291+
"plugins/content/frontend/content-blocks/**/*.vue",
292+
"plugins/journey_engine/frontend/builder/**/*.vue"
293+
],
210294
"env": {
211-
"es2020": true,
295+
"es2023": true,
212296
"node": true
213297
},
214298
"parserOptions": {
215-
"ecmaVersion": 2020
299+
"ecmaVersion": 2023
216300
},
217301
"rules": {
218302
"no-console": "off",
@@ -237,9 +321,6 @@
237321
"for-direction": [
238322
"off"
239323
],
240-
"no-console": [
241-
"off"
242-
],
243324
"no-control-regex": [
244325
"off"
245326
],
@@ -288,11 +369,11 @@
288369
],
289370
"excludedFiles": "plugins/*/tests.js",
290371
"env": {
291-
"es2020": true,
372+
"es2023": true,
292373
"node": true
293374
},
294375
"parserOptions": {
295-
"ecmaVersion": 2020
376+
"ecmaVersion": 2023
296377
},
297378
"rules": {
298379
"no-console": "off"
@@ -305,13 +386,12 @@
305386
"plugins/*/tests.js"
306387
],
307388
"env": {
308-
"es2020": true,
389+
"es2023": true,
309390
"node": true,
310391
"mocha": true
311392
},
312393
"parserOptions": {
313-
"ecmaVersion": 2020,
314-
"sourceType": "module"
394+
"ecmaVersion": 2023
315395
},
316396
"rules": {
317397
"no-console": "off",
@@ -324,7 +404,7 @@
324404
"ui-tests/**/*.js"
325405
],
326406
"env": {
327-
"es2020": true,
407+
"es2023": true,
328408
"node": true,
329409
"mocha": true
330410
},
@@ -333,7 +413,7 @@
333413
"cy": "readonly"
334414
},
335415
"parserOptions": {
336-
"ecmaVersion": 2020,
416+
"ecmaVersion": 2023,
337417
"sourceType": "module"
338418
},
339419
"rules": {
@@ -343,4 +423,4 @@
343423
}
344424
}
345425
]
346-
}
426+
}

‎.github/workflows/deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: Deploy
66
on:
77
# Triggers the workflow on push or pull request events but only for the master branch
88
push:
9-
branches: [ master, next ]
9+
branches: [ master, next, release.24.10, release.24.12 ]
1010

1111
# Allows you to run this workflow manually from the Actions tab
1212
workflow_dispatch:

‎.github/workflows/main.yml‎

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969

7070
services:
7171
mongodb:
72-
image: mongo:6.0
72+
image: mongo:8.0
7373
options: >-
7474
--health-cmd mongosh
7575
--health-interval 10s
@@ -105,7 +105,7 @@ jobs:
105105
- name: ESLint
106106
shell: bash
107107
run: |
108-
npm install [email protected]
108+
npm install [email protected] [email protected] @stylistic/[email protected]
109109
npx eslint .
110110
111111
- name: NPM install
@@ -126,7 +126,7 @@ jobs:
126126

127127
services:
128128
mongodb:
129-
image: mongo:6.0
129+
image: mongo:8.0
130130
options: >-
131131
--health-cmd mongosh
132132
--health-interval 10s
@@ -160,6 +160,11 @@ jobs:
160160
shell: bash
161161
run: "sed -i 's/port: 3001,/port: 3001, workers: 1,/' /opt/countly/api/config.js"
162162

163+
- name: NPM install
164+
shell: bash
165+
working-directory: /opt/countly
166+
run: npm install
167+
163168
- name: Run tests
164169
shell: bash
165170
working-directory: /opt/countly
@@ -173,7 +178,7 @@ jobs:
173178

174179
services:
175180
mongodb:
176-
image: mongo:6.0
181+
image: mongo:8.0
177182
options: >-
178183
--health-cmd mongosh
179184
--health-interval 10s
@@ -207,6 +212,11 @@ jobs:
207212
shell: bash
208213
run: "sed -i 's/port: 3001,/port: 3001, workers: 1,/' /opt/countly/api/config.js"
209214

215+
- name: NPM install
216+
shell: bash
217+
working-directory: /opt/countly
218+
run: npm install
219+
210220
- name: Install plugins
211221
shell: bash
212222
run: |
@@ -226,7 +236,7 @@ jobs:
226236

227237
services:
228238
mongodb:
229-
image: mongo:6.0
239+
image: mongo:8.0
230240
options: >-
231241
--health-cmd mongosh
232242
--health-interval 10s
@@ -260,6 +270,11 @@ jobs:
260270
shell: bash
261271
run: "sed -i 's/mongosh --quiet/mongosh --host mongodb --quiet/' /opt/countly/bin/backup/import_events.sh && sed -i 's/mongoimport --db/mongoimport --host mongodb --db/' /opt/countly/bin/backup/import_events.sh"
262272

273+
- name: NPM install
274+
shell: bash
275+
working-directory: /opt/countly
276+
run: npm install
277+
263278
- name: Prepare environment
264279
shell: bash
265280
working-directory: /opt/countly
@@ -287,7 +302,7 @@ jobs:
287302
cd ui-tests
288303
npm install
289304
xvfb-run --auto-servernum --server-args="-screen 0 1280x1024x24" \
290-
npm run cy:run:dashboard --headless --no-sandbox --disable-gpu --disable-dev-shm-usage
305+
npm run cy:run:dashboard
291306
292307
- name: Upload UI tests artifacts
293308
if: ${{ failure() }}
@@ -304,7 +319,7 @@ jobs:
304319

305320
services:
306321
mongodb:
307-
image: mongo:6.0
322+
image: mongo:8.0
308323
options: >-
309324
--health-cmd mongosh
310325
--health-interval 10s
@@ -338,6 +353,11 @@ jobs:
338353
shell: bash
339354
run: "sed -i 's/mongosh --quiet/mongosh --host mongodb --quiet/' /opt/countly/bin/backup/import_events.sh && sed -i 's/mongoimport --db/mongoimport --host mongodb --db/' /opt/countly/bin/backup/import_events.sh"
340355

356+
- name: NPM install
357+
shell: bash
358+
working-directory: /opt/countly
359+
run: npm install
360+
341361
- name: Prepare environment
342362
shell: bash
343363
working-directory: /opt/countly
@@ -361,7 +381,7 @@ jobs:
361381
cd ui-tests
362382
npm install
363383
xvfb-run --auto-servernum --server-args="-screen 0 1280x1024x24" \
364-
npm run cy:run:onboarding --headless --no-sandbox --disable-gpu --disable-dev-shm-usage
384+
npm run cy:run:onboarding
365385
366386
- name: Upload UI tests artifacts
367387
if: ${{ failure() }}

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,5 @@ frontend/express/public/stylesheets/vue/clyvue.css.map
4343
log/
4444
log/supervisord/
4545
plugins/plugins.json.*
46-
.sdk
46+
.sdk
47+
dump

0 commit comments

Comments
 (0)