Skip to content

merge next journey+master #5807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Nov 26, 2024
Merged

merge next journey+master #5807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5eb6968
[core] cache: updated deprecated api of lru-cache, cleaned up mongodb…
Oct 18, 2024
d36dd59
Merge branch 'master' into SER-1984-ss-reworking-cache-js-not-to-use-…
cihadtekin Nov 19, 2024
7a9539b
es2023 for backend and content specific eslint
kanwarujjaval Nov 26, 2024
2c7a00d
es2023 for backend and content specific eslint
kanwarujjaval Nov 26, 2024
1f78489
another fix
kanwarujjaval Nov 26, 2024
41308cf
Merge pull request #5690 from Countly/SER-1984-ss-reworking-cache-js-…
ArtursKadikis Nov 26, 2024
3c7b27c
another fix for ui things
kanwarujjaval Nov 26, 2024
40ee4a5
Merge branch 'next' into eslint-ecma-change
kanwarujjaval Nov 26, 2024
af93668
Merge pull request #5804 from Countly/eslint-ecma-change
kanwarujjaval Nov 26, 2024
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
64 changes: 56 additions & 8 deletions .eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,55 @@
]
},
"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"
],
"extends": [
"eslint:recommended",
"plugin:vue/vue3-essential",
"plugin:vue/vue3-strongly-recommended",
"plugin:vue/vue3-recommended"
],
"rules": {
"no-console": ["error"],
"@stylistic/quotes": ["error", "single"],
"@stylistic/quote-props": ["error", "as-needed"]
},
"plugins": [
"vue",
"@stylistic"
],
"parserOptions": {
"ecmaVersion": 2023,
"sourceType": "module",
"extraFileExtensions": [".vue"]
},
"env": {
"node": true,
"es2023": true,
"es6": true
}
},
{
"files": [
"frontend/express/public/javascripts/countly/*.js",
Expand Down Expand Up @@ -208,7 +257,7 @@
],
"excludedFiles": "plugins/*/frontend/public/**/*.js",
"env": {
"es2020": true,
"es2023": true,
"node": true
},
"parserOptions": {
Expand Down Expand Up @@ -285,11 +334,11 @@
],
"excludedFiles": "plugins/*/tests.js",
"env": {
"es2020": true,
"es2023": true,
"node": true
},
"parserOptions": {
"ecmaVersion": 2020
"ecmaVersion": 2023
},
"rules": {
"no-console": "off"
Expand All @@ -302,13 +351,12 @@
"plugins/*/tests.js"
],
"env": {
"es2020": true,
"es2023": true,
"node": true,
"mocha": true
},
"parserOptions": {
"ecmaVersion": 2020,
"sourceType": "module"
"ecmaVersion": 2023
},
"rules": {
"no-console": "off",
Expand All @@ -321,7 +369,7 @@
"ui-tests/**/*.js"
],
"env": {
"es2020": true,
"es2023": true,
"node": true,
"mocha": true
},
Expand All @@ -330,7 +378,7 @@
"cy": "readonly"
},
"parserOptions": {
"ecmaVersion": 2020,
"ecmaVersion": 2023,
"sourceType": "module"
},
"rules": {
Expand Down
4 changes: 2 additions & 2 deletions api/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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', {});
Expand Down Expand Up @@ -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
Expand Down
Loading
Loading