Skip to content

fix(gatsby-plugin-gatsby-cloud): Copying manifest #31092

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

Merged
LekoArts merged 2 commits into from
Apr 28, 2021
Merged

fix(gatsby-plugin-gatsby-cloud): Copying manifest #31092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dad008f
update tests
LekoArts Apr 28, 2021
1b3aa69
check for existence of manifest file
LekoArts Apr 28, 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
4 changes: 2 additions & 2 deletions integration-tests/functions/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"start-server-and-test": "^1.11.3"
},
"dependencies": {
"gatsby": "3.4.0-next.2-dev-1618947033238",
"gatsby-plugin-gatsby-cloud": "latest",
"gatsby": "^3.5.0-next.0",
"gatsby-plugin-gatsby-cloud": "^2.5.0-next.0",
"react": "^17.0.1",
"react-dom": "^17.0.1"
}
Expand Down
1 change: 1 addition & 0 deletions integration-tests/gatsby-pipeline/gatsby-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ module.exports = {
},
`gatsby-transformer-sharp`,
`gatsby-plugin-sharp`,
`gatsby-plugin-gatsby-cloud`
],
}
11 changes: 6 additions & 5 deletions integration-tests/gatsby-pipeline/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@
"dependencies": {
"gatsby": "latest",
"gatsby-image": "latest",
"gatsby-plugin-gatsby-cloud": "latest",
"gatsby-plugin-react-helmet": "latest",
"gatsby-plugin-sharp": "latest",
"gatsby-source-filesystem": "latest",
"gatsby-transformer-sharp": "latest",
"prop-types": "^15.6.2",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"react-helmet": "^5.2.0"
"prop-types": "^15.7.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-helmet": "^6.1.0"
},
"keywords": [
"gatsby"
Expand All @@ -38,4 +39,4 @@
"engines": {
"node": ">=12.13.0"
}
}
}
2 changes: 1 addition & 1 deletion integration-tests/gatsby-pipeline/src/components/seo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react"
import PropTypes from "prop-types"
import Helmet from "react-helmet"
import { Helmet } from "react-helmet"
import { StaticQuery, graphql } from "gatsby"

function SEO({ description, lang, meta, keywords, title }) {
Expand Down
10 changes: 7 additions & 3 deletions packages/gatsby-plugin-gatsby-cloud/src/copy-functions-manifest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
import { copyFile } from "fs-extra"
import { copyFile, existsSync } from "fs-extra"
import {
PUBLIC_FUNCTIONS_FILENAME,
CACHE_FUNCTIONS_FILENAME,
} from "./constants"

export default async function copyFunctionsManifest(pluginData, siteDirectory) {
export default async function copyFunctionsManifest(pluginData) {
const { publicFolder, functionsFolder } = pluginData
const manifestPath = functionsFolder(CACHE_FUNCTIONS_FILENAME)
const publicManifestPath = publicFolder(PUBLIC_FUNCTIONS_FILENAME)

await copyFile(manifestPath, publicManifestPath)
const hasManifestFile = existsSync(manifestPath)

if (hasManifestFile) {
await copyFile(manifestPath, publicManifestPath)
}
}
2 changes: 1 addition & 1 deletion packages/gatsby-plugin-gatsby-cloud/src/gatsby-node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ exports.onPostBuild = async (
await Promise.all([
buildHeadersProgram(pluginData, pluginOptions, reporter),
createRedirects(pluginData, redirects, rewrites),
copyFunctionsManifest(pluginData, redirects, rewrites),
copyFunctionsManifest(pluginData),
])
}

Expand Down