From 77a8fd6c487c70f93619c36dfe05419bc96a9d65 Mon Sep 17 00:00:00 2001 From: Rob de Kort Date: Tue, 18 Aug 2020 23:02:06 +0200 Subject: [PATCH] Upgrade to Tailwind 1.7 row-gap and col-gap utilities are now deprecated --- composer.lock | 67 ++++++++++--------- package-lock.json | 20 +++--- package.json | 2 +- resources/views/errors/404.antlers.html | 2 +- .../views/page_builder/_article.antlers.html | 2 +- .../page_builder/_call_to_action.antlers.html | 2 +- .../page_builder/_collection.antlers.html | 2 +- .../page_builder/_form_contact.antlers.html | 2 +- .../page_builder/_link_blocks.antlers.html | 2 +- tailwind.config.js | 3 + 10 files changed, 53 insertions(+), 51 deletions(-) diff --git a/composer.lock b/composer.lock index e30623908..bd6352745 100644 --- a/composer.lock +++ b/composer.lock @@ -60,16 +60,16 @@ }, { "name": "brick/math", - "version": "0.8.15", + "version": "0.9.0", "source": { "type": "git", "url": "https://github.com/brick/math.git", - "reference": "9b08d412b9da9455b210459ff71414de7e6241cd" + "reference": "b69d0daabbb830b1dac93d757cdc5dab253574c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/brick/math/zipball/9b08d412b9da9455b210459ff71414de7e6241cd", - "reference": "9b08d412b9da9455b210459ff71414de7e6241cd", + "url": "https://api.github.com/repos/brick/math/zipball/b69d0daabbb830b1dac93d757cdc5dab253574c2", + "reference": "b69d0daabbb830b1dac93d757cdc5dab253574c2", "shasum": "" }, "require": { @@ -102,7 +102,7 @@ "brick", "math" ], - "time": "2020-04-15T15:59:35+00:00" + "time": "2020-08-18T09:40:56+00:00" }, { "name": "composer/ca-bundle", @@ -1679,16 +1679,16 @@ }, { "name": "league/commonmark", - "version": "1.5.3", + "version": "1.5.4", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "2574454b97e4103dc4e36917bd783b25624aefcd" + "reference": "21819c989e69bab07e933866ad30c7e3f32984ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/2574454b97e4103dc4e36917bd783b25624aefcd", - "reference": "2574454b97e4103dc4e36917bd783b25624aefcd", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/21819c989e69bab07e933866ad30c7e3f32984ba", + "reference": "21819c989e69bab07e933866ad30c7e3f32984ba", "shasum": "" }, "require": { @@ -1744,7 +1744,7 @@ "md", "parser" ], - "time": "2020-07-19T22:47:30+00:00" + "time": "2020-08-18T01:19:12+00:00" }, { "name": "league/csv", @@ -1819,16 +1819,16 @@ }, { "name": "league/flysystem", - "version": "1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "6e96f54d82e71f71c4108da33ee96a7f57083710" + "reference": "63cd8c14708b9544d3f61d3c15b747fda1c95c6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/6e96f54d82e71f71c4108da33ee96a7f57083710", - "reference": "6e96f54d82e71f71c4108da33ee96a7f57083710", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/63cd8c14708b9544d3f61d3c15b747fda1c95c6e", + "reference": "63cd8c14708b9544d3f61d3c15b747fda1c95c6e", "shasum": "" }, "require": { @@ -1900,7 +1900,7 @@ "sftp", "storage" ], - "time": "2020-08-12T14:23:41+00:00" + "time": "2020-08-18T10:57:55+00:00" }, { "name": "league/glide", @@ -2382,16 +2382,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.8.0", + "version": "v4.9.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "8c58eb4cd4f3883f82611abeac2efbc3dbed787e" + "reference": "aaee038b912e567780949787d5fe1977be11a778" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8c58eb4cd4f3883f82611abeac2efbc3dbed787e", - "reference": "8c58eb4cd4f3883f82611abeac2efbc3dbed787e", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/aaee038b912e567780949787d5fe1977be11a778", + "reference": "aaee038b912e567780949787d5fe1977be11a778", "shasum": "" }, "require": { @@ -2399,7 +2399,7 @@ "php": ">=7.0" }, "require-dev": { - "ircmaxell/php-yacc": "^0.0.6", + "ircmaxell/php-yacc": "^0.0.7", "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" }, "bin": [ @@ -2408,7 +2408,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.8-dev" + "dev-master": "4.9-dev" } }, "autoload": { @@ -2430,7 +2430,7 @@ "parser", "php" ], - "time": "2020-08-09T10:23:20+00:00" + "time": "2020-08-18T19:48:01+00:00" }, { "name": "opis/closure", @@ -3146,20 +3146,20 @@ }, { "name": "ramsey/uuid", - "version": "4.1.0", + "version": "4.1.1", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "988dbefc7878d0a35f12afb4df1f7dd0bd153c43" + "reference": "cd4032040a750077205918c86049aa0f43d22947" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/988dbefc7878d0a35f12afb4df1f7dd0bd153c43", - "reference": "988dbefc7878d0a35f12afb4df1f7dd0bd153c43", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/cd4032040a750077205918c86049aa0f43d22947", + "reference": "cd4032040a750077205918c86049aa0f43d22947", "shasum": "" }, "require": { - "brick/math": "^0.8", + "brick/math": "^0.8 || ^0.9", "ext-json": "*", "php": "^7.2 || ^8", "ramsey/collection": "^1.0", @@ -3223,7 +3223,7 @@ "identifier", "uuid" ], - "time": "2020-07-28T16:51:01+00:00" + "time": "2020-08-18T17:17:46+00:00" }, { "name": "seld/jsonlint", @@ -3406,16 +3406,16 @@ }, { "name": "statamic/cms", - "version": "v3.0.0-beta.44", + "version": "v3.0.0-beta.45", "source": { "type": "git", "url": "https://github.com/statamic/cms.git", - "reference": "e47a352c511872038822e060e690b96585e03ed0" + "reference": "aa8892f1a3b98ebc770febd1b5bd362f33e636b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/statamic/cms/zipball/e47a352c511872038822e060e690b96585e03ed0", - "reference": "e47a352c511872038822e060e690b96585e03ed0", + "url": "https://api.github.com/repos/statamic/cms/zipball/aa8892f1a3b98ebc770febd1b5bd362f33e636b9", + "reference": "aa8892f1a3b98ebc770febd1b5bd362f33e636b9", "shasum": "" }, "require": { @@ -3477,7 +3477,7 @@ "laravel", "statamic" ], - "time": "2020-08-14T19:32:59+00:00" + "time": "2020-08-18T17:11:48+00:00" }, { "name": "statamic/stringy", @@ -7254,6 +7254,7 @@ "keywords": [ "tokenizer" ], + "abandoned": true, "time": "2019-09-17T06:23:10+00:00" }, { diff --git a/package-lock.json b/package-lock.json index 669fb0d91..821a0d9e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1041,7 +1041,6 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/@tailwindcss/custom-forms/-/custom-forms-0.2.1.tgz", "integrity": "sha512-XdP5XY6kxo3x5o50mWUyoYWxOPV16baagLoZ5uM41gh6IhXzhz/vJYzqrTb/lN58maGIKlpkxgVsQUNSsbAS3Q==", - "dev": true, "requires": { "lodash": "^4.17.11", "mini-svg-data-uri": "^1.0.3", @@ -1325,9 +1324,9 @@ } }, "acorn": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz", - "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==" + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz", + "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==" }, "acorn-node": { "version": "1.8.2", @@ -7073,8 +7072,7 @@ "mini-svg-data-uri": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.2.3.tgz", - "integrity": "sha512-zd6KCAyXgmq6FV1mR10oKXYtvmA9vRoB6xPSTUJTbFApCtkefDnYueVR1gkof3KcdLZo1Y8mjF2DFmQMIxsHNQ==", - "dev": true + "integrity": "sha512-zd6KCAyXgmq6FV1mR10oKXYtvmA9vRoB6xPSTUJTbFApCtkefDnYueVR1gkof3KcdLZo1Y8mjF2DFmQMIxsHNQ==" }, "minimalistic-assert": { "version": "1.0.1", @@ -10659,9 +10657,9 @@ "dev": true }, "tailwindcss": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-1.6.2.tgz", - "integrity": "sha512-Cpa0kElG8Sg5sJSvTYi2frmIQZq0w37RLNNrYyy/W6HIWKspqSdTfb9tIN6X1gm4KV5a+TE/n7EKmn5Q9C7EUQ==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-1.7.0.tgz", + "integrity": "sha512-MA9GaF+8KVim1B7TeT4GRD6cbopYQ/IdAyzisRO3dauANbzJ/h/0Z1w+MWpi2NjsF/CvGRfmiRRVSAKeDSfbng==", "requires": { "@fullhuman/postcss-purgecss": "^2.1.2", "autoprefixer": "^9.4.5", @@ -10679,6 +10677,7 @@ "postcss-js": "^2.0.0", "postcss-nested": "^4.1.1", "postcss-selector-parser": "^6.0.0", + "postcss-value-parser": "^4.1.0", "pretty-hrtime": "^1.0.3", "reduce-css-calc": "^2.1.6", "resolve": "^1.14.2" @@ -10972,8 +10971,7 @@ "traverse": { "version": "0.6.6", "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz", - "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=", - "dev": true + "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=" }, "tslib": { "version": "1.13.0", diff --git a/package.json b/package.json index b9a675040..327fda00b 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "@tailwindcss/typography": "^0.2.0", "@tailwindcss/custom-forms": "^0.2.1", "alpinejs": "^2.6.0", - "tailwindcss": "^1.6.2" + "tailwindcss": "^1.7.0" }, "devDependencies": { "autoprefixer": "^9.8.6", diff --git a/resources/views/errors/404.antlers.html b/resources/views/errors/404.antlers.html index d6975c1c9..f72459a4c 100644 --- a/resources/views/errors/404.antlers.html +++ b/resources/views/errors/404.antlers.html @@ -1,6 +1,6 @@ {{# The 404 page taking it's content from the configuration global. #}}
-
+
{{ partial:typography/h1 class="mb-4" :content="configuration:404_title" }} {{ partial:typography/paragraph :content="configuration:404_text" }} diff --git a/resources/views/page_builder/_article.antlers.html b/resources/views/page_builder/_article.antlers.html index 0fca3de46..3af16c2b7 100644 --- a/resources/views/page_builder/_article.antlers.html +++ b/resources/views/page_builder/_article.antlers.html @@ -1,5 +1,5 @@ {{# The article (Bard) content block with set support. #}} -
+
{{ bard scope="set" }} {{ partial src="components/{type}" }} {{ /bard }} diff --git a/resources/views/page_builder/_call_to_action.antlers.html b/resources/views/page_builder/_call_to_action.antlers.html index ff5dee83f..484d069f4 100644 --- a/resources/views/page_builder/_call_to_action.antlers.html +++ b/resources/views/page_builder/_call_to_action.antlers.html @@ -1,5 +1,5 @@ {{# The call to action content block. #}} -
+
{{ if block:title }} {{ partial:typography/h2 class="mb-4" :content="block:title" }} diff --git a/resources/views/page_builder/_collection.antlers.html b/resources/views/page_builder/_collection.antlers.html index 16b07165d..f237f94e5 100644 --- a/resources/views/page_builder/_collection.antlers.html +++ b/resources/views/page_builder/_collection.antlers.html @@ -1,5 +1,5 @@ {{# The collection content block with optional title. #}} -
+
{{ if block:title }} {{ partial:typography/h2 class="mb-4" :content="block:title" }} diff --git a/resources/views/page_builder/_form_contact.antlers.html b/resources/views/page_builder/_form_contact.antlers.html index 7b9493eee..539585d6a 100644 --- a/resources/views/page_builder/_form_contact.antlers.html +++ b/resources/views/page_builder/_form_contact.antlers.html @@ -1,5 +1,5 @@ {{# The contact form content block. #}} -
+
{{ if block:title }} {{ partial:typography/h2 class="mb-4" :content="block:title" }} diff --git a/resources/views/page_builder/_link_blocks.antlers.html b/resources/views/page_builder/_link_blocks.antlers.html index 8496509dd..4a7e7ba94 100644 --- a/resources/views/page_builder/_link_blocks.antlers.html +++ b/resources/views/page_builder/_link_blocks.antlers.html @@ -1,5 +1,5 @@ {{# The link blocks content block. #}} -
+
{{ if block:title }} {{ partial:typography/h2 :content="block:title" }} diff --git a/tailwind.config.js b/tailwind.config.js index 74301f001..db22c4ddc 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -11,6 +11,9 @@ const defaultTheme = require('tailwindcss/defaultTheme') const plugin = require('tailwindcss/plugin') module.exports = { + future: { + removeDeprecatedGapUtilities: true, + }, purge: { content: [ './resources/views/**/*.html',