Skip to content

Commit cf30479

Browse files
ascorbicascorbic
committed
Merge branch 'feat/remove-cache-headers' into feat/v4
2 parents a3991ae + 9f88d08 commit cf30479

File tree

5 files changed

+0
-291
lines changed

5 files changed

+0
-291
lines changed

‎src/__tests__/__snapshots__/build-headers-program.js.snap

Lines changed: 0 additions & 184 deletions
Original file line numberDiff line numberDiff line change
@@ -1,123 +1,5 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

3-
exports[`build-headers-program with caching headers 1`] = `
4-
"## Created with gatsby-plugin-netlify
5-
6-
/*
7-
X-Frame-Options: DENY
8-
X-XSS-Protection: 1; mode=block
9-
X-Content-Type-Options: nosniff
10-
Referrer-Policy: same-origin
11-
/offline-plugin-app-shell-fallback/
12-
Link: </webpack-runtime-acaa8994f1f704475e21.js>; rel=preload; as=script
13-
Link: </styles-565f081c8374bbda155f.js>; rel=preload; as=script
14-
Link: </app-f33c13590352da20930f.js>; rel=preload; as=script
15-
Link: </component---node-modules-gatsby-plugin-offline-app-shell-js-78f9e4dea04737fa062d.js>; rel=preload; as=script
16-
Link: </page-data/app-data.json>; rel=preload; as=fetch; crossorigin
17-
Link: </page-data/offline-plugin-app-shell-fallback/page-data.json>; rel=preload; as=fetch; crossorigin
18-
/hi-folks/
19-
Link: </webpack-runtime-acaa8994f1f704475e21.js>; rel=preload; as=script
20-
Link: </styles-565f081c8374bbda155f.js>; rel=preload; as=script
21-
Link: </app-f33c13590352da20930f.js>; rel=preload; as=script
22-
Link: </0-0180cd94ef2497ac7db8.js>; rel=preload; as=script
23-
Link: </component---src-templates-blog-post-js-517987eae96e75cddbe7.js>; rel=preload; as=script
24-
Link: </page-data/app-data.json>; rel=preload; as=fetch; crossorigin
25-
Link: </page-data/hi-folks/page-data.json>; rel=preload; as=fetch; crossorigin
26-
/my-second-post/
27-
Link: </webpack-runtime-acaa8994f1f704475e21.js>; rel=preload; as=script
28-
Link: </styles-565f081c8374bbda155f.js>; rel=preload; as=script
29-
Link: </app-f33c13590352da20930f.js>; rel=preload; as=script
30-
Link: </0-0180cd94ef2497ac7db8.js>; rel=preload; as=script
31-
Link: </component---src-templates-blog-post-js-517987eae96e75cddbe7.js>; rel=preload; as=script
32-
Link: </page-data/app-data.json>; rel=preload; as=fetch; crossorigin
33-
Link: </page-data/my-second-post/page-data.json>; rel=preload; as=fetch; crossorigin
34-
/hello-world/
35-
Link: </webpack-runtime-acaa8994f1f704475e21.js>; rel=preload; as=script
36-
Link: </styles-565f081c8374bbda155f.js>; rel=preload; as=script
37-
Link: </app-f33c13590352da20930f.js>; rel=preload; as=script
38-
Link: </0-0180cd94ef2497ac7db8.js>; rel=preload; as=script
39-
Link: </component---src-templates-blog-post-js-517987eae96e75cddbe7.js>; rel=preload; as=script
40-
Link: </page-data/app-data.json>; rel=preload; as=fetch; crossorigin
41-
Link: </page-data/hello-world/page-data.json>; rel=preload; as=fetch; crossorigin
42-
/404/
43-
Link: </webpack-runtime-acaa8994f1f704475e21.js>; rel=preload; as=script
44-
Link: </styles-565f081c8374bbda155f.js>; rel=preload; as=script
45-
Link: </app-f33c13590352da20930f.js>; rel=preload; as=script
46-
Link: </0-0180cd94ef2497ac7db8.js>; rel=preload; as=script
47-
Link: </component---src-pages-404-js-53e6c51a5a7e73090f50.js>; rel=preload; as=script
48-
Link: </page-data/app-data.json>; rel=preload; as=fetch; crossorigin
49-
Link: </page-data/404/page-data.json>; rel=preload; as=fetch; crossorigin
50-
/
51-
Link: </webpack-runtime-acaa8994f1f704475e21.js>; rel=preload; as=script
52-
Link: </styles-565f081c8374bbda155f.js>; rel=preload; as=script
53-
Link: </app-f33c13590352da20930f.js>; rel=preload; as=script
54-
Link: </0-0180cd94ef2497ac7db8.js>; rel=preload; as=script
55-
Link: </component---src-pages-index-js-0bdd01c77ee09ef0224c.js>; rel=preload; as=script
56-
Link: </page-data/app-data.json>; rel=preload; as=fetch; crossorigin
57-
Link: </page-data/index/page-data.json>; rel=preload; as=fetch; crossorigin
58-
/404.html
59-
Link: </webpack-runtime-acaa8994f1f704475e21.js>; rel=preload; as=script
60-
Link: </styles-565f081c8374bbda155f.js>; rel=preload; as=script
61-
Link: </app-f33c13590352da20930f.js>; rel=preload; as=script
62-
Link: </0-0180cd94ef2497ac7db8.js>; rel=preload; as=script
63-
Link: </component---src-pages-404-js-53e6c51a5a7e73090f50.js>; rel=preload; as=script
64-
Link: </page-data/app-data.json>; rel=preload; as=fetch; crossorigin
65-
Link: </page-data/404.html/page-data.json>; rel=preload; as=fetch; crossorigin
66-
"
67-
`;
68-
69-
exports[`build-headers-program with manifest['pages-manifest'] 1`] = `
70-
"## Created with gatsby-plugin-netlify
71-
72-
/*
73-
X-Frame-Options: DENY
74-
X-XSS-Protection: 1; mode=block
75-
X-Content-Type-Options: nosniff
76-
Referrer-Policy: same-origin
77-
/offline-plugin-app-shell-fallback/
78-
Link: </webpack-runtime-acaa8994f1f704475e21.js>; rel=preload; as=script
79-
Link: </styles-565f081c8374bbda155f.js>; rel=preload; as=script
80-
Link: </app-f33c13590352da20930f.js>; rel=preload; as=script
81-
Link: </component---node-modules-gatsby-plugin-offline-app-shell-js-78f9e4dea04737fa062d.js>; rel=preload; as=script
82-
/hi-folks/
83-
Link: </webpack-runtime-acaa8994f1f704475e21.js>; rel=preload; as=script
84-
Link: </styles-565f081c8374bbda155f.js>; rel=preload; as=script
85-
Link: </app-f33c13590352da20930f.js>; rel=preload; as=script
86-
Link: </0-0180cd94ef2497ac7db8.js>; rel=preload; as=script
87-
Link: </component---src-templates-blog-post-js-517987eae96e75cddbe7.js>; rel=preload; as=script
88-
/my-second-post/
89-
Link: </webpack-runtime-acaa8994f1f704475e21.js>; rel=preload; as=script
90-
Link: </styles-565f081c8374bbda155f.js>; rel=preload; as=script
91-
Link: </app-f33c13590352da20930f.js>; rel=preload; as=script
92-
Link: </0-0180cd94ef2497ac7db8.js>; rel=preload; as=script
93-
Link: </component---src-templates-blog-post-js-517987eae96e75cddbe7.js>; rel=preload; as=script
94-
/hello-world/
95-
Link: </webpack-runtime-acaa8994f1f704475e21.js>; rel=preload; as=script
96-
Link: </styles-565f081c8374bbda155f.js>; rel=preload; as=script
97-
Link: </app-f33c13590352da20930f.js>; rel=preload; as=script
98-
Link: </0-0180cd94ef2497ac7db8.js>; rel=preload; as=script
99-
Link: </component---src-templates-blog-post-js-517987eae96e75cddbe7.js>; rel=preload; as=script
100-
/404/
101-
Link: </webpack-runtime-acaa8994f1f704475e21.js>; rel=preload; as=script
102-
Link: </styles-565f081c8374bbda155f.js>; rel=preload; as=script
103-
Link: </app-f33c13590352da20930f.js>; rel=preload; as=script
104-
Link: </0-0180cd94ef2497ac7db8.js>; rel=preload; as=script
105-
Link: </component---src-pages-404-js-53e6c51a5a7e73090f50.js>; rel=preload; as=script
106-
/
107-
Link: </webpack-runtime-acaa8994f1f704475e21.js>; rel=preload; as=script
108-
Link: </styles-565f081c8374bbda155f.js>; rel=preload; as=script
109-
Link: </app-f33c13590352da20930f.js>; rel=preload; as=script
110-
Link: </0-0180cd94ef2497ac7db8.js>; rel=preload; as=script
111-
Link: </component---src-pages-index-js-0bdd01c77ee09ef0224c.js>; rel=preload; as=script
112-
/404.html
113-
Link: </webpack-runtime-acaa8994f1f704475e21.js>; rel=preload; as=script
114-
Link: </styles-565f081c8374bbda155f.js>; rel=preload; as=script
115-
Link: </app-f33c13590352da20930f.js>; rel=preload; as=script
116-
Link: </0-0180cd94ef2497ac7db8.js>; rel=preload; as=script
117-
Link: </component---src-pages-404-js-53e6c51a5a7e73090f50.js>; rel=preload; as=script
118-
"
119-
`;
120-
1213
exports[`build-headers-program with security headers 1`] = `
1224
"## Created with gatsby-plugin-netlify
1235
@@ -186,69 +68,3 @@ exports[`build-headers-program with security headers 1`] = `
18668
Link: </page-data/404.html/page-data.json>; rel=preload; as=fetch; crossorigin
18769
"
18870
`;
189-
190-
exports[`build-headers-program without caching headers 1`] = `
191-
"## Created with gatsby-plugin-netlify
192-
193-
/*
194-
X-Frame-Options: DENY
195-
X-XSS-Protection: 1; mode=block
196-
X-Content-Type-Options: nosniff
197-
Referrer-Policy: same-origin
198-
/offline-plugin-app-shell-fallback/
199-
Link: </webpack-runtime-acaa8994f1f704475e21.js>; rel=preload; as=script
200-
Link: </styles-565f081c8374bbda155f.js>; rel=preload; as=script
201-
Link: </app-f33c13590352da20930f.js>; rel=preload; as=script
202-
Link: </component---node-modules-gatsby-plugin-offline-app-shell-js-78f9e4dea04737fa062d.js>; rel=preload; as=script
203-
Link: </page-data/app-data.json>; rel=preload; as=fetch; crossorigin
204-
Link: </page-data/offline-plugin-app-shell-fallback/page-data.json>; rel=preload; as=fetch; crossorigin
205-
/hi-folks/
206-
Link: </webpack-runtime-acaa8994f1f704475e21.js>; rel=preload; as=script
207-
Link: </styles-565f081c8374bbda155f.js>; rel=preload; as=script
208-
Link: </app-f33c13590352da20930f.js>; rel=preload; as=script
209-
Link: </0-0180cd94ef2497ac7db8.js>; rel=preload; as=script
210-
Link: </component---src-templates-blog-post-js-517987eae96e75cddbe7.js>; rel=preload; as=script
211-
Link: </page-data/app-data.json>; rel=preload; as=fetch; crossorigin
212-
Link: </page-data/hi-folks/page-data.json>; rel=preload; as=fetch; crossorigin
213-
/my-second-post/
214-
Link: </webpack-runtime-acaa8994f1f704475e21.js>; rel=preload; as=script
215-
Link: </styles-565f081c8374bbda155f.js>; rel=preload; as=script
216-
Link: </app-f33c13590352da20930f.js>; rel=preload; as=script
217-
Link: </0-0180cd94ef2497ac7db8.js>; rel=preload; as=script
218-
Link: </component---src-templates-blog-post-js-517987eae96e75cddbe7.js>; rel=preload; as=script
219-
Link: </page-data/app-data.json>; rel=preload; as=fetch; crossorigin
220-
Link: </page-data/my-second-post/page-data.json>; rel=preload; as=fetch; crossorigin
221-
/hello-world/
222-
Link: </webpack-runtime-acaa8994f1f704475e21.js>; rel=preload; as=script
223-
Link: </styles-565f081c8374bbda155f.js>; rel=preload; as=script
224-
Link: </app-f33c13590352da20930f.js>; rel=preload; as=script
225-
Link: </0-0180cd94ef2497ac7db8.js>; rel=preload; as=script
226-
Link: </component---src-templates-blog-post-js-517987eae96e75cddbe7.js>; rel=preload; as=script
227-
Link: </page-data/app-data.json>; rel=preload; as=fetch; crossorigin
228-
Link: </page-data/hello-world/page-data.json>; rel=preload; as=fetch; crossorigin
229-
/404/
230-
Link: </webpack-runtime-acaa8994f1f704475e21.js>; rel=preload; as=script
231-
Link: </styles-565f081c8374bbda155f.js>; rel=preload; as=script
232-
Link: </app-f33c13590352da20930f.js>; rel=preload; as=script
233-
Link: </0-0180cd94ef2497ac7db8.js>; rel=preload; as=script
234-
Link: </component---src-pages-404-js-53e6c51a5a7e73090f50.js>; rel=preload; as=script
235-
Link: </page-data/app-data.json>; rel=preload; as=fetch; crossorigin
236-
Link: </page-data/404/page-data.json>; rel=preload; as=fetch; crossorigin
237-
/
238-
Link: </webpack-runtime-acaa8994f1f704475e21.js>; rel=preload; as=script
239-
Link: </styles-565f081c8374bbda155f.js>; rel=preload; as=script
240-
Link: </app-f33c13590352da20930f.js>; rel=preload; as=script
241-
Link: </0-0180cd94ef2497ac7db8.js>; rel=preload; as=script
242-
Link: </component---src-pages-index-js-0bdd01c77ee09ef0224c.js>; rel=preload; as=script
243-
Link: </page-data/app-data.json>; rel=preload; as=fetch; crossorigin
244-
Link: </page-data/index/page-data.json>; rel=preload; as=fetch; crossorigin
245-
/404.html
246-
Link: </webpack-runtime-acaa8994f1f704475e21.js>; rel=preload; as=script
247-
Link: </styles-565f081c8374bbda155f.js>; rel=preload; as=script
248-
Link: </app-f33c13590352da20930f.js>; rel=preload; as=script
249-
Link: </0-0180cd94ef2497ac7db8.js>; rel=preload; as=script
250-
Link: </component---src-pages-404-js-53e6c51a5a7e73090f50.js>; rel=preload; as=script
251-
Link: </page-data/app-data.json>; rel=preload; as=fetch; crossorigin
252-
Link: </page-data/404.html/page-data.json>; rel=preload; as=fetch; crossorigin
253-
"
254-
`;

‎src/__tests__/build-headers-program.js

Lines changed: 0 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -191,108 +191,6 @@ describe(`build-headers-program`, () => {
191191
}
192192
}
193193

194-
it(`with caching headers`, async () => {
195-
const pluginData = await createPluginData()
196-
197-
const pluginOptions = {
198-
...DEFAULT_OPTIONS,
199-
mergeCachingHeaders: true,
200-
}
201-
202-
await buildHeadersProgram(pluginData, pluginOptions, reporter)
203-
204-
expect(reporter.panic).not.toHaveBeenCalled()
205-
const output = await fs.readFile(
206-
pluginData.publicFolder(`_headers`),
207-
`utf8`
208-
)
209-
expect(output).toMatchSnapshot()
210-
expect(output).toMatch(/app-data\.json/)
211-
expect(output).toMatch(/page-data\.json/)
212-
// we should only check page-data & app-data once which leads to 2 times
213-
expect(fs.existsSync).toBeCalledTimes(2)
214-
})
215-
216-
it(`with manifest['pages-manifest']`, async () => {
217-
const pluginData = await createPluginData()
218-
219-
fs.existsSync.mockImplementation(path => {
220-
if (path.includes(`page-data.json`) || path.includes(`app-data.json`)) {
221-
return false
222-
}
223-
224-
return true
225-
})
226-
227-
// gatsby < 2.9 uses page-manifest
228-
pluginData.manifest[`pages-manifest`] = [
229-
`pages-manifest-ab11f09e0ca7ecd3b43e.js`,
230-
]
231-
232-
const pluginOptions = {
233-
...DEFAULT_OPTIONS,
234-
mergeCachingHeaders: true,
235-
}
236-
237-
await buildHeadersProgram(pluginData, pluginOptions, reporter)
238-
239-
expect(reporter.panic).not.toHaveBeenCalled()
240-
const output = await fs.readFile(
241-
pluginData.publicFolder(`_headers`),
242-
`utf8`
243-
)
244-
expect(output).toMatchSnapshot()
245-
expect(output).toMatch(/\/pages-manifest-ab11f09e0ca7ecd3b43e\.js/g)
246-
expect(output).not.toMatch(/\/app-data\.json/g)
247-
expect(output).not.toMatch(/\/page-data\.json/g)
248-
expect(output).not.toMatch(/\/undefined/g)
249-
})
250-
251-
it(`without app-data file`, async () => {
252-
const pluginData = await createPluginData()
253-
254-
// gatsby 2.17.0+ adds an app-data file
255-
delete pluginData.manifest[`pages-manifest`]
256-
257-
const pluginOptions = {
258-
...DEFAULT_OPTIONS,
259-
mergeCachingHeaders: true,
260-
}
261-
fs.existsSync.mockImplementation(path => {
262-
if (path.includes(`app-data.json`)) {
263-
return false
264-
}
265-
266-
return true
267-
})
268-
269-
await buildHeadersProgram(pluginData, pluginOptions, reporter)
270-
271-
expect(reporter.panic).not.toHaveBeenCalled()
272-
const output = await fs.readFile(
273-
pluginData.publicFolder(`_headers`),
274-
`utf8`
275-
)
276-
expect(output).not.toMatch(/app-data\.json/g)
277-
expect(output).not.toMatch(/\/undefined/g)
278-
})
279-
280-
it(`without caching headers`, async () => {
281-
const pluginData = await createPluginData()
282-
283-
const pluginOptions = {
284-
...DEFAULT_OPTIONS,
285-
mergeCachingHeaders: false,
286-
}
287-
288-
await buildHeadersProgram(pluginData, pluginOptions, reporter)
289-
290-
expect(reporter.panic).not.toHaveBeenCalled()
291-
expect(
292-
await fs.readFile(pluginData.publicFolder(`_headers`), `utf8`)
293-
).toMatchSnapshot()
294-
})
295-
296194
it(`with security headers`, async () => {
297195
const pluginData = await createPluginData()
298196

‎src/__tests__/gatsby-node.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ describe(`gatsby-node.js`, () => {
88
`"allPageHeaders" must be an array`,
99
`"mergeSecurityHeaders" must be a boolean`,
1010
`"mergeLinkHeaders" must be a boolean`,
11-
`"mergeCachingHeaders" must be a boolean`,
1211
`"transformHeaders" must have an arity lesser or equal to 2`,
1312
`"generateMatchPathRewrites" must be a boolean`,
1413
]
@@ -18,7 +17,6 @@ describe(`gatsby-node.js`, () => {
1817
allPageHeaders: `this should be an array`,
1918
mergeSecurityHeaders: `this should be a boolean`,
2019
mergeLinkHeaders: `this should be a boolean`,
21-
mergeCachingHeaders: `this should be a boolean`,
2220
transformHeaders: (too, many, args) => ``,
2321
generateMatchPathRewrites: `this should be a boolean`,
2422
})
@@ -35,7 +33,6 @@ describe(`gatsby-node.js`, () => {
3533
allPageHeaders: [`First header`, `Second header`],
3634
mergeSecurityHeaders: true,
3735
mergeLinkHeaders: false,
38-
mergeCachingHeaders: true,
3936
transformHeaders: () => null,
4037
generateMatchPathRewrites: false,
4138
})

‎src/constants.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ export const DEFAULT_OPTIONS = {
1111
headers: {},
1212
mergeSecurityHeaders: true,
1313
mergeLinkHeaders: true,
14-
mergeCachingHeaders: true,
1514
transformHeaders: _.identity, // optional transform for manipulating headers for sorting, etc
1615
generateMatchPathRewrites: true, // generate rewrites for client only paths
1716
}

‎src/gatsby-node.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ const pluginOptionsSchema = function ({ Joi }) {
7373
mergeLinkHeaders: Joi.boolean().description(
7474
`When set to true, turns off the default gatsby js headers`
7575
),
76-
7776
transformHeaders: Joi.function()
7877
.maxArity(2)
7978
.description(

0 commit comments

Comments
 (0)