From 4c58d9af0cbed28224d21d09729d35d6dbd5ac47 Mon Sep 17 00:00:00 2001 From: Shivendra Date: Thu, 27 Feb 2025 15:57:46 +0530 Subject: [PATCH 1/3] Fix dependency issue --- packages/Webkul/Admin/package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Admin/package.json b/packages/Webkul/Admin/package.json index d028b9678..824548afd 100644 --- a/packages/Webkul/Admin/package.json +++ b/packages/Webkul/Admin/package.json @@ -1,5 +1,6 @@ { "private": true, + "type": "module", "scripts": { "dev": "vite", "build": "vite build" @@ -7,10 +8,10 @@ "devDependencies": { "autoprefixer": "^10.4.16", "axios": "^1.6.4", - "laravel-vite-plugin": "^0.7.2", + "laravel-vite-plugin": "^1.0", "postcss": "^8.4.23", "tailwindcss": "^3.3.2", - "vite": "^4.0.0", + "vite": "^5.4.12", "vue": "^3.4.19" }, "dependencies": { From 2d340853ec989d5e0bed28a0684b62d0adf3d372 Mon Sep 17 00:00:00 2001 From: Shivendra Date: Thu, 27 Feb 2025 16:00:41 +0530 Subject: [PATCH 2/3] revert mail changes --- packages/Webkul/Marketing/src/Mail/CampaignMail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Marketing/src/Mail/CampaignMail.php b/packages/Webkul/Marketing/src/Mail/CampaignMail.php index f5058c035..882167d73 100644 --- a/packages/Webkul/Marketing/src/Mail/CampaignMail.php +++ b/packages/Webkul/Marketing/src/Mail/CampaignMail.php @@ -2,7 +2,7 @@ namespace Webkul\Marketing\Mail; -use Illuminate\Mail\Mailable as Mailable; +use Illuminate\Mail\Mailable; use Illuminate\Mail\Mailables\Address; use Illuminate\Mail\Mailables\Content; use Illuminate\Mail\Mailables\Envelope; From e6bc000ad0c83fd3566586ced5ab1af66ac48a12 Mon Sep 17 00:00:00 2001 From: Shivendra Date: Thu, 27 Feb 2025 18:45:19 +0530 Subject: [PATCH 3/3] fix issue --- packages/Webkul/Admin/{postcss.config.js => postcss.config.cjs} | 0 packages/Webkul/Admin/vite.config.js | 1 + 2 files changed, 1 insertion(+) rename packages/Webkul/Admin/{postcss.config.js => postcss.config.cjs} (100%) diff --git a/packages/Webkul/Admin/postcss.config.js b/packages/Webkul/Admin/postcss.config.cjs similarity index 100% rename from packages/Webkul/Admin/postcss.config.js rename to packages/Webkul/Admin/postcss.config.cjs diff --git a/packages/Webkul/Admin/vite.config.js b/packages/Webkul/Admin/vite.config.js index 0d5e813b8..23ca05cd5 100644 --- a/packages/Webkul/Admin/vite.config.js +++ b/packages/Webkul/Admin/vite.config.js @@ -18,6 +18,7 @@ export default defineConfig(({ mode }) => { server: { host: process.env.VITE_HOST || "localhost", port: process.env.VITE_PORT || 5173, + cors: true, }, plugins: [