diff --git a/package.json b/package.json index b8fea0929..1ee2259c7 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,8 @@ "typecheck": "vue-tsc --noEmit -p tsconfig.app.json --composite false", "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --ignore-path .gitignore", "story:dev": "histoire dev --port 4000", - "story:build": "histoire build" + "story:build": "histoire build", + "prettier": "prettier --write './src/**/*.{vue,js,jsx,ts,tsx,css,scss,json,yml,yaml,html}'" }, "dependencies": { "@halo-dev/admin-api": "^1.0.0", @@ -53,6 +54,7 @@ "jsdom": "^19.0.0", "postcss": "^8.4.14", "prettier": "^2.6.2", + "prettier-plugin-tailwindcss": "^0.1.11", "sass": "^1.52.1", "start-server-and-test": "^1.14.0", "tailwindcss": "^3.0.24", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0aaa73e66..d29b04642 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -30,6 +30,7 @@ specifiers: pinia: ^2.0.14 postcss: ^8.4.14 prettier: ^2.6.2 + prettier-plugin-tailwindcss: ^0.1.11 sass: ^1.52.1 start-server-and-test: ^1.14.0 tailwindcss: ^3.0.24 @@ -84,6 +85,7 @@ devDependencies: jsdom: 19.0.0 postcss: 8.4.14 prettier: 2.6.2 + prettier-plugin-tailwindcss: 0.1.11_prettier@2.6.2 sass: 1.52.1 start-server-and-test: 1.14.0 tailwindcss: 3.0.24 @@ -5620,6 +5622,15 @@ packages: fast-diff: 1.2.0 dev: true + /prettier-plugin-tailwindcss/0.1.11_prettier@2.6.2: + resolution: {integrity: sha512-a28+1jvpIZQdZ/W97wOXb6VqI762MKE/TxMMuibMEHhyYsSxQA8Ek30KObd5kJI2HF1ldtSYprFayXJXi3pz8Q==} + engines: {node: '>=12.17.0'} + peerDependencies: + prettier: '>=2.2.0' + dependencies: + prettier: 2.6.2 + dev: true + /prettier/2.6.2: resolution: {integrity: sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==} engines: {node: '>=10.13.0'} diff --git a/prettier.config.js b/prettier.config.js new file mode 100644 index 000000000..f01cc7a68 --- /dev/null +++ b/prettier.config.js @@ -0,0 +1,3 @@ +module.exports = { + plugins: [require("prettier-plugin-tailwindcss")], +}; diff --git a/src/components/base/alert/Alert.story.vue b/src/components/base/alert/Alert.story.vue index c5c2108be..f4441989c 100644 --- a/src/components/base/alert/Alert.story.vue +++ b/src/components/base/alert/Alert.story.vue @@ -18,22 +18,22 @@ function initState() {