Skip to content

Commit

Permalink
Jekyll 3.3.0 features (#60)
Browse files Browse the repository at this point in the history
* Update jekyll to version 3.3.1

* Cleanup path

* Update dev dependencies

* Bump the version
  • Loading branch information
Nir Galon authored Dec 5, 2016
1 parent daf6264 commit d869391
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 25 deletions.
2 changes: 1 addition & 1 deletion generators/app/templates/my-awesome-site/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ruby RUBY_VERSION
#
# This will help ensure the proper Jekyll version is running.
# Happy Jekylling!
gem "jekyll", "3.2.1"
gem "jekyll", "3.3.1"

# If you have any plugins, put them here!
# group :jekyll_plugins do
Expand Down
4 changes: 2 additions & 2 deletions generators/app/templates/my-awesome-site/_includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
<meta name="description" content="{{ site.description }}">

<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
<link rel="stylesheet" href="css/main.css">
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.url }}">
<link rel="manifest" href="{{ "/manifest.json" | prepend: site.baseurl }}">
<link rel="manifest" href="manifest.json">
</head>
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@

{% include footer.html %}

<link async href="{{ "/scripts/main.min.js" | prepend: site.baseurl }}">
<link async href="scripts/main.min.js">
<% if (includeSW) { -%>
<script>
if ('serviceWorker' in navigator) {
navigator.serviceWorker.register("{{ "/sw.js" | prepend: site.baseurl }}").then(function() {
navigator.serviceWorker.register("sw.js").then(function() {
console.log("Service Worker Registered");
});
}
Expand Down
18 changes: 1 addition & 17 deletions generators/app/templates/my-awesome-site/gulpfile.babel
Original file line number Diff line number Diff line change
Expand Up @@ -181,20 +181,6 @@ gulp.task('build', () =>
);

<% if (includeGithub) { -%>
// Edit config file for jekyll build.
gulp.task('before-gh-deploy', () => {
return gulp.src('./_config.yml')
.pipe($.replace('baseurl: ""', 'baseurl: "/<%= projectName %>"'))
.pipe(gulp.dest('./'));
});

// Revert config file for gulp serve in local.
gulp.task('cleanup-gh-deploy', () => {
return gulp.src('./_config.yml')
.pipe($.replace('baseurl: "/<%= projectName %>"', 'baseurl: ""'))
.pipe(gulp.dest('./'));
});

// Depoly website to gh-pages.
gulp.task('gh-pages', () => {
return gulp.src('./_site/**/*')
Expand All @@ -203,7 +189,6 @@ gulp.task('gh-pages', () => {

gulp.task('deploy', () => {
runSequence(
'before-gh-deploy',
<% if (includePug) { -%>
'pug',
<% } -%>
Expand All @@ -217,8 +202,7 @@ gulp.task('deploy', () => {
'generate-service-worker',
<% } -%>
'minify-images',
'gh-pages',
'cleanup-gh-deploy'
'gh-pages'
)
});
<% } -%>
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "generator-jekyll-starter-kit",
"version": "1.0.6",
"version": "1.0.7",
"description": "Combine Jekyll and Google web-starter-kit to enjoy the best of both worlds",
"homepage": "https://github.com/nirgn975/generator-jekyll-starter-kit",
"author": {
"name": "Nir Galon",
"email": "[email protected]",
"url": "http://nirgn.com"
"url": "http://www.nirgn.com"
},
"files": [
"generators"
Expand Down Expand Up @@ -36,7 +36,7 @@
},
"devDependencies": {
"eslint": "^3.1.1",
"eslint-config-xo-space": "^0.14.0",
"eslint-config-xo-space": "^0.15.0",
"gulp": "^3.9.0",
"gulp-coveralls": "^0.1.0",
"gulp-eslint": "^3.0.1",
Expand Down

0 comments on commit d869391

Please sign in to comment.