From 00117955e7eb3f416bf850bdbe5b8f26c4c4c607 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 14 Oct 2019 11:58:18 +0200 Subject: [PATCH] added shared prettier config --- package.json | 5 ++--- scm-plugins/scm-git-plugin/package.json | 3 ++- scm-plugins/scm-hg-plugin/package.json | 7 +++---- scm-plugins/scm-legacy-plugin/package.json | 7 +++---- scm-plugins/scm-svn-plugin/package.json | 7 +++---- scm-ui/babel-preset/package.json | 1 + scm-ui/eslint-config/package.json | 1 + scm-ui/jest-preset/package.json | 1 + scm-ui/plugin-scripts/package.json | 1 + scm-ui/prettier-config/index.js | 5 +++++ scm-ui/prettier-config/package.json | 12 ++++++++++++ scm-ui/ui-components/package.json | 4 ++-- scm-ui/ui-extensions/package.json | 3 ++- scm-ui/ui-polyfill/package.json | 1 + scm-ui/ui-styles/package.json | 3 ++- scm-ui/ui-tests/package.json | 3 ++- scm-ui/ui-types/package.json | 3 ++- scm-ui/ui-webapp/package.json | 4 ++-- yarn.lock | 9 +++++++-- 19 files changed, 54 insertions(+), 26 deletions(-) create mode 100644 scm-ui/prettier-config/index.js create mode 100644 scm-ui/prettier-config/package.json diff --git a/package.json b/package.json index 65294fe562..11102144f0 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,6 @@ "lerna": "^3.17.0", "mustache": "^3.1.0", "node-sass": "^4.12.0", - "prettier": "^1.18.2", "sass-loader": "^8.0.0", "script-loader": "^0.7.2", "speed-measure-webpack-plugin": "^1.3.1", @@ -48,8 +47,8 @@ ] }, "jest": { - "preset": "@scm-manager/jest-preset", - "rootDir": "./scm-ui" + "preset": "@scm-manager/jest-preset" }, + "prettier": "@scm-manager/prettier-config", "dependencies": {} } diff --git a/scm-plugins/scm-git-plugin/package.json b/scm-plugins/scm-git-plugin/package.json index 9104abb51f..0ba9606365 100644 --- a/scm-plugins/scm-git-plugin/package.json +++ b/scm-plugins/scm-git-plugin/package.json @@ -15,5 +15,6 @@ }, "jest": { "preset": "@scm-manager/jest-preset" - } + }, + "prettier": "@scm-manager/prettier-config" } diff --git a/scm-plugins/scm-hg-plugin/package.json b/scm-plugins/scm-hg-plugin/package.json index 5065e4a5c5..e5ea74ef57 100644 --- a/scm-plugins/scm-hg-plugin/package.json +++ b/scm-plugins/scm-hg-plugin/package.json @@ -10,8 +10,7 @@ "presets": ["@scm-manager/babel-preset"] }, "jest": { - "transform": { - "^.+\\.js$": "../../scm-ui/scripts/babelPluginTransformer.js" - } - } + "preset": "@scm-manager/jest-preset" + }, + "prettier": "@scm-manager/prettier-config" } diff --git a/scm-plugins/scm-legacy-plugin/package.json b/scm-plugins/scm-legacy-plugin/package.json index 6c18fb3083..0219fa905e 100644 --- a/scm-plugins/scm-legacy-plugin/package.json +++ b/scm-plugins/scm-legacy-plugin/package.json @@ -10,8 +10,7 @@ "presets": ["@scm-manager/babel-preset"] }, "jest": { - "transform": { - "^.+\\.js$": "../../scm-ui/scripts/babelPluginTransformer.js" - } - } + "preset": "@scm-manager/jest-preset" + }, + "prettier": "@scm-manager/prettier-config" } diff --git a/scm-plugins/scm-svn-plugin/package.json b/scm-plugins/scm-svn-plugin/package.json index e90d9cfe75..806839b903 100644 --- a/scm-plugins/scm-svn-plugin/package.json +++ b/scm-plugins/scm-svn-plugin/package.json @@ -10,8 +10,7 @@ "presets": ["@scm-manager/babel-preset"] }, "jest": { - "transform": { - "^.+\\.js$": "../../scm-ui/scripts/babelPluginTransformer.js" - } - } + "preset": "@scm-manager/jest-preset" + }, + "prettier": "@scm-manager/prettier-config" } diff --git a/scm-ui/babel-preset/package.json b/scm-ui/babel-preset/package.json index ace8afb0ee..bd4d177e61 100644 --- a/scm-ui/babel-preset/package.json +++ b/scm-ui/babel-preset/package.json @@ -6,6 +6,7 @@ "main": "index.js", "author": "Sebastian Sdorra ", "private": false, + "prettier": "@scm-manager/prettier-config", "dependencies": { "@babel/core": "^7.6.3", "@babel/plugin-proposal-class-properties": "^7.5.5", diff --git a/scm-ui/eslint-config/package.json b/scm-ui/eslint-config/package.json index 410230f9da..57e6a321dc 100644 --- a/scm-ui/eslint-config/package.json +++ b/scm-ui/eslint-config/package.json @@ -6,6 +6,7 @@ "author": "Sebastian Sdorra ", "license": "MIT", "private": false, + "prettier": "@scm-manager/prettier-config", "dependencies": { "babel-eslint": "^10.0.3", "eslint": "^6.5.1", diff --git a/scm-ui/jest-preset/package.json b/scm-ui/jest-preset/package.json index 2174dfbb6e..bc111955bf 100644 --- a/scm-ui/jest-preset/package.json +++ b/scm-ui/jest-preset/package.json @@ -6,6 +6,7 @@ "author": "Sebastian Sdorra ", "license": "BSD-3-Clause", "private": false, + "prettier": "@scm-manager/prettier-config", "dependencies": { "babel-jest": "^24.9.0", "babel-plugin-require-context-hook": "^1.0.0", diff --git a/scm-ui/plugin-scripts/package.json b/scm-ui/plugin-scripts/package.json index 9340c0c830..e9c3bd92a5 100644 --- a/scm-ui/plugin-scripts/package.json +++ b/scm-ui/plugin-scripts/package.json @@ -5,6 +5,7 @@ "description": "Plugin scripts", "author": "Sebastian Sdorra ", "private": false, + "prettier": "@scm-manager/prettier-config", "dependencies": { "@scm-manager/babel-preset": "2.0.0-SNAPSHOT", "@scm-manager/eslint-config": "2.0.0-SNAPSHOT" diff --git a/scm-ui/prettier-config/index.js b/scm-ui/prettier-config/index.js new file mode 100644 index 0000000000..6073b335aa --- /dev/null +++ b/scm-ui/prettier-config/index.js @@ -0,0 +1,5 @@ +module.exports = { + // we want to change this later to 120, + // but for now we will keep the 80 to avoid to much/unwanted changes in commits + printWidth: 80 +}; diff --git a/scm-ui/prettier-config/package.json b/scm-ui/prettier-config/package.json new file mode 100644 index 0000000000..47e3c3b158 --- /dev/null +++ b/scm-ui/prettier-config/package.json @@ -0,0 +1,12 @@ +{ + "name": "@scm-manager/prettier-config", + "version": "2.0.0-SNAPSHOT", + "license": "BSD-3-Clause", + "description": "Prettier configuration", + "author": "Sebastian Sdorra ", + "private": false, + "main": "index.js", + "dependencies": { + "prettier": "^1.18.2" + } +} diff --git a/scm-ui/ui-components/package.json b/scm-ui/ui-components/package.json index 82f9141347..7921baae1e 100644 --- a/scm-ui/ui-components/package.json +++ b/scm-ui/ui-components/package.json @@ -11,7 +11,6 @@ "author": "Sebastian Sdorra ", "license": "BSD-3-Clause", "scripts": { - "eslint-fix": "eslint src --fix", "test": "jest", "storybook": "start-storybook" }, @@ -50,5 +49,6 @@ }, "jest": { "preset": "@scm-manager/jest-preset" - } + }, + "prettier": "@scm-manager/prettier-config" } diff --git a/scm-ui/ui-extensions/package.json b/scm-ui/ui-extensions/package.json index a48d3aa838..3411f9d006 100644 --- a/scm-ui/ui-extensions/package.json +++ b/scm-ui/ui-extensions/package.json @@ -18,5 +18,6 @@ }, "jest": { "preset": "@scm-manager/jest-preset" - } + }, + "prettier": "@scm-manager/prettier-config" } diff --git a/scm-ui/ui-polyfill/package.json b/scm-ui/ui-polyfill/package.json index 2e90564c9f..81922e37c8 100644 --- a/scm-ui/ui-polyfill/package.json +++ b/scm-ui/ui-polyfill/package.json @@ -6,6 +6,7 @@ "author": "Sebastian Sdorra ", "license": "BSD-3-Clause", "private": true, + "prettier": "@scm-manager/prettier-config", "dependencies": { "@babel/polyfill": "^7.6.0", "whatwg-fetch": "^3.0.0" diff --git a/scm-ui/ui-styles/package.json b/scm-ui/ui-styles/package.json index 71090a83cf..a47dc1408a 100644 --- a/scm-ui/ui-styles/package.json +++ b/scm-ui/ui-styles/package.json @@ -22,5 +22,6 @@ "style-loader": "^1.0.0", "webpack": "^4.41.0", "webpack-dev-server": "^3.8.2" - } + }, + "prettier": "@scm-manager/prettier-config" } diff --git a/scm-ui/ui-tests/package.json b/scm-ui/ui-tests/package.json index 494a6f94c8..0e6bdc8cc3 100644 --- a/scm-ui/ui-tests/package.json +++ b/scm-ui/ui-tests/package.json @@ -13,5 +13,6 @@ "enzyme-context-react-router-4": "^2.0.0", "jest": "^24.9.0", "raf": "^3.4.1" - } + }, + "prettier": "@scm-manager/prettier-config" } diff --git a/scm-ui/ui-types/package.json b/scm-ui/ui-types/package.json index a8d85a6594..464f8578f0 100644 --- a/scm-ui/ui-types/package.json +++ b/scm-ui/ui-types/package.json @@ -18,5 +18,6 @@ }, "babel": { "presets": ["@scm-manager/babel-preset"] - } + }, + "prettier": "@scm-manager/prettier-config" } diff --git a/scm-ui/ui-webapp/package.json b/scm-ui/ui-webapp/package.json index fb8b1e954a..8122c94ef8 100644 --- a/scm-ui/ui-webapp/package.json +++ b/scm-ui/ui-webapp/package.json @@ -53,7 +53,6 @@ "node-sass-chokidar": "^1.3.0", "npm-run-all": "^4.1.3", "postcss-easy-import": "^3.0.0", - "prettier": "^1.13.7", "react-test-renderer": "^16.4.1", "redux-mock-store": "^1.5.3", "systemjs": "0.21.6" @@ -65,5 +64,6 @@ }, "jest": { "preset": "@scm-manager/jest-preset" - } + }, + "prettier": "@scm-manager/prettier-config" } diff --git a/yarn.lock b/yarn.lock index 2e31fe5de1..b0feeb489c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3359,6 +3359,11 @@ babel-code-frame@^6.22.0: esutils "^2.0.2" js-tokens "^3.0.2" +babel-core@7.0.0-bridge.0: + version "7.0.0-bridge.0" + resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece" + integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg== + babel-eslint@^10.0.3: version "10.0.3" resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.3.tgz#81a2c669be0f205e19462fed2482d33e4687a88a" @@ -7003,7 +7008,7 @@ gitconfiglocal@^1.0.0: dependencies: ini "^1.3.2" -gitdiff-parser@^0.1.2: +gitdiff-parser@^0.1.2, "gitdiff-parser@https://github.com/cloudogu/gitdiff-parser#3a72da4a8e3d9bfb4b9e01a43e85628c19f26cc4": version "0.1.2" resolved "https://github.com/cloudogu/gitdiff-parser#3a72da4a8e3d9bfb4b9e01a43e85628c19f26cc4" @@ -11129,7 +11134,7 @@ prepend-http@^2.0.0: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= -prettier@^1.13.7, prettier@^1.16.4, prettier@^1.18.2: +prettier@^1.16.4, prettier@^1.18.2: version "1.18.2" resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea" integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==