Skip to content

Commit

Permalink
Upgrade Jekyll and more (#89)
Browse files Browse the repository at this point in the history
* Add Carol Ng to the Contributors section

* Update Jekyll to version 3.6.2 in Gemfile

* Add issue and PR templates

* bump the npm version

* Remove feed.xml file and use jekyll-feed pluging, updated in version 3.6.0

* Update project generated packages
  • Loading branch information
Nir Galon authored Dec 22, 2017
1 parent f0f0654 commit 290dde3
Show file tree
Hide file tree
Showing 11 changed files with 5,337 additions and 51 deletions.
11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
**This is a ...** (check one with "x")
```
[ ] Bug report
[ ] Feature request
[ ] Clarification on the documentation
```

**Current behavior**


**What is the expected behavior?** (if you know how it should behave)
16 changes: 16 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
**What kind of change does this PR introduce?** (check _one_ with "x")
```
[ ] Bugfix
[ ] Feature
[ ] Code style update (formatting, local variables)
[ ] Refactoring (no functional changes, no api changes)
[ ] Build related changes
[ ] CI related changes
[ ] Docs related changes
[ ] Other... Please describe:
```

**Link to the open issue**:


**Other information**:
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ Great! Here is how you can install the local generator to test changes.

* [Nir Galon](http://nirgn.com)
* [Yotam Emergy](http://ydesign.webflow.io/)
* [Carol Ng](https://www.carolkng.com/)

[![npm][downloads-image]][downloads-url] [![Donate][donate-image]][donate-url]

Expand Down
6 changes: 0 additions & 6 deletions generators/app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,6 @@ module.exports = Generator.extend({
this.destinationPath(this.projectName + '/_posts')
);

// Copy all .xml files.
this.fs.copy(
this.templatePath('my-awesome-site/*.xml'),
this.destinationPath(this.projectName)
);

// Copy all .yml files.
this.fs.copy(
this.templatePath('my-awesome-site/*.yml'),
Expand Down
8 changes: 4 additions & 4 deletions generators/app/templates/my-awesome-site/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ ruby RUBY_VERSION
#
# This will help ensure the proper Jekyll version is running.
# Happy Jekylling!
gem "jekyll", "3.6.0"
gem "jekyll", "3.6.2"

# If you have any plugins, put them here!
# group :jekyll_plugins do
# gem "jekyll-github-metadata", "~> 1.0"
# end
group :jekyll_plugins do
gem "jekyll-feed", "~> 0.6"
end
2 changes: 1 addition & 1 deletion generators/app/templates/my-awesome-site/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

To install this project, you'll need the following things installed on your machine.

1. [Jekyll](http://jekyllrb.com/) - `$ gem install jekyll -v 3.6.0`
1. [Jekyll](http://jekyllrb.com/) - `$ gem install jekyll -v 3.6.2`
2. [NodeJS](http://nodejs.org) - use the installer.
<% if (includeFirebase) { -%>
3. [Firebase CLI](https://github.com/firebase/firebase-tools).
Expand Down
30 changes: 0 additions & 30 deletions generators/app/templates/my-awesome-site/feed.xml

This file was deleted.

16 changes: 8 additions & 8 deletions generators/app/templates/my-awesome-site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
"author": "<%= githubUsername %>",
"license": "ISC",
"devDependencies": {
"babel-core": "^6.25.0",
"babel-core": "^6.26.0",
"babel-preset-es2015": "^6.24.1",
"browser-sync": "^2.18.13",
"browser-sync": "^2.21.0",
<% if (includeFirebase) { -%>
"firebase-tools": "^3.3.0",
"firebase-tools": "^3.16.0",
<% } -%>
"gulp": "^3.9.1",
"gulp-autoprefixer": "^4.0.0",
"gulp-babel": "^6.1.2",
"gulp-babel": "^7.0.0",
"gulp-clean": "^0.3.2",
"gulp-concat": "^2.6.1",
"gulp-cssnano": "^2.1.2",
Expand All @@ -27,27 +27,27 @@
"gulp-gh-pages": "^0.5.4",
<% } -%>
"gulp-htmlmin": "3.0.0",
"gulp-imagemin": "^3.3.0",
"gulp-imagemin": "^4.0.0",
"gulp-load-plugins": "1.5.0",
<% if (includeGithub) { -%>
"gulp-replace": "^0.6.1",
<% } -%>
<% if (includePug) { -%>
"gulp-pug": "3.0.4",
"gulp-pug": "3.3.0",
<% } -%>
<% if (includeSass || includeScss) { -%>
"gulp-sass": "^3.1.0",
<% } -%>
"gulp-shell": "^0.6.3",
"gulp-uglify": "^3.0.0",
<% if (includeTravis) { -%>
"lighthouse": "^2.3.0",
"lighthouse": "^2.7.0",
<% } -%>
<% if (includeSW) { -%>
"sw-precache": "^5.2.0",
"sw-toolbox": "^3.6.0",
<% } -%>
"run-sequence": "^2.1.0"
"run-sequence": "^2.2.0"
},
"repository": {
"type": "git",
Expand Down
Loading

0 comments on commit 290dde3

Please sign in to comment.