refactor: move core package into widgetbook

.github/dependabot.yaml

@@ -20,11 +20,6 @@ updates:
     schedule:
       interval: "daily"
     versioning-strategy: increase
-  - package-ecosystem: "pub"
-    directory: "/packages/widgetbook_core"
-    schedule:
-      interval: "daily"
-    versioning-strategy: increase
   - package-ecosystem: "pub"
     directory: "/packages/widgetbook_generator"
     schedule:

examples/custom_theme_example/pubspec.lock

@@ -206,12 +206,5 @@ packages:
       relative: true
     source: path
     version: "3.0.0-rc.1"
-  widgetbook_core:
-    dependency: "direct overridden"
-    description:
-      path: "../../packages/widgetbook_core"
-      relative: true
-    source: path
-    version: "3.0.0-rc.1"
 sdks:
   dart: ">=3.0.0-0 <4.0.0"

examples/knobs_example/pubspec.lock

@@ -199,12 +199,5 @@ packages:
       relative: true
     source: path
     version: "3.0.0-rc.1"
-  widgetbook_core:
-    dependency: "direct overridden"
-    description:
-      path: "../../packages/widgetbook_core"
-      relative: true
-    source: path
-    version: "3.0.0-rc.1"
 sdks:
   dart: ">=3.0.0-0 <4.0.0"

examples/screen_util_example/pubspec.lock

@@ -518,13 +518,6 @@ packages:
       relative: true
     source: path
     version: "3.0.0-rc.1"
-  widgetbook_core:
-    dependency: "direct overridden"
-    description:
-      path: "../../packages/widgetbook_core"
-      relative: true
-    source: path
-    version: "3.0.0-rc.1"
   widgetbook_generator:
     dependency: "direct dev"
     description:

packages/widgetbook/CHANGELOG.md

@@ -2,13 +2,16 @@
 
  - **FEAT**: Add `listOrNull` knob. ([#741](https://github.com/widgetbook/widgetbook/pull/741))
  - **FEAT**: Add `initialOption` to `list` knob. ([#733](https://github.com/widgetbook/widgetbook/pull/733))
+ - **REFACTOR**: Move `widgetbook_core` package to `widgetbook` package. ([#742](https://github.com/widgetbook/widgetbook/pull/742))
  - **REFACTOR**: Export `WidgetbookState`. ([#724](https://github.com/widgetbook/widgetbook/pull/724))
  - **REFACTOR**: Export fields to be used for custom addons/knobs. ([#728](https://github.com/widgetbook/widgetbook/pull/728))
  - **REFACTOR**: Make `KnobsBuilder.onKnobAdded` public. ([#727](https://github.com/widgetbook/widgetbook/pull/727))
  - **FIX**: Use related type checks when comparing device's frame state to its query parameter. ([#715](https://github.com/widgetbook/widgetbook/pull/715))
  - **FIX**: Add missing type parameter to `LabelBuilder`, which affected the `list` knob. ([#718](https://github.com/widgetbook/widgetbook/pull/718))
  - **FIX**: Use `labelBuilder`-based string comparison in `list` knob. ([#729](https://github.com/widgetbook/widgetbook/pull/729))
  - **FIX**: Add `key` to use cases to prevent out-of-sync builds. ([#720](https://github.com/widgetbook/widgetbook/pull/720))
+ - **Fix**: Prevent `onNodeSelected` from being called if the node is already selected. ([#725](https://github.com/widgetbook/widgetbook/pull/725))
+ - **Fix**: Use `ListView` for `SettingsPanel`. ([#732](https://github.com/widgetbook/widgetbook/pull/732))
 
 ## 3.0.0-rc.1
 

packages/widgetbook/lib/src/addons/common/widgetbook_addon.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:widgetbook_core/widgetbook_core.dart';
 
 import '../../fields/fields.dart';
 import '../../knobs/knobs.dart';
-import '../../models/models.dart';
+import '../../navigation/navigation.dart';
+import '../../settings/settings.dart';
 import '../addons.dart';
 
 /// [WidgetbookAddon]s are like global [Knob]s, they change the state for all

packages/widgetbook/lib/src/fields/list_field.dart

@@ -1,7 +1,7 @@
 import 'package:collection/collection.dart';
 import 'package:flutter/widgets.dart';
-import 'package:widgetbook_core/widgetbook_core.dart';
 
+import '../settings/settings.dart';
 import 'field.dart';
 import 'field_codec.dart';
 import 'field_type.dart';

packages/widgetbook/lib/src/knobs/knob.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/widgets.dart';
-import 'package:widgetbook_core/widgetbook_core.dart';
 
 import '../fields/field.dart';
-import '../models/models.dart';
+import '../navigation/navigation.dart';
+import '../settings/settings.dart';
 import '../state/state.dart';
 
 /// Allows [WidgetbookUseCase]s to have dynamically adjustable parameters.

packages/widgetbook/lib/src/models/widgetbook_category.dart → packages/widgetbook/lib/src/navigation/directories/widgetbook_category.dart

@@ -1,4 +1,4 @@
-import 'package:widgetbook_core/widgetbook_core.dart';
+import '../models/models.dart';
 
 class WidgetbookCategory extends MultiChildNavigationNodeData {
   const WidgetbookCategory({

packages/widgetbook/lib/src/models/widgetbook_component.dart → packages/widgetbook/lib/src/navigation/directories/widgetbook_component.dart

@@ -1,5 +1,4 @@
-import 'package:widgetbook_core/widgetbook_core.dart';
-
+import '../models/models.dart';
 import 'widgetbook_use_case.dart';
 
 class WidgetbookComponent extends MultiChildNavigationNodeData {

packages/widgetbook/lib/src/models/widgetbook_folder.dart → packages/widgetbook/lib/src/navigation/directories/widgetbook_folder.dart

@@ -1,4 +1,4 @@
-import 'package:widgetbook_core/widgetbook_core.dart';
+import '../models/models.dart';
 
 class WidgetbookFolder extends MultiChildNavigationNodeData {
   const WidgetbookFolder({

packages/widgetbook/lib/src/models/widgetbook_package.dart → packages/widgetbook/lib/src/navigation/directories/widgetbook_package.dart

@@ -1,4 +1,4 @@
-import 'package:widgetbook_core/widgetbook_core.dart';
+import '../models/models.dart';
 
 class WidgetbookPackage extends MultiChildNavigationNodeData {
   const WidgetbookPackage({

packages/widgetbook/lib/src/models/widgetbook_use_case.dart → packages/widgetbook/lib/src/navigation/directories/widgetbook_use_case.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import 'package:widgetbook_core/widgetbook_core.dart';
+import '../models/models.dart';
 
 typedef UseCaseBuilder = Widget Function(BuildContext context);
 

packages/widgetbook_core/lib/src/navigation_tree/models/models.dart → packages/widgetbook/lib/src/navigation/models/models.dart

@@ -1,4 +1,5 @@
 export 'leaf_navigation_node_data.dart';
 export 'multi_child_navigation_node_data.dart';
 export 'navigation_node_data_interface.dart';
+export 'navigation_node_type.dart';
 export 'navigation_tree_node_data.dart';

packages/widgetbook_core/lib/src/navigation_tree/models/navigation_node_data_interface.dart → packages/widgetbook/lib/src/navigation/models/navigation_node_data_interface.dart

@@ -1,7 +1,7 @@
 import 'package:collection/collection.dart';
-import 'package:flutter/cupertino.dart';
+import 'package:meta/meta.dart';
 
-import '../enums/navigation_node_type.dart';
+import 'navigation_node_type.dart';
 
 @immutable
 abstract class NavigationNodeDataInterface {

packages/widgetbook_core/lib/src/navigation_tree/enums/navigation_node_type.dart → packages/widgetbook/lib/src/navigation/models/navigation_node_type.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import '../../icons/icons.dart';
+import '../icons/icons.dart';
 
 enum NavigationNodeType {
   package,

packages/widgetbook_core/lib/src/navigation_tree/models/navigation_tree_node_data.dart → packages/widgetbook/lib/src/navigation/models/navigation_tree_node_data.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import '../enums/navigation_node_type.dart';
+import 'navigation_node_type.dart';
 
 class NavigationTreeNodeData {
   const NavigationTreeNodeData({

packages/widgetbook/lib/src/navigation/navigation.dart

@@ -0,0 +1,4 @@
+export 'directories/directories.dart';
+export 'icons/icons.dart';
+export 'models/models.dart';
+export 'widgets/widgets.dart';

packages/widgetbook_core/lib/src/navigation_tree/widgets/navigation_tree.dart → packages/widgetbook/lib/src/navigation/widgets/navigation_tree.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import '../navigation_tree.dart';
+import '../navigation.dart';
 
 typedef NodeSelectedCallback = void Function(
   String path,

packages/widgetbook_core/lib/src/navigation_tree/widgets/navigation_tree_item.dart → packages/widgetbook/lib/src/navigation/widgets/navigation_tree_item.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import '../../icons/icons.dart';
+import '../icons/icons.dart';
 import '../models/navigation_tree_node_data.dart';
 
 class NavigationTreeItem extends StatelessWidget {

packages/widgetbook_core/lib/src/navigation_tree/widgets/navigation_tree_node.dart → packages/widgetbook/lib/src/navigation/widgets/navigation_tree_node.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import '../navigation_tree.dart';
+import '../navigation.dart';
 
 class NavigationTreeNode extends StatefulWidget {
   const NavigationTreeNode({

packages/widgetbook/lib/src/routing/app_router_delegate.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:meta/meta.dart';
 
-import '../app/widgetbook_shell.dart';
-import '../app/workbench.dart';
 import '../state/state.dart';
+import '../workbench/workbench.dart';
 import 'app_route_config.dart';
+import 'widgetbook_shell.dart';
 
 @internal
 class AppRouterDelegate extends RouterDelegate<AppRouteConfig>

packages/widgetbook/lib/src/app/widgetbook_shell.dart → packages/widgetbook/lib/src/routing/widgetbook_shell.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:widgetbook_core/widgetbook_core.dart' as core;
 
+import '../navigation/navigation.dart';
+import '../settings/settings.dart';
 import '../state/state.dart';
 
 class WidgetbookShell extends StatelessWidget {
@@ -20,7 +21,7 @@ class WidgetbookShell extends StatelessWidget {
       child: Row(
         crossAxisAlignment: CrossAxisAlignment.stretch,
         children: [
-          core.NavigationPanel(
+          NavigationPanel(
             initialPath: state.path,
             directories: state.directories,
             onNodeSelected: (path, _) {
@@ -37,17 +38,17 @@ class WidgetbookShell extends StatelessWidget {
           ),
           SizedBox(
             width: 400,
-            child: core.SettingsPanel(
+            child: SettingsPanel(
               settings: [
                 if (state.addons != null) ...{
-                  core.SettingsPanelData(
+                  SettingsPanelData(
                     name: 'Properties',
                     settings: state.addons!
                         .map((addon) => addon.buildSetting(context))
                         .toList(),
                   ),
                 },
-                core.SettingsPanelData(
+                SettingsPanelData(
                   name: 'Knobs',
                   settings: state.knobs.values
                       .map((knob) => knob.build(context))

packages/widgetbook/lib/src/state/widgetbook_catalog.dart

@@ -1,7 +1,6 @@
 import 'package:meta/meta.dart';
-import 'package:widgetbook_core/widgetbook_core.dart';
 
-import '../models/models.dart';
+import '../navigation/navigation.dart';
 
 @internal
 class WidgetbookCatalog {

packages/widgetbook/lib/src/state/widgetbook_state.dart

@@ -1,13 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:meta/meta.dart';
-import 'package:widgetbook_core/widgetbook_core.dart';
 
 import '../addons/addons.dart';
 import '../fields/fields.dart';
 import '../integrations/widgetbook_integration.dart';
 import '../knobs/knob.dart';
-import '../models/models.dart';
+import '../navigation/navigation.dart';
 import '../routing/routing.dart';
 import 'widgetbook_catalog.dart';
 import 'widgetbook_scope.dart';

packages/widgetbook/lib/src/widgetbook.dart

@@ -1,12 +1,12 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:widgetbook_core/widgetbook_core.dart';
 
 import 'addons/addons.dart';
 import 'integrations/integrations.dart';
-import 'models/models.dart';
+import 'navigation/navigation.dart';
 import 'routing/app_router.dart';
 import 'state/state.dart';
+import 'themes.dart';
 
 /// Describes the configuration for your [Widget] library.
 ///

packages/widgetbook/lib/src/app/use_case_builder.dart → packages/widgetbook/lib/src/workbench/use_case_builder.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import '../models/models.dart';
+import '../navigation/navigation.dart';
 import '../state/state.dart';
 
 class UseCaseBuilder extends StatefulWidget {

packages/widgetbook/lib/widgetbook.dart

@@ -18,6 +18,6 @@ export 'src/knobs/knobs.dart'
         ListOrNullKnob,
         StringKnob,
         StringOrNullKnob;
-export 'src/models/models.dart';
+export 'src/navigation/directories/directories.dart';
 export 'src/state/state.dart' hide WidgetbookCatalog, WidgetbookScope;
 export 'src/widgetbook.dart';