ultimate-jekyll-manager 0.0.36 → 0.0.38

package/README.md

@@ -57,7 +57,27 @@ npm start -- --debug=true
 ```
 * `--ujPluginDevMode=true` - Enables the development mode for the [Ultimate Jekyll Ruby plugin](https://github.com/itw-creative-works/jekyll-uj-powertools).
 ```bash
+npm start -- --ujPluginDevMode=true
+```
+
+## Running Specific Tasks
+You can run specific tasks using the `npm run gulp` command with the appropriate task name.
+
+Some of these require environment variables to be set and other tasks to be run first.
 
+Here are some examples:
+
+### Run the `audit` task:
+```bash
+npx uj audit
+```
+
+### Run the `translation` task:
+```bash
+GH_TOKEN=XXX \
+GITHUB_REPOSITORY=XXX \
+npx uj translation
+```
 <!-- Developing -->
 ## 🛠 Developing
 1. Clone the repo to your local machine.

package/dist/cli.js

@@ -10,6 +10,9 @@ const ALIASES = {
   install: ['-i', 'i', '--install'],
   setup: ['-s', '--setup'],
   version: ['-v', '--version'],
+  // Tasks
+  audit: ['-a', '--audit'],
+  translation: ['-t', '--translation'],
 };
 
 // Function to resolve command name from aliases

package/dist/commands/audit.js

@@ -0,0 +1,15 @@
+// Libraries
+const Manager = new (require('../build.js'));
+const logger = Manager.logger('audit');
+const { execute } = require('node-powertools');
+
+// Load package
+const package = Manager.getPackage('main');
+const project = Manager.getPackage('project');
+
+module.exports = async function (options) {
+  // Log
+  logger.log(`Starting audit...`);
+
+  await execute('UJ_FORCE_AUDIT=true bundle exec npm run gulp -- audit', { log: true })
+};

package/dist/commands/translation.js

@@ -0,0 +1,15 @@
+// Libraries
+const Manager = new (require('../build.js'));
+const logger = Manager.logger('translation');
+const { execute } = require('node-powertools');
+
+// Load package
+const package = Manager.getPackage('main');
+const project = Manager.getPackage('project');
+
+module.exports = async function (options) {
+  // Log
+  logger.log(`Starting translation...`);
+
+  await execute('UJ_FORCE_TRANSLATION=true bundle exec npm run gulp -- translation', { log: true })
+};

package/dist/defaults/dist/_includes/main/global/body.html

@@ -0,0 +1,33 @@
+<!-- Alerts -->
+<!-- Master - Outdated Alert Box -->
+<div
+  class="main-alert main-alert-top main-alert-fixed main-alert-outdated bg-danger animation-fade-in"
+  role="alert" aria-live="polite" aria-label="Outdated browser"
+  hidden>
+  <span class="main-alert-close">&times;</span>
+  <div>
+    <i class="fa-solid fa-warning fa-bounce me-2"></i>
+    You are using an outdated browser that our site <strong>DOES NOT</strong> support. Please <a href="https://www.google.com/chrome" rel="nofollow" target="_blank">click here</a> to update your browser.
+  </div>
+</div>
+<div
+  class="main-alert main-alert-top main-alert-fixed main-alert-suspended bg-danger animation-fade-in"
+  role="alert" aria-live="polite" aria-label="Payment method issue"
+  hidden>
+  <span class="main-alert-close">&times;</span>
+  <div>
+    <i class="fa-solid fa-warning fa-bounce me-2"></i>
+    There is a <strong>problem with your payment method</strong>. To continue using <strong>{{ site.brand.name }}</strong>, please <a href="{{ site.url }}/account#billing" target="_blank">update your payment method</a>.
+  </div>
+</div>
+<div
+  class="main-alert main-alert-top main-alert-fixed main-alert-sale bg-primary animation-fade-in"
+  role="alert" aria-live="polite" aria-label="Flash sale"
+  hidden>
+  <span class="main-alert-close">&times;</span>
+  <div>
+    <i class="fa-solid fa-stopwatch fa-beat me-2"></i>
+    <strong>FLASH SALE!</strong>
+    Save <strong>15%</strong> at checkout—today only! <a href="{{ site.url }}/pricing" target="_blank">Claim discount</a>.
+  </div>
+</div>

package/dist/defaults/dist/_includes/main/global/head.html

@@ -11,34 +11,34 @@
 {% endif %}
 
 <!-- Prefetch -->
-<link rel="dns-prefetch" href="https://fonts.googleapis.com">
-<link rel="dns-prefetch" href="https://fonts.gstatic.com" crossorigin>
-<link rel="dns-prefetch" href="https://cdn.jsdelivr.net">
-<link rel="dns-prefetch" href="https://cdnjs.cloudflare.com">
+<link rel="dns-prefetch" href="https://fonts.googleapis.com"/>
+<link rel="dns-prefetch" href="https://fonts.gstatic.com" crossorigin/>
+<link rel="dns-prefetch" href="https://cdn.jsdelivr.net"/>
+<link rel="dns-prefetch" href="https://cdnjs.cloudflare.com"/>
 
 <!-- Meta -->
-<meta charset="utf-8">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+<meta charset="utf-8"/>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
 {% if site.meta.viewport != '' and site.meta.viewport != false and site.meta.viewport != null %}
-  <meta name="viewport" content="{{ site.meta.viewport }}">
+  <meta name="viewport" content="{{ site.meta.viewport }}"/>
 {% else %}
   <!-- <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no, minimum-scale=1, maximum-scale=5"> --> <!-- DISABLED 4/8/23 to prevent auto-zooming on text fields -->
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no"/>
 {% endif %}
-<meta name="HandheldFriendly" content="True">
-<meta name="MobileOptimized" content="320">
-<meta name="generator" content="Ultimate Jekyll">
+<meta name="HandheldFriendly" content="True"/>
+<meta name="MobileOptimized" content="320"/>
+<meta name="generator" content="Ultimate Jekyll"/>
 
 <!-- Referrer -->
-<meta name="referrer" content="{{ page.meta.referrer | default: layout.meta.referrer | default: site.meta.referrer | default: 'strict-origin-when-cross-origin' }}">
+<meta name="referrer" content="{{ page.meta.referrer | default: layout.meta.referrer | default: site.meta.referrer | default: 'strict-origin-when-cross-origin' }}"/>
 
 <!-- Canonical -->
-<link rel="canonical" href="{{ site.url }}{{ page-url-stripped }}">
+<link rel="canonical" href="{{ site.url }}{{ page-url-stripped }}"/>
 
 <!-- Robots -->
 {%- if page.meta.index == false or layout.meta.index == false or site.meta.index == false -%}
-  <meta name="robots" content="noindex">
+  <meta name="robots" content="noindex"/>
 {% endif %}
 
 <!-- Keywords -->
@@ -49,10 +49,10 @@
 {%- else -%}
   {% assign page-keywords = '' %}
 {%- endif -%}
-<meta name="keywods" content="{{ page-keywords }}">
+<meta name="keywords" content="{{ page-keywords }}"/>
 
 <!-- Manifest.json -->
-<link rel="manifest" href="{{ site.url }}/manifest.json">
+<link rel="manifest" href="{{ site.url }}/manifest.json"/>
 
 <!-- Title -->
 {%- if page-is-post and page.post.title != null and page.post.title != '' -%}
@@ -65,8 +65,8 @@
   {% assign page-title = site.meta.title | liquify %}
 {%- endif -%}
 <title>{{ page-title }}</title>
-<meta name="twitter:title" content="{{ page-title }}">
-<meta property="og:title" content="{{ page-title }}">
+<meta name="twitter:title" content="{{ page-title }}"/>
+<meta property="og:title" content="{{ page-title }}"/>
 
 <!-- Description -->
 {%- if page-is-post and page.post.excerpt != null and page.post.excerpt != '' -%}
@@ -78,9 +78,9 @@
 {%- else -%}
   {% assign page-description = site.meta.description | liquify %}
 {%- endif -%}
-<meta name="description" content="{{ page-description }}">
-<meta name="twitter:description" content="{{ page-description }}">
-<meta property="og:description" content="{{ page-description }}">
+<meta name="description" content="{{ page-description }}"/>
+<meta name="twitter:description" content="{{ page-description }}"/>
+<meta property="og:description" content="{{ page-description }}"/>
 
 <!-- Image -->
 {%- if page-is-post and page.post.id != null and page.post.id != '' -%}
@@ -90,30 +90,29 @@
 {%- else -%}
   {% capture page-image %}{%- if site.meta.og-image contains '://' -%}{%- else -%}{{ site.url }}/assets/images/og{%- endif -%}{{ site.meta.og-image }}{% endcapture %}
 {%- endif -%}
-<meta name="twitter:image" content="{{ page-image }}">
-<meta property="og:image" content="{{ page-image }}">
+<meta name="twitter:image" content="{{ page-image }}"/>
+<meta property="og:image" content="{{ page-image }}"/>
 
 <!-- OG: Twitter -->
-<meta name="twitter:card" content="summary">
-<meta name="twitter:site" content="@{{ site.socials.twitter }}">
-<meta name="twitter:widgets:theme" content="light">
+<meta name="twitter:card" content="summary"/>
+<meta name="twitter:site" content="@{{ site.socials.twitter }}"/>
+<meta name="twitter:widgets:theme" content="light"/>
 
 <!-- OG: Facebook / Open Graph -->
-<meta property="og:url" content="{{ site.url }}{{ page-url-stripped }}">
+<meta property="og:url" content="{{ site.url }}{{ page-url-stripped }}"/>
 {%- if page-is-post -%}
   {% assign og-type = 'article' %}
 {%- else -%}
   {% assign og-type = 'website' %}
 {%- endif -%}
-<meta property="og:type" content="{{ og-type }}">
+<meta property="og:type" content="{{ og-type }}"/>
 
 <!-- Main Feed -->
-<link href="{{ site.url }}/feeds/posts.xml" type="application/atom+xml" rel="alternate" title="{{ site.brand.name }} Feed">
+<link href="{{ site.url }}/feeds/posts.xml" type="application/atom+xml" rel="alternate" title="{{ site.brand.name }} Feed"/>
 
 <!-- Language Tags -->
-<link rel="alternate" href="{{ site.url }}{{ page-url-stripped }}" hreflang="x-default">
-<link rel="alternate" href="{{ site.url }}{{ page-url-stripped }}" hreflang="en">
-<!-- <link rel="alternate" href="{{ site.url }}/es/{{ page-url-stripped }}" hreflang="es"> -->
+<link rel="alternate" href="{{ site.url }}{{ page-url-stripped }}" hreflang="x-default"/>
+<link rel="alternate" href="{{ site.url }}{{ page-url-stripped }}" hreflang="{{ site.translation.default |  default: 'en' }}"/>
 
 <!-- Favicon -->
 {%- if site.favicon.path != null and site.favicon.path != '' -%}
@@ -121,24 +120,24 @@
 {%- else -%}
   {% assign favicon-path = site.url | append: '/assets/images/favicon' %}
 {%- endif -%}
-<link rel="apple-touch-icon" sizes="180x180" href="{{ favicon-path }}/apple-touch-icon.png?cb={{ site.uj.cache_breaker }}">
-<link rel="icon" type="image/png" sizes="32x32" href="{{ favicon-path }}/favicon-32x32.png?cb={{ site.uj.cache_breaker }}">
-<link rel="icon" type="image/png" sizes="16x16" href="{{ favicon-path }}/favicon-16x16.png?cb={{ site.uj.cache_breaker }}">
-<link rel="mask-icon" href="{{ favicon-path }}/safari-pinned-tab.svg" color="{{ site.favicon.safari-pinned-tab }}">
-<link rel="shortcut icon" type="image/x-icon" href="{{ favicon-path }}/favicon.ico?cb={{ site.uj.cache_breaker }}">
-<meta name="msapplication-TileColor" content="{{ site.favicon.msapp-tile-color }}">
-<meta name="msapplication-config" content="{{ favicon-path }}/browserconfig.xml?cb={{ site.uj.cache_breaker }}">
-<meta name="theme-color" content="{{ site.favicon.theme-color }}">
+<link rel="apple-touch-icon" sizes="180x180" href="{{ favicon-path }}/apple-touch-icon.png?cb={{ site.uj.cache_breaker }}"/>
+<link rel="icon" type="image/png" sizes="32x32" href="{{ favicon-path }}/favicon-32x32.png?cb={{ site.uj.cache_breaker }}"/>
+<link rel="icon" type="image/png" sizes="16x16" href="{{ favicon-path }}/favicon-16x16.png?cb={{ site.uj.cache_breaker }}"/>
+<link rel="mask-icon" href="{{ favicon-path }}/safari-pinned-tab.svg" color="{{ site.favicon.safari-pinned-tab }}"/>
+<link rel="shortcut icon" type="image/x-icon" href="{{ favicon-path }}/favicon.ico?cb={{ site.uj.cache_breaker }}"/>
+<meta name="msapplication-TileColor" content="{{ site.favicon.msapp-tile-color }}"/>
+<meta name="msapplication-config" content="{{ favicon-path }}/browserconfig.xml?cb={{ site.uj.cache_breaker }}"/>
+<meta name="theme-color" content="{{ site.favicon.theme-color }}"/>
 
 <!-- Browser Support -->
 <!--[if lte IE 9]>
-  <link rel="stylesheet" type="text/css" href="/assets/css/main/lte-ie9.css?cb={{ site.uj.cache_breaker }}">
+  <link rel="stylesheet" type="text/css" href="/assets/css/main/lte-ie9.css?cb={{ site.uj.cache_breaker }}"/>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.min.js"></script>
 <![endif]-->
 
 <!-- CSS Bundle -->
-<link rel="stylesheet" type="text/css" href="{{ site.url }}/assets/css/main.bundle.css?cb={{ site.uj.cache_breaker }}">
+<link rel="stylesheet" type="text/css" href="{{ site.url }}/assets/css/main.bundle.css?cb={{ site.uj.cache_breaker }}"/>
 
 <!-- Style - Scripts are Disabled -->
 <noscript>
@@ -149,40 +148,6 @@
   </style>
 </noscript>
 
-<!-- Alerts -->
-<!-- Master - Outdated Alert Box -->
-<div
-  class="main-alert main-alert-top main-alert-fixed main-alert-outdated bg-danger animation-fade-in"
-  role="alert" aria-live="polite" aria-label="Outdated browser"
-  hidden>
-  <span class="main-alert-close">&times;</span>
-  <div>
-    <i class="fa-solid fa-warning fa-bounce me-2"></i>
-    You are using an outdated browser that our site <strong>DOES NOT</strong> support. Please <a href="https://www.google.com/chrome" rel="nofollow" target="_blank">click here</a> to update your browser.
-  </div>
-</div>
-<div
-  class="main-alert main-alert-top main-alert-fixed main-alert-suspended bg-danger animation-fade-in"
-  role="alert" aria-live="polite" aria-label="Payment method issue"
-  hidden>
-  <span class="main-alert-close">&times;</span>
-  <div>
-    <i class="fa-solid fa-warning fa-bounce me-2"></i>
-    There is a <strong>problem with your payment method</strong>. To continue using <strong>{{ site.brand.name }}</strong>, please <a href="{{ site.url }}/account#billing" target="_blank">update your payment method</a>.
-  </div>
-</div>
-<div
-  class="main-alert main-alert-top main-alert-fixed main-alert-sale bg-primary animation-fade-in"
-  role="alert" aria-live="polite" aria-label="Flash sale"
-  hidden>
-  <span class="main-alert-close">&times;</span>
-  <div>
-    <i class="fa-solid fa-stopwatch fa-beat me-2"></i>
-    <strong>FLASH SALE!</strong>
-    Save <strong>15%</strong> at checkout—today only! <a href="{{ site.url }}/pricing" target="_blank">Claim discount</a>.
-  </div>
-</div>
-
 <!-- App - Head Content -->
 {%- if page.settings.include-app-head == false -%}
 {% elsif layout.settings.include-app-head == false %}

package/dist/defaults/dist/_layouts/main/global/default.html

@@ -8,7 +8,7 @@ layout: null
 
 <!DOCTYPE html>
 <html
-  lang="en"
+  lang="{{ site.translation.default |  default: 'en' }}"
   class="{{ layout.html.class }} {{ page.html.class }}" {{ layout.html.attributes }} {{ page.html.attributes }}
 
   data-theme-id="{{ site.theme.id }}"
@@ -27,6 +27,9 @@ layout: null
     class="{{ layout.body.class }} {{ page.body.class }}" {{ layout.body.attributes }} {{ page.body.attributes }}
     >
 
+    <!-- Head -->
+    {%- include /main/global/body.html -%}
+
     <!-- Header -->
     {%- if page.settings.include-app-header == false -%}
     {% elsif layout.settings.include-app-header == false %}

package/dist/defaults/dist/_layouts/themes/bootstrap/frontend/default.html

@@ -1,7 +1,19 @@
 ---
 ### ALL PAGES ###
-layout: themes/geeks/frontend/default
+layout: main/global/default
 
 ### REGULAR PAGES ###
+
 ---
-{{ content }}
+{%- include /themes/bootstrap/header.html -%}
+
+<!-- ========== MAIN CONTENT ========== -->
+<main>
+  {% if page.extension == '.md' %}
+    {{ content | liquify | markdownify }}
+  {%- else -%}
+    {{ content | liquify }}
+  {%- endif -%}
+</main>
+
+{%- include /themes/bootstrap/footer.html -%}

package/dist/defaults/dist/_layouts/themes/geeks/frontend/default copy.html

@@ -0,0 +1,47 @@
+---
+### ALL PAGES ###
+layout: main/global/default
+
+### REGULAR PAGES ###
+head:
+  pre-bundle-css: '
+    {%- include /themes/geeks/head-pre-bundle.html -%}
+  '
+
+foot:
+  pre-bundle-script: '
+    {%- include /themes/geeks/foot-pre-bundle.html -%}
+  '
+
+settings:
+  include-app-foot: false
+  include-app-head: false
+  include-app-footer: false
+  include-app-header: false
+  include-script-bundle: true
+  include-script-core: true
+  include-css-bundle: false
+  manager-configuration: "
+    {
+      libraries: {
+        cookieconsent: {
+          enabled: true
+        },
+        chatsy: {
+          enabled: true
+        },
+        sentry: {
+          enabled: true
+        }
+      },
+    }
+  "
+---
+{%- include /themes/geeks/header.html -%}
+
+<!-- ========== MAIN CONTENT ========== -->
+<main class="bg-white">
+  {{ content | liquify | markdownify }}
+</main>
+
+{%- include /themes/geeks/footer.html -%}

package/dist/defaults/dist/_layouts/themes/geeks/frontend/default.html

@@ -41,7 +41,11 @@ settings:
 
 <!-- ========== MAIN CONTENT ========== -->
 <main class="bg-white">
-  {{ content | liquify | markdownify }}
+  {% if page.extension == '.md' %}
+    {{ content | liquify | markdownify }}
+  {%- else -%}
+    {{ content | liquify }}
+  {%- endif -%}
 </main>
 
 {%- include /themes/geeks/footer.html -%}

package/dist/defaults/dist/feeds/posts.xml

@@ -3,9 +3,18 @@ layout: null
 permalink: /feeds/posts.xml
 ---
 
-<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom">
+<rss
+  version="2.0"
+  xmlns:dc="http://purl.org/dc/elements/1.1/"
+  xmlns:content="http://purl.org/rss/1.0/modules/content/"
+  xmlns:atom="http://www.w3.org/2005/Atom"
+  >
   <channel>
-    <atom:link href="{{ site.url }}{{ page.url }}" rel="self" type="application/rss+xml" />
+    <atom:link
+      href="{{ site.url }}{{ page.url }}"
+      rel="self"
+      type="application/rss+xml"
+    />
     <title>
       <![CDATA[
         {{ site.brand.name }} Blog

package/dist/defaults/dist/sitemap.xml

@@ -6,7 +6,12 @@ sitemap:
 ---
 
 <?xml version="1.0" encoding="UTF-8"?>
-<urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+<urlset
+  xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
+  xmlns:xhtml="http://www.w3.org/1999/xhtml"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
+  >
   {% assign pages = site.pages %}
   {% assign default-time = site.time | date_to_xmlschema %}
 

package/dist/gulp/main.js

@@ -5,6 +5,7 @@ const argv = Manager.getArguments();
 const { series, parallel, watch } = require('gulp');
 const path = require('path');
 const jetpack = require('fs-jetpack');
+const glob = require('glob').globSync;
 
 // Load package
 const package = Manager.getPackage('main');
@@ -14,7 +15,7 @@ const project = Manager.getPackage('project');
 logger.log('Starting...', argv);
 
 // Load tasks
-const tasks = jetpack.list(path.join(__dirname, 'tasks'));
+const tasks = glob('*.js', { cwd: `${__dirname}/tasks` });
 
 // Init global
 global.tasks = {};
@@ -47,6 +48,7 @@ exports.build = series(
   exports.distribute,
   parallel(exports.sass, exports.webpack, exports.imagemin),
   exports.jekyll,
+  exports.audit,
   exports.translation,
 );
 
@@ -56,6 +58,6 @@ exports.default = series(
   // exports.clean,
   exports.serve,
   exports.build,
-  exports.developmentRebuild,
+  // exports.developmentRebuild,
   // exports.watcher,
 );