Revert Dialog and Dialog(draft) folder refactor that causes import issues

docs/content/Dialog.mdx

@@ -3,7 +3,7 @@ title: Dialog
 status: Alpha
 ---
 
-import data from '../../src/Dialog/Dialog.docs.json'
+import data from '../../src/Dialog.docs.json'
 
 The dialog component is used for all modals. It renders on top of the rest of the app with an overlay.
 

docs/content/drafts/Dialog2.mdx → docs/content/drafts/Dialog.mdx

@@ -1,14 +1,10 @@
 ---
 title: Dialog v2
-componentId: dialog_2
+componentId: dialog
 status: Draft
-a11yReviewed: false
-description: Use an underlined nav to allow tab like navigation with overflow behaviour in your UI.
-source: https://github.com/primer/react/tree/main/src/Dialog2
-storybook: '/react/storybook/?path=/story/drafts-components-dialog--default'
 ---
 
-import data from '../../../src/Dialog2/Dialog.docs.json'
+import data from '../../../src/Dialog/Dialog.docs.json'
 
 ```js
 import {Dialog} from '@primer/react/drafts'

docs/src/@primer/gatsby-theme-doctocat/nav.yml

@@ -159,7 +159,7 @@
 - title: Drafts
   children:
     - title: Dialog v2
-      url: /drafts/Dialog2
+      url: /drafts/Dialog
     - title: InlineAutocomplete
       url: /drafts/InlineAutocomplete
     - title: MarkdownEditor

generated/components.json

@@ -122,6 +122,60 @@
       ],
       "subcomponents": []
     },
+    "dialog": {
+      "id": "dialog",
+      "name": "Dialog",
+      "status": "alpha",
+      "a11yReviewed": false,
+      "stories": [],
+      "props": [
+        {
+          "name": "isOpen",
+          "type": "boolean",
+          "description": "Whether or not the dialog is open"
+        },
+        {
+          "name": "onDismiss",
+          "type": "() => void",
+          "description": "Function that will be called when the dialog is closed"
+        },
+        {
+          "name": "returnFocusRef",
+          "type": " React.RefObject<HTMLElement>",
+          "description": "The element to restore focus back to after the `Dialog` is closed"
+        },
+        {
+          "name": "initialFocusRef",
+          "type": " React.RefObject<HTMLElement>",
+          "description": "Element inside of the `Dialog` you'd like to be focused when the Dialog is opened. If nothing is passed to `initialFocusRef` the close button is focused."
+        },
+        {
+          "name": "aria-labelledby",
+          "type": "string",
+          "description": "Pass an id to use for the aria-label. Use either a `aria-label` or an `aria-labelledby` but not both."
+        },
+        {
+          "name": "aria-label",
+          "type": "string",
+          "description": "Pass a label to be used to describe the Dialog. Use either a `aria-label` or an `aria-labelledby` but not both."
+        },
+        {
+          "name": "sx",
+          "type": "SystemStyleObject"
+        }
+      ],
+      "subcomponents": [
+        {
+          "name": "Dialog.Header",
+          "props": [
+            {
+              "name": "sx",
+              "type": "SystemStyleObject"
+            }
+          ]
+        }
+      ]
+    },
     "filter_list": {
       "id": "filter_list",
       "name": "FilterList",
@@ -2053,76 +2107,12 @@
       ],
       "subcomponents": []
     },
-    "dialog": {
-      "id": "dialog",
-      "name": "Dialog",
-      "status": "alpha",
-      "a11yReviewed": false,
-      "stories": [
-        {
-          "id": "components-dialog--default",
-          "code": "() => {\n  const [isOpen, setIsOpen] = useState(false)\n  const returnFocusRef = React.useRef(null)\n  return (\n    <>\n      <Button ref={returnFocusRef} onClick={() => setIsOpen(true)}>\n        Open\n      </Button>\n      <Dialog\n        returnFocusRef={returnFocusRef}\n        isOpen={isOpen}\n        onDismiss={() => setIsOpen(false)}\n        aria-labelledby=\"header-id\"\n      >\n        <Dialog.Header id=\"header-id\">Title</Dialog.Header>\n        some content\n      </Dialog>\n    </>\n  )\n}"
-        }
-      ],
-      "props": [
-        {
-          "name": "isOpen",
-          "type": "boolean",
-          "description": "Whether or not the dialog is open"
-        },
-        {
-          "name": "onDismiss",
-          "type": "() => void",
-          "description": "Function that will be called when the dialog is closed"
-        },
-        {
-          "name": "returnFocusRef",
-          "type": " React.RefObject<HTMLElement>",
-          "description": "The element to restore focus back to after the `Dialog` is closed"
-        },
-        {
-          "name": "initialFocusRef",
-          "type": " React.RefObject<HTMLElement>",
-          "description": "Element inside of the `Dialog` you'd like to be focused when the Dialog is opened. If nothing is passed to `initialFocusRef` the close button is focused."
-        },
-        {
-          "name": "aria-labelledby",
-          "type": "string",
-          "description": "Pass an id to use for the aria-label. Use either a `aria-label` or an `aria-labelledby` but not both."
-        },
-        {
-          "name": "aria-label",
-          "type": "string",
-          "description": "Pass a label to be used to describe the Dialog. Use either a `aria-label` or an `aria-labelledby` but not both."
-        },
-        {
-          "name": "sx",
-          "type": "SystemStyleObject"
-        }
-      ],
-      "subcomponents": [
-        {
-          "name": "Dialog.Header",
-          "props": [
-            {
-              "name": "sx",
-              "type": "SystemStyleObject"
-            }
-          ]
-        }
-      ]
-    },
     "drafts_dialog": {
       "id": "drafts_dialog",
       "name": "Dialog",
       "status": "draft",
       "a11yReviewed": false,
-      "stories": [
-        {
-          "id": "components-dialog--default",
-          "code": "() => {\n  const [isOpen, setIsOpen] = useState(false)\n  const buttonRef = useRef<HTMLButtonElement>(null)\n  const onDialogClose = useCallback(() => setIsOpen(false), [])\n  return (\n    <>\n      <Button ref={buttonRef} onClick={() => setIsOpen(!isOpen)}>\n        Show dialog\n      </Button>\n      {isOpen && <Dialog onClose={onDialogClose}>Dialog Content</Dialog>}\n    </>\n  )\n}"
-        }
-      ],
+      "stories": [],
       "props": [
         {
           "name": "title",

script/generate-e2e-tests.js

@@ -336,25 +336,6 @@ const components = new Map([
       ],
     },
   ],
-  [
-    'DialogV2',
-    {
-      stories: [
-        {
-          id: 'drafts-components-dialog--default',
-          name: 'Default',
-        },
-        {
-          id: 'drafts-components-dialog-features--basic-dialog',
-          name: 'Basic Dialog',
-        },
-        {
-          id: 'drafts-components-dialog-features--basic-confirmation-dialog',
-          name: 'Basic Confirmation Dialog',
-        },
-      ],
-    },
-  ],
   [
     'Flash',
     {

src/Dialog.docs.json

@@ -0,0 +1,54 @@
+{
+  "id": "dialog",
+  "name": "Dialog",
+  "status": "alpha",
+  "a11yReviewed": false,
+  "stories": [],
+  "props": [
+    {
+      "name": "isOpen",
+      "type": "boolean",
+      "description": "Whether or not the dialog is open"
+    },
+    {
+      "name": "onDismiss",
+      "type": "() => void",
+      "description": "Function that will be called when the dialog is closed"
+    },
+    {
+      "name": "returnFocusRef",
+      "type": " React.RefObject<HTMLElement>",
+      "description": "The element to restore focus back to after the `Dialog` is closed"
+    },
+    {
+      "name": "initialFocusRef",
+      "type": " React.RefObject<HTMLElement>",
+      "description": "Element inside of the `Dialog` you'd like to be focused when the Dialog is opened. If nothing is passed to `initialFocusRef` the close button is focused."
+    },
+    {
+      "name": "aria-labelledby",
+      "type": "string",
+      "description": "Pass an id to use for the aria-label. Use either a `aria-label` or an `aria-labelledby` but not both."
+    },
+    {
+      "name": "aria-label",
+      "type": "string",
+      "description": "Pass a label to be used to describe the Dialog. Use either a `aria-label` or an `aria-labelledby` but not both."
+    },
+    {
+      "name": "sx",
+      "type": "SystemStyleObject"
+    }
+  ],
+  "subcomponents": [
+    {
+      "name": "Dialog.Header",
+      "props": [
+        {
+          "name": "sx",
+          "type": "SystemStyleObject"
+        }
+      ]
+    }
+  ]
+}