Skip to content

Commit f738df7

Browse files
committed
Merge branch 'hotfix/md-ignores'
2 parents 82b4828 + af6387c commit f738df7

File tree

6 files changed

+16
-5
lines changed

6 files changed

+16
-5
lines changed

CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

5+
## [4.0.3] - 2018-01-12
6+
# Fixes
7+
- Fixes file move node script to ignore `util/` folder and all `.md` files.
8+
9+
# Updates
10+
- Update bowser documentation to reflect correct comparison operator.
11+
512
## [4.0.2] - 2017-10-20
613
# Fixes
714
- Fixes typo in bowser function, adjust operator for browser version check.

documentation/javascript.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Prelude includes [Bowser](https://github.com/lancedikson/bowser) to aid in
1616
browser detection. You can modify these as needed but by default is as follows:
1717

1818
```js
19-
if( bowser.msie && bower.version === 11 ) {
19+
if( bowser.msie && bower.version == 11 ) {
2020
$('body').addClass('ie-11');
2121
} else if ( bowser.safari ) {
2222
$('body').addClass('safari');

package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "prelude-wp",
3-
"version": "4.0.2",
3+
"version": "4.0.3",
44
"description": "Prelude is a Wordpress starter theme that helps you craft custom themes. It uses Gulp to compile and minify scss/css, concatenate and minify JS, compress images, and more.",
55
"main": "index.php",
66
"scripts": {

util/exclude.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
CHANGELOG.md
2+
README.md
3+
util/

util/moveFiles.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ if( process.env.CI !== 'true' && process.env.TRAVIS !== 'true') {
2727
if( userInputMove === 'Y' || userInputMove === 'y' || userInputMove === 'yes' ) {
2828
console.log('You answered yes... Attempting move.'.green);
2929

30-
exec('rsync -a -v --ignore-existing ./gulpfile.js ./../../ && rsync -a -v --ignore-existing ./ ./../../',(err, stdout, stderr) => {
30+
exec(`rsync -a -v --ignore-existing --exclude-from './util/exclude.txt' ./ ./../../`,(err, stdout, stderr) => {
3131
if(err) {
32-
console.error('There was an error moving the files. Please try manually.');
32+
console.error(err);
33+
console.error('There was an error moving the files. Please try manually.'.red);
3334
return;
3435
}
3536

0 commit comments

Comments
 (0)