From 3fea5c14548ec4bfdb7cfd6f05b889b307c23278 Mon Sep 17 00:00:00 2001 From: Martin Ficzel Date: Wed, 19 Jan 2022 17:04:12 +0100 Subject: [PATCH 1/6] TASK: Use tailwind 3 --- .../Vendor.WheelInventor/package.json | 4 +- .../Vendor.WheelInventor/tailwind.config.js | 15 +- yarn.lock | 177 ++++++------------ 3 files changed, 69 insertions(+), 127 deletions(-) diff --git a/DistributionPackages/Vendor.WheelInventor/package.json b/DistributionPackages/Vendor.WheelInventor/package.json index aad5835..e9278cf 100644 --- a/DistributionPackages/Vendor.WheelInventor/package.json +++ b/DistributionPackages/Vendor.WheelInventor/package.json @@ -23,7 +23,7 @@ }, "devDependencies": { "@sitegeist/eslint-config-es-neos-eslint": "^2.0.2", - "@tailwindcss/typography": "^0.4.1", + "@tailwindcss/typography": "^0.5.0", "@types/classnames": "^2.3.1", "@types/final-form-focus": "^1.1.1", "@types/react": "^17.0.34", @@ -44,7 +44,7 @@ "postcss-cli": "^8.3.1", "postcss-discard-duplicates": "^5.0.1", "postcss-selector-parser": "^6.0.6", - "tailwindcss": "^2.2.9", + "tailwindcss": "^3.0.0", "ts-loader": "^9.2.5", "ts-node": "^10.2.1", "typescript": "^4.4.2", diff --git a/DistributionPackages/Vendor.WheelInventor/tailwind.config.js b/DistributionPackages/Vendor.WheelInventor/tailwind.config.js index a2f7de6..bcc542e 100644 --- a/DistributionPackages/Vendor.WheelInventor/tailwind.config.js +++ b/DistributionPackages/Vendor.WheelInventor/tailwind.config.js @@ -1,11 +1,9 @@ const theme = require('tailwindcss/defaultTheme'); - +const colors = require('tailwindcss/colors') module.exports = { - mode: 'jit', - purge: [ + content: [ './Resources/Private/Fusion/**/*' ], - darkMode: false, theme: { colors: { brand: { @@ -17,9 +15,9 @@ module.exports = { contrast: '#000' }, neutral: { - lighter: theme.colors.gray[200], - DEFAULT: theme.colors.gray[500], - darker: theme.colors.gray[900] + lighter: colors.gray[200], + DEFAULT: colors.gray[500], + darker: colors.gray[900] }, info: { DEFAULT: '#76bed0', @@ -40,9 +38,6 @@ module.exports = { }, extend: {}, }, - variants: { - extend: {}, - }, plugins: [ require('@tailwindcss/typography'), ], diff --git a/yarn.lock b/yarn.lock index ff7c7e5..ea57981 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1172,10 +1172,10 @@ remark "^13.0.0" unist-util-find-all-after "^3.0.2" -"@tailwindcss/typography@^0.4.1": - version "0.4.1" - resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.4.1.tgz#51ddbceea6a0ee9902c649dbe58871c81a831212" - integrity sha512-ovPPLUhs7zAIJfr0y1dbGlyCuPhpuv/jpBoFgqAc658DWGGrOBWBMpAWLw2KlzbNeVk4YBJMzue1ekvIbdw6XA== +"@tailwindcss/typography@^0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.5.0.tgz#47886ec46ac41e1211d24fea05301046d9b30906" + integrity sha512-1p/3C6C+JJziS/ghtG8ACYalbA2SyLJY27Pm33cVTlAoY6VQ7zfm2H64cPxUMBkVIlWXTtWHhZcZJPobMRmQAA== dependencies: lodash.castarray "^4.4.0" lodash.isplainobject "^4.0.6" @@ -2297,11 +2297,6 @@ byte-size@^7.0.0: resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-7.0.1.tgz#b1daf3386de7ab9d706b941a748dbfc71130dee3" integrity sha512-crQdqyCwhokxwV1UyDzLZanhkugAgft7vt0qbbdt60C6Zf3CAiGmtUCylbtYwrU6loOUw3euGrNtW1J651ot1A== -bytes@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" - integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== - cacache@^15.0.5: version "15.0.6" resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.6.tgz#65a8c580fda15b59150fb76bf3f3a8e45d583099" @@ -2642,7 +2637,7 @@ color-name@1.1.3: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= -color-name@^1.0.0, color-name@~1.1.4: +color-name@^1.0.0, color-name@^1.1.4, color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== @@ -2655,14 +2650,6 @@ color-string@^1.5.4: color-name "^1.0.0" simple-swizzle "^0.2.2" -color-string@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.0.tgz#63b6ebd1bec11999d1df3a79a7569451ac2be8aa" - integrity sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ== - dependencies: - color-name "^1.0.0" - simple-swizzle "^0.2.2" - color@^3.0.0: version "3.1.3" resolved "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz#ca67fb4e7b97d611dcde39eceed422067d91596e" @@ -2671,14 +2658,6 @@ color@^3.0.0: color-convert "^1.9.1" color-string "^1.5.4" -color@^4.0.1: - version "4.1.0" - resolved "https://registry.yarnpkg.com/color/-/color-4.1.0.tgz#9502e6a2dcacb26adf4c60910a27628d010b3de3" - integrity sha512-o2rkkxyLGgYoeUy1OodXpbPAQNmlNBrirQ8ODO8QutzDiDMNdezSOZLNnusQ6pUpCQJUsaJIo9DZJKqa2HgH7A== - dependencies: - color-convert "^2.0.1" - color-string "^1.9.0" - colord@^2.9.1: version "2.9.2" resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.2.tgz#25e2bacbbaa65991422c07ea209e2089428effb1" @@ -2719,11 +2698,6 @@ commander@^7.0.0, commander@^7.2.0: resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== -commander@^8.0.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" - integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== - commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" @@ -3067,11 +3041,6 @@ css-tree@^1.1.3: mdn-data "2.0.14" source-map "^0.6.1" -css-unit-converter@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.2.tgz#4c77f5a1954e6dbff60695ecb214e3270436ab21" - integrity sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA== - css-what@^3.2.1: version "3.4.2" resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" @@ -4120,15 +4089,6 @@ fraction.js@^4.1.1: resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.1.2.tgz#13e420a92422b6cf244dff8690ed89401029fbe8" integrity sha512-o2RiJQ6DZaR/5+Si0qJUIy637QMRudSi9kU/FFzx9EZazrIdnBgpU+3sEWCxAVhH2RtxW2Oz+T4p2o8uOPVcgA== -fs-extra@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1" - integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - fs-extra@^9.0.0, fs-extra@^9.1.0: version "9.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" @@ -4315,7 +4275,7 @@ glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@^5.1.2, dependencies: is-glob "^4.0.1" -glob-parent@^6.0.1: +glob-parent@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== @@ -4874,7 +4834,7 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" -is-color-stop@^1.0.0, is-color-stop@^1.1.0: +is-color-stop@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345" integrity sha1-z/9HGu5N1cnhWFmPvhKWe1za00U= @@ -4893,6 +4853,13 @@ is-core-module@^2.2.0: dependencies: has "^1.0.3" +is-core-module@^2.8.0: + version "2.8.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" + integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== + dependencies: + has "^1.0.3" + is-date-object@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" @@ -5473,11 +5440,6 @@ lodash.templatesettings@^4.0.0: dependencies: lodash._reinterpolate "^3.0.0" -lodash.topath@^4.5.2: - version "4.5.2" - resolved "https://registry.yarnpkg.com/lodash.topath/-/lodash.topath-4.5.2.tgz#3616351f3bba61994a0931989660bd03254fd009" - integrity sha1-NhY1Hzu6YZlKCTGYlmC9AyVP0Ak= - lodash.truncate@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" @@ -5887,11 +5849,6 @@ mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -modern-normalize@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/modern-normalize/-/modern-normalize-1.1.0.tgz#da8e80140d9221426bd4f725c6e11283d34f90b7" - integrity sha512-2lMlY1Yc1+CUy0gw4H95uNN7vjbpoED7NNRSBHE25nWfLBdmMzFCsPshlzbxHz+gYMcBEUN8V4pU16prcdPSgA== - modify-values@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" @@ -5953,13 +5910,6 @@ node-bin-setup@^1.0.0: resolved "https://registry.yarnpkg.com/node-bin-setup/-/node-bin-setup-1.0.6.tgz#4b5c9bb937ece702d7069b36ca78af4684677528" integrity sha512-uPIxXNis1CRbv1DwqAxkgBk5NFV3s7cMN/Gf556jSw6jBvV7ca4F9lRL/8cALcZecRibeqU+5dFYqFFmzv5a0Q== -node-emoji@^1.11.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" - integrity sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A== - dependencies: - lodash "^4.17.21" - node-fetch@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" @@ -6589,6 +6539,11 @@ path-parse@^1.0.6: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== +path-parse@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + path-type@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" @@ -6972,6 +6927,13 @@ postcss-js@^3.0.3: camelcase-css "^2.0.1" postcss "^8.1.6" +postcss-js@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-4.0.0.tgz#31db79889531b80dc7bc9b0ad283e418dce0ac00" + integrity sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ== + dependencies: + camelcase-css "^2.0.1" + postcss-lab-function@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz#bb51a6856cd12289ab4ae20db1e3821ef13d7d2e" @@ -7613,6 +7575,14 @@ postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6: cssesc "^3.0.0" util-deprecate "^1.0.2" +postcss-selector-parser@^6.0.8: + version "6.0.8" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.8.tgz#f023ed7a9ea736cd7ef70342996e8e78645a7914" + integrity sha512-D5PG53d209Z1Uhcc0qAZ5U3t5HagH3cxu+WLZ22jt3gLUpXM4eXXfiO14jiDWST3NNooX/E8wISfOhZ9eIjGTQ== + dependencies: + cssesc "^3.0.0" + util-deprecate "^1.0.2" + postcss-simple-vars@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/postcss-simple-vars/-/postcss-simple-vars-6.0.3.tgz#e66516c7fe980da3498f4a8ad400b9c53861806c" @@ -7658,7 +7628,7 @@ postcss-unique-selectors@^5.0.2: alphanum-sort "^1.0.2" postcss-selector-parser "^6.0.5" -postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.0: +postcss-value-parser@^3.0.0: version "3.3.1" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== @@ -7719,7 +7689,7 @@ postcss@^8.1.6, postcss@^8.2.8: nanoid "^3.1.20" source-map "^0.6.1" -postcss@^8.3.5, postcss@^8.3.6: +postcss@^8.3.6: version "8.4.5" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.5.tgz#bae665764dfd4c6fcc24dc0fdf7e7aa00cc77f95" integrity sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg== @@ -7815,16 +7785,6 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -purgecss@^4.0.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/purgecss/-/purgecss-4.1.3.tgz#683f6a133c8c4de7aa82fe2746d1393b214918f7" - integrity sha512-99cKy4s+VZoXnPxaoM23e5ABcP851nC2y2GROkkjS8eJaJtlciGavd7iYAw2V84WeBqggZ12l8ef44G99HmTaw== - dependencies: - commander "^8.0.0" - glob "^7.1.7" - postcss "^8.3.5" - postcss-selector-parser "^6.0.6" - q@^1.1.2, q@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" @@ -8088,14 +8048,6 @@ redent@^3.0.0: indent-string "^4.0.0" strip-indent "^3.0.0" -reduce-css-calc@^2.1.8: - version "2.1.8" - resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz#7ef8761a28d614980dc0c982f772c93f7a99de03" - integrity sha512-8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg== - dependencies: - css-unit-converter "^1.1.1" - postcss-value-parser "^3.3.0" - regenerator-runtime@^0.13.4: version "0.13.9" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" @@ -8215,6 +8167,15 @@ resolve@^1.1.6, resolve@^1.10.0, resolve@^1.20.0, resolve@^1.9.0: is-core-module "^2.2.0" path-parse "^1.0.6" +resolve@^1.21.0: + version "1.21.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.21.0.tgz#b51adc97f3472e6a5cf4444d34bc9d6b9037591f" + integrity sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA== + dependencies: + is-core-module "^2.8.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + resolve@^2.0.0-next.3: version "2.0.0-next.3" resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46" @@ -8258,7 +8219,7 @@ rimraf@^2.6.3: dependencies: glob "^7.1.3" -rimraf@^3.0.0, rimraf@^3.0.2: +rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -8927,6 +8888,11 @@ supports-color@^8.0.0, supports-color@^8.1.0: dependencies: has-flag "^4.0.0" +supports-preserve-symlinks-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== + svg-tags@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" @@ -8985,43 +8951,31 @@ table@^6.0.9: string-width "^4.2.3" strip-ansi "^6.0.1" -tailwindcss@^2.2.9: - version "2.2.19" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-2.2.19.tgz#540e464832cd462bb9649c1484b0a38315c2653c" - integrity sha512-6Ui7JSVtXadtTUo2NtkBBacobzWiQYVjYW0ZnKaP9S1ZCKQ0w7KVNz+YSDI/j7O7KCMHbOkz94ZMQhbT9pOqjw== +tailwindcss@^3.0.0: + version "3.0.15" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.0.15.tgz#e4db219771eb7678a3bfd97b3f6c8fe20be0a410" + integrity sha512-bT2iy7FtjwgsXik4ZoJnHXR+SRCiGR1W95fVqpLZebr64m4ahwUwRbIAc5w5+2fzr1YF4Ct2eI7dojMRRl8sVQ== dependencies: arg "^5.0.1" - bytes "^3.0.0" chalk "^4.1.2" chokidar "^3.5.2" - color "^4.0.1" + color-name "^1.1.4" cosmiconfig "^7.0.1" detective "^5.2.0" didyoumean "^1.2.2" dlv "^1.1.3" fast-glob "^3.2.7" - fs-extra "^10.0.0" - glob-parent "^6.0.1" - html-tags "^3.1.0" - is-color-stop "^1.1.0" - is-glob "^4.0.1" - lodash "^4.17.21" - lodash.topath "^4.5.2" - modern-normalize "^1.1.0" - node-emoji "^1.11.0" + glob-parent "^6.0.2" + is-glob "^4.0.3" normalize-path "^3.0.0" object-hash "^2.2.0" - postcss-js "^3.0.3" + postcss-js "^4.0.0" postcss-load-config "^3.1.0" postcss-nested "5.0.6" - postcss-selector-parser "^6.0.6" - postcss-value-parser "^4.1.0" - pretty-hrtime "^1.0.3" - purgecss "^4.0.3" + postcss-selector-parser "^6.0.8" + postcss-value-parser "^4.2.0" quick-lru "^5.1.1" - reduce-css-calc "^2.1.8" - resolve "^1.20.0" - tmp "^0.2.1" + resolve "^1.21.0" tapable@^1.0.0: version "1.1.3" @@ -9162,13 +9116,6 @@ tmp@^0.0.33: dependencies: os-tmpdir "~1.0.2" -tmp@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" - integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== - dependencies: - rimraf "^3.0.0" - to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" From 5c420dd559b58caf4832c050c3ceda8ec9fef533 Mon Sep 17 00:00:00 2001 From: Martin Ficzel Date: Wed, 19 Jan 2022 17:09:55 +0100 Subject: [PATCH 2/6] TASK: Move concurrently dependency to root package.jason --- .github/workflows/qa.yaml | 8 +++++++- DistributionPackages/Vendor.Site/package.json | 1 - .../Vendor.WheelInventor/package.json | 1 - package.json | 3 ++- yarn.lock | 15 --------------- 5 files changed, 9 insertions(+), 19 deletions(-) diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml index 63fd3f4..783a1b8 100644 --- a/.github/workflows/qa.yaml +++ b/.github/workflows/qa.yaml @@ -1,6 +1,12 @@ name: QA -on: [push, pull_request] +on: + push: + branches: + - master + pull_request: + branches-ignore: + - master jobs: fe-build: diff --git a/DistributionPackages/Vendor.Site/package.json b/DistributionPackages/Vendor.Site/package.json index 7b4943b..91fe2d9 100644 --- a/DistributionPackages/Vendor.Site/package.json +++ b/DistributionPackages/Vendor.Site/package.json @@ -17,7 +17,6 @@ "@types/node": "^14.14.36", "@types/terser-webpack-plugin": "^5.0.3", "autoprefixer": "^10.2.5", - "concurrently": "^6.2.0", "css-loader": "^5.2.0", "css-minimizer-webpack-plugin": "^1.3.0", "eslint": "^7.22.0", diff --git a/DistributionPackages/Vendor.WheelInventor/package.json b/DistributionPackages/Vendor.WheelInventor/package.json index e9278cf..696d31e 100644 --- a/DistributionPackages/Vendor.WheelInventor/package.json +++ b/DistributionPackages/Vendor.WheelInventor/package.json @@ -33,7 +33,6 @@ "@typescript-eslint/eslint-plugin": "^4.30.0", "@typescript-eslint/parser": "^4.30.0", "autoprefixer": "^10.3.4", - "concurrently": "^6.2.1", "cssnano": "^5.0.8", "eslint": "^7.32.0", "eslint-plugin-react": "^7.25.1", diff --git a/package.json b/package.json index 0391a22..0a10e6d 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,8 @@ "DistributionPackages/*" ], "devDependencies": { - "lerna": "^4.0.0" + "lerna": "^4.0.0", + "concurrently": "^6.2.1" }, "scripts": { "cleanup:node": "find . -name 'node_modules' -type d -prune -print -exec rm -rf '{}' \\;", diff --git a/yarn.lock b/yarn.lock index ea57981..ccb4096 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2726,21 +2726,6 @@ concat-stream@^2.0.0: readable-stream "^3.0.2" typedarray "^0.0.6" -concurrently@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-6.2.0.tgz#587e2cb8afca7234172d8ea55176088632c4c56d" - integrity sha512-v9I4Y3wFoXCSY2L73yYgwA9ESrQMpRn80jMcqMgHx720Hecz2GZAvTI6bREVST6lkddNypDKRN22qhK0X8Y00g== - dependencies: - chalk "^4.1.0" - date-fns "^2.16.1" - lodash "^4.17.21" - read-pkg "^5.2.0" - rxjs "^6.6.3" - spawn-command "^0.0.2-1" - supports-color "^8.1.0" - tree-kill "^1.2.2" - yargs "^16.2.0" - concurrently@^6.2.1: version "6.5.0" resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-6.5.0.tgz#57082bfe797f93cf4a437ce54742c56823a8ea05" From 812bb3e695d5d9e96f892ab4da47e1fad23c5c5f Mon Sep 17 00:00:00 2001 From: Martin Ficzel Date: Wed, 19 Jan 2022 17:11:42 +0100 Subject: [PATCH 3/6] TASK: Adjust github qa config --- .github/workflows/qa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml index 783a1b8..2d31904 100644 --- a/.github/workflows/qa.yaml +++ b/.github/workflows/qa.yaml @@ -5,7 +5,7 @@ on: branches: - master pull_request: - branches-ignore: + branches: - master jobs: From 0442456eb3f03f2c5dfa51013337313bb5649736 Mon Sep 17 00:00:00 2001 From: Martin Ficzel Date: Wed, 19 Jan 2022 17:36:45 +0100 Subject: [PATCH 4/6] TASK: Remove alpine js in favor of splitted js submodules --- .../Block/ScrollToTop/ScrollToTop.alpine.ts | 26 ------------------- .../Block/ScrollToTop/ScrollToTop.entry.ts | 3 +++ .../Block/ScrollToTop/ScrollToTop.fusion | 6 ++--- .../Fusion/Resource/BodyScripts.fusion | 2 -- 4 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 DistributionPackages/Vendor.WheelInventor/Resources/Private/Fusion/Presentation/Block/ScrollToTop/ScrollToTop.alpine.ts create mode 100644 DistributionPackages/Vendor.WheelInventor/Resources/Private/Fusion/Presentation/Block/ScrollToTop/ScrollToTop.entry.ts diff --git a/DistributionPackages/Vendor.WheelInventor/Resources/Private/Fusion/Presentation/Block/ScrollToTop/ScrollToTop.alpine.ts b/DistributionPackages/Vendor.WheelInventor/Resources/Private/Fusion/Presentation/Block/ScrollToTop/ScrollToTop.alpine.ts deleted file mode 100644 index 5bc4cc6..0000000 --- a/DistributionPackages/Vendor.WheelInventor/Resources/Private/Fusion/Presentation/Block/ScrollToTop/ScrollToTop.alpine.ts +++ /dev/null @@ -1,26 +0,0 @@ -function ScrollToTop() { - return { - button: { - 'x-on:scroll.window'() { - this.visible = window.scrollY > 0; - }, - - 'x-bind:class'() { - return { - 'opacity-100': this.visible, - 'opacity-0 pointer-events-none': !this.visible - }; - }, - - 'x-on:click'() { - window.scroll({ - top: 0, - behavior: 'smooth' - }); - }, - } as any, - visible: window.scrollY > 0 - }; -} - -Object.assign(window, {ScrollToTop}); diff --git a/DistributionPackages/Vendor.WheelInventor/Resources/Private/Fusion/Presentation/Block/ScrollToTop/ScrollToTop.entry.ts b/DistributionPackages/Vendor.WheelInventor/Resources/Private/Fusion/Presentation/Block/ScrollToTop/ScrollToTop.entry.ts new file mode 100644 index 0000000..d16ee16 --- /dev/null +++ b/DistributionPackages/Vendor.WheelInventor/Resources/Private/Fusion/Presentation/Block/ScrollToTop/ScrollToTop.entry.ts @@ -0,0 +1,3 @@ +export default (el: HTMLElement): void => { + el.addEventListener("click", (e) => (console.log("to implement"))); +}; diff --git a/DistributionPackages/Vendor.WheelInventor/Resources/Private/Fusion/Presentation/Block/ScrollToTop/ScrollToTop.fusion b/DistributionPackages/Vendor.WheelInventor/Resources/Private/Fusion/Presentation/Block/ScrollToTop/ScrollToTop.fusion index c5fde05..66d2c1e 100644 --- a/DistributionPackages/Vendor.WheelInventor/Resources/Private/Fusion/Presentation/Block/ScrollToTop/ScrollToTop.fusion +++ b/DistributionPackages/Vendor.WheelInventor/Resources/Private/Fusion/Presentation/Block/ScrollToTop/ScrollToTop.fusion @@ -15,17 +15,17 @@ prototype(Vendor.WheelInventor:Block.ScrollToTop) < prototype(Neos.Fusion:Compon @propTypes { id = ${PropTypes.string.isRequired} title = ${PropTypes.string.isRequired} + content = ${PropTypes.string.isRequired} } renderer = afx` ` } diff --git a/DistributionPackages/Vendor.WheelInventor/Resources/Private/Fusion/Resource/BodyScripts.fusion b/DistributionPackages/Vendor.WheelInventor/Resources/Private/Fusion/Resource/BodyScripts.fusion index ec796d0..cf07fe8 100644 --- a/DistributionPackages/Vendor.WheelInventor/Resources/Private/Fusion/Resource/BodyScripts.fusion +++ b/DistributionPackages/Vendor.WheelInventor/Resources/Private/Fusion/Resource/BodyScripts.fusion @@ -13,6 +13,4 @@ prototype(Vendor.WheelInventor:Resource.BodyScripts) < prototype(Neos.Fusion:Arr @process.addCacheBuster = ${value + '?cb=' + SitegeistKlarSchiffCacheBuster.get()} } } - - alpine = '' } From 1b219135a84721b280292ba751476425d22b9884 Mon Sep 17 00:00:00 2001 From: Martin Ficzel Date: Wed, 19 Jan 2022 17:48:45 +0100 Subject: [PATCH 5/6] TASK: Move concurrently dependency back into the consuming packages --- DistributionPackages/Vendor.Site/package.json | 1 + DistributionPackages/Vendor.WheelInventor/package.json | 1 + package.json | 3 +-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/DistributionPackages/Vendor.Site/package.json b/DistributionPackages/Vendor.Site/package.json index 91fe2d9..24032d0 100644 --- a/DistributionPackages/Vendor.Site/package.json +++ b/DistributionPackages/Vendor.Site/package.json @@ -17,6 +17,7 @@ "@types/node": "^14.14.36", "@types/terser-webpack-plugin": "^5.0.3", "autoprefixer": "^10.2.5", + "concurrently": "^6.2.1", "css-loader": "^5.2.0", "css-minimizer-webpack-plugin": "^1.3.0", "eslint": "^7.22.0", diff --git a/DistributionPackages/Vendor.WheelInventor/package.json b/DistributionPackages/Vendor.WheelInventor/package.json index 696d31e..e9278cf 100644 --- a/DistributionPackages/Vendor.WheelInventor/package.json +++ b/DistributionPackages/Vendor.WheelInventor/package.json @@ -33,6 +33,7 @@ "@typescript-eslint/eslint-plugin": "^4.30.0", "@typescript-eslint/parser": "^4.30.0", "autoprefixer": "^10.3.4", + "concurrently": "^6.2.1", "cssnano": "^5.0.8", "eslint": "^7.32.0", "eslint-plugin-react": "^7.25.1", diff --git a/package.json b/package.json index 0a10e6d..0391a22 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,7 @@ "DistributionPackages/*" ], "devDependencies": { - "lerna": "^4.0.0", - "concurrently": "^6.2.1" + "lerna": "^4.0.0" }, "scripts": { "cleanup:node": "find . -name 'node_modules' -type d -prune -print -exec rm -rf '{}' \\;", From 29d4d8d1e09cc9c75e0b98f3c493760c31c2ea82 Mon Sep 17 00:00:00 2001 From: Martin Ficzel Date: Wed, 19 Jan 2022 18:20:26 +0100 Subject: [PATCH 6/6] TASK: Improve ecrc configuration To accept generated files --- .ecrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ecrc b/.ecrc index edada87..921db70 100644 --- a/.ecrc +++ b/.ecrc @@ -1,3 +1,3 @@ { - "Exclude": ["node_modules", "^Packages", "^Data", "^Web", "^Build", "Configuration/README", ".yaml.example", ".ddev", "bin"] + "Exclude": [".ddev", ".git", "bin", "node_modules", "^Packages", "^Data", "^Web", "Build", "Configuration/README", ".yaml.example", ".css.fusion", ".js.fusion" ] }