From cf51ad0d46befa8edd050fac3ba20e615f429e3f Mon Sep 17 00:00:00 2001 From: Kasper Fabricius Kristensen <45367945+kasperkristensen@users.noreply.github.com> Date: Tue, 7 Mar 2023 14:43:08 +0100 Subject: [PATCH] fix(admin-ui): move dependencies from devDependencies (#3405) --- .changeset/tasty-hornets-flow.md | 5 +++ packages/admin-ui/package.json | 13 ++++---- packages/admin-ui/ui/postcss.config.js | 2 +- .../new/components/shipping-details.tsx | 14 ++++---- yarn.lock | 33 +++++++++++++++++++ 5 files changed, 54 insertions(+), 13 deletions(-) create mode 100644 .changeset/tasty-hornets-flow.md diff --git a/.changeset/tasty-hornets-flow.md b/.changeset/tasty-hornets-flow.md new file mode 100644 index 0000000000..8f2d94f8f1 --- /dev/null +++ b/.changeset/tasty-hornets-flow.md @@ -0,0 +1,5 @@ +--- +"@medusajs/admin-ui": patch +--- + +fix(admin-ui): move tailwind to direct dependency diff --git a/packages/admin-ui/package.json b/packages/admin-ui/package.json index 9f67cf368e..835f85614c 100644 --- a/packages/admin-ui/package.json +++ b/packages/admin-ui/package.json @@ -39,15 +39,20 @@ "@radix-ui/react-switch": "^1.0.1", "@radix-ui/react-tooltip": "^1.0.3", "@segment/analytics-next": "^1.51.1", + "@tailwindcss/forms": "^0.5.3", + "@tailwindcss/line-clamp": "^0.4.2", "@tanstack/react-query": "4.22.0", "@tanstack/react-table": "^8.7.9", "@vitejs/plugin-react": "^3.1.0", + "autoprefixer": "^10.4.13", "clsx": "^1.2.1", "confetti-js": "^0.0.18", "copy-to-clipboard": "^3.3.1", "emoji-picker-react": "^4.4.3", "framer-motion": "^9.1.6", "medusa-react": "*", + "postcss": "^8.4.21", + "query-string": "^8.1.0", "react": "^18.2.0", "react-collapsible": "^2.8.3", "react-country-flag": "^3.0.2", @@ -67,23 +72,19 @@ "react-router-dom": "^6.8.0", "react-select": "^5.5.4", "react-table": "^7.7.0", + "tailwindcss": "3.2.2", + "tailwindcss-radix": "^2.7.0", "type-fest": "^3.6.0", "vite": "^4.1.4" }, "devDependencies": { "@medusajs/medusa": "*", - "@tailwindcss/forms": "^0.5.3", - "@tailwindcss/line-clamp": "^0.4.2", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^14.0.0", "@testing-library/user-event": "^14.4.3", "@types/react": "^18.0.27", "@types/react-dom": "^18.0.10", "@types/react-table": "^7.7.9", - "autoprefixer": "^10.4.13", - "postcss": "^8.4.21", - "tailwindcss": "3.2.2", - "tailwindcss-radix": "^2.7.0", "typescript": "^4.9.3", "vitest": "^0.28.5" }, diff --git a/packages/admin-ui/ui/postcss.config.js b/packages/admin-ui/ui/postcss.config.js index c84faf9396..26ec0e2d9b 100644 --- a/packages/admin-ui/ui/postcss.config.js +++ b/packages/admin-ui/ui/postcss.config.js @@ -2,10 +2,10 @@ const path = require("path") module.exports = { plugins: [ + require("tailwindcss/nesting"), require("tailwindcss")({ config: path.join(__dirname, "tailwind.config.js"), }), require("autoprefixer"), - require("tailwindcss/nesting"), ], } diff --git a/packages/admin-ui/ui/src/domain/orders/new/components/shipping-details.tsx b/packages/admin-ui/ui/src/domain/orders/new/components/shipping-details.tsx index 9315f852ba..fb3567b077 100644 --- a/packages/admin-ui/ui/src/domain/orders/new/components/shipping-details.tsx +++ b/packages/admin-ui/ui/src/domain/orders/new/components/shipping-details.tsx @@ -1,5 +1,5 @@ import qs from "query-string" -import React, { useContext, useEffect, useMemo, useState } from "react" +import { useContext, useEffect, useMemo, useState } from "react" import Spinner from "../../../../components/atoms/spinner" import Button from "../../../../components/fundamentals/button" import AddressForm, { @@ -7,7 +7,7 @@ import AddressForm, { } from "../../../../components/templates/address-form" import Medusa from "../../../../services/api" -import { useAdminCustomer } from "medusa-react" +import { useAdminCustomer, useAdminCustomers } from "medusa-react" import { Controller, useWatch } from "react-hook-form" import LockIcon from "../../../../components/fundamentals/icons/lock-icon" import InputField from "../../../../components/molecules/input" @@ -24,6 +24,8 @@ const ShippingDetails = () => { const [addNew, setAddNew] = useState(false) const { disableNextPage, enableNextPage } = useContext(SteppedContext) + const { customers } = useAdminCustomers() + const { context: { validCountries }, form, @@ -144,7 +146,7 @@ const ShippingDetails = () => { }, [shippingAddress, email]) return ( -
+
Customer and shipping details @@ -182,11 +184,11 @@ const ShippingDetails = () => { required // @ts-ignore prefix={ - !!customerId ? ( + customerId ? ( ) : undefined } - tabIndex={!!customerId ? -1 : 0} + tabIndex={customerId ? -1 : 0} />
@@ -229,7 +231,7 @@ const ShippingDetails = () => {