Skip to content

Commit 0d04412

Browse files
authored
Merge branch 'next' into rc-command
2 parents 6cb74ae + e1a67ce commit 0d04412

38 files changed

+2214
-1752
lines changed

.editorconfig

+1-1
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

+70-9
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",
@@ -206,9 +262,15 @@
206262
"plugins/*/frontend/**/*.js",
207263
"plugins/*/extend/**/*.js"
208264
],
209-
"excludedFiles": "plugins/*/frontend/public/**/*.js",
265+
"excludedFiles": [
266+
"plugins/*/frontend/public/**/*.js",
267+
"plugins/content/frontend/content-blocks/**/*.js",
268+
"plugins/journey_engine/frontend/builder/**/*.js",
269+
"plugins/content/frontend/content-blocks/**/*.vue",
270+
"plugins/journey_engine/frontend/builder/**/*.vue"
271+
],
210272
"env": {
211-
"es2020": true,
273+
"es2023": true,
212274
"node": true
213275
},
214276
"parserOptions": {
@@ -285,11 +347,11 @@
285347
],
286348
"excludedFiles": "plugins/*/tests.js",
287349
"env": {
288-
"es2020": true,
350+
"es2023": true,
289351
"node": true
290352
},
291353
"parserOptions": {
292-
"ecmaVersion": 2020
354+
"ecmaVersion": 2023
293355
},
294356
"rules": {
295357
"no-console": "off"
@@ -302,13 +364,12 @@
302364
"plugins/*/tests.js"
303365
],
304366
"env": {
305-
"es2020": true,
367+
"es2023": true,
306368
"node": true,
307369
"mocha": true
308370
},
309371
"parserOptions": {
310-
"ecmaVersion": 2020,
311-
"sourceType": "module"
372+
"ecmaVersion": 2023
312373
},
313374
"rules": {
314375
"no-console": "off",
@@ -321,7 +382,7 @@
321382
"ui-tests/**/*.js"
322383
],
323384
"env": {
324-
"es2020": true,
385+
"es2023": true,
325386
"node": true,
326387
"mocha": true
327388
},
@@ -330,7 +391,7 @@
330391
"cy": "readonly"
331392
},
332393
"parserOptions": {
333-
"ecmaVersion": 2020,
394+
"ecmaVersion": 2023,
334395
"sourceType": "module"
335396
},
336397
"rules": {

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
- name: ESLint
106106
shell: bash
107107
run: |
108-
npm install [email protected]
108+
109109
npx eslint .
110110
111111
- name: NPM install

.gitignore

+2-1
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

CHANGELOG.md

+23-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,29 @@
22
Fixes:
33
- [remote-config] Moving the remote config enable/disable functionality to the drop-down
44

5-
Enterprise fixes:
5+
## Version 24.10.x
6+
7+
Dependencies:
8+
- Bump puppeteer from 23.8.0 to 23.9.0
9+
- Bump nodemailer from 6.9.15 to 6.9.16
10+
- Bump countly-sdk-web from 24.4.1 to 24.11.0
11+
- Bump tslib from 2.7.0 to 2.8.1
12+
- Bump form-data from 4.0.0 to 4.0.1
13+
- Bump jimp from 0.22.12 to 1.6.0
14+
- Bump jsdoc from 4.0.3 to 4.0.4
15+
- Bump countly-sdk-nodejs from 22.6.0 to 24.10.0
16+
17+
## Version 24.10.3
18+
Fixes:
19+
- [dashboards] Fixing issue where dashboard widgets go into single column
20+
21+
Security:
22+
- Bump puppeteer from 17.1.3 to 23.8.0
23+
- Bump express from 4.21.0 to 4.21.1
24+
- Bump sass from 1.79.4 to 1.81.0
25+
- Bump express-session from 1.18.0 to 1.18.1
26+
- Bump cross-spawn from 7.0.3 to 7.0.6 in /ui-tests
27+
- Bump cross-spawn from 7.0.3 to 7.0.6 in /plugins/hooks
628

729
## Version 24.10.2
830
Fixes:

Dockerfile-api

+5-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ ENV COUNTLY_CONTAINER="api" \
1717
COUNTLY_CONFIG_API_API_WORKERS="1" \
1818
COUNTLY_CONFIG_API_API_HOST="0.0.0.0" \
1919
NODE_OPTIONS="--max-old-space-size=2048" \
20-
TINI_VERSION="0.18.0"
21-
20+
TINI_VERSION="0.18.0"\
21+
PUPPETEER_CACHE_DIR=/opt/countly/.cache/puppeteer
22+
2223
WORKDIR /opt/countly
2324
COPY . .
2425

@@ -58,7 +59,7 @@ RUN curl -s -L -o /tmp/tini.deb "https://github.com/krallin/tini/releases/downlo
5859
# cleanup & chown
5960
npm remove -y --no-save mocha nyc should supertest && \
6061
apt-get remove -y git gcc g++ make automake autoconf libtool pkg-config unzip sqlite3 && \
61-
apt-get install -y libgbm-dev libgbm1 gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils && \
62+
apt-get install -y libgbm-dev libgbm1 gconf-service libasound2 libatk1.0-0 libatk-bridge2.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils && \
6263
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
6364
rm -rf test /tmp/* /tmp/.??* /var/tmp/* /var/tmp/.??* /var/log/* /root/.npm && \
6465
\
@@ -75,4 +76,4 @@ USER 1001:0
7576

7677
ENTRYPOINT ["/usr/bin/tini", "-v", "--"]
7778

78-
CMD ["/opt/countly/bin/docker/cmd.sh"]
79+
CMD ["/opt/countly/bin/docker/cmd.sh"]

api/api.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ plugins.connectToAllDatabases().then(function() {
265265
if (cluster.isMaster) {
266266
plugins.installMissingPlugins(common.db);
267267
common.runners = require('./parts/jobs/runner');
268-
common.cache = new CacheMaster(common.db);
268+
common.cache = new CacheMaster();
269269
common.cache.start().then(() => {
270270
setImmediate(() => {
271271
plugins.dispatch('/cache/init', {});
@@ -334,7 +334,7 @@ plugins.connectToAllDatabases().then(function() {
334334
console.log("Starting worker", process.pid, "parent:", process.ppid);
335335
const taskManager = require('./utils/taskmanager.js');
336336

337-
common.cache = new CacheWorker(common.db);
337+
common.cache = new CacheWorker();
338338
common.cache.start();
339339

340340
//since process restarted mark running tasks as errored

0 commit comments

Comments
 (0)