From d9b6ac47ea883dfcee0295fe50a3e12d26d7cf53 Mon Sep 17 00:00:00 2001 From: Andreas Blaesius Date: Fri, 30 Oct 2020 12:11:05 +0100 Subject: [PATCH] build(deps-dev): add prettier plugin-php - Please note: php-plugin can't handle files with mixed content (PHP containing HTML and/or JS and/or CSS). For reference: - https://github.com/prettier/plugin-php/issues/846 - https://github.com/prettier/plugin-php/issues/845 Change-Id: I40f2f013ec8f9f9557285f38bdc78190d7fb5b41 --- .prettierrc | 11 ++++++++++- package.json | 2 ++ yarn.lock | 44 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) diff --git a/.prettierrc b/.prettierrc index c111ed47a..865707925 100644 --- a/.prettierrc +++ b/.prettierrc @@ -2,5 +2,14 @@ "trailingComma": "none", "singleQuote": true, "bracketSpacing": false, - "printWidth": 120 + "printWidth": 120, + "overrides": [ + { + "files": "*.php", + "options": { + "printWidth": 180, + "braceStyle": "1tbs", + } + }, + ] } \ No newline at end of file diff --git a/package.json b/package.json index d5cb0ca5c..5c592167a 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "eslint:fix": "eslint src/js/*.js --fix", "format": "npm-run-all --parallel format:*", "format:js": "prettier src/js/*.js --write", + "format:php": "prettier {api,lib}/{,*/**/}*.php --write", "format:scss": "prettier src/sass/{,*/**/}*.scss --write", "pack:build": "npm-run-all --serial eslint build pack:zip", "pack:zip": "node scripts/pack-build.js", @@ -56,6 +57,7 @@ "devDependencies": { "@babel/core": "^7.12.10", "@babel/preset-env": "^7.12.11", + "@prettier/plugin-php": "^0.16.1", "archiver": "^5.1.0", "colors": "^1.4.0", "eslint": "^7.16.0", diff --git a/yarn.lock b/yarn.lock index 0085fbc73..ab262340f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -848,6 +848,15 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" +"@prettier/plugin-php@^0.16.1": + version "0.16.1" + resolved "https://registry.yarnpkg.com/@prettier/plugin-php/-/plugin-php-0.16.1.tgz#0255749fe1a36c00c7ddc049ec8dc2928a8ac512" + integrity sha512-U0G5MnWEw3H4o53ZKmIDNBAN9w/7jkiFAhWPG6DJ+FyB9RmdhDouW05wLq8UraxjigzmXNZzT+ZQor697iW9Hg== + dependencies: + linguist-languages "^7.5.1" + mem "^8.0.0" + php-parser "3.0.2" + "@types/color-name@^1.1.1": version "1.1.1" resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" @@ -3265,6 +3274,11 @@ liftoff@^3.1.0: rechoir "^0.6.2" resolve "^1.1.7" +linguist-languages@^7.5.1: + version "7.11.1" + resolved "https://registry.yarnpkg.com/linguist-languages/-/linguist-languages-7.11.1.tgz#69938a526bb6090c2fc173d0e440693bb0667818" + integrity sha512-+cRUk+1WTbydcdzipXQER2iilX+wMrb1LPkbkGuDP/IcGPJRDmOZH6Olf1iH6sHlHwPnJYiNJH39YsFCVZxvUQ== + load-json-file@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" @@ -3347,6 +3361,13 @@ make-iterator@^1.0.0: dependencies: kind-of "^6.0.2" +map-age-cleaner@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" + integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w== + dependencies: + p-defer "^1.0.0" + map-cache@^0.2.0, map-cache@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" @@ -3379,6 +3400,14 @@ matchdep@^2.0.0: resolve "^1.4.0" stack-trace "0.0.10" +mem@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/mem/-/mem-8.0.0.tgz#b5e4b6d2d241c6296da05436173b4d0c7ae1f9ac" + integrity sha512-qrcJOe6uD+EW8Wrci1Vdiua/15Xw3n/QnaNXE7varnB6InxSk7nu3/i5jfy3S6kWxr8WYJ6R1o0afMUtvorTsA== + dependencies: + map-age-cleaner "^0.1.3" + mimic-fn "^3.1.0" + memorystream@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2" @@ -3431,6 +3460,11 @@ mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24: dependencies: mime-db "1.44.0" +mimic-fn@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74" + integrity sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ== + "minimatch@>= 0.1.0", minimatch@^3.0.4, minimatch@~3.0.2: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -3767,6 +3801,11 @@ osenv@0: os-homedir "^1.0.0" os-tmpdir "^1.0.0" +p-defer@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" + integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww= + p-limit@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" @@ -3926,6 +3965,11 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= +php-parser@3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/php-parser/-/php-parser-3.0.2.tgz#a86dbbc110e57378cba71ab4cd9b0d18f3872ac3" + integrity sha512-a7y1+odEGsceLDLpu7oNyspZ0pK8FMWJOoim4/yd82AtnEZNLdCLZ67arnOQZ9K0lHJiSp4/7lVUpGELVxE14w== + pidtree@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.1.tgz#ef09ac2cc0533df1f3250ccf2c4d366b0d12114a"