resolve conflict

This commit is contained in:
hirakei1203
2022-11-25 14:19:21 +09:00
29 changed files with 11184 additions and 130 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "flowbite-vue",
"version": "0.0.6",
"version": "0.0.7",
"repository": "https://github.com/themesberg/flowbite-vue.git",
"author": "themesberg",
"license": "MIT",
@@ -33,39 +33,42 @@
},
"peerDependencies": {
"tailwindcss": "^3",
"vue": "^3"
"vue": "^3.2.41"
},
"devDependencies": {
"@types/lodash": "^4.14.182",
"@types/node": "^18.0.0",
"@typescript-eslint/eslint-plugin": "^5.30.0",
"@typescript-eslint/parser": "^5.30.0",
"@vitejs/plugin-vue": "^2.3.3",
"@vue/compiler-sfc": "^3.2.37",
"@vue/test-utils": "^2.0.0",
"@vue/tsconfig": "^0.1.3",
"c8": "^7.11.3",
"class-names": "^1.0.0",
"eslint": "^8.18.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-vue": "^9.1.1",
"flowbite": "^1.4.2",
"jsdom": "^20.0.0",
"lodash": "^4.17.21",
"postcss": "^8.4.14",
"postcss-prefix-selector": "^1.16.0",
"prettier": "^2.3.2",
"tailwindcss": "^3",
"tsc-alias": "^1.7.0",
"typescript": "^4.7.3",
"vite": "^2.4.3",
"vitest": "^0.16.0",
"vue-eslint-parser": "^9.0.3",
"vue-tsc": "^0.30.0"
"@types/lodash-es": "4.17.6",
"@types/node": "18.11.9",
"@typescript-eslint/eslint-plugin": "5.43.0",
"@typescript-eslint/parser": "5.43.0",
"@vitejs/plugin-vue": "2.3.4",
"@vue/test-utils": "2.2.4",
"@vue/tsconfig": "0.1.3",
"c8": "7.12.0",
"eslint": "8.28.0",
"eslint-config-prettier": "8.5.0",
"eslint-plugin-vue": "9.7.0",
"jsdom": "20.0.3",
"postcss": "8.4.19",
"postcss-prefix-selector": "1.16.0",
"prettier": "2.7.1",
"tsc-alias": "1.7.1",
"typescript": "4.7.3",
"vite": "2.9.15",
"vitepress": "1.0.0-alpha.29",
"vitest": "0.25.2",
"vue-eslint-parser": "9.1.0",
"vue-tsc": "0.30.0"
},
"dependencies": {
"@vueuse/core": "^8.9.1",
"floating-vue": "^2.0.0-beta.20",
"vitepress": "^1.0.0-alpha.4"
"@vueuse/core": "9.3.0",
"classnames": "2.3.2",
"flowbite": "1.5.4",
"lodash-es": "4.17.21",
"tailwindcss": "3.2.4"
},
"engines": {
"node": "14.x",
"npm": "8.x"
}
}