diff --git a/.prettierrc.json b/.prettierrc.json index 079a6b4a3..a57fe3467 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -9,5 +9,6 @@ "tabWidth": 2, "trailingComma": "es5", "useTabs": false, - "embeddedLanguageFormatting": "off" + "embeddedLanguageFormatting": "off", + "order": "smacss" } diff --git a/package.json b/package.json index fb82eccea..fcd3b2d16 100644 --- a/package.json +++ b/package.json @@ -123,6 +123,7 @@ "postcss-loader": "^7.0.1", "postcss-preset-env": "^7.8.1", "prettier": "^2.0.4", + "prettier-plugin-css-order": "^1.3.0", "prettier-plugin-tailwindcss": "^0.1.7", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/packages/outline-templates/default/.prettierrc.json b/packages/outline-templates/default/.prettierrc.json index 94c81cd85..5dd6545a0 100644 --- a/packages/outline-templates/default/.prettierrc.json +++ b/packages/outline-templates/default/.prettierrc.json @@ -8,5 +8,6 @@ "singleQuote": true, "tabWidth": 2, "trailingComma": "es5", - "useTabs": false + "useTabs": false, + "order": "smacss" } diff --git a/packages/outline-templates/package.json b/packages/outline-templates/package.json index 3325c2046..b81a40e67 100644 --- a/packages/outline-templates/package.json +++ b/packages/outline-templates/package.json @@ -13,5 +13,8 @@ "type": "git", "url": "https://github.com/phase2/outline.git", "directory": "packages/outline-templates" + }, + "devDependencies": { + "prettier-plugin-css-order": "^1.3.0" } } diff --git a/packages/outline-templates/yarn.lock b/packages/outline-templates/yarn.lock new file mode 100644 index 000000000..a37ea86a7 --- /dev/null +++ b/packages/outline-templates/yarn.lock @@ -0,0 +1,33 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +css-declaration-sorter@^6.2.2: + version "6.4.0" + resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz#630618adc21724484b3e9505bce812def44000ad" + integrity sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew== + +postcss-less@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-6.0.0.tgz#463b34c60f53b648c237f569aeb2e09149d85af4" + integrity sha512-FPX16mQLyEjLzEuuJtxA8X3ejDLNGGEG503d2YGZR5Ask1SpDN8KmZUMpzCvyalWRywAn1n1VOA5dcqfCLo5rg== + +postcss-scss@^4.0.3: + version "4.0.6" + resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.6.tgz#5d62a574b950a6ae12f2aa89b60d63d9e4432bfd" + integrity sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ== + +prettier-plugin-css-order@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/prettier-plugin-css-order/-/prettier-plugin-css-order-1.3.0.tgz#ceccba99e2273f49426779d0c1a93d4fc0c9c531" + integrity sha512-wOS4qlbUARCoiiuOG0TiB/j751soC3+gUnMMva5HVWKvHJdLNYqh+jXK3MvvixR6xkJVPxHSF7rIIhkHIuHTFg== + dependencies: + css-declaration-sorter "^6.2.2" + postcss-less "^6.0.0" + postcss-scss "^4.0.3" + sync-threads "^1.0.1" + +sync-threads@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/sync-threads/-/sync-threads-1.0.1.tgz#1e854ce579eaca0d0f1f0885a40bc2be6237b593" + integrity sha512-hIdwt/c/e1ONnr2RJmfBxEAj/J6KQQWKdToF3Qw8ZNRsTNNteGkOe63rQy9I7J5UNlr8Yl0wkzIr9wgLY94x0Q== diff --git a/yarn.lock b/yarn.lock index 7b549a5a4..7bdab4f1e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9042,6 +9042,11 @@ css-blank-pseudo@^3.0.3: dependencies: postcss-selector-parser "^6.0.9" +css-declaration-sorter@^6.2.2: + version "6.4.0" + resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz#630618adc21724484b3e9505bce812def44000ad" + integrity sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew== + css-has-pseudo@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz#57f6be91ca242d5c9020ee3e51bbb5b89fc7af73" @@ -15970,6 +15975,11 @@ postcss-lab-function@^4.2.1: "@csstools/postcss-progressive-custom-properties" "^1.1.0" postcss-value-parser "^4.2.0" +postcss-less@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-6.0.0.tgz#463b34c60f53b648c237f569aeb2e09149d85af4" + integrity sha512-FPX16mQLyEjLzEuuJtxA8X3ejDLNGGEG503d2YGZR5Ask1SpDN8KmZUMpzCvyalWRywAn1n1VOA5dcqfCLo5rg== + postcss-load-config@^3.0.0, postcss-load-config@^3.1.0, postcss-load-config@^3.1.4: version "3.1.4" resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz#1ab2571faf84bb078877e1d07905eabe9ebda855" @@ -16226,6 +16236,11 @@ postcss-reporter@^7.0.0: picocolors "^1.0.0" thenby "^1.3.4" +postcss-scss@^4.0.3: + version "4.0.6" + resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.6.tgz#5d62a574b950a6ae12f2aa89b60d63d9e4432bfd" + integrity sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ== + postcss-selector-not@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz#8f0a709bf7d4b45222793fc34409be407537556d" @@ -16309,6 +16324,16 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== +prettier-plugin-css-order@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/prettier-plugin-css-order/-/prettier-plugin-css-order-1.3.0.tgz#ceccba99e2273f49426779d0c1a93d4fc0c9c531" + integrity sha512-wOS4qlbUARCoiiuOG0TiB/j751soC3+gUnMMva5HVWKvHJdLNYqh+jXK3MvvixR6xkJVPxHSF7rIIhkHIuHTFg== + dependencies: + css-declaration-sorter "^6.2.2" + postcss-less "^6.0.0" + postcss-scss "^4.0.3" + sync-threads "^1.0.1" + prettier-plugin-tailwindcss@^0.1.7: version "0.1.13" resolved "https://registry.yarnpkg.com/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.1.13.tgz#ca1071361dc7e2ed5d95a2ee36825ce45f814942" @@ -18233,6 +18258,11 @@ symbol-tree@^3.2.4: resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== +sync-threads@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/sync-threads/-/sync-threads-1.0.1.tgz#1e854ce579eaca0d0f1f0885a40bc2be6237b593" + integrity sha512-hIdwt/c/e1ONnr2RJmfBxEAj/J6KQQWKdToF3Qw8ZNRsTNNteGkOe63rQy9I7J5UNlr8Yl0wkzIr9wgLY94x0Q== + synchronous-promise@^2.0.15: version "2.0.16" resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.16.tgz#669b75e86b4295fdcc1bb0498de9ac1af6fd51a9"