Merge pull request #15 from doubleo2/master

Update ALL the things!

.nvmrc

@@ -1 +1 @@
-v8.17.0
+v14.18.0

Gemfile

@@ -8,15 +8,15 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem "jekyll", "3.5.0"
+gem "jekyll", "4.2.1"
 
 # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
 # uncomment the line below. To upgrade, run `bundle update github-pages`.
 # gem "github-pages", group: :jekyll_plugins
 
 # If you have any plugins, put them here!
 group :jekyll_plugins do
-   gem "jekyll-feed", "~> 0.6"
+   gem "jekyll-feed"
    gem 'jekyll-sitemap'
    gem 'jekyll-seo-tag'
    gem 'octopress-minify-html'

Gemfile.lock

@@ -1,104 +1,124 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    amp-jekyll (1.0.2)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    amp-jekyll (1.0.3)
       fastimage (>= 1.8.0)
-      jekyll (~> 3.0)
+      jekyll (>= 3.0, < 5.0)
       nokogiri (>= 1.6.0)
     colorator (1.1.0)
+    concurrent-ruby (1.1.9)
     css_press (0.3.2)
       csspool-st (= 3.1.2)
       json
     csspool-st (3.1.2)
-    execjs (2.7.0)
-    fastimage (2.1.3)
-    ffi (1.9.25)
-    ffi (1.9.25-x64-mingw32)
+    em-websocket (0.5.2)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    eventmachine (1.2.7)
+    eventmachine (1.2.7-x64-mingw32)
+    execjs (2.8.1)
+    fastimage (2.2.5)
+    ffi (1.15.4)
+    ffi (1.15.4-x64-mingw32)
     forwardable-extended (2.6.0)
     html_press (0.8.2)
       htmlentities
       multi_css (>= 0.1.0)
       multi_js (>= 0.1.0)
     htmlentities (4.3.4)
-    jekyll (3.5.0)
+    http_parser.rb (0.6.0)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    jekyll (4.2.1)
       addressable (~> 2.4)
       colorator (~> 1.0)
-      jekyll-sass-converter (~> 1.0)
-      jekyll-watch (~> 1.1)
-      kramdown (~> 1.3)
+      em-websocket (~> 0.5)
+      i18n (~> 1.0)
+      jekyll-sass-converter (~> 2.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3.3)
+      mercenary (~> 0.4.0)
       pathutil (~> 0.9)
-      rouge (~> 1.7)
+      rouge (~> 3.0)
       safe_yaml (~> 1.0)
-    jekyll-feed (0.10.0)
-      jekyll (~> 3.3)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
-    jekyll-seo-tag (2.5.0)
-      jekyll (~> 3.3)
-    jekyll-sitemap (1.2.0)
-      jekyll (~> 3.3)
-    jekyll-watch (1.5.1)
+      terminal-table (~> 2.0)
+    jekyll-feed (0.15.1)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-sass-converter (2.1.0)
+      sassc (> 2.0.1, < 3.0)
+    jekyll-seo-tag (2.7.1)
+      jekyll (>= 3.8, < 5.0)
+    jekyll-sitemap (1.4.0)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-watch (2.2.1)
       listen (~> 3.0)
-    json (2.1.0)
-    kramdown (1.17.0)
-    liquid (4.0.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    mercenary (0.3.6)
-    mini_portile2 (2.3.0)
+    json (2.5.1)
+    kramdown (2.3.1)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    liquid (4.0.3)
+    listen (3.7.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    mercenary (0.4.0)
+    mini_portile2 (2.6.1)
     multi_css (0.1.0)
       css_press
     multi_js (0.1.0)
       uglifier (~> 2)
-    nokogiri (1.8.4)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    nokogiri (1.12.5-x64-mingw32)
+      racc (~> 1.4)
     octopress-hooks (2.6.2)
       jekyll (>= 2.0)
     octopress-minify-html (1.3.1)
       html_press (~> 0.8)
       jekyll (>= 2.0)
       octopress-hooks
-    pathutil (0.16.1)
+    pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (3.0.3)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    rouge (1.11.1)
-    ruby_dep (1.5.0)
-    safe_yaml (1.0.4)
-    sass (3.5.7)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    tzinfo-data (1.2018.5)
+    public_suffix (4.0.6)
+    racc (1.5.2)
+    rb-fsevent (0.11.0)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rexml (3.2.5)
+    rouge (3.26.1)
+    safe_yaml (1.0.5)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sassc (2.4.0-x64-mingw32)
+      ffi (~> 1.9)
+    terminal-table (2.0.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    tzinfo-data (1.2021.2)
       tzinfo (>= 1.0.0)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    unicode-display_width (1.8.0)
 
 PLATFORMS
   ruby
   x64-mingw32
 
 DEPENDENCIES
   amp-jekyll
-  jekyll (= 3.5.0)
-  jekyll-feed (~> 0.6)
+  jekyll (= 4.2.1)
+  jekyll-feed
   jekyll-seo-tag
   jekyll-sitemap
   octopress-minify-html
   tzinfo-data
 
 BUNDLED WITH
-   1.16.4
+   1.17.2

_src/index.js

@@ -1,7 +1,7 @@
 // CSS and SASS files
 import './index.scss';
 
-import Tobi from 'rqrauhvmra__tobi'
+import { default as Tobi } from '@midzer/tobii'
 const tobi = new Tobi()
 
 // Remove the two following lines to remove the product hunt floating prompt

_src/index.scss

@@ -1,3 +1,3 @@
 @import 'normalize.css';
-@import '../node_modules/rqrauhvmra__tobi/css/tobi.css';
-@import '../_scss/default';
+@import '../node_modules/@midzer/tobii/src/scss/tobii.scss';
+@import '../_scss/default';

config/sw.config.js

@@ -1,15 +1,18 @@
 module.exports = {
-  staticFileGlobs: [
-    '_site/assets/**.css',
-    '_site/**.html',
-	'_site/**/**.html',
-    '_site/assets/images/**.*',
-    '_site/assets/**.js',
+  swDest: '_site/service-worker.js',
+  globPatterns: [
+    'assets/**.css',
+    '**.html',
+    '**/**.html',
+    'assets/images/**.*',
+    'assets/**.js',
   ],
-  stripPrefix: '_site/',
+  modifyURLPrefix: {
+    '_site/': ''
+  },
   runtimeCaching: [{
     urlPattern: '/',
-    handler: 'networkFirst',
+    handler: 'NetworkFirst',
   }],
-  root: '_site',
+  globDirectory: '_site',
 };

config/webpack.common.js

@@ -1,7 +1,7 @@
 /* eslint-disable import/no-extraneous-dependencies */
 const path = require('path');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const FaviconsWebpackPlugin = require('favicons-webpack-plugin');
 
@@ -17,11 +17,12 @@ module.exports = {
       template: './_src/template/default.html',
       filename: '../_layouts/default.html',
     }),
-    new ExtractTextPlugin('[name].css'),
-    new CopyWebpackPlugin([{
-      from: path.resolve('_images'),
-      to: 'images/',
-    }]),
+    new MiniCssExtractPlugin(),
+    new CopyWebpackPlugin({
+      patterns:[
+        { from: path.resolve('_images'), to: 'images/', }
+      ]
+    }),
   ],
   module: {
     rules: [
@@ -31,27 +32,25 @@ module.exports = {
         use: {
           loader: 'babel-loader',
           options: {
-            presets: ['env'],
+            presets: ['@babel/preset-env'],
           },
         },
       },
       {
         test: /\.(css|scss)$/,
-        use: ExtractTextPlugin.extract({
-          fallback: 'style-loader',
-          use: [
-            { loader: 'css-loader', options: { importLoaders: 1 } },
-            {
-              loader: 'postcss-loader',
-              options: {
-                config: {
-                  path: 'config/postcss.config.js',
-                },
-              },
+        use: [
+          MiniCssExtractPlugin.loader,
+          { loader: 'css-loader', options: { importLoaders: 1, url: false } },
+          {
+            loader: 'postcss-loader',
+            options: {
+              postcssOptions: {
+                config: 'config/postcss.config.js',
+              }
             },
-            { loader: 'sass-loader' },
-          ],
-        }),
+          },
+          { loader: 'sass-loader' },
+        ],
       },
       {
         test: /\.(png|svg|jpg|gif)$/,

config/webpack.dev.js

@@ -1,5 +1,5 @@
 /* eslint-disable import/no-extraneous-dependencies */
-const Merge = require('webpack-merge');
+const { merge: Merge } = require('webpack-merge');
 const CommonConfig = require('./webpack.common.js');
 const path = require('path');
 const BrowserSyncPlugin = require('browser-sync-webpack-plugin');
@@ -28,9 +28,9 @@ module.exports = Merge(CommonConfig, {
   ],
   module: {},
   devServer: {
-    contentBase: [
-      path.resolve('_site'),
-    ],
+    static: {
+      directory: path.resolve('_site'),
+    },
     hot: true,
   },
 });

config/webpack.prod.js

@@ -1,34 +1,32 @@
 /* eslint-disable import/no-extraneous-dependencies */
-const Merge = require('webpack-merge');
+const { merge: Merge } = require('webpack-merge');
 const CommonConfig = require('./webpack.common.js');
 const path = require('path');
 const webpack = require('webpack');
-const CleanWebpackPlugin = require('clean-webpack-plugin');
+const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 const ImageminPlugin = require('imagemin-webpack-plugin').default;
+const TerserPlugin = require("terser-webpack-plugin");
 
 module.exports = Merge(CommonConfig, {
   output: {
     filename: '[name]-[hash].bundle.js',
     path: path.resolve('assets'),
     publicPath: '/assets/',
   },
+  optimization: {
+    minimize: true,
+    minimizer: [new TerserPlugin({
+      terserOptions: {
+        keep_fnames: true
+      }
+    })]
+  },
   plugins: [
-    new CleanWebpackPlugin(['assets'], { root: path.resolve(__dirname, '..'), verbose: true }),
+    new CleanWebpackPlugin({ cleanOnceBeforeBuildPatterns: ['assets'], verbose: true }),
     new webpack.LoaderOptionsPlugin({
       minimize: true,
       debug: false,
     }),
-    new webpack.optimize.UglifyJsPlugin({
-      beautify: false,
-      mangle: {
-        screw_ie8: true,
-        keep_fnames: true,
-      },
-      compress: {
-        screw_ie8: true,
-      },
-      comments: false,
-    }),
     new ImageminPlugin({ test: /\.(jpe?g|png|gif|svg)$/i }),
   ],
 });

config/webpack.pwa.js

@@ -1,5 +1,5 @@
 /* eslint-disable import/no-extraneous-dependencies */
-const Merge = require('webpack-merge');
+const { merge: Merge } = require('webpack-merge');
 const ProdConfig = require('./webpack.prod.js');
 const path = require('path');
 const WebpackPwaManifest = require('webpack-pwa-manifest');