Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: gatsbyjs/gatsby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: gatsby@2.24.23
Choose a base ref
...
head repository: gatsbyjs/gatsby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: gatsby@2.24.24
Choose a head ref
  • 15 commits
  • 90 files changed
  • 16 contributors

Commits on Jul 31, 2020

  1. feat(gatsby-telemetry): Add API to track feature usage (#26071)

    * feat(gatsby-telemetry): Add API to track feature usage
    
    * fix lint
    
    * bring back machineId type
    blainekasten authored Jul 31, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    22196a1 View commit details
  2. refactor(www): standardize border styles (#25460)

    * use border/borderColor properties for styling borders
    
    * use border/borderColor properties for styling borders
    
    * bump gatsby-design-tokens
    
    * update stuff
    
    * fix order, it's important — otherwise `borderColor` will render as `initial`
    
    Fix views/creators/badge background color along the way.
    
    Co-authored-by: Florian Kissling <florian.kissling@gmail.com>
    tesseralis and fk authored Jul 31, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    5be939b View commit details
  3. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4e74b97 View commit details
  4. fix(readme): gatsby-remark-images -> put code in code fences (#25854)

    * put code in code fences
    
    * more code fences
    
    * lint
    muescha authored Jul 31, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    96fdb6b View commit details
  5. fix brand names (#25877)

    muescha authored Jul 31, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    89dcdef View commit details
  6. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7a7436c View commit details
  7. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f1cb299 View commit details
  8. fix(docs): Deploy to DigitalOcean -> fix 404 internal link, fix note …

    …layout, fix brand names (#25961)
    
    * fix 404 internal link, fix note layout, fix brand names
    
    * add file name to code block
    
    * Apply suggestions from code review
    
    Co-authored-by: Aisha Blake <aisha@gatsbyjs.com>
    muescha and Aisha Blake authored Jul 31, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    dd0ea0a View commit details

Commits on Aug 1, 2020

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ede0e22 View commit details
  2. add redux doc to sidebar (#26082)

    Marcy Sutton authored Aug 1, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9dc6074 View commit details
  3. fix wrong internal links (#26026)

    Co-authored-by: Aisha Blake <aisha@gatsbyjs.com>
    muescha and Aisha Blake authored Aug 1, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f6bd06b View commit details

Commits on Aug 3, 2020

  1. chore(docs): Added closing brackets missing in documentation (#26196)

    Co-authored-by: gatsbybot <mathews.kyle+gatsbybot@gmail.com>
    ADJA and gatsbybot authored Aug 3, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7d0cb27 View commit details
  2. (blog) Gatsby Gazette for July (#26171)

    * Draft the Gatsby Gazette for July
    
    * Add reflex screenshot
    
    * Add content and image
    
    * Fixed typo and image
    
    * chore: format
    
    * add MDX conference link
    
    Co-authored-by: John Otander <johnotander@gmail.com>
    
    * Fix spelling
    
    * Make linter happy with dictionary additions
    
    * change frontmatter date of publication
    
    Co-authored-by: gatsbybot <mathews.kyle+gatsbybot@gmail.com>
    Co-authored-by: Michelle Gienow <michellegienow@gmail.com>
    Co-authored-by: John Otander <johnotander@gmail.com>
    4 people authored Aug 3, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    589923f View commit details
  3. chore(benchmarks): added benchmark code for agility cms. (#25771)

    * added benchmark code for agility cms.
    
    * updated the update cmd, and env variable names
    
    * updates based on feedback to PR #25771
    
    * tweaked the filesystem source path
    
    * Update benchmarks/source-agilitycms/README.md
    
    Co-authored-by: Peter van der Zee <209817+pvdz@users.noreply.github.com>
    
    * updated example data-update cmd
    
    * chore: format
    
    Co-authored-by: Joel Varty <joelvarty@outlook.com>
    Co-authored-by: Peter van der Zee <209817+pvdz@users.noreply.github.com>
    Co-authored-by: gatsbybot <mathews.kyle+gatsbybot@gmail.com>
    4 people authored Aug 3, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    43952c6 View commit details
  4. chore(release): Publish

     - gatsby-admin@0.1.113
     - gatsby-cli@2.12.69
     - gatsby-recipes@0.1.59
     - gatsby-remark-images@3.3.24
     - gatsby-source-wordpress@3.3.27
     - gatsby-telemetry@1.3.25
     - gatsby@2.24.24
    freiksenet committed Aug 3, 2020
    Copy the full SHA
    9c8b442 View commit details
Showing with 1,665 additions and 121 deletions.
  1. +12 −0 benchmarks/source-agilitycms/.env.development.example
  2. +9 −0 benchmarks/source-agilitycms/.env.production.example
  3. +76 −0 benchmarks/source-agilitycms/.gitignore
  4. +7 −0 benchmarks/source-agilitycms/.prettierrc
  5. +74 −0 benchmarks/source-agilitycms/CODE_OF_CONDUCT.md
  6. +21 −0 benchmarks/source-agilitycms/LICENSE
  7. +37 −0 benchmarks/source-agilitycms/README.md
  8. +120 −0 benchmarks/source-agilitycms/bin/setup.js
  9. +72 −0 benchmarks/source-agilitycms/bin/update.js
  10. +68 −0 benchmarks/source-agilitycms/gatsby-config.js
  11. +57 −0 benchmarks/source-agilitycms/gatsby-node.js
  12. +46 −0 benchmarks/source-agilitycms/package.json
  13. +50 −0 benchmarks/source-agilitycms/src/AgilityPage.js
  14. +13 −0 benchmarks/source-agilitycms/src/agility/components/AgilityPageTemplate.js
  15. +38 −0 benchmarks/source-agilitycms/src/agility/components/ContentZone.js
  16. +35 −0 benchmarks/source-agilitycms/src/agility/components/DynamicPreviewPage.js
  17. +101 −0 benchmarks/source-agilitycms/src/agility/utils.js
  18. +300 −0 benchmarks/source-agilitycms/src/components/LayoutTemplate.css
  19. +15 −0 benchmarks/source-agilitycms/src/components/LayoutTemplate_1.js
  20. +15 −0 benchmarks/source-agilitycms/src/components/LayoutTemplate_2.js
  21. +19 −0 benchmarks/source-agilitycms/src/components/PreviewBar.css
  22. +20 −0 benchmarks/source-agilitycms/src/components/PreviewBar.js
  23. +19 −0 benchmarks/source-agilitycms/src/components/SEO.js
  24. +9 −0 benchmarks/source-agilitycms/src/img/logo.svg
  25. +14 −0 benchmarks/source-agilitycms/src/modules/PostDetails.css
  26. +28 −0 benchmarks/source-agilitycms/src/modules/PostDetails.js
  27. +15 −0 benchmarks/source-agilitycms/src/modules/PostListing.css
  28. +68 −0 benchmarks/source-agilitycms/src/modules/PostListing.js
  29. +13 −0 benchmarks/source-agilitycms/src/modules/RichTextArea.js
  30. +11 −0 benchmarks/source-agilitycms/src/pageTemplates/MainTemplate.js
  31. BIN benchmarks/source-agilitycms/static/favicon.ico
  32. +14 −0 dictionary.txt
  33. +6 −0 docs/blog/2020-07-21-Gatsby-Days-Reconfigured-Benedicte-Raae/index.md
  34. +83 −0 docs/blog/gazette-july-2020/index.md
  35. BIN docs/blog/gazette-july-2020/reflex.png
  36. +1 −0 docs/contributing/contributor-swag.md
  37. +1 −1 docs/contributing/translation/maintainers.md
  38. +2 −2 docs/docs/basic-hardware-software-requirements.md
  39. +16 −16 docs/docs/deploying-to-digitalocean-droplet.md
  40. +2 −2 docs/docs/glossary.md
  41. +1 −1 docs/docs/node-api-helpers.md
  42. +24 −20 docs/docs/scroll-restoration.md
  43. +1 −1 docs/docs/seo.md
  44. +1 −1 docs/docs/working-with-video.md
  45. +4 −0 packages/gatsby-admin/CHANGELOG.md
  46. +2 −2 packages/gatsby-admin/package.json
  47. +4 −0 packages/gatsby-cli/CHANGELOG.md
  48. +3 −3 packages/gatsby-cli/package.json
  49. +4 −0 packages/gatsby-recipes/CHANGELOG.md
  50. +2 −2 packages/gatsby-recipes/package.json
  51. +6 −0 packages/gatsby-remark-images/CHANGELOG.md
  52. +5 −5 packages/gatsby-remark-images/README.md
  53. +1 −1 packages/gatsby-remark-images/package.json
  54. +4 −0 packages/gatsby-source-wordpress/CHANGELOG.md
  55. +1 −1 packages/gatsby-source-wordpress/README.md
  56. +1 −1 packages/gatsby-source-wordpress/package.json
  57. +6 −0 packages/gatsby-telemetry/CHANGELOG.md
  58. +1 −1 packages/gatsby-telemetry/package.json
  59. +14 −0 packages/gatsby-telemetry/src/__tests__/telemetry.ts
  60. +1 −0 packages/gatsby-telemetry/src/index.ts
  61. +6 −0 packages/gatsby-telemetry/src/telemetry.ts
  62. +4 −0 packages/gatsby/CHANGELOG.md
  63. +3 −3 packages/gatsby/package.json
  64. +2 −1 www/src/components/banner.js
  65. +4 −2 www/src/components/card.js
  66. +2 −3 www/src/components/diagram.js
  67. +5 −13 www/src/components/docs-table-of-contents.js
  68. +1 −2 www/src/components/features/compare-button.js
  69. +2 −2 www/src/components/features/evaluation-table-section-header-bottom.js
  70. +2 −4 www/src/components/features/simple-evaluation-table.js
  71. +1 −2 www/src/components/guidelines/box-with-border.js
  72. +1 −3 www/src/components/guidelines/color/overview.js
  73. +2 −1 www/src/components/homepage/homepage-features.js
  74. +2 −1 www/src/components/homepage/homepage-logo-banner.js
  75. +2 −1 www/src/components/layer-model/layer-model.js
  76. +3 −2 www/src/components/rotator.js
  77. +1 −2 www/src/components/shared/pullquote.js
  78. +1 −2 www/src/components/sidebar/item-link.js
  79. +2 −1 www/src/components/tags-section.js
  80. +3 −0 www/src/data/sidebars/doc-links.yaml
  81. +3 −3 www/src/templates/template-blog-list.js
  82. +4 −2 www/src/templates/template-blog-post.js
  83. +3 −2 www/src/templates/template-creator-details.js
  84. +1 −2 www/src/utils/styles/index.js
  85. +2 −2 www/src/views/creators/badge.js
  86. +2 −1 www/src/views/creators/creators-header.js
  87. +2 −1 www/src/views/shared/collapsible.js
  88. +2 −1 www/src/views/showcase/featured-sites.js
  89. +2 −1 www/src/views/starter/meta.js
  90. +2 −1 www/src/views/starter/source.js
12 changes: 12 additions & 0 deletions benchmarks/source-agilitycms/.env.development.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Your Instance Id
BENCHMARK_AGILITY_GUID=

# Your Preview API Key (recommended) - you can get this from the Getting Started Page in Agility CMS
BENCHMARK_AGILITY_API_KEY=

# If using your Preview API Key, set this to true
BENCHMARK_AGILITY_API_ISPREVIEW=true

# USED FOR PUSHING DATA INTO AGILITY (Available in Global Security Settings area of Agility CMS)
BENCHMARK_AGILITY_WEBSITE_NAME=
BENCHMARK_AGILITY_SECURITY_KEY=
9 changes: 9 additions & 0 deletions benchmarks/source-agilitycms/.env.production.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Your Instance Id
BENCHMARK_AGILITY_GUID=

# Your Live API Key (recommended) - you can get this from the Getting Started Page in Agility CMS
BENCHMARK_AGILITY_API_KEY=

# Since you won't want to preview here, set this to false
BENCHMARK_AGILITY_API_ISPREVIEW=false

76 changes: 76 additions & 0 deletions benchmarks/source-agilitycms/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# TypeScript v1 declaration files
typings/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env
.env.production
.env.development

# next.js build output
.next

.cache

.vscode

.netlify

public/
.cache/

.gatsby-context.js

bundle-stats.json
7 changes: 7 additions & 0 deletions benchmarks/source-agilitycms/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"endOfLine": "lf",
"semi": false,
"singleQuote": false,
"tabWidth": 2,
"trailingComma": "es5"
}
74 changes: 74 additions & 0 deletions benchmarks/source-agilitycms/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

- Using welcoming and inclusive language
- Being respectful of differing viewpoints and experiences
- Gracefully accepting constructive criticism
- Focusing on what is best for the community
- Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

- The use of sexualized language or imagery and unwelcome sexual attention or
advances
- Trolling, insulting/derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others' private information, such as a physical or electronic
address, without explicit permission
- Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [support@agilitycms.com](support@agilitycms.com). All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org), version 1.4,
available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct.html](https://www.contributor-covenant.org/version/1/4/code-of-conduct.html)

For answers to common questions about this code of conduct, see
[https://www.contributor-covenant.org/faq](https://www.contributor-covenant.org/faq)
21 changes: 21 additions & 0 deletions benchmarks/source-agilitycms/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2018 gatsbyjs

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
37 changes: 37 additions & 0 deletions benchmarks/source-agilitycms/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<p align="center">
<a href="https://gatsbyjs.org">
<img alt="Gatsby" src="https://www.gatsbyjs.org/monogram.svg" height="60" />
<img alt="Gatsby" src="https://static.agilitycms.com/layout/img/logo-original.svg" width="200" />
</a>
</p>
<h1 align="center">
Gatsby + Agility CMS : WILL IT BUILD
</h1>

## To Update Content from the CMS

```shell
npm run data-update
```

## Pull Content From Agility CMS

For the first time setup only (this has been done by Agility CMS staff)

```shell
npm run setup
```

## Build

```shell
gatsby build
```

## 🎉🤘💖🖖

<a name="license"></a>

# License

Distributed under the MIT License. See [LICENSE](LICENSE) for more information.
120 changes: 120 additions & 0 deletions benchmarks/source-agilitycms/bin/setup.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
/*
THIS RUNS THE INITIAL SETUP FOR THE SITE BASED ON the following variables:
env.DATA_PATH
env.BENCHMARK_AGILITY_WEBSITE_NAME
env.BENCHMARK_AGILITY_SECURITY_KEY
*/

require("dotenv").config({
path: `.env.${process.env.NODE_ENV}`,
})

const async = require("async")
const fs = require("fs")
const path = require(`path`)
const fetch = require('node-fetch');
const agilityMgmt = require('@agility/content-management')

const runSetup = async () => {

const dataPath = process.env.DATA_PATH
const websiteName = process.env.BENCHMARK_AGILITY_WEBSITE_NAME
const securityKey = process.env.BENCHMARK_AGILITY_SECURITY_KEY

console.log(`*** STARTING IMPORT ${websiteName}`)

const mgmtApi = agilityMgmt.getApi({
location: 'USA',
websiteName: websiteName,
securityKey: securityKey

});


let itemCount = 0
const posts = await readposts(dataPath)

await async.eachLimit(posts, 10, async (post) => {

await importPost({ mgmtApi, post })
itemCount++
});

console.log(`*** FINISHED IMPORT OF ${itemCount} items`)
}

const importPost = async ({ post, mgmtApi }) => {

//create the media
//let imageUrl = post.image.url
// let fetchRes = await fetch(imageUrl)
// let imageBlob = await fetchRes.buffer()

// let filename = imageUrl.substring(imageUrl.lastIndexOf("/") + 1)

// let mediaObj = await mgmtApi.uploadMedia({
// fileName: filename,
// fileContent: imageBlob
// })

/*
mediaID
url
size
contentType
*/

//create the content item
let contentItem = {
contentID: -1,
fields: {
"Title": post.title,
"articleNumber": post.articleNumber,
"content": post.content,
"image": post.image.url
}
}

const contentID = await mgmtApi.saveContentItem({
contentItem,
languageCode: "en-us",
referenceName: "posts"
})

console.log("Saved content item ", contentID)


}


async function* readposts(dataPath) {
console.log("READING posts ", dataPath)
if (!fs.promises.opendir) {
console.error(`This command requires Node 12.12+`)
process.exit(1)
}

if (!fs.existsSync(dataPath)) {
console.error(`Could not find datasource directory: ${dataPath}`)
process.exit(1)
}
const dir = await fs.promises.opendir(dataPath)


for await (const dirent of dir) {
console.log(dirent)
if (dirent.isFile() && /\.json$/.test(dirent.name)) {
const filePath = path.join(dataPath, dirent.name)


const content = fs.readFileSync(filePath)
const posts = JSON.parse(content)
for (const post of posts) {
yield post
}
}
}
}


runSetup()
Loading