From 284458db436cae7799f303125dad1d8b3c0f54b9 Mon Sep 17 00:00:00 2001 From: "sourcegraph-commit-signing-app[bot]" <188111114+sourcegraph-commit-signing-app[bot]@users.noreply.github.com> Date: Tue, 5 Aug 2025 22:43:37 +0000 Subject: [PATCH 1/2] Remove all entrypoint imports --- lib/src/react_client/chain_refs.dart | 2 +- lib/src/react_client/component_registration.dart | 2 +- lib/src/react_client/dart_interop_statics.dart | 2 +- lib/src/react_client/internal_react_interop.dart | 2 +- lib/src/react_client/lazy.dart | 4 ++-- lib/src/react_client/private_utils.dart | 2 +- lib/src/typedefs.dart | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/src/react_client/chain_refs.dart b/lib/src/react_client/chain_refs.dart index 1245e445..c477c430 100644 --- a/lib/src/react_client/chain_refs.dart +++ b/lib/src/react_client/chain_refs.dart @@ -1,5 +1,5 @@ import 'package:js/js_util.dart'; -import 'package:react/react.dart' as react; + import 'package:react/react_client/react_interop.dart'; import 'package:react/src/react_client/factory_util.dart'; diff --git a/lib/src/react_client/component_registration.dart b/lib/src/react_client/component_registration.dart index e32f47b1..c6c8a93f 100644 --- a/lib/src/react_client/component_registration.dart +++ b/lib/src/react_client/component_registration.dart @@ -1,6 +1,6 @@ import 'dart:html'; -import 'package:react/react.dart'; + import 'package:react/react_client/bridge.dart'; import 'package:react/react_client/js_backed_map.dart'; import 'package:react/react_client/react_interop.dart'; diff --git a/lib/src/react_client/dart_interop_statics.dart b/lib/src/react_client/dart_interop_statics.dart index cc361f9c..9ffd0ac7 100644 --- a/lib/src/react_client/dart_interop_statics.dart +++ b/lib/src/react_client/dart_interop_statics.dart @@ -6,7 +6,7 @@ import 'dart:js_util'; import 'package:js/js.dart'; import 'package:meta/meta.dart'; -import 'package:react/react.dart'; + import 'package:react/react_client/bridge.dart'; import 'package:react/react_client/js_backed_map.dart'; import 'package:react/react_client/js_interop_helpers.dart'; diff --git a/lib/src/react_client/internal_react_interop.dart b/lib/src/react_client/internal_react_interop.dart index 66b9240e..edb6232e 100644 --- a/lib/src/react_client/internal_react_interop.dart +++ b/lib/src/react_client/internal_react_interop.dart @@ -6,7 +6,7 @@ library react.src.react_client.internal_react_interop; import 'package:js/js.dart'; import 'package:meta/meta.dart'; -import 'package:react/react.dart' show Component, Component2, ComponentFactory; + import 'package:react/react_client/bridge.dart'; import 'package:react/react_client/js_backed_map.dart'; import 'package:react/react_client/react_interop.dart' diff --git a/lib/src/react_client/lazy.dart b/lib/src/react_client/lazy.dart index 65ba9e5a..257a94f1 100644 --- a/lib/src/react_client/lazy.dart +++ b/lib/src/react_client/lazy.dart @@ -1,7 +1,7 @@ import 'dart:js'; import 'dart:js_util'; -import 'package:react/react.dart'; + import 'package:react/react_client/component_factory.dart'; import 'package:react/react_client/react_interop.dart'; import 'package:react/src/js_interop_util.dart'; @@ -14,7 +14,7 @@ import 'package:react/src/js_interop_util.dart'; /// /// Example usage: /// ```dart -/// import 'package:react/react.dart' show lazy, Suspense; +/// /// import './simple_component.dart' deferred as simple; /// /// final lazyComponent = lazy(() async { diff --git a/lib/src/react_client/private_utils.dart b/lib/src/react_client/private_utils.dart index 5d1c38ad..6bf6187f 100644 --- a/lib/src/react_client/private_utils.dart +++ b/lib/src/react_client/private_utils.dart @@ -4,7 +4,7 @@ library react_client_private_utils; import 'dart:js_util'; import 'package:js/js.dart'; -import 'package:react/react.dart' show Component2; + import 'package:react/react_client/react_interop.dart'; import 'package:react/src/js_interop_util.dart'; import 'package:react/src/react_client/component_registration.dart' show registerComponent2; diff --git a/lib/src/typedefs.dart b/lib/src/typedefs.dart index e408e9d2..5ee43456 100644 --- a/lib/src/typedefs.dart +++ b/lib/src/typedefs.dart @@ -1,6 +1,6 @@ library react.typedefs; -import 'package:react/react.dart'; + import 'package:react/react_client/js_backed_map.dart'; /// The type of `Component.ref` specified as a callback. From 198a97c09d8199e001b79aac94e59dee2736fa52 Mon Sep 17 00:00:00 2001 From: Sydney Jodon Date: Wed, 6 Aug 2025 15:57:26 -0700 Subject: [PATCH 2/2] Update imports --- lib/src/react_client/chain_refs.dart | 3 ++- lib/src/react_client/component_registration.dart | 2 +- lib/src/react_client/dart_interop_statics.dart | 3 ++- lib/src/react_client/internal_react_interop.dart | 2 ++ lib/src/react_client/lazy.dart | 5 +++-- lib/src/react_client/private_utils.dart | 3 ++- lib/src/typedefs.dart | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/lib/src/react_client/chain_refs.dart b/lib/src/react_client/chain_refs.dart index c477c430..4a4bfa6c 100644 --- a/lib/src/react_client/chain_refs.dart +++ b/lib/src/react_client/chain_refs.dart @@ -1,8 +1,9 @@ import 'package:js/js_util.dart'; - import 'package:react/react_client/react_interop.dart'; import 'package:react/src/react_client/factory_util.dart'; +import '../../react.dart' as react; + /// Returns a ref that updates both [ref1] and [ref2], effectively /// allowing you to set multiple refs. /// diff --git a/lib/src/react_client/component_registration.dart b/lib/src/react_client/component_registration.dart index c6c8a93f..fb2ab677 100644 --- a/lib/src/react_client/component_registration.dart +++ b/lib/src/react_client/component_registration.dart @@ -1,6 +1,5 @@ import 'dart:html'; - import 'package:react/react_client/bridge.dart'; import 'package:react/react_client/js_backed_map.dart'; import 'package:react/react_client/react_interop.dart'; @@ -9,6 +8,7 @@ import 'package:react/react_client/component_factory.dart'; import 'package:react/src/react_client/dart_interop_statics.dart'; import 'package:react/src/react_client/internal_react_interop.dart'; +import '../../react.dart'; import '../js_interop_util.dart'; /// Util used with `registerComponent2` to ensure no important lifecycle diff --git a/lib/src/react_client/dart_interop_statics.dart b/lib/src/react_client/dart_interop_statics.dart index 9ffd0ac7..148b01a6 100644 --- a/lib/src/react_client/dart_interop_statics.dart +++ b/lib/src/react_client/dart_interop_statics.dart @@ -6,7 +6,6 @@ import 'dart:js_util'; import 'package:js/js.dart'; import 'package:meta/meta.dart'; - import 'package:react/react_client/bridge.dart'; import 'package:react/react_client/js_backed_map.dart'; import 'package:react/react_client/js_interop_helpers.dart'; @@ -17,6 +16,8 @@ import 'package:react/src/react_client/internal_react_interop.dart'; import 'package:react/src/react_client/private_utils.dart'; import 'package:react/src/typedefs.dart'; +import '../../react.dart'; + /// The static methods that proxy JS component lifecycle methods to Dart components. @internal @Deprecated('Only used with the deprecated Component base class and not Component2.') diff --git a/lib/src/react_client/internal_react_interop.dart b/lib/src/react_client/internal_react_interop.dart index edb6232e..fb9cea9f 100644 --- a/lib/src/react_client/internal_react_interop.dart +++ b/lib/src/react_client/internal_react_interop.dart @@ -13,6 +13,8 @@ import 'package:react/react_client/react_interop.dart' show React, ReactClass, ReactComponent, ReactDartComponentInternal; import 'package:react/src/typedefs.dart'; +import '../../react.dart' show Component, Component2, ComponentFactory; + /// A JavaScript interop class representing a value in a React JS `context` object. /// /// Used for storing/accessing Dart [ReactDartContextInternal] objects in `context` diff --git a/lib/src/react_client/lazy.dart b/lib/src/react_client/lazy.dart index 257a94f1..2a18773e 100644 --- a/lib/src/react_client/lazy.dart +++ b/lib/src/react_client/lazy.dart @@ -1,11 +1,12 @@ import 'dart:js'; import 'dart:js_util'; - import 'package:react/react_client/component_factory.dart'; import 'package:react/react_client/react_interop.dart'; import 'package:react/src/js_interop_util.dart'; +import '../../react.dart'; + /// Defer loading a component's code until it is rendered for the first time. /// /// The `lazy` function is used to create lazy components in react-dart. Lazy components are able to run asynchronous code only when they are trying to be rendered for the first time, allowing for deferred loading of the component's code. @@ -14,7 +15,7 @@ import 'package:react/src/js_interop_util.dart'; /// /// Example usage: /// ```dart -/// +/// import 'package:react/react.dart' show lazy, Suspense; /// import './simple_component.dart' deferred as simple; /// /// final lazyComponent = lazy(() async { diff --git a/lib/src/react_client/private_utils.dart b/lib/src/react_client/private_utils.dart index 6bf6187f..d0b4c270 100644 --- a/lib/src/react_client/private_utils.dart +++ b/lib/src/react_client/private_utils.dart @@ -4,12 +4,13 @@ library react_client_private_utils; import 'dart:js_util'; import 'package:js/js.dart'; - import 'package:react/react_client/react_interop.dart'; import 'package:react/src/js_interop_util.dart'; import 'package:react/src/react_client/component_registration.dart' show registerComponent2; import 'package:react/src/react_client/internal_react_interop.dart'; +import '../../react.dart' show Component2; + /// A flag used to cache whether React is accessible. /// /// This is used when setting environment variables to ensure they can be set properly. diff --git a/lib/src/typedefs.dart b/lib/src/typedefs.dart index 5ee43456..27b2da84 100644 --- a/lib/src/typedefs.dart +++ b/lib/src/typedefs.dart @@ -1,8 +1,9 @@ library react.typedefs; - import 'package:react/react_client/js_backed_map.dart'; +import '../../react.dart'; + /// The type of `Component.ref` specified as a callback. /// /// See: