Skip to content

Commit 3c2da99

Browse files
michaelxmichaelx
committed
0.2.0
- Updated all dependencies - Updated gems (jekyll, s3_website) - Removed jQuery dependency, left examples in place - Dropped deprecated gulp-util - Fixed lint-js call on watch task - Enabled revision task
1 parent 8adca05 commit 3c2da99

File tree

11 files changed

+139
-100
lines changed

11 files changed

+139
-100
lines changed

‎Gemfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
source "https://rubygems.org"
22

3-
gem 'jekyll', '~> 3.1.6'
4-
gem 's3_website', '~> 2.14.3'
3+
gem 'jekyll', '~> 3.8.3'
4+
gem 's3_website', '~> 3.4.0'

‎Gemfile.lock‎

Lines changed: 64 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,85 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
colorator (0.1)
4+
addressable (2.5.2)
5+
public_suffix (>= 2.0.2, < 4.0)
6+
aws-sdk (2.11.74)
7+
aws-sdk-resources (= 2.11.74)
8+
aws-sdk-core (2.11.74)
9+
aws-sigv4 (~> 1.0)
10+
jmespath (~> 1.0)
11+
aws-sdk-resources (2.11.74)
12+
aws-sdk-core (= 2.11.74)
13+
aws-sigv4 (1.0.2)
14+
colorator (1.1.0)
515
colored (1.2)
6-
configure-s3-website (1.7.1)
7-
deep_merge (= 1.0.0)
8-
deep_merge (1.0.0)
16+
concurrent-ruby (1.0.5)
17+
configure-s3-website (2.3.0)
18+
aws-sdk (~> 2)
19+
deep_merge (~> 1.0.0)
20+
deep_merge (1.0.1)
921
dotenv (1.0.2)
10-
ffi (1.9.10)
11-
jekyll (3.1.6)
12-
colorator (~> 0.1)
22+
em-websocket (0.5.1)
23+
eventmachine (>= 0.12.9)
24+
http_parser.rb (~> 0.6.0)
25+
eventmachine (1.2.7)
26+
ffi (1.9.25)
27+
forwardable-extended (2.6.0)
28+
http_parser.rb (0.6.0)
29+
i18n (0.9.5)
30+
concurrent-ruby (~> 1.0)
31+
jekyll (3.8.3)
32+
addressable (~> 2.4)
33+
colorator (~> 1.0)
34+
em-websocket (~> 0.5)
35+
i18n (~> 0.7)
1336
jekyll-sass-converter (~> 1.0)
14-
jekyll-watch (~> 1.1)
15-
kramdown (~> 1.3)
16-
liquid (~> 3.0)
37+
jekyll-watch (~> 2.0)
38+
kramdown (~> 1.14)
39+
liquid (~> 4.0)
1740
mercenary (~> 0.3.3)
18-
rouge (~> 1.7)
41+
pathutil (~> 0.9)
42+
rouge (>= 1.7, < 4)
1943
safe_yaml (~> 1.0)
20-
jekyll-sass-converter (1.4.0)
44+
jekyll-sass-converter (1.5.2)
2145
sass (~> 3.4)
22-
jekyll-watch (1.4.0)
23-
listen (~> 3.0, < 3.1)
24-
kramdown (1.11.1)
25-
liquid (3.0.6)
26-
listen (3.0.8)
46+
jekyll-watch (2.0.0)
47+
listen (~> 3.0)
48+
jmespath (1.4.0)
49+
kramdown (1.17.0)
50+
liquid (4.0.0)
51+
listen (3.1.5)
2752
rb-fsevent (~> 0.9, >= 0.9.4)
2853
rb-inotify (~> 0.9, >= 0.9.7)
54+
ruby_dep (~> 1.2)
2955
mercenary (0.3.6)
30-
rb-fsevent (0.9.7)
31-
rb-inotify (0.9.7)
32-
ffi (>= 0.5.0)
33-
rouge (1.11.0)
34-
s3_website (2.14.3)
56+
pathutil (0.16.1)
57+
forwardable-extended (~> 2.6)
58+
public_suffix (3.0.2)
59+
rb-fsevent (0.10.3)
60+
rb-inotify (0.9.10)
61+
ffi (>= 0.5.0, < 2)
62+
rouge (3.1.1)
63+
ruby_dep (1.5.0)
64+
s3_website (3.4.0)
3565
colored (= 1.2)
36-
configure-s3-website (= 1.7.1)
66+
configure-s3-website (= 2.3.0)
3767
dotenv (~> 1.0)
3868
thor (~> 0.18)
3969
safe_yaml (1.0.4)
40-
sass (3.4.22)
41-
thor (0.19.1)
70+
sass (3.5.6)
71+
sass-listen (~> 4.0.0)
72+
sass-listen (4.0.0)
73+
rb-fsevent (~> 0.9, >= 0.9.4)
74+
rb-inotify (~> 0.9, >= 0.9.7)
75+
thor (0.20.0)
4276

4377
PLATFORMS
4478
ruby
4579

4680
DEPENDENCIES
47-
jekyll (~> 3.1.6)
48-
s3_website (~> 2.14.3)
81+
jekyll (~> 3.8.3)
82+
s3_website (~> 3.4.0)
83+
84+
BUNDLED WITH
85+
1.15.4

‎app/_assets/javascripts/app.js‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
1-
require('jquery');
1+
// Example
22

3-
$(function() {
4-
console.log("jQuery loaded");
5-
});
3+
//require('jquery');
4+
5+
//$(function() {
6+
// console.log('jQuery loaded');
7+
//});
8+
9+
10+
// If you want above. Don’t forget to add the following to the package.json:
11+
//"browserify-shim": {
12+
// "jquery": "$"
13+
//},
14+
15+
// And add jQuery to your dependencies in bower.json:
16+
//"jquery": "~2.1.1"

‎app/_includes/head.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<title>{% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>
77
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
88

9-
<link rel="stylesheet" href="{{ "/assets/css/main.css" | prepend: site.baseurl }}">
9+
<link rel="stylesheet" href="{{ '/assets/css/main.css' | prepend: site.baseurl }}">
1010
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
1111
<script src="{{ '/assets/js/head.js' | prepend: site.baseurl }}"></script>
12-
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">
12+
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ '/feed.xml' | prepend: site.baseurl | prepend: site.url }}">
1313
</head>

‎bower.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
22
"name": "gulp-jekyll",
33
"private": true,
4-
"dependencies": {
5-
"jquery": "~2.1.1"
6-
}
4+
"dependencies": {}
75
}

‎gulp/config.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,6 @@ module.exports = {
9393
options: {
9494
precss: {},
9595
autoprefixer: {
96-
browsers: [
97-
'last 2 versions',
98-
'ie 9',
99-
'android 4'
100-
],
10196
cascade: true
10297
},
10398
mqpacker: { sort: true }
@@ -255,6 +250,7 @@ module.exports = {
255250
dest: productionAssets + '/css/',
256251
options: {
257252
uncss: {
253+
htmlroot: production,
258254
html: [
259255
production + '/**/*.html'
260256
],

‎gulp/tasks/development/styles.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@ var mqpacker = require('css-mqpacker');
88
var cssnano = require('cssnano');
99
var plumber = require('gulp-plumber');
1010
var sourcemaps = require('gulp-sourcemaps');
11-
var gutil = require('gulp-util');
1211
var browsersync = require('browser-sync');
1312

1413
function onError (err) {
15-
gutil.beep();
1614
console.log(err);
1715
this.emit('end');
1816
}

‎gulp/tasks/development/watch.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ var gulp = require('gulp');
99
gulp.task('watch', ['browsersync'], function() {
1010
gulp.watch(config.jekyll, ['jekyll-rebuild']);
1111
gulp.watch(config.styles, ['styles', 'lint-styles']);
12-
gulp.watch(config.scripts, ['scripts-browserify', 'lintJs']);
12+
gulp.watch(config.scripts, ['scripts-browserify', 'lint-js']);
1313
gulp.watch(config.images, ['images']);
1414
//gulp.watch(config.svg, ['copy:fonts']);
1515
//gulp.watch(config.sprites, ['sprites']);

‎gulp/tasks/production/build.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ gulp.task('build:production', function(callback) {
3737
'optimize:css',
3838
'lint-json'
3939
],
40-
//'revision',
41-
//'rev:collect',
40+
'revision',
41+
'rev:collect',
4242
// [
4343
// 'webp'
4444
// 'gzip'

‎gulp/tasks/production/styles.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@ var autoprefixer = require('autoprefixer');
77
var mqpacker = require('css-mqpacker');
88
var cssnano = require('cssnano');
99
var plumber = require('gulp-plumber');
10-
var gutil = require('gulp-util');
1110
var browsersync = require('browser-sync');
1211

1312
function onError (err) {
14-
gutil.beep();
1513
console.log(err);
1614
this.emit('end');
1715
}

0 commit comments

Comments
 (0)