Skip to content

Commit

Permalink
Merge branch 'release/1.0.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
khalwat committed Dec 16, 2017
2 parents 2d71b01 + cd4207c commit ec4b33a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# nystudio107/craft Change Log

## 1.0.6 - 2017.12.16
### Changed
* Updated to use the latest `critical` package, adjusted `gulpfile.js` base path

## 1.0.5 - 2017.12.13
### Changed
* Slurp whitespace with the minify tags
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": "nystudio107/craft",
"description": "nystudio107 Craft 3 CMS scaffolding project",
"version": "1.0.4",
"version": "1.0.6",
"keywords": [
"craft",
"cms",
Expand Down
1 change: 0 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,6 @@ function processCriticalCSS(element, i, callback) {
dest: criticalDest,
inline: false,
ignore: [],
base: pkg.paths.dist.base,
css: [
pkg.paths.dist.css + pkg.vars.siteCssName,
],
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
"babel-plugin-transform-runtime": "^6.15.0",
"babel-preset-es2015": "^6.16.0",
"chalk": "^1.1.3",
"critical": "0.8.0",
"critical": "^1.1.0",
"fancy-log": "^1.2.0",
"git-rev-sync": "^1.7.1",
"gulp": "^3.9.0",
Expand Down

0 comments on commit ec4b33a

Please sign in to comment.