Skip to content

Commit

Permalink
Merge branch 'release/3.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
terryupton committed Oct 21, 2020
2 parents 88dd7b3 + d938981 commit 48291e1
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 40 deletions.
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog
All notable changes to this project will be documented in this file.
## [3.1.0] - 2020-10-20
### Changed
Updated NPM Package and Dependencies

## [3.0.0] - 2020-10-20
### Added
Expand Down Expand Up @@ -66,13 +69,13 @@ Config Files
- Variants

### Removed
Plugins Removed
- Plugins Removed
- Imager Plugin (no longer supported)
- Retcon Plugin (possibly not required now tailwind offers typography plugin)
- Typed Link Field Plugin (not required for all projects as standard)
- CP Field Inspect Plugin (now native)
- Relabel Plugin (now native)
Config Files
- Config Files
- Image Config File


Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "terryupton/boilerplate-craft",
"description": "A starting boilerplate for Craft Projects",
"version": "3.0.0",
"version": "3.1.0",
"license": "MIT",
"type": "project",
"require": {
Expand Down
38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "craft-bp",
"version": "3.3.0",
"version": "3.1.0",
"description": "Craft CMS boilerplate and starter project",
"main": "index.js",
"keywords": [
Expand All @@ -25,31 +25,31 @@
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
},
"devDependencies": {
"browser-sync": "^2.26.7",
"browser-sync": "^2.26.13",
"browser-sync-webpack-plugin": "2.2.2",
"clean-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^5.1.1",
"cross-env": "^7.0.0",
"imagemin-mozjpeg": "^8.0.0",
"copy-webpack-plugin": "^6.2.1",
"cross-env": "^7.0.2",
"imagemin-mozjpeg": "^9.0.0",
"imagemin-webpack-plugin": "^2.4.2",
"laravel-mix": "^5.0.1",
"laravel-mix": "^5.0.7",
"laravel-mix-criticalcss": "^1.0.1",
"laravel-mix-purgecss": "^4.2.0",
"laravel-mix-versionhash": "^1.1.2",
"laravel-mix-purgecss": "^5.0.0",
"laravel-mix-versionhash": "^1.1.7",
"postcss-color-function": "^4.1.0",
"postcss-pxtorem": "^4.0.1",
"postcss-scss": "^2.0.0",
"postcss-sorting": "^5.0.1",
"resolve-url-loader": "3.1.1",
"sass": "^1.26.2",
"sass-loader": "8.*",
"stylelint": "^13.2.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.*",
"stylelint": "^13.7.2",
"stylelint-config-recommended": "^3.0.0",
"vue-template-compiler": "^2.6.11"
"vue-template-compiler": "^2.6.12"
},
"dependencies": {
"tailwindcss": "^1.2.0",
"@tailwindcss/ui": "^0.1.3",
"lazysizes": "^5.2.0"
"tailwindcss": "^1.9.5",
"@tailwindcss/ui": "^0.6.2",
"lazysizes": "^5.2.2"
}
}
36 changes: 18 additions & 18 deletions package.json.default
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,31 @@
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
},
"devDependencies": {
"browser-sync": "^2.26.7",
"browser-sync": "^2.26.13",
"browser-sync-webpack-plugin": "2.2.2",
"clean-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^5.1.1",
"cross-env": "^7.0.0",
"imagemin-mozjpeg": "^8.0.0",
"copy-webpack-plugin": "^6.2.1",
"cross-env": "^7.0.2",
"imagemin-mozjpeg": "^9.0.0",
"imagemin-webpack-plugin": "^2.4.2",
"laravel-mix": "^5.0.1",
"laravel-mix": "^5.0.7",
"laravel-mix-criticalcss": "^1.0.1",
"laravel-mix-purgecss": "^4.2.0",
"laravel-mix-versionhash": "^1.1.2",
"laravel-mix-purgecss": "^5.0.0",
"laravel-mix-versionhash": "^1.1.7",
"postcss-color-function": "^4.1.0",
"postcss-pxtorem": "^4.0.1",
"postcss-scss": "^2.0.0",
"postcss-sorting": "^5.0.1",
"resolve-url-loader": "3.1.1",
"sass": "^1.26.2",
"sass-loader": "8.*",
"stylelint": "^13.2.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.*",
"stylelint": "^13.7.2",
"stylelint-config-recommended": "^3.0.0",
"vue-template-compiler": "^2.6.11"
"vue-template-compiler": "^2.6.12"
},
"dependencies": {
"tailwindcss": "^1.2.0",
"@tailwindcss/ui": "^0.1.3",
"lazysizes": "^5.2.0"
"tailwindcss": "^1.9.5",
"@tailwindcss/ui": "^0.6.2",
"lazysizes": "^5.2.2"
}
}

0 comments on commit 48291e1

Please sign in to comment.