Update macaw to 1.0.0 versions by using npm alias (#4357)

* Use macaw aliases

* Use macaw aliases

* Use macaw aliases

* Use macaw aliases

.changeset/honest-otters-bow.md

@@ -0,0 +1,5 @@
+---
+"saleor-dashboard": minor
+---
+
+Use macaw-ui alias to 1.0.0 versions

.github/CONTRIBUTING.md

@@ -64,7 +64,7 @@ We run a series of automated checks on your PR to ensure that it meets our stand
 
 - Translations messages check is failing - run `npm run extract-messages` to update them
 - UI tests are pending - reach out to maintainers to approve them
-- MacawUI migration check is failing - we are on the way to migrate to new MacawUI components, use imports from `@saleor/macaw-ui/next` instead of `@saleor/macaw-ui` in your changes
+- MacawUI migration check is failing - we are on the way to migrate to new MacawUI components, use imports from `@saleor/macaw-ui-next` instead of `@saleor/macaw-ui` in your changes
 
 ### Your PR is merged!
 

.storybook/decorators/MockedProvidersDecorator.tsx

@@ -1,7 +1,7 @@
-import "@saleor/macaw-ui/next/style";
+import "@saleor/macaw-ui-next/style";
 
 import { ThemeProvider as LegacyThemeProvider } from "@saleor/macaw-ui";
-import { ThemeProvider } from "@saleor/macaw-ui/next";
+import { ThemeProvider } from "@saleor/macaw-ui-next";
 import React from "react";
 import { IntlProvider } from "react-intl";
 import { BrowserRouter } from "react-router-dom";

.storybook/preview.tsx

@@ -1,4 +1,4 @@
-import "@saleor/macaw-ui/next/style";
+import "@saleor/macaw-ui-next/style";
 
 import type { Decorator, Preview } from "@storybook/react";
 import React from "react";

package.json

@@ -34,7 +34,8 @@
     "@material-ui/lab": "^4.0.0-alpha.61",
     "@material-ui/styles": "^4.11.4",
     "@reach/auto-id": "^0.16.0",
-    "@saleor/macaw-ui": "0.8.0-pre.136",
+    "@saleor/macaw-ui": "npm:@saleor/macaw-ui@0.7.4",
+    "@saleor/macaw-ui-next": "npm:@saleor/macaw-ui@1.0.0-pre.6",
     "@saleor/sdk": "0.6.0",
     "@sentry/react": "^6.0.0",
     "@types/faker": "^5.1.6",
@@ -292,7 +293,6 @@
       "^@material-ui/core$": "<rootDir>/node_modules/@material-ui/core",
       "^@material-ui/icons$": "<rootDir>/node_modules/@material-ui/icons",
       "^@material-ui/styles$": "<rootDir>/node_modules/@material-ui/styles",
-      "^@saleor/macaw-ui/next$": "<rootDir>/node_modules/@saleor/macaw-ui/dist/index.js",
       "^react$": "<rootDir>/node_modules/react",
       "^react-dom$": "<rootDir>/node_modules/react-dom"
     }

src/apps/components/AllAppList/AllAppList.tsx

@@ -1,7 +1,7 @@
 import { AppstoreApi } from "@dashboard/apps/appstore.types";
 import { AppInstallationFragment } from "@dashboard/graphql";
 import { Skeleton } from "@material-ui/lab";
-import { Box } from "@saleor/macaw-ui/next";
+import { Box } from "@saleor/macaw-ui-next";
 import chunk from "lodash/chunk";
 import React from "react";
 

src/apps/components/AppAvatar/AppAvatar.tsx

@@ -1,6 +1,6 @@
 // @ts-strict-ignore
 import { AppLogo } from "@dashboard/apps/types";
-import { Box, GenericAppIcon } from "@saleor/macaw-ui/next";
+import { Box, GenericAppIcon } from "@saleor/macaw-ui-next";
 import React from "react";
 
 export const AppAvatar: React.FC<{

src/apps/components/AppDetailsPage/AboutCard.tsx

@@ -1,5 +1,5 @@
 import Skeleton from "@dashboard/components/Skeleton";
-import { Box, BoxProps, Text } from "@saleor/macaw-ui/next";
+import { Box, BoxProps, Text } from "@saleor/macaw-ui-next";
 import React from "react";
 import { useIntl } from "react-intl";
 

src/apps/components/AppDetailsPage/AppDetailsPage.tsx

@@ -1,6 +1,6 @@
 import { AppQuery } from "@dashboard/graphql";
 import errorTracker from "@dashboard/services/errorTracking";
-import { Box, Text } from "@saleor/macaw-ui/next";
+import { Box, Text } from "@saleor/macaw-ui-next";
 import React from "react";
 import { ErrorBoundary } from "react-error-boundary";
 

src/apps/components/AppDetailsPage/DataPrivacyCard.tsx

@@ -1,6 +1,6 @@
 import { ExternalLinkNext } from "@dashboard/components/ExternalLink";
 import Skeleton from "@dashboard/components/Skeleton";
-import { Box, BoxProps, Text } from "@saleor/macaw-ui/next";
+import { Box, BoxProps, Text } from "@saleor/macaw-ui-next";
 import React from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 

src/apps/components/AppDetailsPage/HeaderOptions.tsx

@@ -1,6 +1,6 @@
 import { buttonMessages } from "@dashboard/intl";
 import { ButtonBase } from "@material-ui/core";
-import { Box } from "@saleor/macaw-ui/next";
+import { Box } from "@saleor/macaw-ui-next";
 import React from "react";
 import SVG from "react-inlinesvg";
 import { FormattedMessage } from "react-intl";

src/apps/components/AppDetailsPage/PermissionsCard.tsx

@@ -1,7 +1,7 @@
 import { AppPermissionsDialog } from "@dashboard/apps/components/AppPermissionsDialog";
 import Skeleton from "@dashboard/components/Skeleton";
 import { PermissionEnum } from "@dashboard/graphql";
-import { Box, BoxProps, Button, Text } from "@saleor/macaw-ui/next";
+import { Box, BoxProps, Button, Text } from "@saleor/macaw-ui-next";
 import React, { useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 

src/apps/components/AppInstallPage/AppInstallPage.tsx

@@ -17,7 +17,7 @@ import {
   CircularProgress,
   Typography,
 } from "@material-ui/core";
-import { Box, Button } from "@saleor/macaw-ui/next";
+import { Box, Button } from "@saleor/macaw-ui-next";
 import React from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 

src/apps/components/AppListPage/AppListPage.tsx

@@ -3,7 +3,7 @@ import { TopNav } from "@dashboard/components/AppLayout/TopNav";
 import useNavigator from "@dashboard/hooks/useNavigator";
 import { sectionNames } from "@dashboard/intl";
 import { ListProps } from "@dashboard/types";
-import { Box, sprinkles, Text } from "@saleor/macaw-ui/next";
+import { Box, sprinkles, Text } from "@saleor/macaw-ui-next";
 import React, { useCallback } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 

src/apps/components/AppListRow/AppListCardActions.tsx

@@ -2,7 +2,7 @@ import { appInstallationStatusMessages } from "@dashboard/apps/messages";
 import { IS_CLOUD_INSTANCE } from "@dashboard/config";
 import { AppInstallationFragment } from "@dashboard/graphql";
 import { buttonMessages } from "@dashboard/intl";
-import { Box, Button, Text, Tooltip } from "@saleor/macaw-ui/next";
+import { Box, Button, Text, Tooltip } from "@saleor/macaw-ui-next";
 import React from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 

src/apps/components/AppListRow/AppListCardDescription.tsx

@@ -1,5 +1,5 @@
 import { AppstoreApi } from "@dashboard/apps/appstore.types";
-import { Box, Text } from "@saleor/macaw-ui/next";
+import { Box, Text } from "@saleor/macaw-ui-next";
 import React from "react";
 
 import { AppLogo } from "./AppLogo";

src/apps/components/AppListRow/AppListCardIntegrations.tsx

@@ -1,6 +1,6 @@
 import { AppstoreApi } from "@dashboard/apps/appstore.types";
 import { useTheme } from "@saleor/macaw-ui";
-import { Box, Text } from "@saleor/macaw-ui/next";
+import { Box, Text } from "@saleor/macaw-ui-next";
 import React from "react";
 
 interface AppListCardIntegrationsProps {

src/apps/components/AppListRow/AppListCardLinks.tsx

@@ -1,6 +1,6 @@
 import { AppLink } from "@dashboard/apps/types";
 import Link from "@dashboard/components/Link";
-import { Box, Text } from "@saleor/macaw-ui/next";
+import { Box, Text } from "@saleor/macaw-ui-next";
 import React from "react";
 
 interface AppListCardLinksProps {

src/apps/components/AppListRow/AppListRow.tsx

@@ -6,7 +6,7 @@ import {
   resolveInstallationOfAppstoreApp,
 } from "@dashboard/apps/utils";
 import { AppInstallationFragment } from "@dashboard/graphql";
-import { Box } from "@saleor/macaw-ui/next";
+import { Box } from "@saleor/macaw-ui-next";
 import React from "react";
 import { useIntl } from "react-intl";
 

src/apps/components/AppListRow/AppLogo.tsx

@@ -1,4 +1,4 @@
-import { Box } from "@saleor/macaw-ui/next";
+import { Box } from "@saleor/macaw-ui-next";
 import React from "react";
 
 interface AppLogoProps {

src/apps/components/AppListRow/ErrorInstallAction.tsx

@@ -3,7 +3,7 @@ import { AppInstallationFragment } from "@dashboard/graphql";
 import { buttonMessages } from "@dashboard/intl";
 import { Typography } from "@material-ui/core";
 import { Button, Indicator, TooltipMountWrapper } from "@saleor/macaw-ui";
-import { Tooltip } from "@saleor/macaw-ui/next";
+import { Tooltip } from "@saleor/macaw-ui-next";
 import React from "react";
 import { FormattedMessage } from "react-intl";
 

src/apps/components/AppManifestTableDisplay/AppManifestTableDisplay.tsx

@@ -1,7 +1,7 @@
 import { appsMessages } from "@dashboard/apps/messages";
 import { Typography } from "@material-ui/core";
 import { CopyIcon } from "@saleor/macaw-ui";
-import { Tooltip } from "@saleor/macaw-ui/next";
+import { Tooltip } from "@saleor/macaw-ui-next";
 import clsx from "clsx";
 import React, { useState } from "react";
 import { useIntl } from "react-intl";

src/apps/components/AppPage/AppPage.tsx

@@ -7,7 +7,7 @@ import { DetailPageLayout } from "@dashboard/components/Layouts";
 import { APP_VERSION } from "@dashboard/config";
 import { AppQuery } from "@dashboard/graphql";
 import useShop from "@dashboard/hooks/useShop";
-import { Box } from "@saleor/macaw-ui/next";
+import { Box } from "@saleor/macaw-ui-next";
 import React from "react";
 
 import { AppFrame } from "../AppFrame";

src/apps/components/AppPage/AppPageNav.tsx

@@ -3,7 +3,7 @@ import { AppLogo } from "@dashboard/apps/types";
 import { AppUrls } from "@dashboard/apps/urls";
 import { TopNavLink, TopNavWrapper } from "@dashboard/components/AppLayout";
 import useNavigator from "@dashboard/hooks/useNavigator";
-import { Box, Button, Text } from "@saleor/macaw-ui/next";
+import { Box, Button, Text } from "@saleor/macaw-ui-next";
 import React, { useMemo } from "react";
 import { FormattedMessage } from "react-intl";
 

src/apps/components/AppPermissions/AppPermissions.tsx

@@ -1,5 +1,5 @@
 import { AppPermissionFragment } from "@dashboard/graphql";
-import { Box, InfoIcon, Tooltip } from "@saleor/macaw-ui/next";
+import { Box, InfoIcon, Tooltip } from "@saleor/macaw-ui-next";
 import React from "react";
 import { FormattedMessage } from "react-intl";
 

src/apps/components/AppPermissionsDialog/AppPermissionsDialog.tsx

@@ -11,7 +11,7 @@ import {
 import useNotifier from "@dashboard/hooks/useNotifier";
 import { Dialog, DialogContent, DialogTitle } from "@material-ui/core";
 import { Skeleton } from "@material-ui/lab";
-import { Box, Text } from "@saleor/macaw-ui/next";
+import { Box, Text } from "@saleor/macaw-ui-next";
 import React, { useEffect } from "react";
 import { useIntl } from "react-intl";
 

src/apps/components/AppPermissionsDialog/AppPermissionsDialogConfirmation.tsx

@@ -1,7 +1,7 @@
 import { AppPermissionsDialogMessages } from "@dashboard/apps/components/AppPermissionsDialog/messages";
 import { useGetAvailableAppPermissions } from "@dashboard/apps/hooks/useGetAvailableAppPermissions";
 import { PermissionEnum } from "@dashboard/graphql";
-import { Box, Button, Text } from "@saleor/macaw-ui/next";
+import { Box, Button, Text } from "@saleor/macaw-ui-next";
 import React from "react";
 import { useIntl } from "react-intl";
 

src/apps/components/AppPermissionsDialog/AppPermissionsDialogPermissionPicker.tsx

@@ -1,7 +1,7 @@
 import { AppPermissionsDialogMessages } from "@dashboard/apps/components/AppPermissionsDialog/messages";
 import { AppPermission } from "@dashboard/apps/components/AppPermissionsDialog/types";
 import { PermissionEnum } from "@dashboard/graphql";
-import { Box, Button, Checkbox, List, Text } from "@saleor/macaw-ui/next";
+import { Box, Button, Checkbox, List, Text } from "@saleor/macaw-ui-next";
 import React from "react";
 import { useIntl } from "react-intl";
 

src/apps/components/AppWebhooksDisplay/AppWebhooksDisplay.tsx

@@ -11,7 +11,7 @@ import {
   Skeleton,
   Text,
   ThemeTokensValues,
-} from "@saleor/macaw-ui/next";
+} from "@saleor/macaw-ui-next";
 import React from "react";
 import { useIntl } from "react-intl";
 

src/apps/components/InstallWithManifestFormButton/InstallWithManifestFormButton.tsx

@@ -1,7 +1,7 @@
 import { appsMessages } from "@dashboard/apps/messages";
 import { buttonMessages } from "@dashboard/intl";
 import { TextField } from "@material-ui/core";
-import { Box, Button } from "@saleor/macaw-ui/next";
+import { Box, Button } from "@saleor/macaw-ui-next";
 import React, { useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 

src/apps/components/InstalledAppList/InstalledAppList.tsx

@@ -1,7 +1,7 @@
 import { AppInstallation, InstalledApp } from "@dashboard/apps/types";
 import { ListProps } from "@dashboard/types";
 import { Skeleton } from "@material-ui/lab";
-import { List } from "@saleor/macaw-ui/next";
+import { List } from "@saleor/macaw-ui-next";
 import React from "react";
 
 import InstalledAppListRow from "../InstalledAppListRow";

src/apps/components/InstalledAppListRow/AppManifestUrl.tsx

@@ -1,4 +1,4 @@
-import { Box, CopyIcon, Text, Tooltip } from "@saleor/macaw-ui/next";
+import { Box, CopyIcon, Text, Tooltip } from "@saleor/macaw-ui-next";
 import clsx from "clsx";
 import React, { useState } from "react";
 import { FormattedMessage } from "react-intl";

src/apps/components/InstalledAppListRow/InstalledAppListRow.tsx

@@ -3,7 +3,7 @@ import { InstalledApp } from "@dashboard/apps/types";
 import { AppPaths, AppUrls } from "@dashboard/apps/urls";
 import { isAppInTunnel } from "@dashboard/apps/utils";
 import Link from "@dashboard/components/Link";
-import { Box, Chip, List, sprinkles, Text } from "@saleor/macaw-ui/next";
+import { Box, Chip, List, sprinkles, Text } from "@saleor/macaw-ui-next";
 import React from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 import { useLocation } from "react-router";

src/apps/components/NotInstalledAppListRow/NotInstalledAppListRow.tsx

@@ -17,7 +17,7 @@ import {
   Tooltip,
   TrashBinIcon,
   WarningIcon,
-} from "@saleor/macaw-ui/next";
+} from "@saleor/macaw-ui-next";
 import React from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 

src/apps/views/AppPermissionRequestView/AppPermissionRequestView.tsx

@@ -7,7 +7,7 @@ import {
   useAppQuery,
   useAppUpdatePermissionsMutation,
 } from "@dashboard/graphql";
-import { Box, BoxProps, Button, Text, TextProps } from "@saleor/macaw-ui/next";
+import { Box, BoxProps, Button, Text, TextProps } from "@saleor/macaw-ui-next";
 import React, { useEffect } from "react";
 import { useIntl } from "react-intl";
 import { useLocation, useParams } from "react-router";

src/attributes/components/AttributeListDatagrid/AttributeListDatagrid.tsx

@@ -14,7 +14,7 @@ import { AttributeFragment } from "@dashboard/graphql";
 import useNavigator from "@dashboard/hooks/useNavigator";
 import { ListProps, SortPage } from "@dashboard/types";
 import { Item } from "@glideapps/glide-data-grid";
-import { Box } from "@saleor/macaw-ui/next";
+import { Box } from "@saleor/macaw-ui-next";
 import React, { useCallback, useMemo } from "react";
 import { useIntl } from "react-intl";
 

src/attributes/components/AttributeListPage/AttributeListPage.tsx

@@ -11,7 +11,7 @@ import { AttributeFragment } from "@dashboard/graphql";
 import useNavigator from "@dashboard/hooks/useNavigator";
 import { sectionNames } from "@dashboard/intl";
 import { Card } from "@material-ui/core";
-import { Box, Button, ChevronRightIcon } from "@saleor/macaw-ui/next";
+import { Box, Button, ChevronRightIcon } from "@saleor/macaw-ui-next";
 import React, { useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 

src/categories/components/CategoryBackground/CategoryBackground.tsx

@@ -9,7 +9,7 @@ import { CategoryDetailsFragment } from "@dashboard/graphql";
 import { commonMessages } from "@dashboard/intl";
 import { Card, CardContent, TextField } from "@material-ui/core";
 import { makeStyles } from "@saleor/macaw-ui";
-import { vars } from "@saleor/macaw-ui/next";
+import { vars } from "@saleor/macaw-ui-next";
 import React from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 

src/categories/components/CategoryCreatePage/CategoryCreatePage.tsx

@@ -8,7 +8,7 @@ import Savebar from "@dashboard/components/Savebar";
 import { SeoForm } from "@dashboard/components/SeoForm";
 import { ProductErrorFragment } from "@dashboard/graphql";
 import useNavigator from "@dashboard/hooks/useNavigator";
-import { Box } from "@saleor/macaw-ui/next";
+import { Box } from "@saleor/macaw-ui-next";
 import React from "react";
 import { useIntl } from "react-intl";
 

src/categories/components/CategoryListDatagrid/CategoryListDatagrid.tsx

@@ -13,7 +13,7 @@ import { TablePaginationWithContext } from "@dashboard/components/TablePaginatio
 import { CategoryFragment } from "@dashboard/graphql";
 import { PageListProps, SortPage } from "@dashboard/types";
 import { Item } from "@glideapps/glide-data-grid";
-import { Box } from "@saleor/macaw-ui/next";
+import { Box } from "@saleor/macaw-ui-next";
 import React, { ReactNode, useCallback, useMemo } from "react";
 import { useIntl } from "react-intl";
 

src/categories/components/CategoryListPage/CategoryListPage.tsx

@@ -17,7 +17,7 @@ import {
   TabPageProps,
 } from "@dashboard/types";
 import { Card } from "@material-ui/core";
-import { Box, ChevronRightIcon } from "@saleor/macaw-ui/next";
+import { Box, ChevronRightIcon } from "@saleor/macaw-ui-next";
 import React, { useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 

src/categories/components/CategoryProductListDatagrid/CategoryProductListDatagrid.tsx

@@ -10,7 +10,7 @@ import { CategoryDetailsQuery } from "@dashboard/graphql";
 import { productUrl } from "@dashboard/products/urls";
 import { PageListProps, RelayToFlat } from "@dashboard/types";
 import { Item } from "@glideapps/glide-data-grid";
-import { Box } from "@saleor/macaw-ui/next";
+import { Box } from "@saleor/macaw-ui-next";
 import React, { ReactNode, useCallback, useMemo } from "react";
 import { useIntl } from "react-intl";
 

src/categories/components/CategoryProducts/CategoryProducts.tsx

@@ -5,7 +5,7 @@ import { InternalLink } from "@dashboard/components/InternalLink";
 import { CategoryDetailsQuery } from "@dashboard/graphql";
 import { productAddUrl, productListUrl } from "@dashboard/products/urls";
 import { RelayToFlat } from "@dashboard/types";
-import { Box, Button } from "@saleor/macaw-ui/next";
+import { Box, Button } from "@saleor/macaw-ui-next";
 import React from "react";
 import { FormattedMessage } from "react-intl";
 

src/categories/components/CategorySubcategories/CategorySubcategories.tsx

@@ -5,7 +5,7 @@ import { DashboardCard } from "@dashboard/components/Card";
 import { InternalLink } from "@dashboard/components/InternalLink";
 import { CategoryDetailsQuery } from "@dashboard/graphql";
 import { ListProps, ListViews, RelayToFlat } from "@dashboard/types";
-import { Box, Button } from "@saleor/macaw-ui/next";
+import { Box, Button } from "@saleor/macaw-ui-next";
 import React from "react";
 import { FormattedMessage } from "react-intl";
 

src/categories/components/CategoryUpdatePage/CategoryUpdatePage.tsx

@@ -11,7 +11,7 @@ import { Tab, TabContainer } from "@dashboard/components/Tab";
 import { CategoryDetailsQuery, ProductErrorFragment } from "@dashboard/graphql";
 import { SubmitPromise } from "@dashboard/hooks/useForm";
 import useNavigator from "@dashboard/hooks/useNavigator";
-import { sprinkles } from "@saleor/macaw-ui/next";
+import { sprinkles } from "@saleor/macaw-ui-next";
 import React from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 

src/channels/components/AssignmentList/AssignmentList.tsx

@@ -2,7 +2,7 @@
 import Skeleton from "@dashboard/components/Skeleton";
 import { ReorderEvent } from "@dashboard/types";
 import { Typography } from "@material-ui/core";
-import { Accordion, Divider } from "@saleor/macaw-ui/next";
+import { Accordion, Divider } from "@saleor/macaw-ui-next";
 import React from "react";
 import { defineMessages, useIntl } from "react-intl";