Update to Jekyll Assets 3

.gitignore

@@ -1,5 +1,5 @@
-/.asset-cache/
 /.bundle/
+/.jekyll-cache/
 /.yardoc
 /Gemfile.lock
 /_site/

.ruby-version

@@ -1 +1 @@
-2.4.1
+2.4.3

README.md

@@ -11,7 +11,7 @@ Used tools:
   - [Circle CI](https://circleci.com/)
   - [Html-proofer](https://github.com/gjtorikian/html-proofer)
   - [Jekyll](http://jekyllrb.com/)
-  - [Jekyll assets](https://github.com/jekyll/jekyll-assets)
+  - [Jekyll Assets](https://github.com/jekyll/jekyll-assets)
   - [Jekyll Sitemap](https://github.com/jekyll/jekyll-sitemap)
   - [HTML5 Boilerplate](https://html5boilerplate.com/) (Influenced by)
   - [Yarn](https://yarnpkg.com)

circle.yml

@@ -1,8 +1,8 @@
 machine:
   ruby:
-    version: 2.4.1
+    version: 2.4.3
   node:
-    version: 8.2.1
+    version: 8.9.3
 
 dependencies:
   pre:

lib/kickster/version.rb

@@ -1,3 +1,3 @@
 module Kickster
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

template/.gitignore

@@ -8,7 +8,6 @@ Thumbs.db
 *.sass-cache
 /_assets/yarn/
 /_site/
-/.asset-cache/
-/node_modules/
+/.jekyll-cache/
 Gemfile.lock
 yarn.lock

template/Gemfile

@@ -2,9 +2,13 @@ source "https://rubygems.org"
 
 gem "autoprefixer-rails"
 gem "html-proofer"
+gem "image_optim"
 gem "jekyll"
 gem "jekyll-assets"
+gem "jekyll-paginate"
 gem "jekyll-sitemap"
+gem "jemoji"
 gem "mini_magick"
 gem "sass"
+gem "sprockets", "4.0.0.beta6"
 gem "uglifier"

template/_config.yml.tt

@@ -1,12 +1,9 @@
 assets:
-  compress:
-      css: true
-      js: true
-  features:
-    automatic_img_size: false
+  plugins:
+    css: { autoprefixer: {}}
+    img: { optim: {}}
+  source_maps: false
   sources:
-    - _assets/fonts
-    - _assets/images
     - _assets/javascripts
     - _assets/stylesheets
     - _assets/yarn
@@ -19,6 +16,7 @@ exclude:
   - Gemfile.lock
   - package.json
   - README.md
+  - yarn.lock
 
 ga_analytics: # Add Google Analytics tracking code
 

template/_includes/head.html

@@ -10,15 +10,15 @@
   <meta property="og:url" content="{{ page.url | absolute_url }}">
   <meta property="og:description" content="{{ page.description }}">
   <meta property="og:site_name" content="{{ site.name }}">
-  <meta property="og:image" content="{{ site.url }}{% asset_path og-image.jpg %}">
+  <meta property="og:image" content="{{ site.url }}{% asset og-image.jpg @path %}">
 
   <meta name="twitter:card" content="summary">
   <meta name="twitter:url" content="{{ page.url | absolute_url }}">
   <meta name="twitter:title" content="{{ page.title }}">
   <meta name="twitter:description" content="{{ page.description }}">
-  <meta name="twitter:image" content="{{ site.url }}{% asset_path og-image.jpg %}">
+  <meta name="twitter:image" content="{{ site.url }}{% asset og-image.jpg @path %}">
 
-  <link rel="apple-touch-icon" href="{% asset_path apple-touch-icon.png %}">
+  <link rel="apple-touch-icon" href="{% asset apple-touch-icon.png @path %}">
 
-  {% stylesheet application %}
+  {% asset application.css %}
 </head>

template/_includes/javascripts.html

@@ -1,10 +1,12 @@
-{% javascript vendor %}
-{% javascript application %}
-
 {% if site.ga_analytics %}
+  <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.ga_analytics }}"></script>
   <script>
-    window.ga=function(){ga.q.push(arguments)};ga.q=[];ga.l=+new Date;
-    ga('create','{{ site.ga_analytics }}','auto');ga('send','pageview')
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments);}
+    gtag('js', new Date());
+    gtag('config', '{{ site.ga_analytics }}');
   </script>
-  <script src="https://www.google-analytics.com/analytics.js" async defer></script>
 {% endif %}
+
+{% asset vendor.js %}
+{% asset application.js %}

template/circle.yml

@@ -1,8 +1,6 @@
 machine:
   ruby:
-    version: 2.4.1
-  node:
-    version: 8.2.1
+    version: 2.4.3
 
 dependencies:
   pre: