Merge branch 'main' into patch-2

.eleventy.js

@@ -1,5 +1,6 @@
 const lodashGet = require("lodash/get");
 const yaml = require("js-yaml");
+const { URL } = require("url");
 
 module.exports = function (eleventyConfig) {
   // Support yaml data files
@@ -38,6 +39,10 @@ module.exports = function (eleventyConfig) {
     return md.render(content);
   });
 
+  eleventyConfig.addFilter('absoluteUrl', (url, base) => {
+    return (new URL(url, base)).toString() || url
+  })
+
 
   eleventyConfig.addFilter('convertFromEpoc', (time) => {
     let date = new Date(0);
@@ -188,6 +193,7 @@ module.exports = function (eleventyConfig) {
   eleventyConfig.addPassthroughCopy("src/site/browserconfig.xml");
   eleventyConfig.addPassthroughCopy("src/site/site.webmanifest");
   eleventyConfig.addPassthroughCopy("src/site/survey/2021/community-survey-2021-methodology.pdf");
+  eleventyConfig.addPassthroughCopy("src/site/survey/2022/community-survey-2022-methodology.pdf");
 
   return {
     dir: {

README.md

@@ -15,18 +15,20 @@ We accept contributions submitted as [pull requests](https://github.com/jamstack
 
 To contribute a link to a resource:
 
-1. Create a new yaml file in the [`src/site/_data/resources`](src/site/_data/resources) folder with a unique and descriptive name. Populate that file according to the structure shown below.
-1. For presentations and video, add an optional thumbnail image to the [`src/site/_data/resources`](src/site/img/cms/resources) folder. (Image should be a jpeg 600px wide and 400px tall)
+1. Create a new md file in the [`src/site/resources`](src/site/resources) folder with a unique and descriptive name. Populate that file according to the structure shown below.
+1. For presentations and video, add an optional thumbnail image to the [`src/site/img/cms`](src/site/img/cms) folder. (Image should be a jpeg 600px wide and 400px tall)
 1. Submit a pull request
 
-_resource yaml reference:_
+_resource md reference:_
 ```yaml
+---
 title: Resource title
 date: Publish date (YYYY-MM-DD)
 link: the URL of this resource
 thumbnailurl: /img/cms/resources/resource-thumbnail.jpg
 type:
   - article (Help us group and sort the resources by type article|video|presentation)
+---
 ```
 
 Before submitting a pull request, or if you are suggesting/contributing code or content changes, it is wise to preview your change in a local build. We've tried to make the process of running a local build as low as possible.
@@ -84,3 +86,4 @@ npm run start
 You can clone this repository and bootstrap it as a test site of your own, complete with the CI/CD build pipeline on [Netlify](https://netlify.com?utm_source=github&utm_medium=jamstackorg-pnh&utm_campaign=devex) by clicking the button below. (Requires free GitHub and Netlify accounts)
 
 [![Deploy to Netlify](https://www.netlify.com/img/deploy/button.svg)](https://app.netlify.com/start/deploy?repository=https://github.com/jamstack/jamstack.org)
+

netlify.toml

@@ -12,18 +12,19 @@
 
 [[redirects]]
   from = "/conference"
-  to = "https://jamstackconf.com/"
-  status = 302
+  to = "/conf"
+  status = 301
 
 [[redirects]]
-  from = "/discord"
-  to = "https://discord.gg/jamstack"
-  status = 302
+  from = "/conf"
+  to = "https://jamstackconf.com/conf/"
+  status = 200
+
 
 [[redirects]]
-  from = "/women-of-jamstack/"
-  to = "https://womenofjamstack.com"
-  status = 302
+  from = "/conf/*"
+  to = "https://jamstackconf.com/conf/:splat"
+  status = 200
 
 [[redirects]]
   from = "/best-practices"
@@ -45,16 +46,6 @@
   to = "https://res.cloudinary.com/netlify/image/fetch/c_fit,l_text:Roboto_56_bold::term,co_rgb:FFFFFF,g_north_west,y_75,x_100,w_1000/c_fit,l_text:Roboto_38_light::summary,co_rgb:FFFFFF,g_north_west,y_200,x_160,w_885/https://jamstack.org/img/og/glossary-card-bg.png"
   status = 200
 
-[[redirects]]
-  from = "/conf/"
-  to = "https://jamstackconf.com/"
-  status = 302
-
-[[redirects]]
-  from = "/conf/cfp"
-  to = "https://docs.google.com/forms/d/e/1FAIpQLSeR5W4m9owqDBJEq2EuRUNXFTOeLCxFPUn0qbuCE15o4SWDFg/viewform"
-  status = 302
-
 [[redirects]]
   from = "/glossary/*"
   to = "/glossary/contribute/index.html"
@@ -65,15 +56,31 @@
   to = "/headless-cms/keystone/"
   status = 301
 
+[[redirects]]
+  from = "/headless-cms/graphcms/"
+  to = "/headless-cms/hygraph/"
+  status = 301
+
 [[redirects]]
   from = "/survey/"
-  to = "/survey/2021/"
+  to = "/survey/2022/"
   status = 302
 
 [[redirects]]
   from = "/survey/2020/"
   to = "https://www.netlify.com/blog/2020/05/27/state-of-the-jamstack-survey-2020-first-results/"
   status = 301
 
+[[redirects]]
+  from = "/headless-cms/netlify-cms/"
+  to = "/headless-cms/decap-cms/"
+  status = 301
+
+[[redirects]]
+  from = "/discord"
+  to = "https://answers.netlify.com/"
+  status = 302
+
 [[plugins]]
   package = "./plugins/keep-dot-cache-folder"
+

package.json

@@ -27,6 +27,7 @@
     "autoprefixer": "^10.2.5",
     "cssnano": "^4.1.10",
     "d3": "^7.1.1",
+    "d3-textwrap": "^3.0.0",
     "dotenv": "^8.2.0",
     "fast-glob": "^3.2.5",
     "gray-matter": "^4.0.2",
@@ -43,6 +44,6 @@
     "postcss-cli": "^8.3.1",
     "postcss-import": "^13.0.0",
     "spdx-correct": "^3.1.1",
-    "tailwindcss": "^2.0.3"
+    "tailwindcss": "^3.1.8"
   }
-}
+}