Merge pull request #99 from carstene1ns/update/cleanup

Update/Cleanup

.netlify/build.sh

@@ -3,15 +3,11 @@
 set -e
 
 if [ "x$1" == "xredirect" ]; then
-  # remove content
-  rm -rf content
+  # remove pages content
+  find content/ -type f -a \( -name '*.md' -o -name '*.html' \) --delete
 
   # make redirect page default
-  mkdir content
   cp .netlify/redirect.md content/index.md
-
-  # relocate assets
-  sed -r 's#(href|src)="/#\1="https://easyrpg.org/#g' -i layouts/default.slim
 fi
 
 # correct url

Gemfile

@@ -7,7 +7,7 @@ gem 'typogruby'         # text enhancements
 gem 'rouge'             # syntax highlighting
 gem 'slim'              # templates
 gem 'builder'           # xml sitemaps
-gem 'yuicompressor'     # css/js uglifying
+gem 'terser'            # js uglifying
 gem 'ruby-xxHash'       # for cache busting
 
 group :nanoc do

Gemfile.lock

@@ -25,6 +25,7 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
+    execjs (2.9.1)
     ffi (1.16.3)
     google-protobuf (3.25.3-x86_64-linux)
     http_parser.rb (0.8.0)
@@ -126,6 +127,8 @@ GEM
       set (~> 1.0)
     stringio (3.1.0)
     temple (0.10.3)
+    terser (1.2.2)
+      execjs (>= 0.3.0, < 3)
     tilt (2.3.0)
     tty-color (0.6.0)
     tty-command (0.10.1)
@@ -139,7 +142,6 @@ GEM
       nokogiri (~> 1.6)
       rexml (~> 3.2)
     webrick (1.8.1)
-    yuicompressor (1.3.3)
     zeitwerk (2.6.13)
 
 PLATFORMS
@@ -157,9 +159,9 @@ DEPENDENCIES
   rouge
   ruby-xxHash
   slim
+  terser
   typogruby
   w3c_validators
-  yuicompressor
 
 RUBY VERSION
    ruby 3.0.5p211

Rules

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
 
-require 'ruby-xxhash'
-
 preprocess do
-  hide_items_from_sitemap
+  write_sitemap_file
 end
 
+# all pages
 compile '/**/*.{html,md}' do
   filter :erb
   filter :kramdown, auto_ids: false if item.identifier =~ '/**/*.md'
@@ -17,52 +16,53 @@ compile '/**/*.{html,md}' do
   filter :tidy if @config[:prod]
 end
 
-compile '/{css/*.scss,js/*.js}' do
-  ext = "." + item.identifier.ext
-  if ext == '.scss'
-    filter :dart_sass, {
-      :syntax => :scss,
-      :style => (@config[:prod] ? :compressed : :expanded)
-    }
-    ext = ".css"
+# home and error page
+route '/*.{html,md}' do
+  item.identifier.without_ext + '.html'
+end
+
+route '/**/*.{html,md}' do
+  # section home
+  if item.identifier =~ '**/index.*'
+    item.identifier.without_ext + ".html"
+  # every other page
+  else
+    item.identifier.without_ext + '/index.html'
   end
+end
 
-  # compress and use a hash to avoid caching issues
+ignore '/css/{vendor,bits}/*'
+compile '/css/*.scss' do
+  filter :dart_sass, :style => (@config[:prod] ? :compressed : :expanded)
+end
+
+compile '/js/*.js' do
   if @config[:prod]
-    filter :yui_compressor, :type => :js if ext == ".js"
-    checksum = XXhash.xxh32(File.read(item[:filename]), 0xEA51)
-    write item.identifier.without_ext + '-' + checksum.to_s + ".min" + ext
+    filter :terser
+  end
+end
+
+route '/{js/*.js,css/*.scss}' do
+  ext = item.identifier.ext == 'scss' ? '.css' : '.' + item.identifier.ext
+  if @config[:prod]
+    item.identifier.without_ext + '-' + asset_hash(item) + '.min' + ext
   else
-    write item.identifier.without_ext + ext
+    item.identifier.without_ext + ext
   end
 end
-ignore '/css/**/*'
 
 compile '/sitemap.xml' do
   filter :erb
   write '/sitemap.xml'
 end
 
-compile '/htaccess.txt' do
-  write '/.htaccess'
-end
-
-route '/**/*.{html,md}' do
-  # homepage
-  if item.identifier =~ '/index.*'
-    '/index.html'
-  # error page
-  elsif item.identifier =~ '/404.*'
-    '/404.html'
-  # section home
-  elsif item.identifier =~ '**/index.*'
-    item.identifier.without_ext + ".html"
-  # every other page
-  else
-    item.identifier.without_ext + '/index.html'
-  end
+# duplicate some files
+compile '/ads.txt' do
+  write item.identifier
+  write "/app-ads.txt"
 end
 
+# copy the rest over
 passthrough '/**/*'
 
 layout '/**/*.slim', :slim, {

content/browserconfig.xml

@@ -2,7 +2,10 @@
 <browserconfig>
     <msapplication>
         <tile>
-            <square150x150logo src="/mstile-150x150.png"/>
+            <square70x70logo src="/images/icons/mstile-70x70.png"/>
+            <square150x150logo src="/images/icons/mstile-150x150.png"/>
+            <square310x310logo src="/images/icons/mstile-310x310.png"/>
+            <wide310x150logo src="/images/icons/mstile-310x150.png"/>
             <TileColor>#2d631d</TileColor>
         </tile>
     </msapplication>

content/manifest.json → content/site.webmanifest

@@ -1,13 +1,14 @@
 {
-    "name": "EasyRPG",
+    "name": "EasyRPG.org",
+    "short_name": "EasyRPG",
     "icons": [
         {
-            "src": "/android-chrome-192x192.png",
+            "src": "/images/icons/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image/png"
         },
         {
-            "src": "/android-chrome-512x512.png",
+            "src": "/images/icons/android-chrome-512x512.png",
             "sizes": "512x512",
             "type": "image/png"
         }

layouts/default.slim

@@ -10,12 +10,7 @@ html lang="en"
     meta name="description" content="Free and open source role playing game interpreter and editor compatible with RPG Maker 2000 and 2003"
     meta name="viewport" content="width=device-width"
     meta http-equiv="X-UA-Compatible" content="IE=edge"
-    link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"
-    link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"
-    link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png"
-    link rel="manifest" href="/manifest.json"
-    link rel="mask-icon" href="/safari-pinned-tab.svg" color="#2d631d"
-    meta name="theme-color" content="#2d631d"
+    == render '/icons.*'
     link rel="stylesheet" href="#{@items['/css/*'].path}"
     script src="/js/vendor/jquery-2.2.4.min.js"
   body

layouts/icons.slim

@@ -0,0 +1,17 @@
+/ apple
+link rel="apple-touch-icon" sizes="180x180" href="/images/icons/apple-touch-icon.png"
+link rel="mask-icon" href="/images/icons/safari-pinned-tab.svg" color="#5bbad5"
+/ standard compliant
+link rel="icon" type="image/png" sizes="32x32" href="/images/icons/favicon-32x32.png"
+link rel="icon" type="image/png" sizes="194x194" href="/images/icons/favicon-194x194.png"
+link rel="icon" type="image/png" sizes="192x192" href="/images/icons/android-chrome-192x192.png"
+link rel="icon" type="image/png" sizes="16x16" href="/images/icons/favicon-16x16.png"
+meta name="theme-color" content="#2d631d"
+/ android
+link rel="manifest" href="/site.webmanifest"
+/ legacy
+link rel="shortcut icon" href="/favicon.ico"
+/ microsoft
+meta name="msapplication-TileColor" content="#2d631d"
+meta name="msapplication-TileImage" content="/images/icons/mstile-144x144.png"
+meta name="msapplication-config" content="/browserconfig.xml"

lib/asset_hash.rb

@@ -0,0 +1,9 @@
+
+# use a hash to avoid caching issues
+
+require 'ruby-xxhash'
+
+def asset_hash(item)
+  sum = XXhash.xxh32(File.read(@item[:filename]), 0xEA51)
+  return sum.to_s
+end

lib/sitemap.rb

@@ -1,11 +1,15 @@
 
 # generate a sitemap for search engines (http://www.sitemaps.org/)
-include Nanoc::Helpers::XMLSitemap
+use_helper Nanoc::Helpers::XMLSitemap
 
-def hide_items_from_sitemap
-  @items.each do |item|
-    if %w{css scss xml js txt}.include?(item[:extension]) || item.identifier =~ /404/
-      item[:is_hidden] = true if item[:is_hidden].nil?
-    end
+# Return all "content" items (pages that are not hidden) for inclusion
+def content_items
+  @items.select do |item|
+    !item[:is_hidden] && (item[:extension] == '.html' || item.path.to_s.end_with?('/'))
   end
 end
+
+# called by preprocess block
+def write_sitemap_file
+  @items.create("<%= xml_sitemap(items: content_items) %>", {}, '/sitemap.xml')
+end