Skip to content

Commit

Permalink
Release 6.7.2
Browse files Browse the repository at this point in the history
Merge branch 'develop' into release
  • Loading branch information
vraravam committed Mar 23, 2024
2 parents f1f0256 + 36d8f4c commit ce7a877
Show file tree
Hide file tree
Showing 210 changed files with 2,581 additions and 1,768 deletions.
4 changes: 4 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,13 @@ module.exports = {
'@typescript-eslint/consistent-type-assertions': 0,
'@typescript-eslint/consistent-type-definitions': 0,
'@typescript-eslint/no-empty-interface': 0,
'@typescript-eslint/ban-ts-comment': 0,

// eslint-plugin-import
'import/no-extraneous-dependencies': 0,

// sonar
'sonar/no-try-promise': 0,
},
},
],
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Currently, these are the combinations of system dependencies that work for MacOS
$ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json
{
"node": "20.11.1",
"pnpm": "8.15.3"
"pnpm": "8.15.5"
}
```

Expand Down
6 changes: 4 additions & 2 deletions biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"enabled": false
},
"organizeImports": {
"enabled": false
"enabled": true
},
"linter": {
"ignore": ["build", "coverage", "node_modules", "recipes", "*.json"],
Expand All @@ -23,7 +23,9 @@
"suspicious": {
"noEmptyInterface": "off",
"noExplicitAny": "off",
"noArrayIndexKey": "off"
"noImplicitAnyLet": "off",
"noArrayIndexKey": "off",
"noThenProperty": "off"
},
"performance": {
"noDelete": "off"
Expand Down
16 changes: 8 additions & 8 deletions esbuild.mjs
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#!/usr/bin/env node
import * as fs from 'node:fs';
import { performance } from 'node:perf_hooks';
import chalk from 'chalk';
import * as esbuild from 'esbuild';
import { sassPlugin } from 'esbuild-sass-plugin';
import { copy } from 'esbuild-plugin-copy';
import glob from 'tiny-glob';
import livereload from 'gulp-livereload';
import * as fs from 'node:fs';
import * as buildInfo from 'preval-build-info';
import { sassPlugin } from 'esbuild-sass-plugin';
import fsPkg from 'fs-extra';
import chalk from 'chalk';
import { performance } from 'node:perf_hooks';
import livereload from 'gulp-livereload';
import moment from 'moment';
import * as buildInfo from 'preval-build-info';
import glob from 'tiny-glob';

const { log } = console;

Expand Down Expand Up @@ -140,4 +140,4 @@ const runEsbuild = async () => {
}
};

runEsbuild();
await runEsbuild();
68 changes: 34 additions & 34 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"productName": "Ferdium",
"desktopName": "ferdium.desktop",
"appId": "org.ferdium.ferdium-app",
"version": "6.7.1",
"version": "6.7.2",
"description": "Messaging app for WhatsApp, Slack, Telegram, Hangouts and many many more.",
"author": "Ferdium Contributors <[email protected]> (https://ferdium.org/)",
"license": "Apache-2.0",
Expand All @@ -14,14 +14,14 @@
"private": true,
"engines": {
"node": "20.11.1",
"pnpm": "8.15.3"
"pnpm": "8.15.5"
},
"engine-strict": true,
"volta": {
"node": "20.11.1",
"pnpm": "8.15.3"
"pnpm": "8.15.5"
},
"packageManager": "[email protected].3",
"packageManager": "[email protected].5",
"scripts": {
"prepare": "is-ci || husky install",
"start": "electron ./build",
Expand Down Expand Up @@ -64,27 +64,27 @@
"@adonisjs/shield": "1.1.0",
"@adonisjs/validator": "5.1.0",
"@electron/remote": "2.1.2",
"@emotion/react": "11.11.3",
"@emotion/react": "11.11.4",
"@emotion/styled": "11.11.0",
"@krisdages/electron-process-manager": "3.0.0",
"@mdi/js": "7.4.47",
"@mdi/react": "1.6.1",
"@mui/icons-material": "5.15.10",
"@mui/material": "5.15.10",
"@mui/icons-material": "5.15.14",
"@mui/material": "5.15.14",
"@octokit/core": "5.1.0",
"@sentry/electron": "4.14.0",
"@superwf/mobx-react-router": "7.4.0",
"auto-launch": "5.0.6",
"classnames": "2.5.1",
"color": "4.2.3",
"csstype": "3.1.3",
"darkreader": "4.9.77",
"darkreader": "4.9.80",
"dbus-next": "0.10.2",
"debug": "4.3.4",
"electron-dl": "3.5.2",
"electron-find": "1.0.7",
"electron-react-titlebar": "1.2.1",
"electron-updater": "6.1.7",
"electron-updater": "6.1.8",
"electron-window-state": "5.0.3",
"fast-folder-size": "2.2.0",
"fs-extra": "11.2.0",
Expand All @@ -96,12 +96,12 @@
"languagedetect": "2.0.0",
"lodash": "4.17.21",
"macos-version": "5.2.1",
"markdown-to-jsx": "7.4.1",
"markdown-to-jsx": "7.4.4",
"minimist": "1.2.8",
"mobx": "6.12.0",
"mobx-localstorage": "1.2.0",
"mobx-react": "7.6.0",
"mobx-react-form": "6.9.3",
"mobx-react-form": "6.9.4",
"moment": "2.30.1",
"ms": "2.1.3",
"normalize-url": "6.1.0",
Expand All @@ -119,9 +119,9 @@
"react-jss": "10.10.0",
"react-loader-spinner": "5.4.5",
"react-modal": "3.16.1",
"react-router-dom": "6.22.1",
"react-router-dom": "6.22.3",
"react-sortable-hoc": "2.0.0",
"react-tooltip": "5.26.2",
"react-tooltip": "5.26.3",
"react-topbar-progress-indicator": "4.1.1",
"react-transition-group": "4.4.5",
"route-parser": "0.0.5",
Expand All @@ -135,65 +135,65 @@
"validator": "13.11.0"
},
"devDependencies": {
"@biomejs/biome": "1.4.1",
"@commitlint/cli": "18.6.1",
"@commitlint/config-conventional": "18.6.2",
"@biomejs/biome": "1.6.1",
"@commitlint/cli": "19.2.1",
"@commitlint/config-conventional": "19.1.0",
"@electron/notarize": "1.2.3",
"@formatjs/cli": "6.2.7",
"@jest/types": "29.6.3",
"@types/auto-launch": "5.0.5",
"@types/color": "3.0.6",
"@types/fs-extra": "11.0.4",
"@types/jest": "29.5.12",
"@types/lodash": "4.14.202",
"@types/lodash": "4.17.0",
"@types/minimist": "1.2.5",
"@types/ms": "0.7.34",
"@types/node": "20.11.19",
"@types/node": "20.11.30",
"@types/prop-types": "15.7.11",
"@types/react": "18.2.55",
"@types/react-color": "3.0.11",
"@types/react-dom": "18.2.19",
"@types/react": "18.2.67",
"@types/react-color": "3.0.12",
"@types/react-dom": "18.2.22",
"@types/react-transition-group": "4.4.10",
"@types/route-parser": "0.1.7",
"@types/semver": "7.5.7",
"@types/semver": "7.5.8",
"@types/tar": "6.1.11",
"@types/uuid": "9.0.8",
"@types/validator": "13.11.9",
"@typescript-eslint/eslint-plugin": "6.21.0",
"@typescript-eslint/parser": "6.21.0",
"@typescript-eslint/eslint-plugin": "7.3.1",
"@typescript-eslint/parser": "7.3.1",
"all-contributors-cli": "6.26.1",
"chalk": "5.3.0",
"concurrently": "8.2.2",
"cross-env": "7.0.3",
"electron": "29.1.1",
"electron-builder": "24.9.1",
"electron": "29.1.5",
"electron-builder": "24.13.3",
"esbuild": "0.16.17",
"esbuild-plugin-copy": "2.1.1",
"esbuild-runner": "2.2.2",
"esbuild-sass-plugin": "2.16.1",
"eslint": "8.56.0",
"eslint": "8.57.0",
"eslint-config-airbnb": "19.0.4",
"eslint-config-airbnb-typescript": "17.1.0",
"eslint-config-airbnb-typescript": "18.0.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-jest": "27.9.0",
"eslint-plugin-jsx-a11y": "6.8.0",
"eslint-plugin-prettier": "5.1.3",
"eslint-plugin-react": "7.33.2",
"eslint-plugin-react": "7.34.1",
"eslint-plugin-react-hooks": "4.6.0",
"eslint-plugin-sonar": "0.12.0",
"eslint-plugin-unicorn": "50.0.1",
"eslint-plugin-sonar": "0.13.2",
"eslint-plugin-unicorn": "51.0.1",
"gulp-livereload": "4.0.2",
"husky": "9.0.11",
"is-ci": "3.0.1",
"jest": "29.7.0",
"prettier": "3.2.5",
"preval-build-info": "1.0.3",
"rimraf": "5.0.5",
"simple-git": "3.22.0",
"simple-git": "3.23.0",
"tiny-glob": "0.2.9",
"ts-node": "10.9.2",
"typescript": "5.3.3",
"typescript": "5.4.3",
"wait-on": "7.2.0"
},
"pnpm": {
Expand All @@ -202,7 +202,7 @@
},
"peerDependencyRules": {
"allowedVersions": {
"@typescript-eslint/parser": "^6.0.0",
"@typescript-eslint/parser": "^7.0.0",
"esbuild-sass-plugin>esbuild": "^0.16.7",
"react-electron-web-view>react": "^18.0.0",
"react-electron-web-view>react-dom": "^18.0.0",
Expand Down
Loading

0 comments on commit ce7a877

Please sign in to comment.