Skip to content

Commit 41f687b

Browse files
committed
Update to latest version in monorepo
1 parent 3f86cff commit 41f687b

File tree

3 files changed

+133
-85
lines changed

3 files changed

+133
-85
lines changed

CHANGELOG.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,48 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [3.13.0-next.0](https://github.com/gatsbyjs/gatsby/compare/[email protected]@3.13.0-next.0) (2021-08-12)
7+
8+
**Note:** Version bump only for package gatsby-plugin-netlify
9+
10+
# [3.12.0-next.3](https://github.com/gatsbyjs/gatsby/compare/[email protected]@3.12.0-next.3) (2021-08-09)
11+
12+
**Note:** Version bump only for package gatsby-plugin-netlify
13+
14+
# [3.12.0-next.2](https://github.com/gatsbyjs/gatsby/compare/[email protected]@3.12.0-next.2) (2021-08-05)
15+
16+
**Note:** Version bump only for package gatsby-plugin-netlify
17+
18+
# [3.12.0-next.1](https://github.com/gatsbyjs/gatsby/compare/[email protected]@3.12.0-next.1) (2021-08-05)
19+
20+
### Bug Fixes
21+
22+
- **deps:** update dependency webpack-assets-manifest to ^5.0.6 for gatsby-plugin-netlify ([#32593](https://github.com/gatsbyjs/gatsby/issues/32593)) ([fa0f286](https://github.com/gatsbyjs/gatsby/commit/fa0f2863a7dfd51c0323032e80aa9f1868d2e506))
23+
24+
# [3.12.0-next.0](https://github.com/gatsbyjs/gatsby/compare/[email protected]@3.12.0-next.0) (2021-07-29)
25+
26+
**Note:** Version bump only for package gatsby-plugin-netlify
27+
28+
# [3.11.0-next.0](https://github.com/gatsbyjs/gatsby/compare/[email protected]@3.11.0-next.0) (2021-07-15)
29+
30+
**Note:** Version bump only for package gatsby-plugin-netlify
31+
32+
# [3.10.0-next.1](https://github.com/gatsbyjs/gatsby/compare/[email protected]@3.10.0-next.1) (2021-07-08)
33+
34+
**Note:** Version bump only for package gatsby-plugin-netlify
35+
36+
# [3.10.0-next.0](https://github.com/gatsbyjs/gatsby/compare/[email protected]@3.10.0-next.0) (2021-07-01)
37+
38+
**Note:** Version bump only for package gatsby-plugin-netlify
39+
40+
# [3.9.0-next.1](https://github.com/gatsbyjs/gatsby/compare/[email protected]@3.9.0-next.1) (2021-06-28)
41+
42+
**Note:** Version bump only for package gatsby-plugin-netlify
43+
44+
# [3.9.0-next.0](https://github.com/gatsbyjs/gatsby/compare/[email protected]@3.9.0-next.0) (2021-06-18)
45+
46+
**Note:** Version bump only for package gatsby-plugin-netlify
47+
648
# [3.8.0-next.1](https://github.com/gatsbyjs/gatsby/compare/[email protected]@3.8.0-next.1) (2021-06-10)
749

850
**Note:** Version bump only for package gatsby-plugin-netlify

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "gatsby-plugin-netlify",
33
"description": "A Gatsby plugin which generates a _headers file for netlify",
4-
"version": "3.8.0-next.1",
4+
"version": "3.13.0-next.0",
55
"author": "Kyle Mathews <[email protected]>",
66
"bugs": {
77
"url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -13,18 +13,18 @@
1313
}
1414
],
1515
"dependencies": {
16-
"@babel/runtime": "^7.14.0",
16+
"@babel/runtime": "^7.14.8",
1717
"fs-extra": "^8.1.0",
1818
"kebab-hash": "^0.1.2",
1919
"lodash": "^4.17.21",
20-
"webpack-assets-manifest": "^5.0.5"
20+
"webpack-assets-manifest": "^5.0.6"
2121
},
2222
"devDependencies": {
23-
"@babel/cli": "^7.14.0",
24-
"@babel/core": "^7.14.0",
25-
"babel-preset-gatsby-package": "^1.8.0-next.1",
23+
"@babel/cli": "^7.14.8",
24+
"@babel/core": "^7.14.8",
25+
"babel-preset-gatsby-package": "^1.13.0-next.0",
2626
"cross-env": "^7.0.3",
27-
"gatsby-plugin-utils": "^1.8.0-next.1"
27+
"gatsby-plugin-utils": "^1.13.0-next.0"
2828
},
2929
"homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-plugin-netlify#readme",
3030
"keywords": [

src/build-headers-program.js

Lines changed: 84 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -241,108 +241,114 @@ const validateUserOptions = (pluginOptions, reporter) => headers => {
241241
return headers
242242
}
243243

244-
const mapUserLinkHeaders = ({
245-
manifest,
246-
pathPrefix,
247-
publicFolder,
248-
}) => headers =>
249-
_.mapValues(headers, headerList =>
250-
_.map(headerList, transformLink(manifest, publicFolder, pathPrefix))
251-
)
252-
253-
const mapUserLinkAllPageHeaders = (
254-
pluginData,
255-
{ allPageHeaders }
256-
) => headers => {
257-
if (!allPageHeaders) {
258-
return headers
259-
}
244+
const mapUserLinkHeaders =
245+
({ manifest, pathPrefix, publicFolder }) =>
246+
headers =>
247+
_.mapValues(headers, headerList =>
248+
_.map(headerList, transformLink(manifest, publicFolder, pathPrefix))
249+
)
260250

261-
const { pages, manifest, publicFolder, pathPrefix } = pluginData
251+
const mapUserLinkAllPageHeaders =
252+
(pluginData, { allPageHeaders }) =>
253+
headers => {
254+
if (!allPageHeaders) {
255+
return headers
256+
}
262257

263-
const headersList = _.map(
264-
allPageHeaders,
265-
transformLink(manifest, publicFolder, pathPrefix)
266-
)
258+
const { pages, manifest, publicFolder, pathPrefix } = pluginData
267259

268-
const duplicateHeadersByPage = {}
269-
pages.forEach(page => {
270-
const pathKey = headersPath(pathPrefix, page.path)
271-
duplicateHeadersByPage[pathKey] = headersList
272-
})
260+
const headersList = _.map(
261+
allPageHeaders,
262+
transformLink(manifest, publicFolder, pathPrefix)
263+
)
273264

274-
return defaultMerge(headers, duplicateHeadersByPage)
275-
}
265+
const duplicateHeadersByPage = {}
266+
pages.forEach(page => {
267+
const pathKey = headersPath(pathPrefix, page.path)
268+
duplicateHeadersByPage[pathKey] = headersList
269+
})
276270

277-
const applyLinkHeaders = (pluginData, { mergeLinkHeaders }) => headers => {
278-
if (!mergeLinkHeaders) {
279-
return headers
271+
return defaultMerge(headers, duplicateHeadersByPage)
280272
}
281273

282-
const { pages, manifest, pathPrefix, publicFolder } = pluginData
283-
const perPageHeaders = preloadHeadersByPage({
284-
pages,
285-
manifest,
286-
pathPrefix,
287-
publicFolder,
288-
})
274+
const applyLinkHeaders =
275+
(pluginData, { mergeLinkHeaders }) =>
276+
headers => {
277+
if (!mergeLinkHeaders) {
278+
return headers
279+
}
289280

290-
return defaultMerge(headers, perPageHeaders)
291-
}
281+
const { pages, manifest, pathPrefix, publicFolder } = pluginData
282+
const perPageHeaders = preloadHeadersByPage({
283+
pages,
284+
manifest,
285+
pathPrefix,
286+
publicFolder,
287+
})
292288

293-
const applySecurityHeaders = ({ mergeSecurityHeaders }) => headers => {
294-
if (!mergeSecurityHeaders) {
295-
return headers
289+
return defaultMerge(headers, perPageHeaders)
296290
}
297291

298-
return headersMerge(headers, SECURITY_HEADERS)
299-
}
292+
const applySecurityHeaders =
293+
({ mergeSecurityHeaders }) =>
294+
headers => {
295+
if (!mergeSecurityHeaders) {
296+
return headers
297+
}
300298

301-
const applyCachingHeaders = (
302-
pluginData,
303-
{ mergeCachingHeaders }
304-
) => headers => {
305-
if (!mergeCachingHeaders) {
306-
return headers
299+
return headersMerge(headers, SECURITY_HEADERS)
307300
}
308301

309-
let chunks = []
310-
// Gatsby v3.5 added componentChunkName to store().components
311-
// So we prefer to pull chunk names off that as it gets very expensive to loop
312-
// over large numbers of pages.
313-
const isComponentChunkSet = !!pluginData.components.entries()?.next()
314-
?.value[1]?.componentChunkName
315-
if (isComponentChunkSet) {
316-
chunks = [...pluginData.components.values()].map(c => c.componentChunkName)
317-
} else {
318-
chunks = Array.from(pluginData.pages.values()).map(
319-
page => page.componentChunkName
320-
)
321-
}
302+
const applyCachingHeaders =
303+
(pluginData, { mergeCachingHeaders }) =>
304+
headers => {
305+
if (!mergeCachingHeaders) {
306+
return headers
307+
}
322308

323-
chunks.push(`pages-manifest`, `app`)
309+
let chunks = []
310+
// Gatsby v3.5 added componentChunkName to store().components
311+
// So we prefer to pull chunk names off that as it gets very expensive to loop
312+
// over large numbers of pages.
313+
const isComponentChunkSet = !!pluginData.components.entries()?.next()
314+
?.value[1]?.componentChunkName
315+
if (isComponentChunkSet) {
316+
chunks = [...pluginData.components.values()].map(
317+
c => c.componentChunkName
318+
)
319+
} else {
320+
chunks = Array.from(pluginData.pages.values()).map(
321+
page => page.componentChunkName
322+
)
323+
}
324324

325-
const files = [].concat(...chunks.map(chunk => pluginData.manifest[chunk]))
325+
chunks.push(`pages-manifest`, `app`)
326326

327-
const cachingHeaders = {}
327+
const files = [].concat(...chunks.map(chunk => pluginData.manifest[chunk]))
328328

329-
files.forEach(file => {
330-
if (typeof file === `string`) {
331-
cachingHeaders[`/` + file] = [IMMUTABLE_CACHING_HEADER]
332-
}
333-
})
329+
const cachingHeaders = {}
334330

335-
return defaultMerge(headers, cachingHeaders, CACHING_HEADERS)
336-
}
331+
files.forEach(file => {
332+
if (typeof file === `string`) {
333+
cachingHeaders[`/` + file] = [IMMUTABLE_CACHING_HEADER]
334+
}
335+
})
336+
337+
return defaultMerge(headers, cachingHeaders, CACHING_HEADERS)
338+
}
337339

338-
const applyTransfromHeaders = ({ transformHeaders }) => headers =>
339-
_.mapValues(headers, transformHeaders)
340+
const applyTransfromHeaders =
341+
({ transformHeaders }) =>
342+
headers =>
343+
_.mapValues(headers, transformHeaders)
340344

341345
const transformToString = headers =>
342346
`${HEADER_COMMENT}\n\n${stringifyHeaders(headers)}`
343347

344-
const writeHeadersFile = ({ publicFolder }) => contents =>
345-
writeFile(publicFolder(NETLIFY_HEADERS_FILENAME), contents)
348+
const writeHeadersFile =
349+
({ publicFolder }) =>
350+
contents =>
351+
writeFile(publicFolder(NETLIFY_HEADERS_FILENAME), contents)
346352

347353
export default function buildHeadersProgram(
348354
pluginData,

0 commit comments

Comments
 (0)