Merge branch 'refactor/web' of https://github.com/schultek/jaspr into…

… refactor/web
schultek · Oct 3, 2024 · 78ff6f4 · 78ff6f4
2 parents baf7ffe + 0357cb9
commit 78ff6f4
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/apps/dart_quotes/pubspec.lock b/apps/dart_quotes/pubspec.lock
@@ -779,10 +779,10 @@ packages:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.2.0"
   term_glyph:
     dependency: transitive
     description:
@@ -795,10 +795,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.3"
+    version: "0.7.2"
   timing:
     dependency: transitive
     description:

diff --git a/examples/backend_serverpod/example_server/pubspec.lock b/examples/backend_serverpod/example_server/pubspec.lock
@@ -316,14 +316,14 @@ packages:
       path: "../../../packages/jaspr"
       relative: true
     source: path
-    version: "0.15.0"
+    version: "0.15.1"
   jaspr_builder:
     dependency: "direct dev"
     description:
       path: "../../../packages/jaspr_builder"
       relative: true
     source: path
-    version: "0.15.0"
+    version: "0.15.1"
   jaspr_riverpod:
     dependency: "direct overridden"
     description:
@@ -518,34 +518,34 @@ packages:
     dependency: "direct main"
     description:
       name: serverpod
-      sha256: "45a33dc9cc25f3d70b41dea1e52c9bcfa9ecd7e93735c61d7d450c1eed19e45d"
+      sha256: cb12291ff1659116aa99770ac46367301fc7f9e3041baf9ecc1c4023aee82b8c
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.1.1"
   serverpod_client:
     dependency: transitive
     description:
       name: serverpod_client
-      sha256: "8aefc285ede74291375d0f4fe125bc8886ffc475769b6c60c8d10e83bbadd359"
+      sha256: "58488119fc7d5b3d182197f7cd14280587bcb4842b49e72567c4513cf908bee5"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.1.1"
   serverpod_serialization:
     dependency: transitive
     description:
       name: serverpod_serialization
-      sha256: e700eb909a03de7220540f92372b515c84b960eeefd954fd81851f57f03d5970
+      sha256: "5233c6a40deeb3e83066d984fa8d7e8c8c3c74eef67a6cdd8f9371a66f1183d3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.1.1"
   serverpod_shared:
     dependency: transitive
     description:
       name: serverpod_shared
-      sha256: f6742eadae5dac9a7b596b800b929101c560725956825b7a4437a400966e69f3
+      sha256: b86f1c9724e1ae41383dc417650ba5dac1a0b1a3e09979f7e205dd1cd4ca1287
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.1.1"
   shelf:
     dependency: transitive
     description:

diff --git a/examples/flutter_embedding/pubspec.lock b/examples/flutter_embedding/pubspec.lock
@@ -673,10 +673,10 @@ packages:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.2.0"
   term_glyph:
     dependency: transitive
     description:
@@ -689,10 +689,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.3"
+    version: "0.7.2"
   timing:
     dependency: transitive
     description:

diff --git a/examples/flutter_plugin_interop/pubspec.lock b/examples/flutter_plugin_interop/pubspec.lock
@@ -779,10 +779,10 @@ packages:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.2.0"
   term_glyph:
     dependency: transitive
     description:
@@ -795,10 +795,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.3"
+    version: "0.7.2"
   timing:
     dependency: transitive
     description:

diff --git a/packages/jaspr/lib/src/browser/clients.dart b/packages/jaspr/lib/src/browser/clients.dart
@@ -65,7 +65,7 @@ void _applyClients(FutureOr<ClientBuilder> Function(String) fn) {
         final between = (start, currNode);
 
         // Remove the data string.
-        start.text = '\$${comp.$1}';
+        start.text = '$clientMarkerPrefix${comp.$1}';
 
         final params = comp.$2 != null //
             ? jsonDecode(unescapeMarkerText(comp.$2!)) as Map<String, dynamic>