Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/frontend-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@iconify/tailwind4": "^1.1.0",
"@playwright/test": "^1.58.2",
"@tailwindcss/postcss": "^4.1.17",
"@types/node": "^20.17.47",
"@types/node": "^20.19.40",
"@types/react": "^19.2.3",
"@types/react-dom": "^19.2.3",
"babel-plugin-react-compiler": "1.0.0",
Expand Down
14 changes: 12 additions & 2 deletions apps/medusa-be/medusa-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,18 @@ const notificationProvider =
},
}

const MEDUSA_ADMIN_ALLOWED_HOSTS =
process.env.NODE_ENV === "development" ? true : process.env.MEDUSA_BACKEND_URL
const MEDUSA_BACKEND_URL = process.env.MEDUSA_BACKEND_URL?.trim()
let MEDUSA_ADMIN_ALLOWED_HOSTS: true | string[] | undefined

if (process.env.NODE_ENV === "development") {
MEDUSA_ADMIN_ALLOWED_HOSTS = true
} else if (MEDUSA_BACKEND_URL) {
try {
MEDUSA_ADMIN_ALLOWED_HOSTS = [new URL(MEDUSA_BACKEND_URL).hostname]
Comment thread
BleedingDev marked this conversation as resolved.
Outdated
} catch {
MEDUSA_ADMIN_ALLOWED_HOSTS = [MEDUSA_BACKEND_URL]
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
}
}

module.exports = defineConfig({
featureFlags: {
Expand Down
2 changes: 1 addition & 1 deletion apps/medusa-be/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"jest": "^30.2.0",
"ts-node": "10.9.2",
"typescript": "^5.9.3",
"vite": "^5.4.21",
"vite": "8.0.11",
"yalc": "1.0.0-pre.53"
},
"engines": {
Expand Down
30 changes: 3 additions & 27 deletions apps/medusa-be/src/admin/widgets/product-description-editor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,7 @@ import {
BoldItalicUnderlineToggles,
CreateLink,
codeBlockPlugin,
codeMirrorPlugin,
DiffSourceToggleWrapper,
diffSourcePlugin,
headingsPlugin,
InsertCodeBlock,
InsertTable,
InsertThematicBreak,
ListsToggle,
linkDialogPlugin,
Expand Down Expand Up @@ -343,17 +338,6 @@ const htmlToMarkdown = (html: string) => {
const markdownToHtml = (markdown: string) =>
String(marked.parse(markdown, { async: false, gfm: true })).trim()

const productEditorCodeLanguages = {
bash: "Bash",
css: "CSS",
html: "HTML",
js: "JavaScript",
json: "JSON",
md: "Markdown",
sh: "Shell",
ts: "TypeScript",
} as const

const ProductDescriptionEditor = ({
data: product,
}: ProductDescriptionEditorProps) => {
Expand Down Expand Up @@ -439,7 +423,7 @@ const ProductDescriptionEditor = ({
() => [
toolbarPlugin({
toolbarContents: () => (
<DiffSourceToggleWrapper>
<>
<UndoRedo />
<Separator />
<BlockTypeSelect />
Expand All @@ -450,10 +434,8 @@ const ProductDescriptionEditor = ({
<ListsToggle />
<Separator />
<CreateLink />
<InsertTable />
<InsertThematicBreak />
<InsertCodeBlock />
</DiffSourceToggleWrapper>
</>
),
}),
headingsPlugin(),
Expand All @@ -464,15 +446,9 @@ const ProductDescriptionEditor = ({
linkDialogPlugin(),
tablePlugin(),
codeBlockPlugin({ defaultCodeBlockLanguage: "html" }),
codeMirrorPlugin({ codeBlockLanguages: productEditorCodeLanguages }),
diffSourcePlugin({
diffMarkdown: htmlToMarkdown(product?.description ?? ""),
readOnlyDiff: true,
viewMode: "rich-text",
}),
markdownShortcutPlugin(),
Comment thread
BleedingDev marked this conversation as resolved.
],
[product?.description]
[]
)

if (!product?.id) {
Expand Down
2 changes: 1 addition & 1 deletion apps/n1/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@iconify/tailwind4": "^1.0.6",
"@tailwindcss/postcss": "^4",
"@tanstack/react-query-devtools": "^5.90.2",
"@types/node": "^20",
"@types/node": "^20.19.40",
"@types/react": "^19.2.3",
"@types/react-dom": "^19.2.3",
"babel-plugin-react-compiler": "^1.0.0",
Expand Down
11 changes: 6 additions & 5 deletions apps/payload/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,22 @@
"@types/node": "^22.5.4",
"@types/react": "19.2.1",
"@types/react-dom": "19.2.1",
"@vitejs/plugin-react": "4.5.2",
"@vitest/coverage-v8": "^3.2.3",
"@vitejs/plugin-react": "6.0.1",
"@vitest/coverage-v8": "^4.1.5",
"cross-env": "^7.0.3",
"esbuild": "0.28.0",
"eslint": "^9.16.0",
"eslint-config-next": "16.2.3",
"jsdom": "26.1.0",
"playwright": "1.56.1",
"playwright-core": "1.56.1",
"prettier": "^3.4.2",
"typescript": "5.7.3",
"vite-tsconfig-paths": "5.1.4",
"vitest": "3.2.4"
"vite": "8.0.11",
Comment thread
BleedingDev marked this conversation as resolved.
"vitest": "4.1.5"
},
"engines": {
"node": "^18.20.2 || >=20.9.0",
"node": "^20.19.0 || >=22.12.0",
"pnpm": "^9 || ^10"
}
}
6 changes: 4 additions & 2 deletions apps/payload/vitest.config.mts
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import react from "@vitejs/plugin-react"
import tsconfigPaths from "vite-tsconfig-paths"
import { defineConfig } from "vitest/config"

export default defineConfig({
plugins: [tsconfigPaths(), react()],
plugins: [react()],
resolve: {
tsconfigPaths: true,
},
test: {
environment: "node",
setupFiles: ["./vitest.setup.ts"],
Expand Down
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,11 @@
"react": "19.2.3",
"react-dom": "19.2.3",
"@types/react": "19.2.3",
"@types/react-dom": "19.2.3"
"@types/react-dom": "19.2.3",
"@medusajs/admin-bundler>vite": "8.0.11",
"@medusajs/admin-vite-plugin>vite": "8.0.11",
"@medusajs/admin-bundler>@vitejs/plugin-react": "6.0.1",
"vite": "8.0.11"
},
"supportedArchitectures": {
"os": [
Expand Down
Loading
Loading