From b66969501cbb2e43f39e7819a1cbd55af903522f Mon Sep 17 00:00:00 2001 From: Daniel Lockyer Date: Thu, 4 Aug 2022 11:59:50 +0200 Subject: [PATCH] Deleted csscomb plugin from Admin - we're meant to be running our CSS through csscomb in order to apply specific code styles, but the reality is that it never gets used - keeping csscomb around just adds to the package cruft and so this commit cleans up references to it in order to --- ghost/admin/.csscomb.json | 240 -------------------------------------- ghost/admin/Gruntfile.js | 18 --- ghost/admin/package.json | 1 - yarn.lock | 72 +----------- 4 files changed, 2 insertions(+), 329 deletions(-) delete mode 100644 ghost/admin/.csscomb.json diff --git a/ghost/admin/.csscomb.json b/ghost/admin/.csscomb.json deleted file mode 100644 index 318b6614fa..0000000000 --- a/ghost/admin/.csscomb.json +++ /dev/null @@ -1,240 +0,0 @@ -{ - "remove-empty-rulesets": true, - "always-semicolon": true, - "color-case": "lower", - "block-indent": " ", - "color-shorthand": true, - "element-case": "lower", - "eof-newline": true, - "leading-zero": true, - "quotes": "double", - "space-before-colon": "", - "space-after-colon": " ", - "space-before-combinator": " ", - "space-after-combinator": " ", - "space-between-declarations": "\n", - "space-before-opening-brace": " ", - "space-after-opening-brace": "\n", - "space-after-selector-delimiter": "\n", - "space-before-selector-delimiter": "", - "space-before-closing-brace": "\n", - "strip-spaces": true, - "tab-size": 4, - "unitless-zero": true, - "sort-order": [ [ - "content", - "visibility", - "position", - "top", - "right", - "bottom", - "left", - "z-index", - "order", - "flex", - "flex-grow", - "flex-shrink", - "flex-basis", - "align-self", - "display", - "flex-flow", - "flex-direction", - "justify-content", - "align-items", - "align-content", - "flex-wrap", - "flex-order", - "flex-pack", - "flex-align", - "float", - "clear", - "box-sizing", - "width", - "height", - "min-width", - "min-height", - "max-width", - "max-height", - "overflow", - "overflow-x", - "overflow-y", - "clip", - "margin", - "margin-top", - "margin-right", - "margin-bottom", - "margin-left", - "padding", - "padding-top", - "padding-right", - "padding-bottom", - "padding-left", - "outline", - "outline-width", - "outline-style", - "outline-color", - "outline-offset", - "border", - "border-spacing", - "border-collapse", - "border-width", - "border-style", - "border-color", - "border-top", - "border-top-width", - "border-top-style", - "border-top-color", - "border-right", - "border-right-width", - "border-right-style", - "border-right-color", - "border-bottom", - "border-bottom-width", - "border-bottom-style", - "border-bottom-color", - "border-left", - "border-left-width", - "border-left-style", - "border-left-color", - "border-image", - "border-image-source", - "border-image-slice", - "border-image-width", - "border-image-outset", - "border-image-repeat", - "border-top-image", - "border-right-image", - "border-bottom-image", - "border-left-image", - "border-corner-image", - "border-top-left-image", - "border-top-right-image", - "border-bottom-right-image", - "border-bottom-left-image", - "table-layout", - "caption-side", - "empty-cells", - "list-style", - "list-style-position", - "list-style-type", - "list-style-image", - "quotes", - "counter-increment", - "counter-reset", - "vertical-align", - "stroke", - "fill", - "stroke-width", - "stroke-opacity", - "color", - "font", - "font-family", - "font-size", - "line-height", - "font-weight", - "font-style", - "font-variant", - "font-size-adjust", - "font-stretch", - "text-rendering", - "font-feature-settings", - "letter-spacing", - "hyphens", - "text-align", - "text-align-last", - "text-decoration", - "text-emphasis", - "text-emphasis-position", - "text-emphasis-style", - "text-emphasis-color", - "text-indent", - "text-justify", - "text-outline", - "text-transform", - "text-wrap", - "text-overflow", - "text-overflow-ellipsis", - "text-overflow-mode", - "text-shadow", - "white-space", - "word-spacing", - "word-wrap", - "word-break", - "tab-size", - "user-select", - "src", - "resize", - "cursor", - "nav-index", - "nav-up", - "nav-right", - "nav-down", - "nav-left", - "background", - "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader", - "background-color", - "background-image", - "background-size", - "background-attachment", - "background-position", - "background-position-x", - "background-position-y", - "background-clip", - "background-origin", - "background-repeat", - "border-radius", - "border-top-left-radius", - "border-top-right-radius", - "border-bottom-right-radius", - "border-bottom-left-radius", - "box-decoration-break", - "box-shadow", - "opacity", - "filter:progid:DXImageTransform.Microsoft.Alpha(Opacity", - "filter", - "transition", - "transition-delay", - "transition-timing-function", - "transition-duration", - "transition-property", - "transform", - "transform-origin", - "animation", - "animation-name", - "animation-duration", - "animation-play-state", - "animation-timing-function", - "animation-delay", - "animation-iteration-count", - "animation-direction", - "animation-fill-mode", - "pointer-events", - "unicode-bidi", - "direction", - "columns", - "column-span", - "column-width", - "column-count", - "column-fill", - "column-gap", - "column-rule", - "column-rule-width", - "column-rule-style", - "column-rule-color", - "break-before", - "break-inside", - "break-after", - "page-break-before", - "page-break-inside", - "page-break-after", - "orphans", - "widows", - "zoom", - "max-zoom", - "min-zoom", - "user-zoom", - "orientation", - "-webkit-overflow-scrolling", - "-ms-overflow-scrolling" - ] ] -} diff --git a/ghost/admin/Gruntfile.js b/ghost/admin/Gruntfile.js index 0a4033d4f9..5cd2e59f5c 100644 --- a/ghost/admin/Gruntfile.js +++ b/ghost/admin/Gruntfile.js @@ -11,21 +11,11 @@ module.exports = function (grunt) { built: { src: ['dist/**'] }, - dependencies: { - src: ['node_modules/**'] - }, tmp: { src: ['tmp/**'] } }, - watch: { - csscomb: { - files: ['app/styles/**/*.css'], - tasks: ['shell:csscombfix'] - } - }, - shell: { ember: { command: function (mode) { @@ -42,14 +32,6 @@ module.exports = function (grunt) { } }, - csscombfix: { - command: 'csscomb -c app/styles/csscomb.json -v app/styles' - }, - - csscomblint: { - command: 'csscomb -c app/styles/csscomb.json -lv app/styles' - }, - options: { preferLocal: true } diff --git a/ghost/admin/package.json b/ghost/admin/package.json index 575778a62e..effce9d0ed 100644 --- a/ghost/admin/package.json +++ b/ghost/admin/package.json @@ -63,7 +63,6 @@ "chai": "4.3.6", "chai-dom": "1.11.0", "codemirror": "5.48.2", - "csscomb": "4.3.0", "cssnano": "4.1.10", "element-resize-detector": "1.2.4", "ember-ajax": "5.1.1", diff --git a/yarn.lock b/yarn.lock index 3370932308..b3b9f6e306 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1520,7 +1520,7 @@ "@babel/helper-create-regexp-features-plugin" "^7.18.6" "@babel/helper-plugin-utils" "^7.18.6" -"@babel/polyfill@^7.11.5", "@babel/polyfill@^7.4.0": +"@babel/polyfill@^7.11.5": version "7.12.1" resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.12.1.tgz#1f2d6371d1261bbd961f3c5d5909150e12d0bd96" integrity sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g== @@ -8243,18 +8243,6 @@ css-what@^6.0.1, css-what@^6.1.0: resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== -csscomb@4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/csscomb/-/csscomb-4.3.0.tgz#8dbc743e66b5190ef57ea0c928c478a6b9592c93" - integrity sha512-U2VDmuCbChAzBz8zLXrcFMs/tORwYa9hjG0qHDCZHzyK7CYgTRzTk+I1Hxgh0SoPiW4XWYL68qG5vDl5hGZQ3w== - dependencies: - "@babel/polyfill" "^7.4.0" - gonzales-pe "4.2.4" - minimatch "3.0.4" - minimist "1.2.0" - vow "0.4.19" - vow-fs "0.3.6" - cssdb@^6.6.3: version "6.6.3" resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-6.6.3.tgz#1f331a2fab30c18d9f087301e6122a878bb1e505" @@ -12484,7 +12472,7 @@ glob@^6.0.1: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.0, glob@^7.0.4, glob@^7.0.5, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.0.0, glob@^7.0.4, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -12601,13 +12589,6 @@ globule@^1.0.0: lodash "^4.17.21" minimatch "~3.0.2" -gonzales-pe@4.2.4: - version "4.2.4" - resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.2.4.tgz#356ae36a312c46fe0f1026dd6cb539039f8500d2" - integrity sha512-v0Ts/8IsSbh9n1OJRnSfa7Nlxi4AkXIsWB6vPept8FDbL4bXn3FNuxjYtO/nmBGu7GDkL9MFeGebeSu6l55EPQ== - dependencies: - minimist "1.1.x" - "google-caja-bower@https://github.com/acburdine/google-caja-bower#ghost": version "6011.0.0" resolved "https://github.com/acburdine/google-caja-bower#275cb75249f038492094a499756a73719ae071fd" @@ -16303,13 +16284,6 @@ minimatch@0.3: dependencies: brace-expansion "^1.1.7" -minimatch@3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" - minimatch@5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b" @@ -16336,16 +16310,6 @@ minimist@0.0.8: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" integrity sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q== -minimist@1.1.x: - version "1.1.3" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz#3bedfd91a92d39016fcfaa1c681e8faa1a1efda8" - integrity sha512-2RbeLaM/Hbo9vJ1+iRrxzfDnX9108qb2m923U+s+Ot2eMey0IYGdSjzHmvtg2XsxoCuMnzOMw7qc573RvnLgwg== - -minimist@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - integrity sha512-7Wl+Jz+IGWuSdgsQEJ4JunV0si/iMhg42MnQQG6h1R6TNeVenp4U9x5CC5v/gYqz/fENLQITAWXidNtVL0NNbw== - minimist@>=1.2.5, minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6: version "1.2.6" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" @@ -22347,11 +22311,6 @@ uuid@8.3.2, uuid@^8.3.1, uuid@^8.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== -uuid@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a" - integrity sha512-FULf7fayPdpASncVy4DLh3xydlXEJJpvIELjYjNeQWYUZ9pclcpvCZSr2gkmN2FrrGcI7G/cJsIEwk5/8vfXpg== - uuid@^3.3.2: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" @@ -22529,33 +22488,6 @@ vm-browserify@^1.0.1: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== -vow-fs@0.3.6: - version "0.3.6" - resolved "https://registry.yarnpkg.com/vow-fs/-/vow-fs-0.3.6.tgz#2d4c59be22e2bf2618ddf597ab4baa923be7200d" - integrity sha512-oK9rtqJSHy7ZQAhAtVU0HiF/oVhm0A4Qx2l2DyyFBUsXbTXUg258EsQGLLIXYZnE5MYaInZLgA6l/10je/EamA== - dependencies: - glob "^7.0.5" - uuid "^2.0.2" - vow "^0.4.7" - vow-queue "^0.4.1" - -vow-queue@^0.4.1: - version "0.4.3" - resolved "https://registry.yarnpkg.com/vow-queue/-/vow-queue-0.4.3.tgz#4ba8f64b56e9212c0dbe57f1405aeebd54cce78d" - integrity sha512-/poAKDTFL3zYbeQg7cl4BGcfP4sGgXKrHnRFSKj97dteUFu8oyXMwIcdwu8NSx/RmPGIuYx1Bik/y5vU4H/VKw== - dependencies: - vow "^0.4.17" - -vow@0.4.19: - version "0.4.19" - resolved "https://registry.yarnpkg.com/vow/-/vow-0.4.19.tgz#cc5ef4d6bb6972d830830a7c9ecf8ad834a7c525" - integrity sha512-S+0+CiQlbUhTNWMlJdqo/ARuXOttXdvw5ACGyh1W97NFHUdwt3Fzyaus03Kvdmo733dwnYS9AGJSDg0Zu8mNfA== - -vow@^0.4.17, vow@^0.4.7: - version "0.4.20" - resolved "https://registry.yarnpkg.com/vow/-/vow-0.4.20.tgz#77ca6ef0828e0043a93e55dc37030226519ce711" - integrity sha512-YYoSYXUYABqY08D/WrjcWJxJSErcILRRTQpcPyUc0SFfgIPKSUFzVt7u1HC3TXGJZM/qhsSjCLNQstxqf7asgQ== - w3c-hr-time@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"