Merge branch 'main' into patch-1

Author: Hugues Tennier

.eleventy.js

@@ -1,9 +1,8 @@
 const lodashGet = require("lodash/get");
+const yaml = require("js-yaml");
 
 module.exports = function(eleventyConfig) {
-
   // Support yaml data files
-  const yaml = require("js-yaml");
   eleventyConfig.addDataExtension("yaml", contents => yaml.safeLoad(contents))
 
   // pass images directly through to the output
@@ -69,9 +68,37 @@ module.exports = function(eleventyConfig) {
 
   // filter a data array based on the value of a property
   eleventyConfig.addFilter('select', (array, clause) => {
-    const property = clause.split("=")[0];
-    const value = clause.split("=")[1];
-    return array.filter(item => item[property].includes(value));
+    if(clause.indexOf("=") > -1) {
+      const property = clause.split("=")[0];
+      const value = clause.split("=")[1];
+      return array.filter(item => lodashGet(item, property).includes(value));
+    } else {
+      return array.map(item => lodashGet(item, clause));
+    }
+  });
+
+  eleventyConfig.addFilter('flatten', (array) => {
+    let results = [];
+    for(let result of array) {
+      if(result) {
+        if(Array.isArray(result)) {
+          results = [...results, ...result];
+        } else {
+          results.push(result);
+        }
+      }
+    }
+    return results;
+  });
+
+  eleventyConfig.addFilter('unique', (array) => {
+    let caseInsensitive = {};
+    for(let val of array) {
+      if(typeof val === "string") {
+        caseInsensitive[val.toLowerCase()] = val;
+      }
+    }
+    return Object.values(caseInsensitive);
   });
 
   // Get a random selection of items from an array

.github/ISSUE_TEMPLATE/meetup.md

@@ -0,0 +1,63 @@
+---
+name: Start a meetup
+about: Talk to us about starting an official Jamstack meetup
+title: 'Starting a meetup group in [this beautiful city]'
+labels: 'community: new'
+assignees: 'philhawksworth'
+---
+
+You're interested in starting a Jamstack community in your area?
+AMAZING! We're keen to help. 🥳
+
+## Please tell us:
+
+1. **The city or region for you new Jamstack Community**: Jamsville, Australia
+1. **When you plan to hold your first event**: January 1st
+1. **How regulalry you plan to meet**: Every other month
+1. **How else we might be able to help**: Connect us with potential speakers
+
+---
+
+# ✨ But before you do, there are a few things to know✨
+
+Please take a look at this information before submitting your issue.
+
+## Before starting a new community group
+
+1. **[Check if there is already an official community](https://jamstack.org/community) in or near your city** - If so, it would be worth joining and supporting that group before deciding to add another. And the organizers of Jamstack groups are likely to welcome some support.
+1. **Organizing an official group takes some commitment** - We're so excited that you've come this far, and we want you to succeed. We ask orgaizers to aim to hold meetings (physical or virtual) at least 3 times a year.
+
+
+## What you need
+
+1. **An online event space** - Most groups use Meetup.com or Facebook to coordinate their events, but you can use a different tool of your preference. What we encourage is that organizers publish events publicly on a neutral platform.
+1. **A published and actionable code of conduct** - To help the community stay inclusive, safe, and welcoming. 
+
+
+## Where we can help
+
+### Resource kit
+
+We'll provide a resource kit with logos and branded assets for you to use. We'd like you to make use of the official Jamstack logo where approporiate, but don't let us stiffle your creativity. Some meetups have also added their own fun aesthetic and that's great too.
+
+### Links and listings
+
+We'll add a link to your events page to the [community section](https://jamstack.org/community) of the official Jamstack site. And if you provide a feed of your upcoming and previous events, we'll also add your events to the listings.
+
+### Community and support
+
+Each Jamstack community group gets their own channel in the [Jamslack](https://jamstack.org/jamslack) to help coordindate your event and communicate with your local community.
+
+You can also speak to other group organizers and reach us for support via in the Jamslack as members of the private organizers admin channel.
+
+### Code of Conduct
+
+We have [a boilerplate code of conduct]() which you can use as a starting point. Please note that you will need to customise this for you and your group. It is vital that the information about how people can contact you and how action may be taken is correct for your group rather than being generic.
+
+### Content and speakers
+
+Recruiting speakers and putting together compelling content can be one of the biggest challenges for User Group leaders. We encourage you to reach out to your fellow user group leaders via [Slack](https://jamstack.org/slack) for ideas, and even consider partnering with them for virtual events or workshops.
+
+## Jamstack Conf
+
+[Jamstack Conf](https://jamstackconf.com) is an annual event for the global Jamstack community and provides a great opportunity for local community groups to participate, apply for awards, and share their knowledge. Active Jamstack user group leaders receive special incentives and activities during this event, and we're keen to get them more involved in helping shape the event. You can [watch videos](https://www.youtube.com/playlist?list=PL58Wk5g77lF94tg-F3y5zRyDeLVhTDnTg) from recent events to help spur content ideas and identify potential speakers for your meetup

netlify.toml

@@ -17,7 +17,7 @@
 
 [[redirects]]
   from = "/slack"
-  to = "https://join.slack.com/t/jamstack/shared_invite/zt-fpqaceec-SZuiLEa7YdLUXHAXrWPWgQ"
+  to = "https://join.slack.com/t/jamstack/shared_invite/zt-kp3asm76-~0QDRYOeBjnd1Hk9tMTAtA"
   status = 302
 
 [[redirects]]
@@ -44,23 +44,3 @@
 
 [[plugins]]
   package = "./plugins/keep-dot-cache-folder"
-
-# Config for the Netlify Build Plugin: netlify-plugin-minify-html
-[[plugins]]
-  package = "netlify-plugin-minify-html"
-
-  # Specify which deploy contexts we'll minify HTML in.
-  # Supports any Deploy Contexts available in Netlify.
-  # https://docs.netlify.com/site-deploys/overview/#deploy-contexts
-  [plugins.inputs]
-    contexts = [
-      'production',
-      'branch-deploy',
-      'deploy-preview'
-    ]
-
-  # Optionally, override the default options for the minification
-  # https://github.com/kangax/html-minifier#options-quick-reference
-  [plugins.inputs.minifierOptions]
-    removeComments = true
-    collapseInlineTagWhitespace = false

package.json

@@ -8,6 +8,9 @@
     "type": "git",
     "url": "https://github.com/jamstack/jamstack.org"
   },
+  "engines": {
+    "node": ">=12"
+  },
   "scripts": {
     "build": "npm-run-all build:html build:css",
     "build:html": "eleventy",
@@ -19,24 +22,25 @@
     "clean": "rm -rf dist"
   },
   "dependencies": {
-    "@11ty/eleventy": "^0.11.0",
+    "@11ty/eleventy": "^0.11.1",
     "@11ty/eleventy-cache-assets": "^2.0.3",
-    "@fullhuman/postcss-purgecss": "^1.3.0",
-    "autoprefixer": "^9.7.6",
+    "autoprefixer": "^10.0.4",
     "cssnano": "^4.1.10",
     "dotenv": "^8.2.0",
     "fast-glob": "^3.2.4",
     "gray-matter": "^4.0.2",
-    "js-yaml": "^3.13.1",
+    "js-yaml": "^3.14.0",
     "lodash": "^4.17.20",
-    "luxon": "^1.23.0",
-    "markdown-it": "^11.0.1",
-    "netlify-plugin-minify-html": "^0.2.2",
+    "luxon": "^1.25.0",
+    "markdown-it": "^12.0.2",
+    "netlify-plugin-minify-html": "^0.3.0",
     "node-fetch": "^2.6.1",
     "npm-run-all": "^4.1.5",
-    "postcss-cli": "^6.1.3",
-    "postcss-import": "^12.0.1",
-    "tailwindcss": "^1.8.10"
+    "postcss": "^8.1.10",
+    "postcss-cli": "^8.3.0",
+    "postcss-import": "^13.0.0",
+    "spdx-correct": "^3.1.1",
+    "tailwindcss": "^2.0.1"
   },
   "devDependencies": {
     "live-server": "^1.2.1"

postcss.config.js

@@ -1,22 +1,7 @@
-// const purgecss = require('@fullhuman/postcss-purgecss')({
-
-//   // Specify the paths to all of the template files in the project
-//   content: [
-//     './src/site/**/*.njk',
-//     './src/site/**/*.md'
-//   ],
-
-//   // Include any special characters
-//   defaultExtractor: content => content.match(/[\w-/:]+(?<!:)/g) || []
-// })
-
-
-
 module.exports = {
   plugins: [
+    require("postcss-import"),
     require('tailwindcss'),
     require('autoprefixer'),
-    require("postcss-import"),
-    // ...process.env.NODE_ENV === 'production' ? [purgecss,  require('cssnano')] : []
   ]
 };

src/11ty/normalizeLicense.js

@@ -0,0 +1,10 @@
+const correct = require("spdx-correct");
+
+module.exports = function(license, title) {
+  let correctedLicenseName = correct(license);
+  if(correctedLicenseName) {
+    return correctedLicenseName;
+  }
+  console.log( `WARN License name (${license}) for ${title} not found on the approved SPDX License List: https://spdx.org/licenses/` );
+  return license;
+};

src/css/tailwind.css

@@ -54,9 +54,7 @@ dd a:focus {
 p+p {
   @apply mt-4;
 }
-section.cards {
-  max-width: 66rem;
-}
+
 
 /*
   CTA links
@@ -88,7 +86,7 @@ a.cta:focus {
 footer p a {
   @apply border-b;
   @apply border-blue-100;
-  @apply whitespace-no-wrap;
+  @apply whitespace-nowrap;
 }
 footer p a:hover,
 footer p a:focus {
@@ -134,16 +132,16 @@ footer p a:focus {
 }
 
 .bg-gradient-card-sunrise {
-  --gradient-color-stops: #F0047F 0%, #FC814A 100%;
+  --tw-gradient-stops: #F0047F 0%, #FC814A 100%;
 }
 .bg-gradient-card-blue {
-  --gradient-color-stops: #04A2DD 0%, #4FF3EA 100%;
+  --tw-gradient-stops: #04A2DD 0%, #4FF3EA 100%;
 }
 .bg-gradient-card-seafoam {
-  --gradient-color-stops: #88F9ED 0%, #00FFB2 100%;
+  --tw-gradient-stops: #88F9ED 0%, #00FFB2 100%;
 }
 .bg-gradient-card-gold {
-  --gradient-color-stops: #FFC803 0%, #FC814A 100%;
+  --tw-gradient-stops: #FFC803 0%, #FC814A 100%;
 }
 .bg-gradient-card-blue-seafoam.bg-gradient-card-blue-seafoam {
   background: linear-gradient(101.87deg, #0090CA 0%, #00BFAD 105.55%), linear-gradient(180deg, #009DDC 0%, #58FCEC 100%);
@@ -314,6 +312,15 @@ details[open] .summary-swap-open {
 .tool-content img {
   @apply my-8;
 }
+
+/* Filters */
+.filter-opensource--hide,
+.filter-typeofcms--hide,
+.filter-language--hide,
+.filter-template--hide,
+.filter-license--hide {
+  display: none !important;
+}
 /* purgecss end ignore */
 
 @tailwind utilities;