Switch to patched electron-redux fork.

wnayes · Jan 7, 2024 · dd06b07 · dd06b07
1 parent 6d5f761
commit dd06b07
Show file tree

Hide file tree

Showing 18 changed files with 4,799 additions and 6,945 deletions.
diff --git a/apps/wm/configureStore.ts b/apps/wm/configureStore.ts
@@ -1,6 +1,6 @@
 import { applyMiddleware, Middleware } from "redux";
 import { configureStore } from "@reduxjs/toolkit";
-import { composeWithStateSync } from "electron-redux/main";
+import { composeWithStateSync } from "@wnayes/electron-redux/main";
 import {
   configReducer,
   desktopReducer,

diff --git a/apps/wm/package.json b/apps/wm/package.json
@@ -23,7 +23,7 @@
   "scripts": {
     "start": "DISPLAY=:1 electron .",
     "build": "pnpm check && pnpm build-index && pnpm build-preload && pnpm generate-version-json",
-    "build-index": "esbuild ./index.js --bundle --platform=node --packages=external --alias:electron-redux/main=electron-redux/es/main.mjs --format=esm --outfile=./dist/index.mjs --sourcemap --banner:js=\"import { createRequire } from 'module'; const require = createRequire(import.meta.url);\"",
+    "build-index": "esbuild ./index.js --bundle --platform=node --packages=external --format=esm --outfile=./dist/index.mjs --sourcemap --banner:js=\"import { createRequire } from 'module'; const require = createRequire(import.meta.url);\"",
     "build-preload": "esbuild ./preload.ts --bundle --platform=node --external:electron --outfile=./dist/preload.js",
     "check": "tsc -b ./tsconfig.json",
     "generate-version-json": "./scripts/generate-version-json.mjs",
@@ -33,27 +33,27 @@
     "@bond-wm/keysym": "workspace:^",
     "@bond-wm/shared": "workspace:^",
     "@bond-wm/tsconfig": "workspace:^",
-    "@reduxjs/toolkit": "^2.0.0",
-    "electron": "^28.0.0",
-    "electron-redux": "2.0.0-alpha.9",
+    "@reduxjs/toolkit": "^2.0.1",
+    "@wnayes/electron-redux": "2.0.0-alpha.10",
+    "electron": "^28.1.1",
     "freedesktop-desktop-entry": "^1.0.0",
     "freedesktop-icons": "^1.0.0",
-    "redux": "^5.0.0",
+    "redux": "^5.0.1",
     "rfc4648": "^1.5.3",
-    "tslib": "^2.4.1",
-    "typescript": "~5.3.2",
-    "vite": "^5.0.10",
-    "vite-node": "^1.1.1",
+    "tslib": "^2.6.2",
+    "typescript": "~5.3.3",
+    "vite": "^5.0.11",
+    "vite-node": "^1.1.3",
     "x11": "^2.3.0",
     "xdg-user-dir": "^0.0.1",
-    "yargs": "^17.6.2"
+    "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@types/node": "^18.11.17",
-    "@types/yargs": "^17.0.15",
-    "esbuild": "^0.16.12",
-    "jest": "^29.3.1",
-    "ts-jest": "^29.0.3",
-    "type-fest": "^3.3.0"
+    "@types/node": "^18.19.5",
+    "@types/yargs": "^17.0.32",
+    "esbuild": "^0.16.17",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.1",
+    "type-fest": "^3.13.1"
   }
 }
diff --git a/apps/wm/preload.ts b/apps/wm/preload.ts
@@ -1,4 +1,4 @@
-import { preload } from "electron-redux/preload";
+import { preload } from "@wnayes/electron-redux/preload";
 
 // Importing the preload module automatically executes it.
 // We need to somehow reference the module though, else esbuild wants to elide it.

diff --git a/docs/package.json b/docs/package.json
@@ -18,10 +18,10 @@
     "@docusaurus/core": "3.0.1",
     "@docusaurus/preset-classic": "3.0.1",
     "@mdx-js/react": "^3.0.0",
-    "clsx": "^2.0.0",
-    "prism-react-renderer": "^2.3.0",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0"
+    "clsx": "^2.1.0",
+    "prism-react-renderer": "^2.3.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "devDependencies": {
     "@docusaurus/module-type-aliases": "3.0.1",

diff --git a/package.json b/package.json
@@ -12,21 +12,18 @@
     "test": "turbo run test"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^6.8.0",
-    "@typescript-eslint/parser": "^6.8.0",
-    "eslint": "^8.52.0",
-    "eslint-config-prettier": "^9.0.0",
+    "@typescript-eslint/eslint-plugin": "^6.18.0",
+    "@typescript-eslint/parser": "^6.18.0",
+    "eslint": "^8.56.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "prettier": "3.0.3",
-    "turbo": "^1.10.16",
-    "typescript": "~5.3.2"
+    "turbo": "^1.11.3",
+    "typescript": "~5.3.3"
   },
   "pnpm": {
     "overrides": {
       "redux": "^5.0.0"
-    },
-    "patchedDependencies": {
-      "electron-redux@2.0.0-alpha.9": "patches/electron-redux@2.0.0-alpha.9.patch"
     }
   },
   "packageManager": "pnpm@8.2.0"

diff --git a/packages/layout-floating/package.json b/packages/layout-floating/package.json
@@ -12,13 +12,13 @@
   },
   "dependencies": {
     "@bond-wm/shared": "workspace:^",
-    "tslib": "^2.4.1"
+    "tslib": "^2.6.2"
   },
   "devDependencies": {
     "@bond-wm/tsconfig": "workspace:^",
-    "@types/node": "^18.11.17",
-    "type-fest": "^3.3.0",
-    "typescript": "~5.3.2",
-    "vite": "^5.0.10"
+    "@types/node": "^18.19.5",
+    "type-fest": "^3.13.1",
+    "typescript": "~5.3.3",
+    "vite": "^5.0.11"
   }
 }
diff --git a/packages/layout-tiling/package.json b/packages/layout-tiling/package.json
@@ -12,13 +12,13 @@
   },
   "dependencies": {
     "@bond-wm/shared": "workspace:^",
-    "tslib": "^2.4.1"
+    "tslib": "^2.6.2"
   },
   "devDependencies": {
     "@bond-wm/tsconfig": "workspace:^",
-    "@types/node": "^18.11.17",
-    "type-fest": "^3.3.0",
-    "typescript": "~5.3.2",
-    "vite": "^5.0.10"
+    "@types/node": "^18.19.5",
+    "type-fest": "^3.13.1",
+    "typescript": "~5.3.3",
+    "vite": "^5.0.11"
   }
 }
diff --git a/packages/react-config/package.json b/packages/react-config/package.json
@@ -28,12 +28,12 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-error-boundary": "^3.1.4",
-    "tslib": "^2.4.1"
+    "tslib": "^2.6.2"
   },
   "devDependencies": {
     "@bond-wm/tsconfig": "workspace:^",
-    "@types/react": "^18.2.46",
+    "@types/react": "^18.2.47",
     "@types/react-dom": "^18.2.18",
-    "typescript": "~5.3.2"
+    "typescript": "~5.3.3"
   }
 }
diff --git a/packages/react-desktop-entries/package.json b/packages/react-desktop-entries/package.json
@@ -12,18 +12,18 @@
     "build": "tsc -b ./tsconfig.json"
   },
   "dependencies": {
+    "@bond-wm/react": "workspace:^",
     "@bond-wm/shared": "workspace:^",
     "@bond-wm/shared-renderer": "workspace:^",
-    "@bond-wm/react": "workspace:^",
-    "tslib": "^2.4.1"
+    "tslib": "^2.6.2"
   },
   "devDependencies": {
     "@bond-wm/tsconfig": "workspace:^",
-    "@types/node": "^18.11.17",
-    "@types/react": "^18.2.46",
+    "@types/node": "^18.19.5",
+    "@types/react": "^18.2.47",
     "@types/react-dom": "^18.2.18",
-    "type-fest": "^3.3.0",
-    "typescript": "~5.3.2"
+    "type-fest": "^3.13.1",
+    "typescript": "~5.3.3"
   },
   "peerDependencies": {
     "react": "^18.2.0",

diff --git a/packages/react-taskbar/package.json b/packages/react-taskbar/package.json
@@ -12,20 +12,20 @@
     "build": "tsc -b ./tsconfig.json"
   },
   "dependencies": {
+    "@bond-wm/react": "workspace:^",
     "@bond-wm/shared": "workspace:^",
     "@bond-wm/shared-renderer": "workspace:^",
-    "@bond-wm/react": "workspace:^",
-    "react-redux": "^9.0.0",
-    "redux": "^5.0.0",
-    "tslib": "^2.4.1"
+    "react-redux": "^9.0.4",
+    "redux": "^5.0.1",
+    "tslib": "^2.6.2"
   },
   "devDependencies": {
     "@bond-wm/tsconfig": "workspace:^",
-    "@types/node": "^18.11.17",
-    "@types/react": "^18.2.46",
+    "@types/node": "^18.19.5",
+    "@types/react": "^18.2.47",
     "@types/react-dom": "^18.2.18",
-    "type-fest": "^3.3.0",
-    "typescript": "~5.3.2"
+    "type-fest": "^3.13.1",
+    "typescript": "~5.3.3"
   },
   "peerDependencies": {
     "react": "^18.2.0",

diff --git a/packages/react-titlebar/package.json b/packages/react-titlebar/package.json
@@ -13,21 +13,21 @@
     "build": "tsc -b ./tsconfig.json && esbuild ./index.tsx --bundle --format=esm --packages=external --loader:.svg=dataurl --loader:.css=dataurl --outfile=./dist/index.js"
   },
   "dependencies": {
+    "@bond-wm/react": "workspace:^",
     "@bond-wm/shared": "workspace:^",
     "@bond-wm/shared-renderer": "workspace:^",
-    "@bond-wm/react": "workspace:^",
-    "react-redux": "^9.0.0",
-    "redux": "^5.0.0",
-    "tslib": "^2.4.1"
+    "react-redux": "^9.0.4",
+    "redux": "^5.0.1",
+    "tslib": "^2.6.2"
   },
   "devDependencies": {
     "@bond-wm/tsconfig": "workspace:^",
-    "@types/node": "^18.11.17",
-    "@types/react": "^18.2.46",
+    "@types/node": "^18.19.5",
+    "@types/react": "^18.2.47",
     "@types/react-dom": "^18.2.18",
-    "esbuild": "^0.16.12",
-    "type-fest": "^3.3.0",
-    "typescript": "~5.3.2"
+    "esbuild": "^0.16.17",
+    "type-fest": "^3.13.1",
+    "typescript": "~5.3.3"
   },
   "peerDependencies": {
     "react": "^18.2.0",

diff --git a/packages/react-wallpaper/package.json b/packages/react-wallpaper/package.json
@@ -11,15 +11,15 @@
     "build": "tsc -b ./tsconfig.json"
   },
   "dependencies": {
-    "tslib": "^2.4.1"
+    "tslib": "^2.6.2"
   },
   "devDependencies": {
     "@bond-wm/tsconfig": "workspace:^",
-    "@types/node": "^18.11.17",
-    "@types/react": "^18.2.46",
+    "@types/node": "^18.19.5",
+    "@types/react": "^18.2.47",
     "@types/react-dom": "^18.2.18",
-    "type-fest": "^3.3.0",
-    "typescript": "~5.3.2"
+    "type-fest": "^3.13.1",
+    "typescript": "~5.3.3"
   },
   "peerDependencies": {
     "@bond-wm/react": "workspace:^",

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -13,21 +13,21 @@
     "clean": "rm -rf ./node_modules"
   },
   "dependencies": {
-    "@callstack/react-theme-provider": "^3.0.9",
     "@bond-wm/shared": "workspace:^",
     "@bond-wm/shared-renderer": "workspace:^",
+    "@callstack/react-theme-provider": "^3.0.9",
     "react-error-boundary": "^3.1.4",
-    "react-redux": "^9.0.0",
-    "redux": "^5.0.0",
-    "tslib": "^2.4.1"
+    "react-redux": "^9.0.4",
+    "redux": "^5.0.1",
+    "tslib": "^2.6.2"
   },
   "devDependencies": {
     "@bond-wm/tsconfig": "workspace:^",
-    "@types/node": "^18.11.17",
-    "@types/react": "^18.2.46",
+    "@types/node": "^18.19.5",
+    "@types/react": "^18.2.47",
     "@types/react-dom": "^18.2.18",
-    "type-fest": "^3.3.0",
-    "typescript": "~5.3.2"
+    "type-fest": "^3.13.1",
+    "typescript": "~5.3.3"
   },
   "peerDependencies": {
     "react": "^18.2.0",

diff --git a/packages/shared-renderer/configureStore.ts b/packages/shared-renderer/configureStore.ts
@@ -1,5 +1,5 @@
 import { configureStore } from "@reduxjs/toolkit";
-import { stateSyncEnhancer } from "electron-redux/renderer";
+import { stateSyncEnhancer } from "@wnayes/electron-redux/renderer";
 import {
   configReducer,
   desktopReducer,

diff --git a/packages/shared-renderer/package.json b/packages/shared-renderer/package.json
@@ -14,17 +14,17 @@
   },
   "dependencies": {
     "@bond-wm/shared": "workspace:^",
-    "@reduxjs/toolkit": "^2.0.0",
-    "electron-redux": "2.0.0-alpha.9",
-    "redux": "^5.0.0",
-    "tslib": "^2.4.1"
+    "@reduxjs/toolkit": "^2.0.1",
+    "@wnayes/electron-redux": "2.0.0-alpha.10",
+    "redux": "^5.0.1",
+    "tslib": "^2.6.2"
   },
   "devDependencies": {
     "@bond-wm/tsconfig": "workspace:^",
-    "@types/node": "^18.11.17",
-    "jest": "^29.3.1",
-    "ts-jest": "^29.0.3",
-    "type-fest": "^3.3.0",
-    "typescript": "~5.3.2"
+    "@types/node": "^18.19.5",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.1",
+    "type-fest": "^3.13.1",
+    "typescript": "~5.3.3"
   }
 }
diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -16,23 +16,23 @@
     "test": "jest"
   },
   "dependencies": {
-    "@reduxjs/toolkit": "^2.0.0",
-    "electron": "^28.0.0",
-    "react-redux": "^9.0.0",
-    "redux": "^5.0.0",
-    "tslib": "^2.4.1",
+    "@reduxjs/toolkit": "^2.0.1",
+    "electron": "^28.1.1",
+    "react-redux": "^9.0.4",
+    "redux": "^5.0.1",
+    "tslib": "^2.6.2",
     "x11": "^2.3.0",
-    "yargs": "^17.6.2"
+    "yargs": "^17.7.2"
   },
   "devDependencies": {
     "@bond-wm/tsconfig": "workspace:^",
-    "@jest/globals": "^29.3.1",
-    "@types/node": "^18.11.17",
-    "@types/yargs": "^17.0.15",
-    "esbuild": "^0.16.12",
-    "jest": "^29.3.1",
-    "ts-jest": "^29.0.3",
-    "type-fest": "^3.3.0",
-    "typescript": "~5.3.2"
+    "@jest/globals": "^29.7.0",
+    "@types/node": "^18.19.5",
+    "@types/yargs": "^17.0.32",
+    "esbuild": "^0.16.17",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.1",
+    "type-fest": "^3.13.1",
+    "typescript": "~5.3.3"
   }
 }