diff --git a/.gitignore b/.gitignore index 62d5037a4..55a2ca56b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,5 @@ coverage __snapshots__ docs/.vitepress/cache .vercel -html \ No newline at end of file +html +.yarn \ No newline at end of file diff --git a/.storybook/preview.js b/.storybook/preview.js index 6c121ab0e..2a77bb9ed 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -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(), diff --git a/.yarnrc.yml b/.yarnrc.yml new file mode 100644 index 000000000..3186f3f07 --- /dev/null +++ b/.yarnrc.yml @@ -0,0 +1 @@ +nodeLinker: node-modules diff --git a/lerna.json b/lerna.json index c8744cb29..4817c3512 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,6 @@ "packages": [ "packages/*" ], - "version": "1.0.1", - "npmClient": "yarn", - "useWorkspaces": true -} + "version": "1.1.0-alpha.7", + "npmClient": "yarn" +} \ No newline at end of file diff --git a/package.json b/package.json index b1a99ab08..55e0fca77 100644 --- a/package.json +++ b/package.json @@ -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", @@ -94,9 +95,6 @@ "index.ts", "preset.js" ], - "workspaces": [ - "packages/*" - ], "private": true, "lint-staged": { "*.{js,jsx,ts,tsx,html,css,vue}": "npm run lint", @@ -112,5 +110,6 @@ }, "resolutions": { "consola": "^3.0.0" - } + }, + "packageManager": "yarn@4.4.1" } diff --git a/packages/blocks/src/Auth/ForgotPassword.vue b/packages/blocks/src/Auth/ForgotPassword.vue index c5f7f5a5e..a90eaecfe 100644 --- a/packages/blocks/src/Auth/ForgotPassword.vue +++ b/packages/blocks/src/Auth/ForgotPassword.vue @@ -1,10 +1,6 @@