fix(admin-next,types): fixes order page from breaking in admin server (#8730)
This commit is contained in:
@@ -18,6 +18,7 @@ export async function getViteConfig(
|
||||
const root = path.resolve(__dirname, "./")
|
||||
|
||||
const backendUrl = options.backendUrl ?? ""
|
||||
const storefrontUrl = options.storefrontUrl ?? ""
|
||||
|
||||
const baseConfig: InlineConfig = {
|
||||
root,
|
||||
@@ -33,6 +34,7 @@ export async function getViteConfig(
|
||||
define: {
|
||||
__BASE__: JSON.stringify(options.path),
|
||||
__BACKEND_URL__: JSON.stringify(backendUrl),
|
||||
__STOREFRONT_URL__: JSON.stringify(storefrontUrl),
|
||||
},
|
||||
server: {
|
||||
fs: {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { AdminOptions } from "@medusajs/types"
|
||||
|
||||
export type BundlerOptions = Required<Pick<AdminOptions, "outDir" | "path">> &
|
||||
Pick<AdminOptions, "vite" | "backendUrl"> & {
|
||||
Pick<AdminOptions, "vite" | "backendUrl" | "storefrontUrl"> & {
|
||||
sources?: string[]
|
||||
}
|
||||
|
||||
2
packages/admin-next/dashboard/src/lib/storefront.ts
Normal file
2
packages/admin-next/dashboard/src/lib/storefront.ts
Normal file
@@ -0,0 +1,2 @@
|
||||
export const MEDUSA_STOREFRONT_URL =
|
||||
__STOREFRONT_URL__ ?? "http://localhost:8000"
|
||||
@@ -5,8 +5,7 @@ import copy from "copy-to-clipboard"
|
||||
import React, { useState } from "react"
|
||||
import { useTranslation } from "react-i18next"
|
||||
import { getStylizedAmount } from "../../../../../lib/money-amount-helpers"
|
||||
|
||||
export const MEDUSA_BACKEND_URL = __STOREFRONT_URL__ ?? "http://localhost:8000"
|
||||
import { MEDUSA_STOREFRONT_URL } from "../../../../../lib/storefront"
|
||||
|
||||
type CopyPaymentLinkProps = {
|
||||
paymentCollection: AdminPaymentCollection
|
||||
@@ -31,7 +30,9 @@ const CopyPaymentLink = React.forwardRef<any, CopyPaymentLinkProps>(
|
||||
e.stopPropagation()
|
||||
|
||||
setDone(true)
|
||||
copy(`${MEDUSA_BACKEND_URL}/payment-collection/${paymentCollection.id}`)
|
||||
copy(
|
||||
`${MEDUSA_STOREFRONT_URL}/payment-collection/${paymentCollection.id}`
|
||||
)
|
||||
|
||||
setTimeout(() => {
|
||||
setDone(false)
|
||||
|
||||
@@ -16,7 +16,7 @@ export type AdminOptions = {
|
||||
/**
|
||||
* Whether to disable the admin dashboard. If set to `true`, the admin dashboard is disabled,
|
||||
* in both development and production environments. The default value is `false`.
|
||||
*
|
||||
*
|
||||
* @example
|
||||
* ```js title="medusa-config.js"
|
||||
* module.exports = defineConfig({
|
||||
@@ -37,7 +37,7 @@ export type AdminOptions = {
|
||||
* - `/store`
|
||||
* - `/auth`
|
||||
* - `/`
|
||||
*
|
||||
*
|
||||
* @example
|
||||
* ```js title="medusa-config.js"
|
||||
* module.exports = defineConfig({
|
||||
@@ -52,7 +52,7 @@ export type AdminOptions = {
|
||||
/**
|
||||
* The directory where the admin build is outputted when you run the `build` command.
|
||||
* The default value is `./build`.
|
||||
*
|
||||
*
|
||||
* @example
|
||||
* ```js title="medusa-config.js"
|
||||
* module.exports = defineConfig({
|
||||
@@ -66,7 +66,7 @@ export type AdminOptions = {
|
||||
outDir?: string
|
||||
/**
|
||||
* The URL of your Medusa application. This is useful to set when you deploy the Medusa application.
|
||||
*
|
||||
*
|
||||
* @example
|
||||
* ```js title="medusa-config.js"
|
||||
* module.exports = defineConfig({
|
||||
@@ -79,6 +79,22 @@ export type AdminOptions = {
|
||||
* ```
|
||||
*/
|
||||
backendUrl?: string
|
||||
/**
|
||||
* The URL of your Medusa storefront application. This will help generate links from the admin
|
||||
* to provide to customers to complete any processes
|
||||
*
|
||||
* @example
|
||||
* ```js title="medusa-config.js"
|
||||
* module.exports = defineConfig({
|
||||
* admin: {
|
||||
* storefrontUrl: process.env.MEDUSA_STOREFRONT_URL ||
|
||||
* "http://localhost:9000"
|
||||
* },
|
||||
* // ...
|
||||
* })
|
||||
* ```
|
||||
*/
|
||||
storefrontUrl?: string
|
||||
/**
|
||||
* Configure the Vite configuration for the admin dashboard. This function receives the default Vite configuration
|
||||
* and returns the modified configuration. The default value is `undefined`.
|
||||
@@ -264,11 +280,11 @@ export type ProjectConfigOptions = {
|
||||
*
|
||||
* This is useful for production databases, which can be supported by setting the `rejectUnauthorized` attribute of `ssl` object to `false`.
|
||||
* During development, it’s recommended not to pass this option.
|
||||
*
|
||||
*
|
||||
* :::note
|
||||
*
|
||||
*
|
||||
* Make sure to add to the end of the database URL `?ssl_mode=disable` as well when disabling `rejectUnauthorized`.
|
||||
*
|
||||
*
|
||||
* :::
|
||||
*
|
||||
* @example
|
||||
@@ -410,9 +426,9 @@ export type ProjectConfigOptions = {
|
||||
* // ...
|
||||
* })
|
||||
* ```
|
||||
*
|
||||
*
|
||||
* @ignore
|
||||
*
|
||||
*
|
||||
* @privateRemarks
|
||||
* Couldn't find any use for this option.
|
||||
*/
|
||||
@@ -493,7 +509,7 @@ export type ProjectConfigOptions = {
|
||||
jwtSecret?: string
|
||||
/**
|
||||
* The expiration time for the JWT token. Its format is based off the [ms package](https://github.com/vercel/ms).
|
||||
*
|
||||
*
|
||||
* If not provided, the default value is `24h`.
|
||||
*
|
||||
* @example
|
||||
@@ -754,7 +770,7 @@ export type ProjectConfigOptions = {
|
||||
* The configurations for your Medusa application are in `medusa-config.js` located in the root of your Medusa project. The configurations include configurations for database, modules, and more.
|
||||
*
|
||||
* `medusa-config.js` exports the value returned by the `defineConfig` utility function imported from `@medusajs/utils`.
|
||||
*
|
||||
*
|
||||
* `defineConfig` accepts as a parameter an object with the following properties:
|
||||
*
|
||||
* - {@link ConfigModule.projectConfig | projectConfig} (required): An object that holds general configurations related to the Medusa application, such as database or CORS configurations.
|
||||
@@ -860,12 +876,12 @@ export type ConfigModule = {
|
||||
|
||||
/**
|
||||
* This property holds all custom modules installed in your Medusa application.
|
||||
*
|
||||
*
|
||||
* :::note
|
||||
*
|
||||
*
|
||||
* Medusa's commerce modules are configured by default, so only
|
||||
* add them to this property if you're changing their configurations or adding providers to a module.
|
||||
*
|
||||
*
|
||||
* :::
|
||||
*
|
||||
* The keys of the `modules` configuration object refer to the module's registration name. Its value can be one of the following:
|
||||
|
||||
Reference in New Issue
Block a user