Skip to content

Commit

Permalink
Merge pull request #722 from gadget-inc/remove-mui
Browse files Browse the repository at this point in the history
remove mui
  • Loading branch information
airhorns authored Jan 12, 2025
2 parents 7f2d31a + 7c31797 commit aa596f7
Show file tree
Hide file tree
Showing 56 changed files with 165 additions and 1,635 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* eslint-disable jest/valid-expect */
import React from "react";
import { MUIAutoInput } from "../../../../src/auto/mui/inputs/MUIAutoInput.js";
import { PolarisAutoInput } from "../../../../src/auto/polaris/inputs/PolarisAutoInput.js";
import { humanizeCamelCase } from "../../../../src/utils.js";
import { api } from "../../../support/api.js";
Expand All @@ -11,10 +10,6 @@ const AutoInput = (props: { suiteName: string; field: string; label?: string })
return <PolarisAutoInput {...props} />;
}

if (props.suiteName === "MUI") {
return <MUIAutoInput {...props} />;
}

throw new Error("Invalid suite name");
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import React from "react";
import { apiTriggerOnly } from "../../../../spec/auto/support/Triggers.js";
import { MUIAutoInput } from "../../../../src/auto/mui/inputs/MUIAutoInput.js";
import { MUIAutoSubmit } from "../../../../src/auto/mui/submit/MUIAutoSubmit.js";
import { PolarisAutoInput } from "../../../../src/auto/polaris/inputs/PolarisAutoInput.js";
import { PolarisAutoSubmit } from "../../../../src/auto/polaris/submit/PolarisAutoSubmit.js";
import { api } from "../../../support/api.js";
Expand Down Expand Up @@ -159,13 +157,8 @@ describeForEachAutoAdapter("AutoForm - Upsert Action", ({ name, adapter: { AutoF
<PolarisAutoInput field="inventoryCount" />
<PolarisAutoSubmit />
</>
) : (
<>
<MUIAutoInput field="name" />
<MUIAutoInput field="inventoryCount" />
<MUIAutoSubmit />
</>
)}
) : // todo: shadcn
null}
</AutoForm>,
wrapper
);
Expand Down
14 changes: 2 additions & 12 deletions packages/react/cypress/support/auto.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
import { LocalizationProvider } from "@mui/x-date-pickers";
import { AdapterDateFns } from "@mui/x-date-pickers/AdapterDateFns";
import { AppProvider, Card, Page } from "@shopify/polaris";
import "@shopify/polaris/build/esm/styles.css";
import translations from "@shopify/polaris/locales/en.json";
import type { ComponentType, ReactNode } from "react";
import React from "react";
import type { AutoAdapter } from "../../src/auto/index.js";
import * as MUIAdapter from "../../src/auto/mui/test-index.js";
import * as PolarisAdapter from "../../src/auto/polaris/index.js";
import { FormProvider, useForm } from "../../src/useActionForm.js";

Expand All @@ -16,10 +13,6 @@ interface AutoSuiteConfig {
wrapper: ComponentType<{ children: ReactNode }>;
}

export const MUIWrapper = ({ children }: { children: ReactNode }) => (
<LocalizationProvider dateAdapter={AdapterDateFns}>{children}</LocalizationProvider>
);

export const PolarisWrapper = ({ children }: { children: ReactNode }) => (
<AppProvider i18n={translations}>
<FormProvider {...useForm()}>
Expand All @@ -30,12 +23,9 @@ export const PolarisWrapper = ({ children }: { children: ReactNode }) => (
</AppProvider>
);

const suites: AutoSuiteConfig[] = [
{ name: "MUI", adapter: MUIAdapter as any, wrapper: MUIWrapper },
{ name: "Polaris", adapter: PolarisAdapter as any, wrapper: PolarisWrapper },
];
const suites: AutoSuiteConfig[] = [{ name: "Polaris", adapter: PolarisAdapter as any, wrapper: PolarisWrapper }];

export const adapters = [MUIAdapter, PolarisAdapter];
export const adapters = [PolarisAdapter];
export const describeForEachAutoAdapter = (suiteName: string, suite: (config: AutoSuiteConfig) => void) => {
// eslint-disable-next-line jest/valid-describe-callback, jest/valid-title
describe.each(suites)((({ name }: { name: string }) => `${suiteName} - ${name}`) as any, suite);
Expand Down
24 changes: 1 addition & 23 deletions packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@
"import": "./dist/esm/auto/polaris/index.js",
"require": "./dist/cjs/auto/polaris/index.js",
"default": "./dist/esm/auto/polaris/index.js"
},
"./auto/mui": {
"import": "./dist/esm/auto/mui/index.js",
"require": "./dist/cjs/auto/mui/index.js",
"default": "./dist/esm/auto/mui/index.js"
}
},
"source": "src/index.ts",
Expand All @@ -35,7 +30,7 @@
"typecheck": "tsc --noEmit",
"clean": "rimraf dist/ auto/",
"build": "pnpm clean && pnpm setup-build && tsc -b tsconfig.cjs.json tsconfig.esm.json && pnpm copy",
"setup-build": "mkdir -p dist/cjs dist/esm auto/polaris auto/mui && echo '{\"type\": \"commonjs\"}' > dist/cjs/package.json && echo '{\"main\": \"../../dist/cjs/auto/polaris/index.js\"}' > auto/polaris/package.json && echo '{\"main\": \"../../dist/cjs/auto/mui/index.js\"}' > auto/mui/package.json && echo '{\"type\": \"module\"}' > dist/esm/package.json",
"setup-build": "mkdir -p dist/cjs dist/esm auto/polaris && echo '{\"type\": \"commonjs\"}' > dist/cjs/package.json && echo '{\"main\": \"../../dist/cjs/auto/polaris/index.js\"}' > auto/polaris/package.json && echo '{\"type\": \"module\"}' > dist/esm/package.json",
"copy": "copyfiles -u 1 src/**/*.css dist/esm && copyfiles -u 1 src/**/*.css dist/cjs",
"watch": "tsc -b tsconfig.esm.json --watch --preserveWatchOutput",
"gql-gen": "graphql-codegen",
Expand Down Expand Up @@ -68,7 +63,6 @@
"@graphql-codegen/client-preset": "^4.1.0",
"@graphql-typed-document-node/core": "^3.2.0",
"@mdxeditor/editor": "^3.8.0",
"@mui/material": "^5.14.8",
"@n1ru4l/json-patch-plus": "^0.2.0",
"@pollyjs/adapter-fetch": "^6.0.6",
"@pollyjs/adapter-node-http": "^6.0.6",
Expand Down Expand Up @@ -117,10 +111,6 @@
},
"peerDependencies": {
"@mdxeditor/editor": "^3.8.0",
"@mui/lab": "5.0.0-alpha.145",
"@mui/material": "^5.14.8",
"@mui/x-data-grid": "^6.12.1",
"@mui/x-date-pickers": "^6.14.0",
"@shopify/polaris": "^12.0.0 || ^13.0.0",
"@shopify/polaris-icons": "^8.1.0 || ^9.0.0",
"react": "^18.0.0",
Expand All @@ -130,18 +120,6 @@
"@mdxeditor/editor": {
"optional": true
},
"@mui/lab": {
"optional": true
},
"@mui/material": {
"optional": true
},
"@mui/x-data-grid": {
"optional": true
},
"@mui/x-date-pickers": {
"optional": true
},
"@shopify/polaris": {
"optional": true
},
Expand Down
2 changes: 1 addition & 1 deletion packages/react/spec/auto/hooks/useTable.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useTable } from "../../../src/useTable.js";
import { testApi as api } from "../../apis.js";
import { mockUrqlClient } from "../../testWrappers.js";
import { MockTable } from "../MockTable.js";
import { PolarisMockedProviders } from "../inputs/PolarisMockedProviders.js";
import { PolarisMockedProviders } from "../polaris/inputs/PolarisMockedProviders.js";
import { recordIdInputField } from "../support/shared.js";
import { widgetModelInputFields } from "../support/widgetModel.js";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ import type { UserEvent } from "@testing-library/user-event";
import { userEvent } from "@testing-library/user-event";
import type { ReactNode } from "react";
import React from "react";
import { MissingApiTriggerErrorMessage } from "../../src/auto/AutoFormActionValidators.js";
import { PolarisAutoForm } from "../../src/auto/polaris/PolarisAutoForm.js";
import { PolarisAutoInput } from "../../src/auto/polaris/inputs/PolarisAutoInput.js";
import { PolarisAutoSubmit } from "../../src/auto/polaris/submit/PolarisAutoSubmit.js";
import { testApi as api } from "../apis.js";
import { MockClientProvider, mockUrqlClient } from "../testWrappers.js";
import { getGizmoModelMetadata } from "./support/gizmoModel.js";
import { getGlobalActionMetadata } from "./support/globalActions.js";
import { getWidgetModelMetadata, getWidgetRecord } from "./support/widgetModel.js";
import { MissingApiTriggerErrorMessage } from "../../../src/auto/AutoFormActionValidators.js";
import { PolarisAutoForm } from "../../../src/auto/polaris/PolarisAutoForm.js";
import { PolarisAutoInput } from "../../../src/auto/polaris/inputs/PolarisAutoInput.js";
import { PolarisAutoSubmit } from "../../../src/auto/polaris/submit/PolarisAutoSubmit.js";
import { testApi as api } from "../../apis.js";
import { MockClientProvider, mockUrqlClient } from "../../testWrappers.js";
import { getGizmoModelMetadata } from "../support/gizmoModel.js";
import { getGlobalActionMetadata } from "../support/globalActions.js";
import { getWidgetModelMetadata, getWidgetRecord } from "../support/widgetModel.js";

const PolarisMockedProviders = (props: { children: ReactNode }) => {
return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { AppProvider, Card, Page } from "@shopify/polaris";
import translations from "@shopify/polaris/locales/en.json";
import React from "react";
import { Provider } from "../../src/GadgetProvider.tsx";
import { PolarisAutoForm } from "../../src/auto/polaris/PolarisAutoForm.tsx";
import { PolarisAutoInput } from "../../src/auto/polaris/inputs/PolarisAutoInput.tsx";
import { PolarisAutoSubmit } from "../../src/auto/polaris/submit/PolarisAutoSubmit.tsx";
import { FormProvider, useForm } from "../../src/useActionForm.ts";
import { testApi as api } from "../apis.ts";
import { StorybookErrorBoundary } from "./StorybookErrorBoundary.tsx";
import { Provider } from "../../../src/GadgetProvider.js";
import { PolarisAutoForm } from "../../../src/auto/polaris/PolarisAutoForm.js";
import { PolarisAutoInput } from "../../../src/auto/polaris/inputs/PolarisAutoInput.js";
import { PolarisAutoSubmit } from "../../../src/auto/polaris/submit/PolarisAutoSubmit.js";
import { FormProvider, useForm } from "../../../src/useActionForm.js";
import { testApi as api } from "../../apis.js";
import { StorybookErrorBoundary } from "../StorybookErrorBoundary.js";

// More on how to set up stories at: https://storybook.js.org/docs/writing-stories#default-export
export default {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import { AppProvider, BlockStack, Box, Button, Checkbox, LegacyCard } from "@sho
import { DeleteIcon } from "@shopify/polaris-icons";
import translations from "@shopify/polaris/locales/en.json";
import React, { useEffect } from "react";
import { Provider } from "../../src/GadgetProvider.tsx";
import { PolarisAutoTable } from "../../src/auto/polaris/PolarisAutoTable.tsx";
import { useAction } from "../../src/useAction.ts";
import { testApi as api } from "../apis.ts";
import { StorybookErrorBoundary } from "./StorybookErrorBoundary.tsx";
import { Provider } from "../../../src/GadgetProvider.js";
import { PolarisAutoTable } from "../../../src/auto/polaris/PolarisAutoTable.js";
import { useAction } from "../../../src/useAction.js";
import { testApi as api } from "../../apis.js";
import { StorybookErrorBoundary } from "../StorybookErrorBoundary.js";

const CustomEmptyStateMarkup = <p>This is a custom empty state. Bazinga.</p>;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { AppProvider, Card, Page } from "@shopify/polaris";
import translations from "@shopify/polaris/locales/en.json";
import React from "react";
import { Provider } from "../../../src/GadgetProvider.tsx";
import { PolarisAutoForm } from "../../../src/auto/polaris/PolarisAutoForm.tsx";
import { FormProvider, useForm } from "../../../src/useActionForm.ts";
import { testApi as api } from "../../apis.ts";
import { Provider } from "../../../../src/GadgetProvider.js";
import { PolarisAutoForm } from "../../../../src/auto/polaris/PolarisAutoForm.js";
import { FormProvider, useForm } from "../../../../src/useActionForm.js";
import { testApi as api } from "../../../apis.js";

export default {
title: "Polaris/AutoForm/Errors",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { AppProvider, Card, Page } from "@shopify/polaris";
import translations from "@shopify/polaris/locales/en.json";
import React from "react";
import { Provider } from "../../../src/GadgetProvider.tsx";
import { PolarisAutoForm } from "../../../src/auto/polaris/PolarisAutoForm.tsx";
import { FormProvider, useForm } from "../../../src/useActionForm.ts";
import { testApi as api } from "../../apis.ts";
import { Provider } from "../../../../src/GadgetProvider.js";
import { PolarisAutoForm } from "../../../../src/auto/polaris/PolarisAutoForm.js";
import { FormProvider, useForm } from "../../../../src/useActionForm.js";
import { testApi as api } from "../../../apis.js";

export default {
title: "Polaris/AutoForm/FindByUniqueField",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { act, render } from "@testing-library/react";
import { userEvent } from "@testing-library/user-event";
import React from "react";
import { PolarisAutoForm } from "../../../src/auto/polaris/PolarisAutoForm.js";
import { PolarisAutoBooleanInput } from "../../../src/auto/polaris/inputs/PolarisAutoBooleanInput.js";
import { PolarisAutoSubmit } from "../../../src/auto/polaris/submit/PolarisAutoSubmit.js";
import { testApi as api } from "../../apis.js";
import { mockUrqlClient } from "../../testWrappers.js";
import { mockWidgetFindBy } from "../support/helper.js";
import { PolarisAutoForm } from "../../../../src/auto/polaris/PolarisAutoForm.js";
import { PolarisAutoBooleanInput } from "../../../../src/auto/polaris/inputs/PolarisAutoBooleanInput.js";
import { PolarisAutoSubmit } from "../../../../src/auto/polaris/submit/PolarisAutoSubmit.js";
import { testApi as api } from "../../../apis.js";
import { mockUrqlClient } from "../../../testWrappers.js";
import { mockWidgetFindBy } from "../../support/helper.js";
import { PolarisMockedProviders } from "./PolarisMockedProviders.js";

describe("PolarisBooleanInput", () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import { jest } from "@jest/globals";
import { act, render, screen } from "@testing-library/react";
import { userEvent } from "@testing-library/user-event";
import React from "react";
import { PolarisAutoForm } from "../../../src/auto/polaris/PolarisAutoForm.js";
import { PolarisAutoDateTimePicker } from "../../../src/auto/polaris/inputs/PolarisAutoDateTimePicker.js";
import { PolarisAutoSubmit } from "../../../src/auto/polaris/submit/PolarisAutoSubmit.js";
import { testApi as api } from "../../apis.js";
import { mockUrqlClient } from "../../testWrappers.js";
import { sleep } from "../../utils.js";
import { mockWidgetFindBy } from "../support/helper.js";
import { PolarisAutoForm } from "../../../../src/auto/polaris/PolarisAutoForm.js";
import { PolarisAutoDateTimePicker } from "../../../../src/auto/polaris/inputs/PolarisAutoDateTimePicker.js";
import { PolarisAutoSubmit } from "../../../../src/auto/polaris/submit/PolarisAutoSubmit.js";
import { testApi as api } from "../../../apis.js";
import { mockUrqlClient } from "../../../testWrappers.js";
import { sleep } from "../../../utils.js";
import { mockWidgetFindBy } from "../../support/helper.js";
import { PolarisMockedProviders } from "./PolarisMockedProviders.js";

describe("PolarisDateTimePicker", () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import { jest } from "@jest/globals";
import type { RenderResult } from "@testing-library/react";
import { render } from "@testing-library/react";
import React from "react";
import { PolarisAutoEncryptedStringInput } from "../../../src/auto/polaris/inputs/PolarisAutoEncryptedStringInput.js";
import { MockForm } from "../MockForm.js";
import { apiTriggerOnly } from "../support/Triggers.js";
import { PolarisAutoEncryptedStringInput } from "../../../../src/auto/polaris/inputs/PolarisAutoEncryptedStringInput.js";
import { MockForm } from "../../MockForm.js";
import { apiTriggerOnly } from "../../support/Triggers.js";

describe("PolarisEncryptedStringInput", () => {
let result: RenderResult;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import { act, render } from "@testing-library/react";
import { userEvent } from "@testing-library/user-event";
import type { ReactNode } from "react";
import React from "react";
import { PolarisAutoForm } from "../../../src/auto/polaris/PolarisAutoForm.js";
import { PolarisAutoHiddenInput } from "../../../src/auto/polaris/inputs/PolarisAutoHiddenInput.js";
import { PolarisAutoSubmit } from "../../../src/auto/polaris/submit/PolarisAutoSubmit.js";
import { testApi as api } from "../../apis.js";
import { MockClientProvider, mockUrqlClient } from "../../testWrappers.js";
import { mockGameStadiumFindBy, mockWidgetFindBy } from "../support/helper.js";
import { getWidgetModelMetadata } from "../support/widgetModel.js";
import { PolarisAutoForm } from "../../../../src/auto/polaris/PolarisAutoForm.js";
import { PolarisAutoHiddenInput } from "../../../../src/auto/polaris/inputs/PolarisAutoHiddenInput.js";
import { PolarisAutoSubmit } from "../../../../src/auto/polaris/submit/PolarisAutoSubmit.js";
import { testApi as api } from "../../../apis.js";
import { MockClientProvider, mockUrqlClient } from "../../../testWrappers.js";
import { mockGameStadiumFindBy, mockWidgetFindBy } from "../../support/helper.js";
import { getWidgetModelMetadata } from "../../support/widgetModel.js";

const PolarisMockedProviders = (props: { children: ReactNode }) => {
return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { act, render } from "@testing-library/react";
import { userEvent } from "@testing-library/user-event";
import React from "react";
import { PolarisAutoForm } from "../../../src/auto/polaris/PolarisAutoForm.js";
import { PolarisAutoJSONInput } from "../../../src/auto/polaris/inputs/PolarisAutoJSONInput.js";
import { PolarisAutoSubmit } from "../../../src/auto/polaris/submit/PolarisAutoSubmit.js";
import { testApi as api } from "../../apis.js";
import { mockUrqlClient } from "../../testWrappers.js";
import { mockWidgetFindBy } from "../support/helper.js";
import { PolarisAutoForm } from "../../../../src/auto/polaris/PolarisAutoForm.js";
import { PolarisAutoJSONInput } from "../../../../src/auto/polaris/inputs/PolarisAutoJSONInput.js";
import { PolarisAutoSubmit } from "../../../../src/auto/polaris/submit/PolarisAutoSubmit.js";
import { testApi as api } from "../../../apis.js";
import { mockUrqlClient } from "../../../testWrappers.js";
import { mockWidgetFindBy } from "../../support/helper.js";
import { PolarisMockedProviders } from "./PolarisMockedProviders.js";

describe("PolarisJSONInput", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type { RenderResult } from "@testing-library/react";
import { render } from "@testing-library/react";
import React from "react";
import { PolarisAutoForm } from "../../../src/auto/polaris/PolarisAutoForm.js";
import { PolarisAutoPasswordInput } from "../../../src/auto/polaris/inputs/PolarisAutoPasswordInput.js";
import { testApi as api } from "../../apis.js";
import { mockUserFindBy } from "../support/helper.js";
import { PolarisAutoForm } from "../../../../src/auto/polaris/PolarisAutoForm.js";
import { PolarisAutoPasswordInput } from "../../../../src/auto/polaris/inputs/PolarisAutoPasswordInput.js";
import { testApi as api } from "../../../apis.js";
import { mockUserFindBy } from "../../support/helper.js";
import { PolarisMockedProviders } from "./PolarisMockedProviders.js";

describe("PolarisPasswordInput", () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import { act, render, screen } from "@testing-library/react";
import type { UserEvent } from "@testing-library/user-event";
import { userEvent } from "@testing-library/user-event";
import React from "react";
import { PolarisAutoForm } from "../../../src/auto/polaris/PolarisAutoForm.js";
import { PolarisAutoRolesInput } from "../../../src/auto/polaris/inputs/PolarisAutoRolesInput.js";
import { PolarisAutoSubmit } from "../../../src/auto/polaris/submit/PolarisAutoSubmit.js";
import { testApi as api } from "../../apis.js";
import { mockUrqlClient } from "../../testWrappers.js";
import { mockWidgetFindBy } from "../support/helper.js";
import { PolarisAutoForm } from "../../../../src/auto/polaris/PolarisAutoForm.js";
import { PolarisAutoRolesInput } from "../../../../src/auto/polaris/inputs/PolarisAutoRolesInput.js";
import { PolarisAutoSubmit } from "../../../../src/auto/polaris/submit/PolarisAutoSubmit.js";
import { testApi as api } from "../../../apis.js";
import { mockUrqlClient } from "../../../testWrappers.js";
import { mockWidgetFindBy } from "../../support/helper.js";
import { PolarisMockedProviders } from "./PolarisMockedProviders.js";

describe("PolarisAutoRolesInput", () => {
Expand Down
Loading

0 comments on commit aa596f7

Please sign in to comment.