Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pull] master from gatsbyjs:master #414

Merged
merged 3 commits into from
Feb 26, 2021
Merged

[pull] master from gatsbyjs:master #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8967b88
fix(gatsby): temporarily pin mini-css-extract-plugin version (#29773)
vladar Feb 25, 2021
27adffe
feat(create-gatsby): Remove offline plugin (#29771)
ascorbic Feb 25, 2021
e79fc6b
fix(gatsby-plugin-mdx): fix relative imports (#29775)
wardpeet Feb 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions packages/create-gatsby/src/features.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{
"gatsby-plugin-google-analytics": {
"message": "Add the Google Analytics tracking script"
},
"gatsby-plugin-image": {
"message": "Add responsive images",
"plugins": [
Expand All @@ -16,12 +13,14 @@
}
}
},
"gatsby-plugin-google-analytics": {
"message": "Add the Google Analytics tracking script"
},
"gatsby-plugin-react-helmet": {
"message": "Add page meta tags with React Helmet",
"dependencies": ["react-helmet"]
},
"gatsby-plugin-sitemap": { "message": "Add an automatic sitemap" },
"gatsby-plugin-offline": { "message": "Enable offline functionality" },
"gatsby-plugin-manifest": {
"message": "Generate a manifest file",
"options": {
Expand Down
10 changes: 6 additions & 4 deletions packages/gatsby-plugin-mdx/gatsby/on-create-node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const fs = require(`fs`)
const path = require(`path`)
const babel = require(`@babel/core`)
const { createContentDigest } = require(`gatsby-core-utils`)
const { createContentDigest, slash } = require(`gatsby-core-utils`)

const defaultOptions = require(`../utils/default-options`)
const {
Expand Down Expand Up @@ -221,9 +221,11 @@ class BabelPluginTransformRelativeImports {
const valueAbsPath = path.resolve(parentFilepath, nodePath)
const replacementPath =
loaders +
path.relative(
path.join(cache.directory, MDX_SCOPES_LOCATION),
valueAbsPath
slash(
path.relative(
path.join(cache.directory, MDX_SCOPES_LOCATION),
valueAbsPath
)
)
node.value = replacementPath
}
Expand Down
4 changes: 2 additions & 2 deletions packages/gatsby/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
"memoizee": "^0.4.15",
"micromatch": "^4.0.2",
"mime": "^2.4.6",
"mini-css-extract-plugin": "^1.3.8",
"mini-css-extract-plugin": "1.3.8",
"mitt": "^1.2.0",
"mkdirp": "^0.5.1",
"moment": "^2.27.0",
Expand Down Expand Up @@ -260,4 +260,4 @@
"yargs": {
"boolean-negation": false
}
}
}
2 changes: 1 addition & 1 deletion yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18602,7 +18602,7 @@ min-indent@^1.0.0:
resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==

mini-css-extract-plugin@^1.3.8:
mini-css-extract-plugin@1.3.8, mini-css-extract-plugin@^1.3.8:
version "1.3.8"
resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.8.tgz#639047b78c2ee728704285aa468d2a5a8d91d566"
integrity sha512-u+2kVov/Gcs74iz+x3phEBWMAGw2djjnKfYez+Pl/b5dyXL7aM4Lp5QQtIq16CDwRHT/woUJki49gBNMhfm1eA==
Expand Down