From 9aab0e74174405ddbfa3a375e5ff332870bbf977 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Mon, 19 May 2025 15:55:07 +0530 Subject: [PATCH 1/5] fix: update package.json and config files to use ES module syntax --- frontend/package.json | 1 + frontend/postcss.config.js | 2 +- frontend/tailwind.config.js | 6 ++++-- package.json | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index e4904246..3047910e 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -2,6 +2,7 @@ "name": "crm-ui", "private": true, "version": "0.0.0", + "type": "module", "scripts": { "dev": "vite", "build": "vite build --base=/assets/crm/frontend/ && yarn copy-html-entry", diff --git a/frontend/postcss.config.js b/frontend/postcss.config.js index 33ad091d..2e7af2b7 100644 --- a/frontend/postcss.config.js +++ b/frontend/postcss.config.js @@ -1,4 +1,4 @@ -module.exports = { +export default { plugins: { tailwindcss: {}, autoprefixer: {}, diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js index cdd9cc9a..85306337 100644 --- a/frontend/tailwind.config.js +++ b/frontend/tailwind.config.js @@ -1,5 +1,7 @@ -module.exports = { - presets: [require('frappe-ui/src/tailwind/preset')], +import frappeUIPreset from 'frappe-ui/src/tailwind/preset' + +export default { + presets: [frappeUIPreset], content: [ './index.html', './src/**/*.{vue,js,ts,jsx,tsx}', diff --git a/package.json b/package.json index 70ac19de..423a4b8f 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,6 @@ { "private": true, + "type": "module", "workspaces": ["frontend", "frappe-ui"], "scripts": { "postinstall": "cd frontend && yarn install", From 1395a12d32c79260952447d652195f362b61ca69 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Mon, 19 May 2025 15:55:37 +0530 Subject: [PATCH 2/5] build(deps): bump frappeui to 0.1.145 --- frontend/package.json | 2 +- yarn.lock | 61 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 58 insertions(+), 5 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 3047910e..c6d861b5 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -12,7 +12,7 @@ "dependencies": { "@twilio/voice-sdk": "^2.10.2", "@vueuse/integrations": "^10.3.0", - "frappe-ui": "^0.1.123", + "frappe-ui": "^0.1.145", "gemoji": "^8.1.0", "lodash": "^4.17.21", "mime": "^4.0.1", diff --git a/yarn.lock b/yarn.lock index a76abc61..2643519a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1236,6 +1236,11 @@ resolved "https://registry.yarnpkg.com/@tiptap/core/-/core-2.10.3.tgz#7744abd4a954f35265af351f1be9b545e819c66d" integrity sha512-wAG/0/UsLeZLmshWb6rtWNXKJftcmnned91/HLccHVQAuQZ1UWH+wXeQKu/mtodxEO7JcU2mVPR9mLGQkK0McQ== +"@tiptap/core@^2.11.7": + version "2.12.0" + resolved "https://registry.yarnpkg.com/@tiptap/core/-/core-2.12.0.tgz#e0bc9255865db53682e83d843c8fef19596a8899" + integrity sha512-3qX8oGVKFFZzQ0vit+ZolR6AJIATBzmEmjAA0llFhWk4vf3v64p1YcXcJsOBsr5scizJu5L6RYWEFatFwqckRg== + "@tiptap/extension-blockquote@^2.10.3": version "2.10.3" resolved "https://registry.yarnpkg.com/@tiptap/extension-blockquote/-/extension-blockquote-2.10.3.tgz#ee29925930ac9a5b129d3ad262bb45afcc23b318" @@ -1268,6 +1273,11 @@ resolved "https://registry.yarnpkg.com/@tiptap/extension-code-block/-/extension-code-block-2.10.3.tgz#5ff1b1e563c4eda44677df444c523de1e5258fa4" integrity sha512-yiDVNg22fYkzsFk5kBlDSHcjwVJgajvO/M5fDXA+Hfxwo2oNcG6aJyyHXFe+UaXTVjdkPej0J6kcMKrTMCiFug== +"@tiptap/extension-code-block@^2.11.9": + version "2.12.0" + resolved "https://registry.yarnpkg.com/@tiptap/extension-code-block/-/extension-code-block-2.12.0.tgz#73bceaa90ba54de65ade42db5a28cc299c16158b" + integrity sha512-1D7cYAjgxEFHdfC/35Ooi4GqWKB5sszbW8iI7N16XILNln26xb0d5KflXqYrwr9CN/ZnZoCl2o6YsP7xEObcZA== + "@tiptap/extension-code@^2.10.3": version "2.10.3" resolved "https://registry.yarnpkg.com/@tiptap/extension-code/-/extension-code-2.10.3.tgz#b9fb04be2d51760f011ec7a060d4e2e3eefe392c" @@ -2267,6 +2277,14 @@ eastasianwidth@^0.2.0: resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== +echarts@^5.6.0: + version "5.6.0" + resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.6.0.tgz#2377874dca9fb50f104051c3553544752da3c9d6" + integrity sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA== + dependencies: + tslib "2.3.0" + zrender "5.6.1" + ejs@^3.1.6: version "3.1.10" resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b" @@ -2542,15 +2560,18 @@ fraction.js@^4.3.7: resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7" integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew== -frappe-ui@^0.1.123: - version "0.1.123" - resolved "https://registry.yarnpkg.com/frappe-ui/-/frappe-ui-0.1.123.tgz#501139a103a03e52648d9ee9ea85aa54bc8102e0" - integrity sha512-WkTnKZ+n82d9xZ9g9ZQXVkFyKU2wlcfT6/9g8/2biJuXMwmo/80I29EKGb9nrM1Liuj0Wtyg9nsqvfvgktdHbw== +frappe-ui@^0.1.145: + version "0.1.145" + resolved "https://registry.yarnpkg.com/frappe-ui/-/frappe-ui-0.1.145.tgz#19ec429badf85f3f2c45a85ec13c3c462ec11ee9" + integrity sha512-DnnSJREu/EpUAJGNFaXEUF3re0hQMmLBOX/MSW9AsQtnCJwXkO5VbH/dyVHAZjqdb9Do3CNQF33/HB4NibNI8Q== dependencies: + "@floating-ui/vue" "^1.1.6" "@headlessui/vue" "^1.7.14" "@popperjs/core" "^2.11.2" "@tailwindcss/forms" "^0.5.3" "@tailwindcss/typography" "^0.5.16" + "@tiptap/core" "^2.11.7" + "@tiptap/extension-code-block" "^2.11.9" "@tiptap/extension-code-block-lowlight" "^2.11.5" "@tiptap/extension-color" "^2.0.3" "@tiptap/extension-highlight" "^2.0.3" @@ -2571,12 +2592,16 @@ frappe-ui@^0.1.123: "@tiptap/vue-3" "^2.0.3" "@vueuse/core" "^10.4.1" dayjs "^1.11.13" + echarts "^5.6.0" feather-icons "^4.28.0" idb-keyval "^6.2.0" lowlight "^3.3.0" lucide-static "^0.479.0" ora "5.4.1" prettier "^3.3.2" + prosemirror-model "^1.25.1" + prosemirror-state "^1.4.3" + prosemirror-view "^1.39.2" radix-vue "^1.5.3" reka-ui "^2.0.2" showdown "^2.1.0" @@ -3732,6 +3757,13 @@ prosemirror-model@^1.0.0, prosemirror-model@^1.19.0, prosemirror-model@^1.20.0, dependencies: orderedmap "^2.0.0" +prosemirror-model@^1.25.1: + version "1.25.1" + resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.25.1.tgz#aeae9f1ec79fcaa76f6fc619800d91fbcf726870" + integrity sha512-AUvbm7qqmpZa5d9fPKMvH1Q5bqYQvAZWOGRvxsB6iFLyycvC9MwNemNVjHVrWgjaoxAfY8XVg7DbvQ/qxvI9Eg== + dependencies: + orderedmap "^2.0.0" + prosemirror-schema-basic@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/prosemirror-schema-basic/-/prosemirror-schema-basic-1.2.3.tgz#649c349bb21c61a56febf9deb71ac68fca4cedf2" @@ -3792,6 +3824,15 @@ prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3, pros prosemirror-state "^1.0.0" prosemirror-transform "^1.1.0" +prosemirror-view@^1.39.2: + version "1.39.3" + resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.39.3.tgz#54fa4b8ab4fd75ad0075dc6dc0be1745429d5a5c" + integrity sha512-bY/7kg0LzRE7ytR0zRdSMWX3sknEjw68l836ffLPMh0OG3OYnNuBDUSF3v0vjvnzgYjgY9ZH/RypbARURlcMFA== + dependencies: + prosemirror-model "^1.20.0" + prosemirror-state "^1.0.0" + prosemirror-transform "^1.1.0" + punycode.js@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/punycode.js/-/punycode.js-2.3.1.tgz#6b53e56ad75588234e79f4affa90972c7dd8cdb7" @@ -4463,6 +4504,11 @@ ts-interface-checker@^0.1.9: resolved "https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699" integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA== +tslib@2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" + integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== + tslib@^2.0.0, tslib@^2.8.0: version "2.8.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f" @@ -4984,3 +5030,10 @@ yaml@^2.3.4: version "2.6.1" resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.6.1.tgz#42f2b1ba89203f374609572d5349fb8686500773" integrity sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg== + +zrender@5.6.1: + version "5.6.1" + resolved "https://registry.yarnpkg.com/zrender/-/zrender-5.6.1.tgz#e08d57ecf4acac708c4fcb7481eb201df7f10a6b" + integrity sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag== + dependencies: + tslib "2.3.0" From 0978fa58a29d6af52f1b1fe4b3e025f4f82ca889 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Mon, 19 May 2025 15:55:54 +0530 Subject: [PATCH 3/5] fix: wrap layout and dialogs in FrappeUIProvider --- frontend/src/App.vue | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 210e93fa..f14de1bb 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -1,16 +1,17 @@