Skip to content

Commit

Permalink
Merge pull request #2377 from ruchamahabal/fix-yarn-workspaces-v15
Browse files Browse the repository at this point in the history
ruchamahabal authored Oct 31, 2024
2 parents 74f57d5 + 2b46fba commit eeaac9f
Showing 4 changed files with 1,817 additions and 244 deletions.
2 changes: 1 addition & 1 deletion frappe-ui
Submodule frappe-ui updated 46 files
+2 −1 .git-blame-ignore-revs
+38 −0 .github/workflows/story-publish.yml
+0 −4 .husky/pre-commit
+27 −0 .pre-commit-config.yaml
+1 −1 frappe-ui.svg
+30 −6 histoire.config.ts
+15 −1 histoire.setup.ts
+1 −4 package.json
+28 −10 src/components/Autocomplete.vue
+22 −20 src/components/Badge.vue
+5 −0 src/components/Calendar.story.md
+16 −16 src/components/Calendar.story.vue
+1 −0 src/components/Calendar/Calendar.vue
+16 −12 src/components/Calendar/CalendarEvent.vue
+11 −1 src/components/Card.vue
+43 −0 src/components/CircularProgressBar.story.md
+62 −0 src/components/CircularProgressBar.story.vue
+195 −0 src/components/CircularProgressBar.vue
+15 −1 src/components/ConfirmDialog.vue
+21 −8 src/components/DatePicker.vue
+21 −8 src/components/DateRangePicker.vue
+22 −9 src/components/DateTimePicker.vue
+90 −82 src/components/Dropdown.vue
+12 −1 src/components/FileUploader.vue
+2 −0 src/components/FormControl.vue
+18 −0 src/components/Rating/Rating.story.vue
+85 −0 src/components/Rating/Rating.vue
+1 −0 src/components/TabButtons.vue
+5 −1 src/components/TextEditor/InsertLink.vue
+25 −0 src/components/Textarea.story.vue
+34 −13 src/components/Textarea.vue
+1 −3 src/components/Toast.vue
+1 −1 src/components/Tooltip/Tooltip.vue
+56 −0 src/components/Tree/Tree.story.md
+73 −0 src/components/Tree/Tree.story.vue
+124 −0 src/components/Tree/Tree.vue
+12 −0 src/components/types/Tree.ts
+152 −0 src/espressoColors.css
+4 −0 src/index.js
+1 −0 src/style.css
+1 −7 src/utils/confirmDialog.js
+83 −0 src/utils/espressoVariables.js
+4 −0 src/utils/frappeRequest.js
+20 −13 src/utils/request.js
+3 −0 src/utils/tailwind.config.js
+2,640 −2,033 yarn.lock
18 changes: 9 additions & 9 deletions frontend/package.json
Original file line number Diff line number Diff line change
@@ -14,17 +14,17 @@
"@ionic/vue": "^7.4.3",
"@ionic/vue-router": "^7.4.3",
"@vitejs/plugin-vue": "^4.4.0",
"autoprefixer": "^10.4.2",
"dayjs": "^1.11.7",
"feather-icons": "^4.28.0",
"autoprefixer": "^10.4.19",
"dayjs": "^1.11.11",
"feather-icons": "^4.29.1",
"firebase": "^10.8.0",
"frappe-ui": "^0.1.67",
"frappe-ui": "^0.1.72",
"postcss": "^8.4.5",
"tailwindcss": "^3.0.15",
"vite": "^5.1.4",
"vite-plugin-pwa": "^0.19.0",
"vue": "^3.2.25",
"vue-router": "^4.0.12",
"tailwindcss": "^3.4.3",
"vite": "^5.4.10",
"vite-plugin-pwa": "^0.20.5",
"vue": "^3.5.12",
"vue-router": "^4.3.2",
"workbox-core": "^7.0.0",
"workbox-precaching": "^7.0.0"
},
10 changes: 5 additions & 5 deletions roster/package.json
Original file line number Diff line number Diff line change
@@ -9,15 +9,15 @@
"copy-html-entry": "cp ../hrms/public/roster/index.html ../hrms/www/roster.html"
},
"dependencies": {
"@vitejs/plugin-vue": "^5.0.4",
"@vitejs/plugin-vue": "^4.4.0",
"autoprefixer": "^10.4.19",
"dayjs": "^1.11.11",
"feather-icons": "^4.29.1",
"frappe-ui": "^0.1.67",
"postcss": "^8.4.38",
"frappe-ui": "^0.1.72",
"postcss": "^8.4.5",
"tailwindcss": "^3.4.3",
"vite": "^5.2.12",
"vue": "^3.4.25",
"vite": "^5.4.10",
"vue": "^3.5.12",
"vue-router": "^4.3.2"
},
"devDependencies": {
Loading

0 comments on commit eeaac9f

Please sign in to comment.