diff --git a/.eslintrc.js b/.eslintrc.js index 0037dd34f1..2c33f56acf 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,4 +1,8 @@ -const { prettierConfig } = require('./.prettierrc'); +let prettierConfig; + +(async () => { + prettierConfig = (await import('prettier-config-spirit')).prettierConfig; +})(); module.exports = { root: true, diff --git a/.prettierignore b/.prettierignore index 9ddfaa855c..84cc6eb822 100644 --- a/.prettierignore +++ b/.prettierignore @@ -7,6 +7,8 @@ packages/**/cjs/* packages/**/umd/* static/assets/icons/react +**/cache + # Ignoring html files because Prettier prefers closing slash on the end of the tag # @See: https://github.com/lmc-eu/spirit-design-system/pull/77/files#r764183332 **/*.html @@ -43,6 +45,7 @@ packages/codemods/src/transforms/**/*.output.tsx # @see: https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored .yarn/plugins .yarn/releases +.yarn/*.gz # Lock Files *.lock diff --git a/.prettierrc.js b/.prettierrc.js deleted file mode 100644 index 8af4621be0..0000000000 --- a/.prettierrc.js +++ /dev/null @@ -1,6 +0,0 @@ -// @TODO: Remove comments after https://github.com/lmc-eu/code-quality-tools/pull/35 is merged -/* eslint-disable import/no-extraneous-dependencies */ -/* eslint-disable global-require */ -module.exports = { - ...require('@lmc-eu/prettier-config'), -}; diff --git a/package.json b/package.json index eebda6407b..70ccd42533 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,6 @@ "@lmc-eu/commitlint-config": "2.0.3", "@lmc-eu/conventional-changelog-lmc-github": "3.0.3", "@lmc-eu/eslint-config-react": "2.0.5", - "@lmc-eu/prettier-config": "2.0.1", "@omlet/cli": "1.10.4", "@playwright/test": "1.47.0", "@rollup/plugin-babel": "6.0.4", diff --git a/yarn.lock b/yarn.lock index 30bdd727c5..27d5b5d6e1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -26524,7 +26524,6 @@ __metadata: "@lmc-eu/commitlint-config": "npm:2.0.3" "@lmc-eu/conventional-changelog-lmc-github": "npm:3.0.3" "@lmc-eu/eslint-config-react": "npm:2.0.5" - "@lmc-eu/prettier-config": "npm:2.0.1" "@omlet/cli": "npm:1.10.4" "@playwright/test": "npm:1.47.0" "@rollup/plugin-babel": "npm:6.0.4"