Skip to content

Commit 0229dba

Browse files
authored
Merge pull request #1045 from EnterpriseDB/feature/evan/strip-legacy-redirects-from-netlify
strip nginx legacy redirects from netlify _redirects Former-commit-id: 7bf9861
2 parents 1941922 + be48fcc commit 0229dba

File tree

4 files changed

+40
-9
lines changed

4 files changed

+40
-9
lines changed

gatsby-node.js

+21
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ const {
2323
findPrevNextNavNodes,
2424
configureRedirects,
2525
configureLegacyRedirects,
26+
readFile,
27+
writeFile,
2628
} = require('./src/constants/gatsby-node-utils.js');
2729

2830
const isBuild = process.env.NODE_ENV === 'production';
@@ -412,3 +414,22 @@ exports.onPreBootstrap = () => {
412414
413415
`);
414416
};
417+
418+
exports.onPostBuild = async ({ reporter, pathPrefix }) => {
419+
const originalRedirects = await readFile('public/_redirects');
420+
421+
// filter out legacyRedirects that are loaded via nginx, not netlify
422+
let filteredRedirects = originalRedirects
423+
.split('\n')
424+
.filter((line) => !line.startsWith(`${pathPrefix}/edb-docs/`))
425+
.join('\n');
426+
427+
if (filteredRedirects.length === originalRedirects.length) {
428+
reporter.warn('no redirects were filtered out, did something change?');
429+
}
430+
431+
await writeFile(
432+
'public/_redirects',
433+
`${filteredRedirects}\n\n# Netlify pathPrefix path rewrite\n${pathPrefix}/* /:splat 200`,
434+
);
435+
};

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"develop": "gatsby develop",
1313
"config-sources": "python3 scripts/source/config_sources.py",
1414
"format": "prettier --write src/**/*.js gatsby-*.js",
15-
"build": "gatsby build --prefix-paths && bash scripts/post-build.sh",
15+
"build": "gatsby build --prefix-paths",
1616
"serve-build": "gatsby serve --prefix-paths",
1717
"update-icons": "git submodule update --init --remote && node scripts/createIconTypes.js && node scripts/createIconNames.js",
1818
"build-pdf": "python3 scripts/pdf/generate_pdf.py",

scripts/post-build.sh

-8
This file was deleted.

src/constants/gatsby-node-utils.js

+18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
const fs = require('fs');
2+
13
const sortVersionArray = (versions) => {
24
return versions
35
.map((version) => version.replace(/\d+/g, (n) => +n + 100000))
@@ -308,6 +310,20 @@ const configureLegacyRedirects = ({
308310
});
309311
};
310312

313+
const readFile = (filePath) =>
314+
new Promise(function (resolve, reject) {
315+
fs.readFile(filePath, 'utf8', function (err, data) {
316+
err ? reject(err) : resolve(data);
317+
});
318+
});
319+
320+
const writeFile = (filePath, data) =>
321+
new Promise(function (resolve, reject) {
322+
fs.writeFile(filePath, data, function (err) {
323+
err ? reject(err) : resolve();
324+
});
325+
});
326+
311327
module.exports = {
312328
sortVersionArray,
313329
replacePathVersion,
@@ -325,4 +341,6 @@ module.exports = {
325341
findPrevNextNavNodes,
326342
configureRedirects,
327343
configureLegacyRedirects,
344+
readFile,
345+
writeFile,
328346
};

0 commit comments

Comments
 (0)