Skip to content

Commit

Permalink
Bump up to 6.7.5
Browse files Browse the repository at this point in the history
Merge branch 'develop' into release
  • Loading branch information
vraravam committed Jun 29, 2024
2 parents cb7f459 + f071f6f commit 5514cab
Show file tree
Hide file tree
Showing 17 changed files with 10,237 additions and 8,280 deletions.
2 changes: 1 addition & 1 deletion .npmrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ save-exact = true
engine-strict = true
unsafe-perm = true
frozen-lockfile = false
strict-peer-dependencies = true
strict-peer-dependencies = false
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.12.2
20.14.0
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ Currently, these are the combinations of system dependencies that work for MacOS
# Note: 'jq' is not a required system dependency; its only here to show the combined output of versions needed
$ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json
{
"node": "20.12.2",
"pnpm": "8.15.7"
"node": "20.14.0",
"pnpm": "9.1.4"
}
```

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Note: Before running this file, you should have already cloned the git repo + submodules on the host machine. This is used when actively developing on your local machine, but you want to build for a different architecture

FROM docker.io/library/node:20.12.2-buster AS builder
FROM docker.io/library/node:20.14.0-buster AS builder

ENV PATH="/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/lib:/usr/include:/usr/share"

Expand Down
82 changes: 41 additions & 41 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.4",
"version": "6.7.5",
"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 @@ -13,15 +13,15 @@
"repository": "https://github.com/ferdium/ferdium-app.git",
"private": true,
"engines": {
"node": "20.12.2",
"pnpm": "8.15.7"
"node": "20.14.0",
"pnpm": "9.1.4"
},
"engine-strict": true,
"volta": {
"node": "20.12.2",
"pnpm": "8.15.7"
"node": "20.14.0",
"pnpm": "9.1.4"
},
"packageManager": "pnpm@8.15.7",
"packageManager": "pnpm@9.1.4",
"scripts": {
"prepare": "is-ci || husky",
"start": "electron ./build",
Expand Down Expand Up @@ -65,8 +65,8 @@
"@emotion/styled": "11.11.5",
"@mdi/js": "7.4.47",
"@mdi/react": "1.6.1",
"@mui/icons-material": "5.15.15",
"@mui/material": "5.15.15",
"@mui/icons-material": "5.15.20",
"@mui/material": "5.15.20",
"@octokit/core": "5.1.0",
"@sentry/electron": "4.14.0",
"@superwf/mobx-react-router": "7.4.0",
Expand All @@ -75,27 +75,27 @@
"classnames": "2.5.1",
"color": "4.2.3",
"csstype": "3.1.3",
"darkreader": "4.9.83",
"darkreader": "4.9.86",
"dbus-next": "0.10.2",
"debug": "4.3.4",
"debug": "4.3.5",
"electron-dl": "3.5.2",
"electron-find": "1.0.7",
"electron-react-titlebar": "1.2.1",
"electron-updater": "6.1.8",
"electron-updater": "6.2.1",
"electron-window-state": "5.0.3",
"fast-folder-size": "2.2.0",
"fs-extra": "11.2.0",
"google-translate-api-x": "10.6.8",
"history": "5.3.0",
"immutable": "4.3.2",
"immutable": "4.3.6",
"jsonwebtoken": "9.0.2",
"jss": "10.10.0",
"languagedetect": "2.0.0",
"lodash": "4.17.21",
"macos-version": "5.2.1",
"markdown-to-jsx": "7.4.6",
"markdown-to-jsx": "7.4.7",
"minimist": "1.2.8",
"mobx": "6.12.3",
"mobx": "6.12.4",
"mobx-localstorage": "1.2.0",
"mobx-react": "7.6.0",
"mobx-react-form": "6.9.4",
Expand All @@ -106,64 +106,64 @@
"pretty-bytes": "5.6.0",
"prop-types": "15.8.1",
"rc-progress": "3.5.1",
"react": "18.2.0",
"react": "18.3.1",
"react-color": "2.19.3",
"react-confetti": "6.1.0",
"react-dom": "18.2.0",
"react-dom": "18.3.1",
"react-dropzone": "14.2.3",
"react-electron-web-view": "2.0.1",
"react-intl": "6.6.5",
"react-intl": "6.6.8",
"react-jss": "10.10.0",
"react-loader-spinner": "5.4.5",
"react-modal": "3.16.1",
"react-router-dom": "6.22.3",
"react-router-dom": "6.23.1",
"react-sortable-hoc": "2.0.0",
"react-tooltip": "5.26.3",
"react-tooltip": "5.27.0",
"react-topbar-progress-indicator": "4.1.1",
"react-transition-group": "4.4.5",
"route-parser": "0.0.5",
"sanitize-filename": "1.6.3",
"semver": "7.6.0",
"semver": "7.6.2",
"sqlite3": "5.1.6",
"tar": "6.2.1",
"tslib": "2.6.2",
"tslib": "2.6.3",
"useragent-generator": "1.1.1-amkt-22079-finish.0",
"uuid": "9.0.1",
"validator": "13.11.0"
"validator": "13.12.0"
},
"devDependencies": {
"@biomejs/biome": "1.6.1",
"@commitlint/cli": "19.2.1",
"@commitlint/config-conventional": "19.1.0",
"@electron/notarize": "2.3.0",
"@eslint-react/eslint-plugin": "1.5.8",
"@formatjs/cli": "6.2.9",
"@commitlint/cli": "19.3.0",
"@commitlint/config-conventional": "19.2.2",
"@electron/notarize": "2.3.2",
"@eslint-react/eslint-plugin": "1.5.12",
"@formatjs/cli": "6.2.12",
"@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.17.0",
"@types/lodash": "4.17.5",
"@types/minimist": "1.2.5",
"@types/ms": "0.7.34",
"@types/node": "20.12.7",
"@types/node": "20.14.8",
"@types/prop-types": "15.7.12",
"@types/react": "18.2.77",
"@types/react": "18.3.3",
"@types/react-color": "3.0.12",
"@types/react-dom": "18.2.25",
"@types/react-dom": "18.3.0",
"@types/react-transition-group": "4.4.10",
"@types/route-parser": "0.1.7",
"@types/semver": "7.5.8",
"@types/tar": "6.1.12",
"@types/tar": "6.1.13",
"@types/uuid": "9.0.8",
"@types/validator": "13.11.9",
"@typescript-eslint/eslint-plugin": "7.6.0",
"@typescript-eslint/parser": "7.6.0",
"@types/validator": "13.12.0",
"@typescript-eslint/eslint-plugin": "7.10.0",
"@typescript-eslint/parser": "7.10.0",
"all-contributors-cli": "6.26.1",
"chalk": "5.3.0",
"concurrently": "8.2.2",
"cross-env": "7.0.3",
"electron": "30.0.6",
"electron": "31.1.0",
"electron-builder": "24.13.3",
"esbuild": "0.16.17",
"esbuild-plugin-copy": "2.1.1",
Expand All @@ -185,10 +185,10 @@
"husky": "9.0.11",
"is-ci": "3.0.1",
"jest": "29.7.0",
"prettier": "3.2.5",
"prettier": "3.3.2",
"preval-build-info": "1.0.3",
"rimraf": "5.0.5",
"simple-git": "3.24.0",
"rimraf": "5.0.7",
"simple-git": "3.25.0",
"tiny-glob": "0.2.9",
"ts-node": "10.9.2",
"typescript": "5.4.5",
Expand Down Expand Up @@ -227,8 +227,8 @@
"usocket": "_EXCLUDED_"
},
"optionalDependencies": {
"macos-notification-state": "github:ferdium/macos-notification-state#e0e78c3aff1a9d2362709dff70d01d3eaef4ee6a",
"node-mac-permissions": "2.3.0"
"macos-notification-state": "github:ferdium/macos-notification-state#7d740bcea260feb08197bd210912133e72853d93",
"node-mac-permissions": "2.4.0"
},
"browserslist": [
"last 2 Chrome versions"
Expand Down
Loading

0 comments on commit 5514cab

Please sign in to comment.