Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
7d4b8fb
Improved dependabot
ar2rsawseen Apr 24, 2025
512194f
Merge branch 'master' into ar2rsawseen/master
ar2rsawseen Apr 24, 2025
6b05515
Merge pull request #6172 from Countly/ar2rsawseen/master
ar2rsawseen Apr 24, 2025
04ca5eb
Bump moment from 2.29.4 to 2.30.1 in /ui-tests
dependabot[bot] Apr 24, 2025
fc849d8
Bump moment-timezone from 0.5.35 to 0.5.48 in /bin/scripts/timezones
dependabot[bot] Apr 24, 2025
fa99373
Bump mocha from 10.8.2 to 11.1.0 in /api/utils/countly-request
dependabot[bot] Apr 24, 2025
8d13cff
Bump puppeteer from 24.7.1 to 24.7.2
dependabot[bot] Apr 24, 2025
9ee8425
Update dependabot.yml
ar2rsawseen Apr 24, 2025
2eea3cb
Merge pull request #6174 from Countly/dependabot/npm_and_yarn/ui-test…
ar2rsawseen Apr 24, 2025
22f637c
Merge branch 'master' into dependabot/npm_and_yarn/bin/scripts/timezo…
ar2rsawseen Apr 24, 2025
b5804bb
Bump chai from 5.1.1 to 5.2.0 in /ui-tests
dependabot[bot] Apr 24, 2025
d4cc4d5
Merge pull request #6175 from Countly/dependabot/npm_and_yarn/bin/scr…
ar2rsawseen Apr 24, 2025
95de728
Merge branch 'master' into ar2rsawseen-patch-41
ar2rsawseen Apr 24, 2025
b425a9e
Bump node-fetch from 2.6.7 to 3.3.2 in /bin/scripts/timezones
dependabot[bot] Apr 24, 2025
cafbb25
Merge pull request #6186 from Countly/ar2rsawseen-patch-41
ar2rsawseen Apr 24, 2025
09a5e0b
Merge branch 'master' into dependabot/npm_and_yarn/api/utils/countly-…
ar2rsawseen Apr 24, 2025
0408ba9
Bump the actions group with 6 updates
dependabot[bot] Apr 24, 2025
e02d46f
Merge pull request #6177 from Countly/dependabot/npm_and_yarn/api/uti…
ar2rsawseen Apr 24, 2025
8df5e71
Merge branch 'master' into dependabot/npm_and_yarn/bin/scripts/timezo…
ar2rsawseen Apr 24, 2025
2112ea8
Merge pull request #6178 from Countly/dependabot/npm_and_yarn/bin/scr…
ar2rsawseen Apr 24, 2025
bde0c3a
Merge branch 'master' into dependabot/npm_and_yarn/puppeteer-24.7.2
ar2rsawseen Apr 24, 2025
850fb35
Merge pull request #6182 from Countly/dependabot/npm_and_yarn/puppete…
ar2rsawseen Apr 24, 2025
ac494fa
Merge branch 'master' into dependabot/npm_and_yarn/ui-tests/chai-5.2.0
ar2rsawseen Apr 24, 2025
e01cf02
Merge pull request #6183 from Countly/dependabot/npm_and_yarn/ui-test…
ar2rsawseen Apr 24, 2025
402a211
Bump @faker-js/faker from 8.2.0 to 9.7.0 in /ui-tests
dependabot[bot] Apr 24, 2025
8069e09
Fix labels
ar2rsawseen Apr 24, 2025
7e31e42
Merge branch 'master' into ar2rsawseen/master
ar2rsawseen Apr 24, 2025
0ae13a0
Fixes
ar2rsawseen Apr 24, 2025
2878c2d
Merge pull request #6187 from Countly/ar2rsawseen/master
ar2rsawseen Apr 25, 2025
e8aba14
Merge branch 'master' into dependabot/npm_and_yarn/ui-tests/faker-js/…
ar2rsawseen Apr 25, 2025
8ddb85a
Merge pull request #6181 from Countly/dependabot/npm_and_yarn/ui-test…
ar2rsawseen Apr 25, 2025
1020983
Merge branch 'master' into dependabot/github_actions/actions-64de86c0d2
ar2rsawseen Apr 25, 2025
cd7bc41
Merge pull request #6185 from Countly/dependabot/github_actions/actio…
ar2rsawseen Apr 25, 2025
85a6847
Localization fixes (#6112)
ar2rsawseen Apr 28, 2025
69230e2
[views] Use aggregation to get heatmap data
widatama Apr 16, 2025
a4fc372
[views] Add meta to heatmap result
widatama Apr 17, 2025
9b69a2d
[views] Add old drill event collection to heatmap result
widatama Apr 18, 2025
0fa59aa
[views] Reorganize test files
widatama Apr 18, 2025
54de0eb
[views] Add tests for heatmap
widatama Apr 23, 2025
f05cc60
[views] Remove old getHeatmap
widatama Apr 23, 2025
f584fda
Update changelog
widatama Apr 24, 2025
1ace39e
Merge pull request #6169 from Countly/heatmap-neo-ingestion-master
Cookiezaurs Apr 29, 2025
cdcafe2
Bump puppeteer from 24.7.2 to 24.8.0
dependabot[bot] May 5, 2025
da249a6
Update index.js (#6197)
ar2rsawseen May 6, 2025
b610c8e
Merge branch 'master' into dependabot/npm_and_yarn/puppeteer-24.8.0
ar2rsawseen May 6, 2025
263499e
new eslint changes and proposal (#6196)
kanwarujjaval May 6, 2025
edfd3cc
Merge branch 'master' into dependabot/npm_and_yarn/puppeteer-24.8.0
ar2rsawseen May 6, 2025
1d5a1b3
Merge pull request #6195 from Countly/dependabot/npm_and_yarn/puppete…
ar2rsawseen May 6, 2025
72f6525
Fix dependencies
ar2rsawseen May 6, 2025
ff85a16
Merge pull request #6199 from Countly/ar2rsawseen/master2
ar2rsawseen May 6, 2025
bdacd13
Merge branch 'master' into next
ar2rsawseen May 8, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
257 changes: 240 additions & 17 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"extends": "eslint:recommended",
"rules": {
// "quotes": ["warn", "single", { "avoidEscape": true }],
"require-atomic-updates": "off",
"block-spacing": [
"error",
Expand Down Expand Up @@ -118,6 +119,240 @@
"unicode-bom": [
"error",
"never"
],
"no-restricted-properties": [
"warn",
{
"object": "Promise",
"property": "map",
"message": "Bluebird-specific method 'Promise.map' detected. Suggestion: use native arrays with Promise.all or a library like 'p-map'."
},
{
"object": "Promise",
"property": "reduce",
"message": "Bluebird-specific method 'Promise.reduce' detected. Suggestion: use Array.reduce plus async/await or a concurrency library."
},
{
"object": "Promise",
"property": "filter",
"message": "Bluebird-specific method 'Promise.filter' detected. Suggestion: use Array.filter plus async/await or a concurrency library."
},
{
"object": "Promise",
"property": "each",
"message": "Bluebird-specific method 'Promise.each' detected. Suggestion: use a for-loop/forEach with async/await."
},
{
"object": "Promise",
"property": "props",
"message": "Bluebird-specific method 'Promise.props' detected. Suggestion: use Promise.all with Object.entries or a custom approach."
},
{
"object": "Promise",
"property": "join",
"message": "Bluebird-specific method 'Promise.join' detected. Suggestion: use Promise.all([...]) and destructuring in .then."
},
{
"object": "Promise",
"property": "try",
"message": "Bluebird-specific method 'Promise.try' detected. Suggestion: use a try/catch block or an async function."
},
{
"object": "Promise",
"property": "attempt",
"message": "Bluebird-specific method 'Promise.attempt' detected. Suggestion: same as 'Promise.try'—use try/catch or async."
},
{
"object": "Promise",
"property": "method",
"message": "Bluebird-specific method 'Promise.method' detected. Suggestion: define an async function or return a native Promise."
},
{
"object": "Promise",
"property": "promisify",
"message": "Bluebird-specific method 'Promise.promisify' detected. Suggestion: use native 'util.promisify' or wrap in a new Promise."
},
{
"object": "Promise",
"property": "promisifyAll",
"message": "Bluebird-specific method 'Promise.promisifyAll' detected. Suggestion: consider 'util.promisify' for each function or a similar library."
},
{
"object": "Promise",
"property": "fromCallback",
"message": "Bluebird-specific method 'Promise.fromCallback' detected. Suggestion: use new Promise(...) or 'util.promisify'."
},
{
"object": "Promise",
"property": "coroutine",
"message": "Bluebird-specific method 'Promise.coroutine' detected. Suggestion: use native async/await."
},
{
"object": "Promise",
"property": "spawn",
"message": "Bluebird-specific method 'Promise.spawn' detected. Suggestion: use native async/await."
},
{
"object": "Promise",
"property": "using",
"message": "Bluebird-specific method 'Promise.using' detected. Suggestion: use try/finally or a resource-management library."
},
{
"object": "Promise",
"property": "disposer",
"message": "Bluebird-specific method 'Promise.disposer' detected. Suggestion: use try/finally or a resource-management library."
},
{
"object": "Promise",
"property": "settle",
"message": "Bluebird-specific method 'Promise.settle' detected. Suggestion: use native 'Promise.allSettled'."
},

/* ---------- Same methods on the Bluebird object itself ---------- */
{
"object": "Bluebird",
"property": "map",
"message": "Bluebird-specific method 'Bluebird.map' detected. Suggestion: use array mapping + Promise.all or 'p-map'."
},
{
"object": "Bluebird",
"property": "reduce",
"message": "Bluebird-specific method 'Bluebird.reduce' detected. Suggestion: use array reduce + async/await or concurrency library."
},
{
"object": "Bluebird",
"property": "filter",
"message": "Bluebird-specific method 'Bluebird.filter' detected. Suggestion: use array filter + async/await or concurrency library."
},
{
"object": "Bluebird",
"property": "each",
"message": "Bluebird-specific method 'Bluebird.each' detected. Suggestion: use a for-loop or forEach + async/await."
},
{
"object": "Bluebird",
"property": "props",
"message": "Bluebird-specific method 'Bluebird.props' detected. Suggestion: use Promise.all with object entries or a custom approach."
},
{
"object": "Bluebird",
"property": "join",
"message": "Bluebird-specific method 'Bluebird.join' detected. Suggestion: use Promise.all([...]) and destructuring."
},
{
"object": "Bluebird",
"property": "try",
"message": "Bluebird-specific method 'Bluebird.try' detected. Suggestion: use a try/catch block or async function."
},
{
"object": "Bluebird",
"property": "attempt",
"message": "Bluebird-specific method 'Bluebird.attempt' detected. Suggestion: use a try/catch block or async function."
},
{
"object": "Bluebird",
"property": "method",
"message": "Bluebird-specific method 'Bluebird.method' detected. Suggestion: define an async function or return a native Promise."
},
{
"object": "Bluebird",
"property": "promisify",
"message": "Bluebird-specific method 'Bluebird.promisify' detected. Suggestion: use native 'util.promisify' or wrap in a new Promise."
},
{
"object": "Bluebird",
"property": "promisifyAll",
"message": "Bluebird-specific method 'Bluebird.promisifyAll' detected. Suggestion: consider 'util.promisify' or a similar library."
},
{
"object": "Bluebird",
"property": "fromCallback",
"message": "Bluebird-specific method 'Bluebird.fromCallback' detected. Suggestion: use new Promise(...) or 'util.promisify'."
},
{
"object": "Bluebird",
"property": "coroutine",
"message": "Bluebird-specific method 'Bluebird.coroutine' detected. Suggestion: use native async/await."
},
{
"object": "Bluebird",
"property": "spawn",
"message": "Bluebird-specific method 'Bluebird.spawn' detected. Suggestion: use native async/await."
},
{
"object": "Bluebird",
"property": "using",
"message": "Bluebird-specific method 'Bluebird.using' detected. Suggestion: use try/finally or a resource-management library."
},
{
"object": "Bluebird",
"property": "disposer",
"message": "Bluebird-specific method 'Bluebird.disposer' detected. Suggestion: use try/finally or a resource-management library."
},
{
"object": "Bluebird",
"property": "settle",
"message": "Bluebird-specific method 'Bluebird.settle' detected. Suggestion: use native 'Promise.allSettled'."
}
],
"no-restricted-syntax": [
"warn",
{
"selector": "CallExpression[callee.property.name='tap']",
"message": "Bluebird-specific instance method '.tap()' detected. Suggestion: use '.then(value => { ...; return value; })'."
},
{
"selector": "CallExpression[callee.property.name='tapCatch']",
"message": "Bluebird-specific instance method '.tapCatch()' detected. Suggestion: use '.catch(error => { ...; throw error; })'."
},
{
"selector": "CallExpression[callee.property.name='spread']",
"message": "Bluebird-specific instance method '.spread()' detected. Suggestion: use '.then(([a, b]) => ... )' with array destructuring."
},
{
"selector": "CallExpression[callee.type='MemberExpression'][callee.property.name='bind'][callee.object.name=/^(Promise|Bluebird|BPromise)$/]",
"message": "Bluebird-specific '.bind()' detected on a Bluebird promise. Suggestion: manually bind 'this' or use arrow functions."
},
{
"selector": "CallExpression[callee.property.name='delay']",
"message": "Bluebird-specific instance method '.delay()' detected. Suggestion: use setTimeout() or a library (e.g., p-delay)."
},
{
"selector": "CallExpression[callee.property.name='timeout']",
"message": "Bluebird-specific instance method '.timeout()' detected. Suggestion: use p-timeout or similar library."
},
{
"selector": "CallExpression[callee.property.name='return']",
"message": "Bluebird-specific instance method '.return()' detected. Suggestion: use '.then(() => someValue)' or rewrite chain."
},
{
"selector": "CallExpression[callee.property.name='throw']",
"message": "Bluebird-specific instance method '.throw()' detected. Suggestion: use '.then(() => { throw error; })'."
},
{
"selector": "CallExpression[callee.property.name='asCallback']",
"message": "Bluebird-specific instance method '.asCallback()' detected. Suggestion: use 'util.callbackify' or rewrite manually."
},
{
"selector": "CallExpression[callee.property.name='nodeify']",
"message": "Bluebird-specific instance method '.nodeify()' detected. Suggestion: use 'util.callbackify' or rewrite manually."
},
{
"selector": "CallExpression[callee.property.name='reflect']",
"message": "Bluebird-specific instance method '.reflect()' detected. Suggestion: use 'Promise.allSettled' or custom handling."
},
{
"selector": "CallExpression[callee.property.name='caught']",
"message": "Bluebird-specific instance method '.caught()' detected. Suggestion: use '.catch()' with condition or separate logic."
},
{
"selector": "CallExpression[callee.property.name='catchReturn']",
"message": "Bluebird-specific instance method '.catchReturn()' detected. Suggestion: use '.catch(err => fallbackValue)' or similar."
},
{
"selector": "CallExpression[callee.property.name='catchThrow']",
"message": "Bluebird-specific instance method '.catchThrow()' detected. Suggestion: use '.catch(err => { throw newError; })'."
}
]
},
"overrides": [
Expand All @@ -142,28 +377,16 @@
{
"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"
"plugins/journey_engine/frontend/builder/**/*.js"
],
"extends": [
"eslint:recommended",
"plugin:vue/vue3-essential",
"plugin:vue/vue3-strongly-recommended",
"plugin:vue/vue3-recommended"
"eslint: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": "^_"
"no-unused-vars": ["error", {
"argsIgnorePattern": "^_", // unused function args
"varsIgnorePattern": "^_" // unused variables
}]
},
"parserOptions": {
Expand Down
Loading
Loading