Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into fix-docsearch
Browse files Browse the repository at this point in the history
  • Loading branch information
gatsbybot committed Apr 22, 2020
2 parents a0156aa + beb3046 commit dcbf9e3
Show file tree
Hide file tree
Showing 417 changed files with 20,630 additions and 6,457 deletions.
4 changes: 4 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -205,12 +205,16 @@ jobs:

unit_tests_node10:
executor: node
environment:
FORCE_COLOR: 0
<<: *test_template

unit_tests_node12:
executor:
name: node
image: "12"
environment:
FORCE_COLOR: 0
<<: *test_template

unit_tests_www:
Expand Down
3 changes: 3 additions & 0 deletions benchmarks/markdown_id/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@
"react-dom": "^16.12.0",
"react-helmet": "^5.2.1",
"react-typography": "^0.16.19",
"ts-node": "^8.9.0",
"typeface-merriweather": "0.0.72",
"typeface-montserrat": "0.0.75",
"typescript": "^3.8.3",
"typography": "^0.16.19",
"typography-theme-wordpress-2016": "^0.16.19"
},
Expand All @@ -46,6 +48,7 @@
"bench": "rm -r markdown-pages; NUM_PAGES=${NUM_PAGES:-2000} node md.generate.js; gatsby clean; node --max_old_space_size=2000 node_modules/.bin/gatsby build",
"benchnb": "gatsby clean; node --max_old_space_size=2000 node_modules/.bin/gatsby build",
"build": "gatsby build",
"data-update": "ts-node scripts/data-update.ts",
"develop": "gatsby develop",
"start": "npm run develop",
"serve": "gatsby serve",
Expand Down
1 change: 1 addition & 0 deletions benchmarks/markdown_id/scripts/data-update.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// noop for now, but will be created later.
3 changes: 3 additions & 0 deletions benchmarks/markdown_slug/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@
"react-dom": "^16.12.0",
"react-helmet": "^5.2.1",
"react-typography": "^0.16.19",
"ts-node": "^8.9.0",
"typeface-merriweather": "0.0.72",
"typeface-montserrat": "0.0.75",
"typescript": "^3.8.3",
"typography": "^0.16.19",
"typography-theme-wordpress-2016": "^0.16.19"
},
Expand All @@ -46,6 +48,7 @@
"bench": "rm -r markdown-pages; NUM_PAGES=${NUM_PAGES:-2000} node md.generate.js; gatsby clean; node --max_old_space_size=2000 node_modules/.bin/gatsby build",
"benchnb": "gatsby clean; node --max_old_space_size=2000 node_modules/.bin/gatsby build",
"build": "gatsby build",
"data-update": "ts-node scripts/data-update.ts",
"develop": "gatsby develop",
"start": "npm run develop",
"serve": "gatsby serve",
Expand Down
1 change: 1 addition & 0 deletions benchmarks/markdown_slug/scripts/data-update.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// noop for now, but will be created later.
5 changes: 4 additions & 1 deletion benchmarks/markdown_table/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@
"bench": "set -x; gatsby clean; NUM_PAGES=${NUM_PAGES:-2000} gatsby build",
"develop": "gatsby develop",
"build": "gatsby build",
"data-update": "ts-node scripts/data-update.ts",
"serve": "gatsby serve"
},
"dependencies": {
"gatsby": "^2.19.5",
"gatsby-transformer-remark": "^2.6.48",
"react": "^16.12.0",
"react-dom": "^16.12.0"
"react-dom": "^16.12.0",
"ts-node": "^8.9.0",
"typescript": "^3.8.3"
},
"devDependencies": {
"faker": "^4.1.0",
Expand Down
1 change: 1 addition & 0 deletions benchmarks/markdown_table/scripts/data-update.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// noop for now, but will be created later.
30 changes: 15 additions & 15 deletions benchmarks/mdx/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,36 +7,36 @@
"scripts": {
"build": "gatsby build",
"build:send": "cross-env BENCHMARK_REPORTING_URL=true gatsby build",
"data-update": "ts-node scripts/data-update.ts",
"develop": "gatsby develop",
"format": "prettier --write \"**/*.{js,jsx,json,md}\"",
"postinstall": "del-cli src/articles && gatsby clean && willit --type=mdx --num-pages=${NUM_PAGES:-512}",
"postinstall": "del-cli src/articles && gatsby clean && willit --use-pregenerated-data --type=mdx --num-pages=${NUM_PAGES:-512}",
"start": "npm run develop",
"serve": "gatsby serve"
},
"resolutions": {
"sharp": "0.25.1"
},
"dependencies": {
"del-cli": "^3.0.0",
"@mdx-js/mdx": "^1.5.7",
"@mdx-js/react": "^1.5.7",
"del-cli": "^3.0.0",
"dotenv": "^8.2.0",
"gatsby": "^2.19.35",
"gatsby-image": "^2.2.40",
"gatsby-plugin-mdx": "^1.0.82",
"gatsby-plugin-page-creator": "^2.1.45",
"gatsby": "^2.20.23",
"gatsby-image": "^2.3.3",
"gatsby-plugin-mdx": "^1.1.8",
"gatsby-plugin-page-creator": "^2.2.2",
"gatsby-plugin-sharp": "^2.4.12",
"gatsby-remark-images": "^3.1.49",
"gatsby-source-filesystem": "^2.1.48",
"gatsby-transformer-sharp": "^2.3.14",
"gatsby-remark-images": "^3.2.3",
"gatsby-source-filesystem": "^2.2.3",
"gatsby-transformer-sharp": "^2.4.5",
"react": "^16.12.0",
"react-dom": "^16.12.0"
"react-dom": "^16.12.0",
"ts-node": "^8.9.0",
"typescript": "^3.8.3"
},
"devDependencies": {
"cross-env": "^7.0.0",
"gatsby-plugin-benchmark-reporting": "*",
"gatsby-plugin-benchmark-reporting": "0.1.3",
"prettier": "2.0.4",
"willit": "*"
"willit": "^1.0.0"
},
"repository": {
"type": "git",
Expand Down
1 change: 1 addition & 0 deletions benchmarks/mdx/scripts/data-update.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// noop for now, but will be created later.
5 changes: 4 additions & 1 deletion benchmarks/source-contentful/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"scripts": {
"clean": "gatsby clean",
"build": "gatsby build",
"data-update": "ts-node scripts/data-update.ts",
"develop": "gatsby develop",
"format": "prettier --write \"**/*.{js,jsx,json,md}\"",
"serve": "gatsby serve",
Expand All @@ -26,7 +27,9 @@
"gatsby-source-filesystem": "^2.1.48",
"gatsby-transformer-sharp": "^2.3.14",
"react": "^16.12.0",
"react-dom": "^16.12.0"
"react-dom": "^16.12.0",
"ts-node": "^8.9.0",
"typescript": "^3.8.3"
},
"devDependencies": {
"chalk": "^2.4.2",
Expand Down
1 change: 1 addition & 0 deletions benchmarks/source-contentful/scripts/data-update.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// noop for now, but will be created later.
5 changes: 4 additions & 1 deletion benchmarks/source-datocms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"scripts": {
"build": "gatsby build",
"build:send": "cross-env BENCHMARK_REPORTING_URL=true gatsby build",
"data-update": "ts-node scripts/data-update.ts",
"develop": "gatsby develop",
"format": "prettier --write \"**/*.{js,jsx,json,md}\"",
"serve": "gatsby serve",
Expand All @@ -22,7 +23,9 @@
"gatsby-transformer-sharp": "^2.3.14",
"lodash.kebabcase": "^4.1.1",
"react": "^16.12.0",
"react-dom": "^16.12.0"
"react-dom": "^16.12.0",
"ts-node": "^8.9.0",
"typescript": "^3.8.3"
},
"devDependencies": {
"cross-env": "^7.0.0",
Expand Down
1 change: 1 addition & 0 deletions benchmarks/source-datocms/scripts/data-update.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// noop for now, but will be created later.
2 changes: 2 additions & 0 deletions benchmarks/source-drupal/.env.example
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
BENCHMARK_DRUPAL_BASE_URL=
BENCHMARK_DRUPAL_USERNAME=
BENCHMARK_DRUPAL_PASSWORD=
7 changes: 6 additions & 1 deletion benchmarks/source-drupal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,27 @@
"scripts": {
"build": "gatsby build",
"build:send": "cross-env BENCHMARK_REPORTING_URL=true gatsby build",
"data-update": "ts-node scripts/data-update.ts",
"develop": "gatsby develop",
"format": "prettier --write \"**/*.{js,jsx,json,md}\"",
"start": "npm run develop",
"serve": "gatsby serve"
},
"dependencies": {
"dotenv": "^8.2.0",
"faker": "^4.1.0",
"gatsby": "^2.19.7",
"gatsby-image": "^2.2.40",
"gatsby-plugin-sharp": "^2.4.5",
"gatsby-source-drupal": "^3.3.18",
"gatsby-source-filesystem": "^2.1.48",
"gatsby-transformer-sharp": "^2.3.14",
"lodash.kebabcase": "^4.1.1",
"node-fetch": "^2.6.0",
"react": "^16.12.0",
"react-dom": "^16.12.0"
"react-dom": "^16.12.0",
"ts-node": "^8.6.2",
"typescript": "^3.8.3"
},
"devDependencies": {
"cross-env": "^7.0.0",
Expand Down
13 changes: 13 additions & 0 deletions benchmarks/source-drupal/scripts/data-update.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/usr/bin/env node

import { update } from "./updater"

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

const username = process.env.BENCHMARK_DRUPAL_USERNAME
const password = process.env.BENCHMARK_DRUPAL_PASSWORD
const server = process.env.BENCHMARK_DRUPAL_BASE_URL

update(username, password, server)
62 changes: 62 additions & 0 deletions benchmarks/source-drupal/scripts/updater.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import fetch from "node-fetch"
import faker from "faker"

interface IArticle {
id: string
attributes: {
title: string
}
}

// Remove last word of title and replace it with a random word.
const updateTitle = (title: string): string =>
`${title.substring(0, title.lastIndexOf(` `))} ${faker.lorem.word()}`

const patchArticle = async (
username: string,
password: string,
server: string,
article: IArticle
): Promise<void> => {
const url = `${server}/jsonapi/node/article/${article.id}`

const response = await fetch(url, {
method: `PATCH`,
headers: {
"Content-Type": `application/vnd.api+json`,
Authorization: `Basic ${Buffer.from(`${username}:${password}`).toString(
`base64`
)}`,
},
body: JSON.stringify({
data: {
type: `node--article`,
id: article.id,
attributes: {
title: updateTitle(article.attributes.title),
},
},
}),
})
}

const getFirstArticle = async (server: string): Promise<IArticle> => {
const url = `${server}/jsonapi/node/article?page[limit]=1&sort=created`
const response = await fetch(url)
const body = await response.json()
return body.data[0]
}

export const update = async (
username?: string,
password?: string,
server?: string
): Promise<void> => {
if (!username || !password || !server) {
console.error(`You must pass username, password and server`)
return
}

const article = await getFirstArticle(server)
await patchArticle(username, password, server, article)
}
11 changes: 11 additions & 0 deletions benchmarks/source-drupal/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"compilerOptions": {
"typeRoots": ["./node_modules/@types", "./typings"],
"target": "ES2018" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
"module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
"strict": true /* Enable all strict type-checking options. */,
"esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */,
"noImplicitAny": false
}
}
5 changes: 4 additions & 1 deletion benchmarks/source-wordpress/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"scripts": {
"build": "gatsby build",
"build:send": "cross-env BENCHMARK_REPORTING_URL=true gatsby build",
"data-update": "ts-node scripts/data-update.ts",
"develop": "gatsby develop",
"format": "prettier --write \"**/*.{js,jsx,json,md}\"",
"serve": "gatsby serve",
Expand All @@ -21,7 +22,9 @@
"gatsby-source-wordpress-experimental": "^0.0.31",
"gatsby-transformer-sharp": "^2.3.14",
"react": "^16.12.0",
"react-dom": "^16.12.0"
"react-dom": "^16.12.0",
"ts-node": "^8.9.0",
"typescript": "^3.8.3"
},
"devDependencies": {
"cross-env": "^7.0.0",
Expand Down
1 change: 1 addition & 0 deletions benchmarks/source-wordpress/scripts/data-update.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// noop for now, but will be created later.
Loading

0 comments on commit dcbf9e3

Please sign in to comment.