fix merge

Author: snowystinger

packages/@react-spectrum/form/stories/Form.stories.tsx

@@ -18,7 +18,6 @@ import {chain} from '@react-aria/utils';
 import {Checkbox, CheckboxGroup} from '@react-spectrum/checkbox';
 import {ColorField} from '@react-spectrum/color';
 import {ComboBox} from '@react-spectrum/combobox';
-import {ComponentMeta, ComponentStoryObj} from '@storybook/react';
 import {Content, Header} from '@react-spectrum/view';
 import {ContextualHelp} from '@react-spectrum/contextualhelp';
 import {countries, states} from './data';
@@ -30,6 +29,7 @@ import {Heading} from '@react-spectrum/text';
 import {InlineAlert} from '@react-spectrum/inlinealert';
 import {Item, Picker} from '@react-spectrum/picker';
 import {Key, ValidationState} from '@react-types/shared';
+import {Meta, StoryObj} from '@storybook/react';
 import {NumberField} from '@react-spectrum/numberfield';
 import {Radio, RadioGroup} from '@react-spectrum/radio';
 import React, {useEffect, useState} from 'react';
@@ -47,9 +47,9 @@ export default {
   title: 'Form',
   component: Form,
   providerSwitcher: {status: 'positive'}
-} as ComponentMeta<typeof Form>;
+} as Meta<typeof Form>;
 
-export type FormStory = ComponentStoryObj<typeof Form>;
+export type FormStory = StoryObj<typeof Form>;
 
 export const Default: FormStory = {
   render: () => <Render />

packages/dev/parcel-config-storybook/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@parcel/config-default": "^2.13.1",
     "@parcel/core": "^2.13.1",
-    "@parcel/resolver-storybook": "^0.0.0",
+    "@parcel/resolver-storybook": ">=0.0.0",
     "@parcel/transformer-js": "^2.13.1",
     "@parcel/transformer-react-refresh-wrap": "^2.13.1",
     "@parcel/transformer-storybook": ">=0.0.2"

yarn.lock

@@ -4321,7 +4321,7 @@ __metadata:
   dependencies:
     "@parcel/config-default": "npm:^2.13.1"
     "@parcel/core": "npm:^2.13.1"
-    "@parcel/resolver-storybook": "npm:^0.0.0"
+    "@parcel/resolver-storybook": "npm:>=0.0.0"
     "@parcel/transformer-js": "npm:^2.13.1"
     "@parcel/transformer-react-refresh-wrap": "npm:^2.13.1"
     "@parcel/transformer-storybook": "npm:>=0.0.2"
@@ -4718,7 +4718,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/plugin@npm:^2.0.0, @parcel/plugin@npm:^2.10.2, @parcel/plugin@npm:^2.13.1, @parcel/plugin@npm:^2.14.0":
+"@parcel/plugin@npm:^2.0.0, @parcel/plugin@npm:^2.13.1, @parcel/plugin@npm:^2.14.0":
   version: 2.15.2
   resolution: "@parcel/plugin@npm:2.15.2"
   dependencies:
@@ -4811,17 +4811,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@parcel/resolver-storybook@npm:^0.0.0":
-  version: 0.0.0
-  resolution: "@parcel/resolver-storybook@npm:0.0.0"
-  dependencies:
-    "@parcel/node-resolver-core": "npm:^3.1.2"
-    "@parcel/plugin": "npm:^2.10.2"
-  checksum: 10c0/730b440fef53e6c1817d0dec1b72c8f127cde5c4fd3e37ecd129c9f47101bbd23184c01d32d1553e0a4d2388d27d978d5346eb8d6fe52a2db2a74c6250c9a67a
-  languageName: node
-  linkType: hard
-
-"@parcel/resolver-storybook@workspace:packages/dev/parcel-resolver-storybook":
+"@parcel/resolver-storybook@npm:>=0.0.0, @parcel/resolver-storybook@npm:^0.0.0, @parcel/resolver-storybook@workspace:packages/dev/parcel-resolver-storybook":
   version: 0.0.0-use.local
   resolution: "@parcel/resolver-storybook@workspace:packages/dev/parcel-resolver-storybook"
   dependencies: