Merge pull request #276 from schultek/fix/builder-imports

Fix/builder imports
schultek · Aug 21, 2024 · 9eef19c · 9eef19c
2 parents 8932e15 + 03d9810
commit 9eef19c
Show file tree

Hide file tree

Showing 85 changed files with 3,311 additions and 1,071 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -56,8 +56,8 @@ jobs:
 
       - name: Update CLI
         run: |
-          melos generate:versions
-          melos format
+          melos run generate:versions
+          melos run format
 
       - name: Commit Versions
         if: steps.bump.outputs.did_bump != '0'

diff --git a/apps/dart_quotes/lib/generated/imports/_web.dart b/apps/dart_quotes/lib/generated/imports/_web.dart
@@ -5,12 +5,14 @@
 
 import '../../../interop/confetti.dart' show JSConfetti;
 import 'package:firebase_core/firebase_core.dart' show Firebase, FirebaseApp;
-import 'package:cloud_firestore/cloud_firestore.dart' show FirebaseFirestore, FieldValue, DocumentSnapshot;
+import 'package:cloud_firestore/cloud_firestore.dart'
+    show FirebaseFirestore, FieldValue, DocumentSnapshot;
 import 'package:firebase_auth/firebase_auth.dart' show FirebaseAuth;
 import '../../../firebase_options.dart' show DefaultFirebaseOptions;
 export '../../../interop/confetti.dart' show JSConfetti;
 export 'package:firebase_core/firebase_core.dart' show Firebase, FirebaseApp;
-export 'package:cloud_firestore/cloud_firestore.dart' show FirebaseFirestore, FieldValue, DocumentSnapshot;
+export 'package:cloud_firestore/cloud_firestore.dart'
+    show FirebaseFirestore, FieldValue, DocumentSnapshot;
 export 'package:firebase_auth/firebase_auth.dart' show FirebaseAuth;
 export '../../../firebase_options.dart' show DefaultFirebaseOptions;
 

diff --git a/apps/dart_quotes/lib/jaspr_options.dart b/apps/dart_quotes/lib/jaspr_options.dart
@@ -2,10 +2,10 @@
 // Generated with jaspr_builder
 
 import 'package:jaspr/jaspr.dart';
-import 'components/quote_like_button.dart' as prefix0;
-import 'pages/home_page.dart' as prefix1;
-import 'pages/quote_page.dart' as prefix2;
-import 'app.dart' as prefix3;
+import 'package:dart_quotes/components/quote_like_button.dart' as prefix0;
+import 'package:dart_quotes/pages/home_page.dart' as prefix1;
+import 'package:dart_quotes/pages/quote_page.dart' as prefix2;
+import 'package:dart_quotes/app.dart' as prefix3;
 
 /// Default [JasprOptions] for use with your jaspr project.
 ///

diff --git a/apps/dart_quotes/pubspec.lock b/apps/dart_quotes/pubspec.lock
@@ -5,18 +5,18 @@ packages:
     dependency: transitive
     description:
       name: _discoveryapis_commons
-      sha256: f8bb1fdbd77f3d5c1d62b5b0eca75fbf1e41bf4f6c62628f880582e2182ae45d
+      sha256: "113c4100b90a5b70a983541782431b82168b3cae166ab130649c36eb3559d498"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.6"
+    version: "1.0.7"
   _fe_analyzer_shared:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7"
+      sha256: "5aaf60d96c4cd00fe7f21594b5ad6a1b699c80a27420f8a837f4d68473ef09e3"
       url: "https://pub.dev"
     source: hosted
-    version: "67.0.0"
+    version: "68.0.0"
   _flutterfire_internals:
     dependency: "direct main"
     description:
@@ -25,6 +25,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.31"
+  _macros:
+    dependency: transitive
+    description: dart
+    source: sdk
+    version: "0.1.5"
   adaptive_number:
     dependency: transitive
     description:
@@ -37,18 +42,18 @@ packages:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d"
+      sha256: "21f1d3720fd1c70316399d5e2bccaebb415c434592d778cce8acb967b8578808"
       url: "https://pub.dev"
     source: hosted
-    version: "6.4.1"
+    version: "6.5.0"
   archive:
     dependency: transitive
     description:
       name: archive
-      sha256: ecf4273855368121b1caed0d10d4513c7241dfc813f7d3c8933b36622ae9b265
+      sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
       url: "https://pub.dev"
     source: hosted
-    version: "3.5.1"
+    version: "3.6.1"
   args:
     dependency: transitive
     description:
@@ -109,10 +114,10 @@ packages:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1"
+      sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.1"
+    version: "4.0.2"
   build_modules:
     dependency: transitive
     description:
@@ -133,18 +138,18 @@ packages:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "3ac61a79bfb6f6cc11f693591063a7f19a7af628dc52f141743edac5c16e8c22"
+      sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.9"
+    version: "2.4.11"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799"
+      sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe
       url: "https://pub.dev"
     source: hosted
-    version: "7.3.0"
+    version: "7.3.1"
   built_collection:
     dependency: transitive
     description:
@@ -237,10 +242,10 @@ packages:
     dependency: transitive
     description:
       name: crypto
-      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+      sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.5"
   csslib:
     dependency: transitive
     description:
@@ -325,26 +330,26 @@ packages:
     dependency: "direct main"
     description:
       name: firebase_core
-      sha256: "372d94ced114b9c40cb85e18c50ac94a7e998c8eec630c50d7aec047847d27bf"
+      sha256: "26de145bb9688a90962faec6f838247377b0b0d32cc0abecd9a4e43525fc856c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.31.0"
+    version: "2.32.0"
   firebase_core_platform_interface:
     dependency: transitive
     description:
       name: firebase_core_platform_interface
-      sha256: c437ae5d17e6b5cc7981cf6fd458a5db4d12979905f9aafd1fea930428a9fe63
+      sha256: "3c3a1e92d6f4916c32deea79c4a7587aa0e9dbbe5889c7a16afcf005a485ee02"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.0"
+    version: "5.2.0"
   firebase_core_web:
     dependency: transitive
     description:
       name: firebase_core_web
-      sha256: "43d9e951ac52b87ae9cc38ecdcca1e8fa7b52a1dd26a96085ba41ce5108db8e9"
+      sha256: e8d1e22de72cb21cdcfc5eed7acddab3e99cd83f3b317f54f7a96c32f25fd11e
       url: "https://pub.dev"
     source: hosted
-    version: "2.17.0"
+    version: "2.17.4"
   firebaseapis:
     dependency: transitive
     description:
@@ -380,10 +385,10 @@ packages:
     dependency: transitive
     description:
       name: freezed_annotation
-      sha256: c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d
+      sha256: c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.4.4"
   frontend_server_client:
     dependency: transitive
     description:
@@ -404,10 +409,10 @@ packages:
     dependency: transitive
     description:
       name: google_identity_services_web
-      sha256: "9482364c9f8b7bd36902572ebc3a7c2b5c8ee57a9c93e6eb5099c1a9ec5265d8"
+      sha256: "5be191523702ba8d7a01ca97c17fca096822ccf246b0a9f11923a6ded06199b6"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.1+1"
+    version: "0.3.1+4"
   googleapis_auth:
     dependency: transitive
     description:
@@ -420,10 +425,10 @@ packages:
     dependency: transitive
     description:
       name: graphs
-      sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
+      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
   hotreloader:
     dependency: transitive
     description:
@@ -444,10 +449,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
+      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
   http_multi_server:
     dependency: transitive
     description:
@@ -565,6 +570,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
+  macros:
+    dependency: transitive
+    description:
+      name: macros
+      sha256: a8403c89b36483b4cbf9f1fcd24562f483cb34a5c9bf101cf2b0d8a083cf1239
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0-main.5"
   matcher:
     dependency: transitive
     description:
@@ -585,10 +598,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
+      sha256: "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.15.0"
+    version: "1.14.0"
   mime:
     dependency: transitive
     description:
@@ -657,10 +670,10 @@ packages:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367
+      sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.3"
+    version: "1.3.0"
   scratch_space:
     dependency: transitive
     description:
@@ -705,10 +718,10 @@ packages:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
+      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "2.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -782,10 +795,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.7.1"
   timing:
     dependency: transitive
     description:
@@ -814,10 +827,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc
+      sha256: "7475cb4dd713d57b6f7464c0e13f06da0d535d8b2067e188962a59bac2cf280b"
       url: "https://pub.dev"
     source: hosted
-    version: "14.2.4"
+    version: "14.2.2"
   watcher:
     dependency: transitive
     description:
@@ -834,14 +847,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.5.1"
+  web_socket:
+    dependency: transitive
+    description:
+      name: web_socket
+      sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.6"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42"
+      sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.5"
+    version: "3.0.1"
   yaml:
     dependency: transitive
     description:
@@ -851,5 +872,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.3.0 <3.6.0"
+  dart: ">=3.4.0 <3.6.0"
   flutter: ">=3.18.0-18.0.pre.54"
diff --git a/apps/dart_quotes/pubspec.yaml b/apps/dart_quotes/pubspec.yaml
@@ -17,8 +17,8 @@ dependencies:
 
 dev_dependencies:
   build_runner: ^2.4.0
-  jaspr_web_compilers: ^4.0.9
-  jaspr_builder: ^0.13.0
+  jaspr_web_compilers: ^4.0.10
+  jaspr_builder: ^0.14.0
   lints: ^3.0.0
 
 jaspr:

diff --git a/apps/dart_quotes_server/config/passwords.yaml b/apps/dart_quotes_server/config/passwords.yaml
@@ -0,0 +1,34 @@
+# Use this file to store passwords to services that your server you use. When
+# the server starts, the passwords will be automatically loaded and can be
+# accessed from the `session.passwords` field. If you don't have access to a
+# session object, passwords can also be accessed from
+# `Serverpod.instance.passwords`. You can provide different passwords for
+# different run configurations. If you want the same password for any
+# configuration used, place it under `shared`.
+#
+# Note that this file should not be under version control. Store it in a safe
+# place.
+
+# Save passwords used across all configurations here.
+shared:
+  mySharedPassword: 'my password'
+
+# These are passwords used when running the server locally in development mode
+development:
+  database: 'CHANGE_ME'
+  redis: 'CHANGE_ME'
+
+  # The service secret is used to communicate between servers and to access the
+  # service protocol.
+  serviceSecret: 'CHANGE_ME_______________________'
+
+# Passwords used in your staging environment if you use one. The default setup
+# use a password for Redis.
+staging:
+  database: 'CHANGE_ME'
+  serviceSecret: 'CHANGE_ME_______________________'
+
+# Passwords used in production mode.
+production:
+  database: 'CHANGE_ME'
+  serviceSecret: 'CHANGE_ME_______________________'