Merge branch 'master' into 24.10->master

Author: Cookiezaurs

.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",
@@ -195,6 +251,28 @@
                 ]
             }
         },
+        {
+            "files": [ "plugins/content/api/positioning/**/*.js" ],
+            "parserOptions": {
+                "ecmaVersion": 2023,
+                "sourceType": "module"
+            },
+            "env": {
+                "node": true,
+                "es2023": true
+            }
+        },
+        {
+            "files": [ "plugins/content/api/positioning/**/*.cjs" ],
+            "parserOptions": {
+                "ecmaVersion": 2023,
+                "sourceType": "commonjs"
+            },
+            "env": {
+                "node": true,
+                "es2023": true
+            }
+        },
         {
             "files": [
                 "api/**/*.js",
@@ -206,13 +284,19 @@
                 "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": {
-                "ecmaVersion": 2020
+                "ecmaVersion": 2023
             },
             "rules": {
                 "no-console": "off",
@@ -285,11 +369,11 @@
             ],
             "excludedFiles": "plugins/*/tests.js",
             "env": {
-                "es2020": true,
+                "es2023": true,
                 "node": true
             },
             "parserOptions": {
-                "ecmaVersion": 2020
+                "ecmaVersion": 2023
             },
             "rules": {
                 "no-console": "off"
@@ -302,13 +386,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 +404,7 @@
                 "ui-tests/**/*.js"
             ],
             "env": {
-                "es2020": true,
+                "es2023": true,
                 "node": true,
                 "mocha": true
             },
@@ -330,7 +413,7 @@
                 "cy": "readonly"
             },
             "parserOptions": {
-                "ecmaVersion": 2020,
+                "ecmaVersion": 2023,
                 "sourceType": "module"
             },
             "rules": {

.github/workflows/deploy.yml

@@ -6,7 +6,7 @@ name: Deploy
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
   push:
-    branches: [ master, next ]
+    branches: [ master, next, release.24.10, release.24.12 ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

.github/workflows/main.yml

@@ -21,20 +21,29 @@ jobs:
   # This workflow contains a single job called "build"
   install:
     # The type of runner that the job will run on
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v3
 
+      - name: Copy code
+        shell: bash
+        run: |
+          sudo mkdir -p /opt/countly
+          touch log/countly-dashboard.log
+          touch log/countly-api.log
+          cp -rf ./* /opt/countly
+        
       - name: Github Actions Azure connection fix
         run: |
           # Workaround for https://github.com/actions/runner-images/issues/675#issuecomment-1381389712
           sudo sed -i 's/azure/us/g' /etc/apt/sources.list
-
+        
       - name: Installing Countly
         shell: bash
+        working-directory: /opt/countly
         run: sudo bash ./bin/countly.install.sh
 
       - name: NodeJS version
@@ -50,10 +59,12 @@ jobs:
         run: mongosh --version
 
       - name: Output API Logs
+        working-directory: /opt/countly
         if: ${{ always() }}
         run: cat log/countly-api.log
 
       - name: Output Dashboard Logs
+        working-directory: /opt/countly
         if: ${{ always() }}
         run: cat log/countly-dashboard.log
 
@@ -105,7 +116,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
@@ -302,7 +313,7 @@ jobs:
           cd ui-tests
           npm install
           xvfb-run --auto-servernum --server-args="-screen 0 1280x1024x24" \
-          npm run cy:run:dashboard --headless --no-sandbox --disable-gpu --disable-dev-shm-usage
+          npm run cy:run:dashboard
 
       - name: Upload UI tests artifacts
         if: ${{ failure() }}
@@ -381,7 +392,7 @@ jobs:
           cd ui-tests
           npm install
           xvfb-run --auto-servernum --server-args="-screen 0 1280x1024x24" \
-          npm run cy:run:onboarding --headless --no-sandbox --disable-gpu --disable-dev-shm-usage
+          npm run cy:run:onboarding
 
       - name: Upload UI tests artifacts
         if: ${{ failure() }}

.github/workflows/stable-je-deploy.yml

@@ -0,0 +1,28 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Deploy Journey Engine
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the master branch
+  push:
+    branches: [ next ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v3
+      
+      - name: Deploy server
+        shell: bash
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.STABLE_JE_SSH_PRIVATE_KEY }}
+        run: bash ./bin/scripts/deploy-je.sh

.gitignore

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