Skip to content

Commit

Permalink
fix: update gameplan patch
Browse files Browse the repository at this point in the history
  • Loading branch information
blaggacao committed Jul 22, 2024
1 parent a2e006b commit 9a40af7
Showing 1 changed file with 48 additions and 28 deletions.
76 changes: 48 additions & 28 deletions src/overlays/frappe/gameplan-0001-revert-re-enable-workspaces.patch
Original file line number Diff line number Diff line change
@@ -1,30 +1,16 @@
From 511fe166823d0eb9a1ac117f2c310c288416ca99 Mon Sep 17 00:00:00 2001
From 6411b3665c4c6ea56544e4bf7be3dc01d7e3b485 Mon Sep 17 00:00:00 2001
From: David <[email protected]>
Date: Sat, 23 Mar 2024 16:19:23 +0100
Subject: [PATCH] revert: re-enable workspaces

(cherry picked from commit f5a78b775258ebda478b10306215aeac4419d6f3)
---
.github/workflows/ui-test.yml | 2 +-
package.json | 4 +-
yarn.lock | 3728 +++++++++++++++++++++++++++++++++
3 files changed, 3731 insertions(+), 3 deletions(-)
package.json | 4 +-
yarn.lock | 3759 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 3761 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ui-test.yml b/.github/workflows/ui-test.yml
index 3f0fc0ca..3e2d652b 100644
--- a/.github/workflows/ui-test.yml
+++ b/.github/workflows/ui-test.yml
@@ -47,7 +47,7 @@ jobs:

- uses: actions/setup-node@v3
with:
- node-version: 16
+ node-version: 18
check-latest: true

- name: Add to Hosts
diff --git a/package.json b/package.json
index 1bdefddf..7e0a79f0 100644
index 1bdefdd..7e0a79f 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
Expand All @@ -41,10 +27,10 @@ index 1bdefddf..7e0a79f0 100644
\ No newline at end of file
+}
diff --git a/yarn.lock b/yarn.lock
index fb57ccd1..f00eb184 100644
index fb57ccd..0ad7c64 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,3 +2,3731 @@
@@ -2,3 +2,3762 @@
# yarn lockfile v1


Expand Down Expand Up @@ -1983,10 +1969,10 @@ index fb57ccd1..f00eb184 100644
+ resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
+ integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==
+
+frappe-ui@^0.1.54:
+ version "0.1.58"
+ resolved "https://registry.yarnpkg.com/frappe-ui/-/frappe-ui-0.1.58.tgz#84500077c696c743c8e49a84da8a954922c4ce5e"
+ integrity sha512-45ngtaexcmP7Yx76weQxZxVo3yqoNNkSyYglDhb7taK2SJ9oX+wEA9lqGNlHfV+DMxlCz4O4wktE3mHBMgSf6A==
+frappe-ui@^0.1.57:
+ version "0.1.64"
+ resolved "https://registry.yarnpkg.com/frappe-ui/-/frappe-ui-0.1.64.tgz#121a0c1146b33c8f66569ea2286ce8f8efee1ad5"
+ integrity sha512-R2BjeoA3H795V8MBOJZiy/XW71Y5V3akeJ2ZWS5itTM8KmWnrzEWsAhjd2SEoVxchEvZIdGqToe4zo+rGKuxdA==
+ dependencies:
+ "@headlessui/vue" "^1.7.14"
+ "@popperjs/core" "^2.11.2"
Expand All @@ -2012,6 +1998,7 @@ index fb57ccd1..f00eb184 100644
+ "@vueuse/core" "^10.4.1"
+ feather-icons "^4.28.0"
+ idb-keyval "^6.2.0"
+ prettier "^3.3.2"
+ radix-vue "^1.5.3"
+ showdown "^2.1.0"
+ socket.io-client "^4.5.1"
Expand Down Expand Up @@ -2869,6 +2856,11 @@ index fb57ccd1..f00eb184 100644
+ picocolors "^1.0.0"
+ source-map-js "^1.2.0"
+
+prettier@^3.3.2:
+ version "3.3.3"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.3.tgz#30c54fe0be0d8d12e6ae61dbb10109ea00d53105"
+ integrity sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==
+
+pretty-bytes@^5.6.0:
+ version "5.6.0"
+ resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
Expand Down Expand Up @@ -3317,7 +3309,16 @@ index fb57ccd1..f00eb184 100644
+ safer-buffer "^2.0.2"
+ tweetnacl "~0.14.0"
+
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+ version "4.2.3"
+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+ integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+ dependencies:
+ emoji-regex "^8.0.0"
+ is-fullwidth-code-point "^3.0.0"
+ strip-ansi "^6.0.1"
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+ version "4.2.3"
+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+ integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand All @@ -3335,7 +3336,14 @@ index fb57ccd1..f00eb184 100644
+ emoji-regex "^9.2.2"
+ strip-ansi "^7.0.1"
+
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+ integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+ dependencies:
+ ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+ integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand Down Expand Up @@ -3684,7 +3692,7 @@ index fb57ccd1..f00eb184 100644
+ dependencies:
+ isexe "^2.0.0"
+
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+ integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
Expand All @@ -3702,6 +3710,15 @@ index fb57ccd1..f00eb184 100644
+ string-width "^4.1.0"
+ strip-ansi "^6.0.0"
+
+wrap-ansi@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+ integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+ dependencies:
+ ansi-styles "^4.0.0"
+ string-width "^4.1.0"
+ strip-ansi "^6.0.0"
+
+wrap-ansi@^8.1.0:
+ version "8.1.0"
+ resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
Expand Down Expand Up @@ -3776,3 +3793,6 @@ index fb57ccd1..f00eb184 100644
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+ integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
--
2.42.0

0 comments on commit 9a40af7

Please sign in to comment.