Merge branch 'next' into rc-command

.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

.eslintrc.json

@@ -121,6 +121,62 @@
         ]
     },
     "overrides": [
+        {
+            "files": [
+                "plugins/content/frontend/vite.config.js",
+                "plugins/journey_engine/frontend/vite.config.js",
+                "plugins/journey_engine/frontend/vite-manifest.js"
+            ],
+            "rules": {
+                "no-console": "off"
+            },
+            "parserOptions": {
+                "ecmaVersion": 2023,
+                "sourceType": "module"
+            },
+            "env": {
+                "node": true,
+                "es2023": true
+            }
+        },
+        {
+            "files": [
+                "plugins/content/frontend/content-blocks/**/*.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",
+                "plugin:vue/vue3-essential",
+                "plugin:vue/vue3-strongly-recommended",
+                "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"],
+                "no-unused-vars": "off",
+                "vue/no-unused-vars": ["error", {
+                    "ignorePattern": "^_"
+                }]
+            },
+            "parserOptions": {
+                "ecmaVersion": 2023,
+                "sourceType": "module",
+                "extraFileExtensions": [".vue"]
+            },
+            "env": {
+                "node": true,
+                "es2023": true,
+                "es6": true
+            }
+        },
         {
             "files": [
                 "frontend/express/public/javascripts/countly/*.js",
@@ -206,9 +262,15 @@
                 "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": {
-                "es2020": true,
+                "es2023": true,
                 "node": true
             },
             "parserOptions": {
@@ -285,11 +347,11 @@
             ],
             "excludedFiles": "plugins/*/tests.js",
             "env": {
-                "es2020": true,
+                "es2023": true,
                 "node": true
             },
             "parserOptions": {
-                "ecmaVersion": 2020
+                "ecmaVersion": 2023
             },
             "rules": {
                 "no-console": "off"
@@ -302,13 +364,12 @@
                 "plugins/*/tests.js"
             ],
             "env": {
-                "es2020": true,
+                "es2023": true,
                 "node": true,
                 "mocha": true
             },
             "parserOptions": {
-                "ecmaVersion": 2020,
-                "sourceType": "module"
+                "ecmaVersion": 2023
             },
             "rules": {
                 "no-console": "off",
@@ -321,7 +382,7 @@
                 "ui-tests/**/*.js"
             ],
             "env": {
-                "es2020": true,
+                "es2023": true,
                 "node": true,
                 "mocha": true
             },
@@ -330,7 +391,7 @@
                 "cy": "readonly"
             },
             "parserOptions": {
-                "ecmaVersion": 2020,
+                "ecmaVersion": 2023,
                 "sourceType": "module"
             },
             "rules": {

.github/workflows/main.yml

@@ -105,7 +105,7 @@ jobs:
       - name: ESLint
         shell: bash
         run: |
-         npm install [email protected]
+         npm install [email protected] [email protected] @stylistic/[email protected]
          npx eslint .
 
       - name: NPM install

.gitignore

@@ -43,4 +43,5 @@ frontend/express/public/stylesheets/vue/clyvue.css.map
 log/
 log/supervisord/
 plugins/plugins.json.*
-.sdk
+.sdk
+dump

CHANGELOG.md

@@ -2,7 +2,29 @@
 Fixes:
 - [remote-config] Moving the remote config enable/disable functionality to the drop-down
 
-Enterprise fixes:
+## Version 24.10.x
+
+Dependencies:
+- Bump puppeteer from 23.8.0 to 23.9.0
+- Bump nodemailer from 6.9.15 to 6.9.16
+- Bump countly-sdk-web from 24.4.1 to 24.11.0
+- Bump tslib from 2.7.0 to 2.8.1
+- Bump form-data from 4.0.0 to 4.0.1
+- Bump jimp from 0.22.12 to 1.6.0
+- Bump jsdoc from 4.0.3 to 4.0.4
+- Bump countly-sdk-nodejs from 22.6.0 to 24.10.0
+
+## Version 24.10.3
+Fixes:
+- [dashboards] Fixing issue where dashboard widgets go into single column
+
+Security:
+- Bump puppeteer from 17.1.3 to 23.8.0
+- Bump express from 4.21.0 to 4.21.1 
+- Bump sass from 1.79.4 to 1.81.0
+- Bump express-session from 1.18.0 to 1.18.1
+- Bump cross-spawn from 7.0.3 to 7.0.6 in /ui-tests
+- Bump cross-spawn from 7.0.3 to 7.0.6 in /plugins/hooks
 
 ## Version 24.10.2
 Fixes:

Dockerfile-api

@@ -17,8 +17,9 @@ ENV COUNTLY_CONTAINER="api" \
 	COUNTLY_CONFIG_API_API_WORKERS="1" \
 	COUNTLY_CONFIG_API_API_HOST="0.0.0.0" \
 	NODE_OPTIONS="--max-old-space-size=2048" \
-	TINI_VERSION="0.18.0"
-
+	TINI_VERSION="0.18.0"\
+	PUPPETEER_CACHE_DIR=/opt/countly/.cache/puppeteer
+
 WORKDIR /opt/countly
 COPY . .
 
@@ -58,7 +59,7 @@ RUN curl -s -L -o /tmp/tini.deb "https://github.com/krallin/tini/releases/downlo
 	# cleanup & chown
 	npm remove -y --no-save mocha nyc should supertest && \
 	apt-get remove -y git gcc g++ make automake autoconf libtool pkg-config unzip sqlite3 && \
-	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 && \
+	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 && \
 	apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
 	rm -rf test /tmp/* /tmp/.??* /var/tmp/* /var/tmp/.??* /var/log/* /root/.npm && \
 	\
@@ -75,4 +76,4 @@ USER 1001:0
 
 ENTRYPOINT ["/usr/bin/tini", "-v", "--"]
 
-CMD ["/opt/countly/bin/docker/cmd.sh"]
+CMD ["/opt/countly/bin/docker/cmd.sh"]

api/api.js

@@ -265,7 +265,7 @@ plugins.connectToAllDatabases().then(function() {
     if (cluster.isMaster) {
         plugins.installMissingPlugins(common.db);
         common.runners = require('./parts/jobs/runner');
-        common.cache = new CacheMaster(common.db);
+        common.cache = new CacheMaster();
         common.cache.start().then(() => {
             setImmediate(() => {
                 plugins.dispatch('/cache/init', {});
@@ -334,7 +334,7 @@ plugins.connectToAllDatabases().then(function() {
         console.log("Starting worker", process.pid, "parent:", process.ppid);
         const taskManager = require('./utils/taskmanager.js');
 
-        common.cache = new CacheWorker(common.db);
+        common.cache = new CacheWorker();
         common.cache.start();
 
         //since process restarted mark running tasks as errored