Revert "Refactor to define a single wrap method (#91)"

This reverts commit 8e93bcc.

Author: fcollonval

packages/lab-example/package.json

@@ -14,7 +14,8 @@
   },
   "license": "BSD-3-Clause",
   "author": {
-    "name": "Jupyter Developer Team"
+    "name": "Jupyter Developer Team",
+    "email": ""
   },
   "files": [
     "lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}",

packages/react-components/src/accordion-item/index.ts renamed to packages/react-components/src/accordion-item/index.tsx

@@ -1,9 +1,14 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { jpAccordionItem } from '@jupyter/web-components';
-import type React from 'react';
-import { wrap } from '../wrap';
+import {
+  provideJupyterDesignSystem,
+  jpAccordionItem
+} from '@jupyter/web-components';
+import { provideReactWrapper } from '@microsoft/fast-react-wrapper';
+import React from 'react';
+
+const { wrap } = provideReactWrapper(React, provideJupyterDesignSystem());
 
 export const AccordionItem: React.DetailedHTMLFactory<
   React.HTMLAttributes<HTMLElement> & {

packages/react-components/src/accordion/index.ts renamed to packages/react-components/src/accordion/index.tsx

@@ -1,9 +1,14 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { jpAccordion } from '@jupyter/web-components';
-import type React from 'react';
-import { wrap } from '../wrap';
+import {
+  provideJupyterDesignSystem,
+  jpAccordion
+} from '@jupyter/web-components';
+import { provideReactWrapper } from '@microsoft/fast-react-wrapper';
+import React from 'react';
+
+const { wrap } = provideReactWrapper(React, provideJupyterDesignSystem());
 
 export const Accordion: React.DetailedHTMLFactory<
   React.HTMLAttributes<HTMLElement> & {

packages/react-components/src/anchor/index.ts renamed to packages/react-components/src/anchor/index.tsx

@@ -1,9 +1,11 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { jpAnchor } from '@jupyter/web-components';
-import type React from 'react';
-import { wrap } from '../wrap';
+import { provideJupyterDesignSystem, jpAnchor } from '@jupyter/web-components';
+import { provideReactWrapper } from '@microsoft/fast-react-wrapper';
+import React from 'react';
+
+const { wrap } = provideReactWrapper(React, provideJupyterDesignSystem());
 
 export const Anchor: React.DetailedHTMLFactory<
   React.HTMLAttributes<HTMLElement> & {

packages/react-components/src/anchored-region/index.ts renamed to packages/react-components/src/anchored-region/index.tsx

@@ -1,9 +1,14 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { jpAnchoredRegion } from '@jupyter/web-components';
-import type React from 'react';
-import { wrap } from '../wrap';
+import {
+  provideJupyterDesignSystem,
+  jpAnchoredRegion
+} from '@jupyter/web-components';
+import { provideReactWrapper } from '@microsoft/fast-react-wrapper';
+import React from 'react';
+
+const { wrap } = provideReactWrapper(React, provideJupyterDesignSystem());
 
 export const AnchoredRegion: React.DetailedHTMLFactory<
   React.HTMLAttributes<HTMLElement> & {

packages/react-components/src/avatar/index.ts renamed to packages/react-components/src/avatar/index.tsx

@@ -1,9 +1,11 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { jpAvatar } from '@jupyter/web-components';
-import type React from 'react';
-import { wrap } from '../wrap';
+import { provideJupyterDesignSystem, jpAvatar } from '@jupyter/web-components';
+import { provideReactWrapper } from '@microsoft/fast-react-wrapper';
+import React from 'react';
+
+const { wrap } = provideReactWrapper(React, provideJupyterDesignSystem());
 
 export const Avatar: React.DetailedHTMLFactory<
   React.HTMLAttributes<HTMLElement> & {

packages/react-components/src/badge/index.ts renamed to packages/react-components/src/badge/index.tsx

@@ -1,9 +1,11 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { jpBadge } from '@jupyter/web-components';
-import type React from 'react';
-import { wrap } from '../wrap';
+import { provideJupyterDesignSystem, jpBadge } from '@jupyter/web-components';
+import { provideReactWrapper } from '@microsoft/fast-react-wrapper';
+import React from 'react';
+
+const { wrap } = provideReactWrapper(React, provideJupyterDesignSystem());
 
 export const Badge: React.DetailedHTMLFactory<
   React.HTMLAttributes<HTMLElement> & {

packages/react-components/src/breadcrumb-item/index.ts renamed to packages/react-components/src/breadcrumb-item/index.tsx

@@ -1,9 +1,14 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { jpBreadcrumbItem } from '@jupyter/web-components';
-import type React from 'react';
-import { wrap } from '../wrap';
+import {
+  provideJupyterDesignSystem,
+  jpBreadcrumbItem
+} from '@jupyter/web-components';
+import { provideReactWrapper } from '@microsoft/fast-react-wrapper';
+import React from 'react';
+
+const { wrap } = provideReactWrapper(React, provideJupyterDesignSystem());
 
 export const BreadcrumbItem: React.DetailedHTMLFactory<
   React.HTMLAttributes<HTMLElement> & {

packages/react-components/src/breadcrumb/index.ts renamed to packages/react-components/src/breadcrumb/index.tsx

@@ -1,9 +1,14 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { jpBreadcrumb } from '@jupyter/web-components';
-import type React from 'react';
-import { wrap } from '../wrap';
+import {
+  provideJupyterDesignSystem,
+  jpBreadcrumb
+} from '@jupyter/web-components';
+import { provideReactWrapper } from '@microsoft/fast-react-wrapper';
+import React from 'react';
+
+const { wrap } = provideReactWrapper(React, provideJupyterDesignSystem());
 
 export const Breadcrumb: React.DetailedHTMLFactory<
   React.HTMLAttributes<HTMLElement> & {

packages/react-components/src/button/index.ts renamed to packages/react-components/src/button/index.tsx

@@ -1,9 +1,11 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { jpButton } from '@jupyter/web-components';
-import type React from 'react';
-import { wrap } from '../wrap';
+import { provideJupyterDesignSystem, jpButton } from '@jupyter/web-components';
+import { provideReactWrapper } from '@microsoft/fast-react-wrapper';
+import React from 'react';
+
+const { wrap } = provideReactWrapper(React, provideJupyterDesignSystem());
 
 export const Button: React.DetailedHTMLFactory<
   React.HTMLAttributes<HTMLElement> & {

packages/react-components/src/card/index.ts renamed to packages/react-components/src/card/index.tsx

@@ -1,9 +1,11 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { jpCard } from '@jupyter/web-components';
-import type React from 'react';
-import { wrap } from '../wrap';
+import { provideJupyterDesignSystem, jpCard } from '@jupyter/web-components';
+import { provideReactWrapper } from '@microsoft/fast-react-wrapper';
+import React from 'react';
+
+const { wrap } = provideReactWrapper(React, provideJupyterDesignSystem());
 
 export const Card: React.DetailedHTMLFactory<
   React.HTMLAttributes<HTMLElement>,

packages/react-components/src/checkbox/index.ts renamed to packages/react-components/src/checkbox/index.tsx

@@ -1,9 +1,14 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { jpCheckbox } from '@jupyter/web-components';
-import type React from 'react';
-import { wrap } from '../wrap';
+import {
+  provideJupyterDesignSystem,
+  jpCheckbox
+} from '@jupyter/web-components';
+import { provideReactWrapper } from '@microsoft/fast-react-wrapper';
+import React from 'react';
+
+const { wrap } = provideReactWrapper(React, provideJupyterDesignSystem());
 
 export const Checkbox: React.DetailedHTMLFactory<
   React.HTMLAttributes<HTMLElement> & {

packages/react-components/src/combobox/index.ts renamed to packages/react-components/src/combobox/index.tsx

@@ -1,9 +1,14 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { jpCombobox } from '@jupyter/web-components';
-import type React from 'react';
-import { wrap } from '../wrap';
+import {
+  provideJupyterDesignSystem,
+  jpCombobox
+} from '@jupyter/web-components';
+import { provideReactWrapper } from '@microsoft/fast-react-wrapper';
+import React from 'react';
+
+const { wrap } = provideReactWrapper(React, provideJupyterDesignSystem());
 
 export const Combobox: React.DetailedHTMLFactory<
   React.HTMLAttributes<HTMLElement> & {

packages/react-components/src/data-grid/index.ts renamed to packages/react-components/src/data-grid/index.tsx

@@ -2,12 +2,15 @@
 // Distributed under the terms of the Modified BSD License.
 
 import {
+  provideJupyterDesignSystem,
   jpDataGrid,
   jpDataGridCell,
   jpDataGridRow
 } from '@jupyter/web-components';
-import type React from 'react';
-import { wrap } from '../wrap';
+import { provideReactWrapper } from '@microsoft/fast-react-wrapper';
+import React from 'react';
+
+const { wrap } = provideReactWrapper(React, provideJupyterDesignSystem());
 
 // WARNING The wrapping needs to be called in order (from bottom to top DOM elements)
 // Otherwise during the wrapping the tag for sub elements won't be resolved and this

packages/react-components/src/date-field/index.ts renamed to packages/react-components/src/date-field/index.tsx

@@ -1,9 +1,14 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { jpDateField } from '@jupyter/web-components';
-import type React from 'react';
-import { wrap } from '../wrap';
+import {
+  provideJupyterDesignSystem,
+  jpDateField
+} from '@jupyter/web-components';
+import { provideReactWrapper } from '@microsoft/fast-react-wrapper';
+import React from 'react';
+
+const { wrap } = provideReactWrapper(React, provideJupyterDesignSystem());
 
 export const DateField: React.DetailedHTMLFactory<
   React.HTMLAttributes<HTMLElement> & {

packages/react-components/src/design-system-provider/index.ts renamed to packages/react-components/src/design-system-provider/index.tsx

@@ -1,9 +1,14 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { jpDesignSystemProvider } from '@jupyter/web-components';
-import type React from 'react';
-import { wrap } from '../wrap';
+import {
+  provideJupyterDesignSystem,
+  jpDesignSystemProvider
+} from '@jupyter/web-components';
+import { provideReactWrapper } from '@microsoft/fast-react-wrapper';
+import React from 'react';
+
+const { wrap } = provideReactWrapper(React, provideJupyterDesignSystem());
 
 export const DesignSystemProvider: React.DetailedHTMLFactory<
   React.HTMLAttributes<HTMLElement> & {

packages/react-components/src/dialog/index.ts renamed to packages/react-components/src/dialog/index.tsx

@@ -1,9 +1,11 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { jpDialog } from '@jupyter/web-components';
-import type React from 'react';
-import { wrap } from '../wrap';
+import { provideJupyterDesignSystem, jpDialog } from '@jupyter/web-components';
+import { provideReactWrapper } from '@microsoft/fast-react-wrapper';
+import React from 'react';
+
+const { wrap } = provideReactWrapper(React, provideJupyterDesignSystem());
 
 export const Dialog: React.DetailedHTMLFactory<
   React.HTMLAttributes<HTMLElement> & {

packages/react-components/src/disclosure/index.ts renamed to packages/react-components/src/disclosure/index.tsx

@@ -1,9 +1,14 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { jpDisclosure } from '@jupyter/web-components';
-import type React from 'react';
-import { wrap } from '../wrap';
+import {
+  provideJupyterDesignSystem,
+  jpDisclosure
+} from '@jupyter/web-components';
+import { provideReactWrapper } from '@microsoft/fast-react-wrapper';
+import React from 'react';
+
+const { wrap } = provideReactWrapper(React, provideJupyterDesignSystem());
 
 export const Disclosure: React.DetailedHTMLFactory<
   React.HTMLAttributes<HTMLElement> & {

packages/react-components/src/divider/index.ts renamed to packages/react-components/src/divider/index.tsx

@@ -1,9 +1,11 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { jpDivider } from '@jupyter/web-components';
-import type React from 'react';
-import { wrap } from '../wrap';
+import { provideJupyterDesignSystem, jpDivider } from '@jupyter/web-components';
+import { provideReactWrapper } from '@microsoft/fast-react-wrapper';
+import React from 'react';
+
+const { wrap } = provideReactWrapper(React, provideJupyterDesignSystem());
 
 export const Divider: React.DetailedHTMLFactory<
   React.HTMLAttributes<HTMLElement> & {

packages/react-components/src/drafts/picker/index.ts renamed to packages/react-components/src/drafts/picker/index.tsx

@@ -1,9 +1,11 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { jpPicker } from '@jupyter/web-components';
-import type React from 'react';
-import { wrap } from '../../wrap';
+import { provideJupyterDesignSystem, jpPicker } from '@jupyter/web-components';
+import { provideReactWrapper } from '@microsoft/fast-react-wrapper';
+import React from 'react';
+
+const { wrap } = provideReactWrapper(React, provideJupyterDesignSystem());
 
 /**
  * @alpha

packages/react-components/src/index.ts

@@ -1,8 +1,6 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-export * from './wrap';
-
 export * from './accordion';
 export * from './accordion-item';
 export * from './anchor';

packages/react-components/src/listbox/index.ts renamed to packages/react-components/src/listbox/index.tsx

@@ -1,9 +1,11 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { jpListbox } from '@jupyter/web-components';
-import type React from 'react';
-import { wrap } from '../wrap';
+import { provideJupyterDesignSystem, jpListbox } from '@jupyter/web-components';
+import { provideReactWrapper } from '@microsoft/fast-react-wrapper';
+import React from 'react';
+
+const { wrap } = provideReactWrapper(React, provideJupyterDesignSystem());
 
 export const Listbox: React.DetailedHTMLFactory<
   React.HTMLAttributes<HTMLElement> & {

packages/react-components/src/menu-item/index.ts renamed to packages/react-components/src/menu-item/index.tsx

@@ -1,9 +1,14 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { jpMenuItem } from '@jupyter/web-components';
-import type React from 'react';
-import { wrap } from '../wrap';
+import {
+  provideJupyterDesignSystem,
+  jpMenuItem
+} from '@jupyter/web-components';
+import { provideReactWrapper } from '@microsoft/fast-react-wrapper';
+import React from 'react';
+
+const { wrap } = provideReactWrapper(React, provideJupyterDesignSystem());
 
 export const MenuItem: React.DetailedHTMLFactory<
   React.HTMLAttributes<HTMLElement> & {

packages/react-components/src/menu/index.ts renamed to packages/react-components/src/menu/index.tsx

@@ -1,9 +1,11 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { jpMenu } from '@jupyter/web-components';
-import type React from 'react';
-import { wrap } from '../wrap';
+import { provideJupyterDesignSystem, jpMenu } from '@jupyter/web-components';
+import { provideReactWrapper } from '@microsoft/fast-react-wrapper';
+import React from 'react';
+
+const { wrap } = provideReactWrapper(React, provideJupyterDesignSystem());
 
 export const Menu: React.DetailedHTMLFactory<
   React.HTMLAttributes<HTMLElement>,