From ff29d3652839df56a7c2bd0f072f612c56de78d3 Mon Sep 17 00:00:00 2001
From: Michael Drury <me@michaeldrury.co.uk>
Date: Fri, 26 Apr 2024 14:59:19 +0100
Subject: [PATCH 1/2] Revert "Getting rollup package versions consistent
 through all packages"

---
 packages/bbui/package.json                       |  2 +-
 .../bbui/{rollup.config.mjs => rollup.config.js} |  0
 .../{rollup.config.mjs => rollup.config.js}      |  0
 packages/pro                                     |  2 +-
 .../sdk/{rollup.config.mjs => rollup.config.js}  |  0
 packages/string-templates/package.json           |  2 +-
 .../{rollup.config.mjs => rollup.config.js}      |  0
 yarn.lock                                        | 16 +++++++++++++++-
 8 files changed, 18 insertions(+), 4 deletions(-)
 rename packages/bbui/{rollup.config.mjs => rollup.config.js} (100%)
 rename packages/client/{rollup.config.mjs => rollup.config.js} (100%)
 rename packages/sdk/{rollup.config.mjs => rollup.config.js} (100%)
 rename packages/string-templates/{rollup.config.mjs => rollup.config.js} (100%)

diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 2dbce9668d..a1baa2a38b 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -21,7 +21,7 @@
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^11.2.1",
     "postcss": "^8.2.9",
-    "rollup": "^4.9.6",
+    "rollup": "^2.45.2",
     "rollup-plugin-postcss": "^4.0.0",
     "rollup-plugin-svelte": "^7.1.0",
     "rollup-plugin-terser": "^7.0.2"
diff --git a/packages/bbui/rollup.config.mjs b/packages/bbui/rollup.config.js
similarity index 100%
rename from packages/bbui/rollup.config.mjs
rename to packages/bbui/rollup.config.js
diff --git a/packages/client/rollup.config.mjs b/packages/client/rollup.config.js
similarity index 100%
rename from packages/client/rollup.config.mjs
rename to packages/client/rollup.config.js
diff --git a/packages/pro b/packages/pro
index 479879246a..01bec5657e 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 479879246aac5dd3073cc695945c62c41fae5b0e
+Subproject commit 01bec5657e0c3c3bb29e883e6ac71258fee8710b
diff --git a/packages/sdk/rollup.config.mjs b/packages/sdk/rollup.config.js
similarity index 100%
rename from packages/sdk/rollup.config.mjs
rename to packages/sdk/rollup.config.js
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 5d99313b39..8cf8d92692 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -38,7 +38,7 @@
     "doctrine": "^3.0.0",
     "jest": "29.7.0",
     "marked": "^4.0.10",
-    "rollup": "^4.9.6",
+    "rollup": "^2.36.2",
     "rollup-plugin-inject-process-env": "^1.3.1",
     "rollup-plugin-node-builtins": "^2.1.2",
     "rollup-plugin-node-globals": "^1.4.0",
diff --git a/packages/string-templates/rollup.config.mjs b/packages/string-templates/rollup.config.js
similarity index 100%
rename from packages/string-templates/rollup.config.mjs
rename to packages/string-templates/rollup.config.js
diff --git a/yarn.lock b/yarn.lock
index 8fb958b76b..727a927df4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11590,7 +11590,7 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-fsevents@^2.3.2, fsevents@~2.3.2:
+fsevents@^2.3.2, fsevents@~2.3.1, fsevents@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
   integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
@@ -19714,6 +19714,20 @@ rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.8.1,
   dependencies:
     estree-walker "^0.6.1"
 
+rollup@2.45.2:
+  version "2.45.2"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.45.2.tgz#8fb85917c9f35605720e92328f3ccbfba6f78b48"
+  integrity sha512-kRRU7wXzFHUzBIv0GfoFFIN3m9oteY4uAsKllIpQDId5cfnkWF2J130l+27dzDju0E6MScKiV0ZM5Bw8m4blYQ==
+  optionalDependencies:
+    fsevents "~2.3.1"
+
+rollup@^2.36.2, rollup@^2.45.2:
+  version "2.79.1"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
+  integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
+  optionalDependencies:
+    fsevents "~2.3.2"
+
 rollup@^3.27.1:
   version "3.29.4"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.4.tgz#4d70c0f9834146df8705bfb69a9a19c9e1109981"

From f338a22a3a8d7ca57dd2af23741fc2d152d8bbfa Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 26 Apr 2024 15:01:52 +0100
Subject: [PATCH 2/2] Pro to latest master.

---
 packages/pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/pro b/packages/pro
index 01bec5657e..479879246a 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 01bec5657e0c3c3bb29e883e6ac71258fee8710b
+Subproject commit 479879246aac5dd3073cc695945c62c41fae5b0e