diff --git a/CHANGELOG.md b/CHANGELOG.md index bdca794..e6ccd25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,20 @@ # Changelog All notable changes to this project will be documented in this file. +## [3.2.0] - 2020-10-20 +### Added +Adding PurgeCSS settings to tailwind config + +### Changed +Clean and tidy up of laravel-mix config +Renamed Craft Site Name in Project Config + +### Removed +PurgeCSS config and dependencies removed from laravel-mix + +Removed PostCSS dependencies no longer required + - PostCSS Colour Functions + - PostCSS Sorting + ## [3.1.0] - 2020-10-20 ### Changed Updated NPM Package and Dependencies diff --git a/composer.json b/composer.json index e4ff516..6aef9f3 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "terryupton/boilerplate-craft", "description": "A starting boilerplate for Craft Projects", - "version": "3.1.0", + "version": "3.2.0", "license": "MIT", "type": "project", "require": { diff --git a/config/project/project.yaml b/config/project/project.yaml index 9bdd032..104668c 100644 --- a/config/project/project.yaml +++ b/config/project/project.yaml @@ -48,7 +48,7 @@ plugins: system: edition: pro live: true - name: 'Lincoln Green Solicitors' + name: 'Craft Boiler Plate' retryDuration: null schemaVersion: 3.5.13 timeZone: Europe/London diff --git a/package.json b/package.json index 5e30545..175605d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "craft-bp", - "version": "3.1.0", + "version": "3.2.0", "description": "Craft CMS boilerplate and starter project", "main": "index.js", "keywords": [ @@ -34,12 +34,9 @@ "imagemin-webpack-plugin": "^2.4.2", "laravel-mix": "^5.0.7", "laravel-mix-criticalcss": "^1.0.1", - "laravel-mix-purgecss": "^5.0.0", "laravel-mix-versionhash": "^1.1.7", - "postcss-color-function": "^4.1.0", "postcss-pxtorem": "^5.1.1", "postcss-scss": "^3.0.2", - "postcss-sorting": "^6.0.0", "resolve-url-loader": "3.1.2", "sass": "^1.27.0", "sass-loader": "10.*", diff --git a/package.json.default b/package.json.default index cb1d6de..80310de 100644 --- a/package.json.default +++ b/package.json.default @@ -27,12 +27,9 @@ "imagemin-webpack-plugin": "^2.4.2", "laravel-mix": "^5.0.7", "laravel-mix-criticalcss": "^1.0.1", - "laravel-mix-purgecss": "^5.0.0", "laravel-mix-versionhash": "^1.1.7", - "postcss-color-function": "^4.1.0", "postcss-pxtorem": "^5.1.1", "postcss-scss": "^3.0.2", - "postcss-sorting": "^6.0.0", "resolve-url-loader": "3.1.2", "sass": "^1.27.0", "sass-loader": "10.*", diff --git a/tailwind.config.js b/tailwind.config.js index 1a63a33..81c2e05 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,6 +1,18 @@ const defaultTheme = require('tailwindcss/defaultTheme'); module.exports = { + purge: { + mode: 'all', + content: [ + './templates/**/*.html', + './templates/**/*.twig', + './src/**/*.js' + ], + + options: { + whitelistPatterns: [/lazyload/, /grayscale-up/, /blur-up/], + } + }, theme: { screens: { 'sm': '600px', @@ -9,7 +21,7 @@ module.exports = { 'xl': '1280px', 'xxl': '1400px', }, - + fontFamily: { sans: ['Open Sans', 'sans-serif'], }, @@ -24,7 +36,7 @@ module.exports = { 'youtube': '#BB0000', 'email': '#a0aec0' }, - + file: { 'doc': '#295595', 'xls': '#207245', @@ -32,16 +44,16 @@ module.exports = { 'pdf': '#FB3449', }, }, - + spacing: { '5/8': '62.5%', // '9/16': '56.25%' }, - + margin: { 'flood': 'calc(50% - 50vw)' }, - + minWidth: theme => ({ ...theme('spacing'), }), @@ -51,7 +63,7 @@ module.exports = { '8xl': '90rem', '9xl': '100rem', }, - + opacity: { '10': '0.10', '15': '0.15', @@ -65,14 +77,14 @@ module.exports = { '90': '0.90', '95': '0.95' }, - + zIndex: { '60': '60', '70': '70', '80': '80', '90': '90', }, - + gridTemplateColumns: { 'auto-fit-130': 'repeat(auto-fit, minmax(130px, 1fr))', 'auto-fit-150': 'repeat(auto-fit, minmax(150px, 1fr))', @@ -82,11 +94,11 @@ module.exports = { 'auto-fit-400': 'repeat(auto-fit, minmax(400px, 1fr))', 'auto-fit-600': 'repeat(auto-fit, minmax(600px, 1fr))', }, - + gridColumnEnd: { '-1': '-1', }, - + gridRowEnd: { '-1': '-1', }, diff --git a/webpack.mix.js b/webpack.mix.js index d227343..29f8c11 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -19,21 +19,6 @@ mix // Extract splits the JS into Vendor, Manfiest and Index .extract() - // .extract([ - // 'lazysizes', - // 'picturefill', - // 'jquery' - // ]) - - // Scripts Minifies Scripts - Use for Legacy Projects - // .scripts([settings.paths.src.js + 'classie.js'], settings.paths.build.js + 'classie.js') - - // .autoload({ - // jQuery: 'jquery', - // $: 'jquery', - // jquery: 'jquery', - // }) - .options({ processCssUrls: false, @@ -63,19 +48,6 @@ mix ] }) - .purgeCss({ - enabled: mix.inProduction(), - globs: [ - path.join(__dirname, settings.paths.templates.base + '**/*.{html,twig}'), - path.join(__dirname, settings.paths.build.js + '**/*.js'), - path.join(__dirname, settings.paths.src.js + '**/*.js'), - ], - defaultExtractor: content => content.match(/[\w-/.%:]+(?