Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ui!): move all ui components to @morpheme/ui package, upgrade Vite, Vue, Nuxt and Yarn and change floating-ui tooltip with radix-vue tooltip #200

Draft
wants to merge 28 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
f27c40e
BREAKING CHANGE: move all ui components to `@morpheme/ui` package. no…
gravitano Sep 2, 2024
a58d95c
chore(ui): update file paths and dependencies
gravitano Sep 2, 2024
97f07ed
chore(ui): fix folder name
gravitano Sep 2, 2024
0ff928c
fix(nuxt): fix imports, components and deps
gravitano Sep 2, 2024
f9b4923
fix(themes): add `sass` as deps
gravitano Sep 2, 2024
8389bc9
chore: fix missing vue-tsc as devDeps
gravitano Sep 2, 2024
ebaac59
chore(ui): update floating-vue dependency to version 5.2.2
gravitano Sep 2, 2024
4fddbd9
chore(nuxt): update @morpheme/ui dependency to version 1.0.2-alpha.6+…
gravitano Sep 2, 2024
cea8dae
chore(ui): update file paths and dependencies
gravitano Sep 2, 2024
acf6842
feat(Tooltip!): replace floating-ui tooltip with radix-vue tooltip
gravitano Sep 2, 2024
165d784
chore: upgrade to Yarn 4
gravitano Sep 2, 2024
8238016
chore: update @morpheme/ui dependency to version 1.0.2-alpha.10
gravitano Sep 2, 2024
a379231
v1.1.0-alpha.0
gravitano Sep 2, 2024
f6dc077
chore: update @morpheme/ui dependency to version 1.0.1
gravitano Sep 2, 2024
829a157
feat: add `FloatingVuePlugin` to Nuxt runtime plugin
gravitano Sep 3, 2024
cb4c509
v1.1.0-alpha.1
gravitano Sep 3, 2024
4ca43d9
v1.1.0-alpha.2
gravitano Sep 3, 2024
2c13d03
chore: update floating-ui plugin
gravitano Sep 3, 2024
067e6e3
v1.1.0-alpha.3
gravitano Sep 3, 2024
e19a202
chore: update @morpheme/ui dependency to version 1.1.0-alpha.2
gravitano Sep 3, 2024
61cf174
v1.1.0-alpha.4
gravitano Sep 3, 2024
17640d9
chore: update floating-ui plugin
gravitano Sep 3, 2024
9162d06
v1.1.0-alpha.5
gravitano Sep 3, 2024
1b55b0a
chore: update npm dependencies and add floating-ui to externals
gravitano Sep 3, 2024
9809761
v1.1.0-alpha.6
gravitano Sep 3, 2024
08cb60c
chore: update floating-ui plugin and add tooltip themes
gravitano Sep 3, 2024
fbb8996
v1.1.0-alpha.7
gravitano Sep 3, 2024
6b3beee
chore: change deps version to stable
gravitano Sep 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ coverage
__snapshots__
docs/.vitepress/cache
.vercel
html
html
.yarn
2 changes: 1 addition & 1 deletion .storybook/preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import '../packages/tailwind-config/tailwind.css';
import '../packages/themes/src/morpheme/main.scss';
import '../packages/themes/src/morpheme/main.dark.scss';
import { setup } from '@storybook/vue3'
import { FloatingVuePlugin } from '../packages/tooltip/src/floating-vue'
import { FloatingVuePlugin } from '../packages/ui/src/tooltip/src/floating-vue'

const router = createRouter({
history: createMemoryHistory(),
Expand Down
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
7 changes: 3 additions & 4 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"packages": [
"packages/*"
],
"version": "1.0.1",
"npmClient": "yarn",
"useWorkspaces": true
}
"version": "1.1.0-alpha.7",
"npmClient": "yarn"
}
105 changes: 52 additions & 53 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,67 +22,68 @@
},
"dependencies": {
"@headlessui/vue": "^1.7.22",
"@vueuse/core": "^10.11.0",
"floating-vue": "^2.0.0-beta.20",
"@morpheme/design-tokens": "^1.0.0",
"@vueuse/core": "^11.0.3",
"floating-vue": "^5.2.2",
"pagino": "^1.4.2",
"vee-validate": "^4.13.1",
"vue": "^3.4.31",
"vue-router": "^4.4.0",
"vee-validate": "^4.13.2",
"vue": "^3.4.38",
"vue-router": "^4.4.3",
"vuex": "^4.1.0",
"yup": "^1.4.0"
},
"devDependencies": {
"@chromatic-com/storybook": "^1",
"@commitlint/cli": "^17.0.3",
"@commitlint/config-conventional": "^17.0.3",
"@headlessui-float/vue": "^0.11.2",
"@iconify-json/heroicons-solid": "^1.1.1",
"@stackblitz/sdk": "^1.9.0",
"@storybook/addon-actions": "^8.1.1",
"@storybook/addon-docs": "^8.1.1",
"@storybook/addon-essentials": "^8.1.1",
"@storybook/addon-links": "^8.1.1",
"@storybook/addon-mdx-gfm": "^8.1.1",
"@storybook/vue3": "^8.1.1",
"@storybook/vue3-vite": "^8.1.1",
"@chromatic-com/storybook": "^1.8.0",
"@commitlint/cli": "^19.4.1",
"@commitlint/config-conventional": "^19.4.1",
"@headlessui-float/vue": "^0.15.0",
"@iconify-json/heroicons-solid": "^1.2.0",
"@morphemeicons/vue": "^0.2.0",
"@stackblitz/sdk": "^1.11.0",
"@storybook/addon-actions": "^8.2.9",
"@storybook/addon-docs": "^8.2.9",
"@storybook/addon-essentials": "^8.2.9",
"@storybook/addon-links": "^8.2.9",
"@storybook/addon-mdx-gfm": "^8.2.9",
"@storybook/vue3": "^8.2.9",
"@storybook/vue3-vite": "^8.2.9",
"@tailwindcss/aspect-ratio": "^0.4.0",
"@tailwindcss/forms": "^0.5.7",
"@tailwindcss/forms": "^0.5.8",
"@tailwindcss/line-clamp": "^0.4.4",
"@tailwindcss/typography": "^0.5.13",
"@typescript-eslint/eslint-plugin": "^5.30.6",
"@typescript-eslint/parser": "^5.30.6",
"@vitejs/plugin-vue": "^5.0.5",
"@vitest/coverage-c8": "^0.31.1",
"@vitest/ui": "^0.31.1",
"@vue/compiler-sfc": "^3.3.4",
"@vue/test-utils": "^2.3.2",
"autoprefixer": "^10.4.4",
"conventional-changelog-cli": "^2.2.2",
"eslint": ">=5.16.0",
"@tailwindcss/typography": "^0.5.15",
"@typescript-eslint/eslint-plugin": "^8.3.0",
"@typescript-eslint/parser": "^8.3.0",
"@vitejs/plugin-vue": "^5.1.3",
"@vitest/coverage-c8": "^0.33.0",
"@vitest/ui": "^2.0.5",
"@vue/compiler-sfc": "^3.4.38",
"@vue/test-utils": "^2.4.6",
"autoprefixer": "^10.4.20",
"conventional-changelog-cli": "^5.0.0",
"eslint": ">=9.9.1",
"eslint-plugin-storybook": "^0.8.0",
"eslint-plugin-vue": "^9.14.1",
"happy-dom": "^9.19.2",
"husky": "^8.0.1",
"jsdom": "^21.1.1",
"lerna": "^6.5.1",
"lint-staged": "^13.0.3",
"eslint-plugin-vue": "^9.27.0",
"happy-dom": "^15.7.3",
"husky": "^9.1.5",
"jsdom": "^25.0.0",
"lerna": "^8.1.8",
"lint-staged": "^15.2.10",
"npm-run-all": "^4.1.5",
"postcss": "^8.4.12",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"sass": "^1.57.1",
"postcss": "^8.4.43",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sass": "^1.77.8",
"standard-version": "^9.3.2",
"storybook": "^8.1.1",
"storybook": "^8.2.9",
"storybook-vue3-router": "^5.0.0",
"tailwindcss": "^3.3.1",
"typescript": "^5.0.0",
"vite": "^4.3.8",
"vitepress": "^1.0.0-beta.20",
"vitest": "^0.31.1",
"vitest-sonar-reporter": "^0.3.4",
"tailwindcss": "^3.4.10",
"typescript": "^5.5.4",
"vite": "^5.4.2",
"vitepress": "^1.3.4",
"vitest": "^2.0.5",
"vitest-sonar-reporter": "^2.0.0",
"vue-gtag": "^2.0.1",
"vue-tsc": "^2.0.24",
"@morphemeicons/vue": "^0.2.0"
"vue-tsc": "^2.1.4"
},
"main": "index.ts",
"module": "index.ts",
Expand All @@ -94,9 +95,6 @@
"index.ts",
"preset.js"
],
"workspaces": [
"packages/*"
],
"private": true,
"lint-staged": {
"*.{js,jsx,ts,tsx,html,css,vue}": "npm run lint",
Expand All @@ -112,5 +110,6 @@
},
"resolutions": {
"consola": "^3.0.0"
}
},
"packageManager": "[email protected]"
}
4 changes: 0 additions & 4 deletions packages/blocks/src/Auth/ForgotPassword.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<script setup lang="ts">
import {useForm} from 'vee-validate';
import {ref} from 'vue';
import VBtn from '@morpheme/button';
import VLogo from '@morpheme/logo';
import {VInput} from '@morpheme/forms';
import Card from '@morpheme/card';
const sent = ref(false);
const showAlert = ref(false);
Expand Down
4 changes: 0 additions & 4 deletions packages/blocks/src/Auth/Login.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<script setup lang="ts">
import {useForm} from 'vee-validate';
import {ref} from 'vue';
import VBtn from '@morpheme/button';
import VLogo from '@morpheme/logo';
import {VInput, VCheckbox} from '@morpheme/forms';
import VCard from '@morpheme/card';
const showPassword = ref(false);
const showAlert = ref(false);
Expand Down
1 change: 0 additions & 1 deletion packages/blocks/src/CTA/Cta.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<script setup lang="ts">
import VBtn from '@morpheme/button';
</script>

<template>
Expand Down
3 changes: 0 additions & 3 deletions packages/blocks/src/Contact/ContactForm.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
<script setup lang="ts">
import VBtn from '@morpheme/button';
import {VInput} from '@morpheme/forms';
import {Icon} from '@morpheme/icon';
import {object, string} from 'yup';
import {useForm} from 'vee-validate';
Expand Down
1 change: 0 additions & 1 deletion packages/blocks/src/Feature/Feature.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<script setup lang="ts">
import {Icon} from '@morpheme/icon';
</script>

<template>
Expand Down
2 changes: 0 additions & 2 deletions packages/blocks/src/Footer/AutoDarkMode.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<script setup lang="ts">
import Logo from '@morpheme/logo';
import Icon from '@morpheme/icon';
</script>

<template>
Expand Down
2 changes: 0 additions & 2 deletions packages/blocks/src/Footer/Dark.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<script setup lang="ts">
import Logo from '@morpheme/logo';
import Icon from '@morpheme/icon';
</script>

<template>
Expand Down
2 changes: 0 additions & 2 deletions packages/blocks/src/Footer/LanguageCurrencyNewsLetter.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<script setup lang="ts">
import Icon from '@morpheme/icon';
import Select from '@morpheme/select';
</script>

<template>
Expand Down
2 changes: 0 additions & 2 deletions packages/blocks/src/Footer/Light.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<script setup lang="ts">
import Logo from '@morpheme/logo';
import Icon from '@morpheme/icon';
</script>

<template>
Expand Down
1 change: 0 additions & 1 deletion packages/blocks/src/Footer/Newsletter.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<script setup lang="ts">
import Icon from '@morpheme/icon';
</script>

<template>
Expand Down
1 change: 0 additions & 1 deletion packages/blocks/src/Footer/SimpleCentered.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<script setup lang="ts">
import Icon from '@morpheme/icon';
</script>

<template>
Expand Down
1 change: 0 additions & 1 deletion packages/blocks/src/Footer/SocialLinksOnly.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<script setup lang="ts">
import Icon from '@morpheme/icon';
</script>

<template>
Expand Down
2 changes: 0 additions & 2 deletions packages/blocks/src/Forms/DefaultForm.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<script setup lang="ts">
import {VInput, VBtn, VFormSelect, VSelect, VAutocomplete} from '@morpheme/ui';
const items = [
{
text: 'Item 1',
Expand Down
2 changes: 0 additions & 2 deletions packages/blocks/src/Forms/DisabledForm.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<script setup lang="ts">
import {VInput, VBtn, VFormSelect, VSelect, VAutocomplete} from '@morpheme/ui';
const items = [
{
text: 'Item 1',
Expand Down
1 change: 0 additions & 1 deletion packages/blocks/src/Forms/InlineForm.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<script setup lang="ts">
import {VInput, VBtn} from '@morpheme/ui';
</script>

<template>
Expand Down
1 change: 0 additions & 1 deletion packages/blocks/src/Hero/Hero.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<script setup lang="ts">
import VBtn from '@morpheme/button';
</script>

<template>
Expand Down
12 changes: 0 additions & 12 deletions packages/blocks/src/Layouts/SidebarLayout.vue
Original file line number Diff line number Diff line change
@@ -1,16 +1,4 @@
<script setup lang="ts">
import {List, ListItem, ListItemHeader} from '@morpheme/list';
import type { DropdownItemProps} from '@morpheme/dropdown';
import {Dropdown} from '@morpheme/dropdown';
import Icon from '@morpheme/icon';
import {ref, watch} from 'vue';
import VBtn from '@morpheme/button';
import {VInput} from '@morpheme/forms';
import '@morpheme/list/src/List.scss';
import '@morpheme/button/src/VBtn.scss';
import '@morpheme/dropdown/src/Dropdown.scss';
import '@morpheme/theme/transition.css';
const accountMenus = ref<DropdownItemProps[]>([
{
text: 'Profile',
Expand Down
8 changes: 0 additions & 8 deletions packages/blocks/src/Navbar/Navbar.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<script setup lang="ts">
import {ref} from 'vue';
import Logo from '@morpheme/logo';
import VBtn from '@morpheme/button';
import Icon from '@morpheme/icon';
import '@morpheme/logo/src/VLogo.scss';
const menus = ref([
{
Expand Down Expand Up @@ -87,7 +83,3 @@ const isOpen = ref(false);
</div>
</header>
</template>

<style>
@import '@morpheme/theme/transition.css';
</style>
11 changes: 6 additions & 5 deletions packages/iconsax/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@morpheme/iconsax",
"version": "1.0.0",
"version": "1.1.0-alpha.2",
"description": "Vue Iconsax",
"private": true,
"scripts": {
Expand All @@ -18,14 +18,15 @@
"author": "Warsono <[email protected]>",
"license": "MIT",
"dependencies": {
"vue": "^3.3.4"
"vue": "^3.4.38"
},
"devDependencies": {
"@morpheme/tailwind-config": "^1.0.0",
"@morpheme/tailwind-config": "^1.1.0-alpha.2",
"@vue/test-utils": "^2.0.0-rc.17",
"c8": "^7.11.3",
"vite": "^4.3.8",
"vitest": "^0.12.4"
"vite": "^5.4.2",
"vitest": "^0.12.4",
"vue-tsc": "^2.1.4"
},
"main": "dist/iconsax.umd.js",
"unpkg": "dist/iconsax.iife.js",
Expand Down
Loading
Loading