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

fix(gatsby): use history fallback to display client-only routes in serve #11581

Merged
merged 1 commit into from
Feb 6, 2019
Merged

fix(gatsby): use history fallback to display client-only routes in serve #11581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions packages/gatsby/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"eslint-plugin-react": "^7.8.2",
"express": "^4.16.3",
"express-graphql": "^0.6.12",
"express-history-api-fallback": "^2.2.1",
"fast-levenshtein": "~2.0.4",
"file-loader": "^1.1.11",
"flat": "^4.0.0",
Expand Down
7 changes: 6 additions & 1 deletion packages/gatsby/src/commands/serve.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/* @flow weak */
const path = require(`path`)
const openurl = require(`better-opn`)
const signalExit = require(`signal-exit`)
const compression = require(`compression`)
const express = require(`express`)
const historyFallback = require(`express-history-api-fallback`)
const getConfigFile = require(`../bootstrap/get-config-file`)
const preferDefault = require(`../bootstrap/prefer-default`)
const chalk = require(`chalk`)
Expand All @@ -18,13 +20,16 @@ module.exports = async program => {
let pathPrefix = config && config.pathPrefix
pathPrefix = prefixPaths && pathPrefix ? pathPrefix : `/`

const root = path.join(program.directory, `public`)

const app = express()
const router = express.Router()
router.use(compression())
router.use(express.static(`public`))
router.use(historyFallback(`index.html`, { root }))
router.use((req, res, next) => {
if (req.accepts(`html`)) {
res.status(404).sendFile(`404.html`, { root: `public` })
res.status(404).sendFile(`404.html`, { root })
} else {
next()
}
Expand Down
5 changes: 5 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7668,6 +7668,11 @@ express-graphql@^0.6.12:
http-errors "^1.3.0"
raw-body "^2.3.2"

express-history-api-fallback@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/express-history-api-fallback/-/express-history-api-fallback-2.2.1.tgz#3a2ad27f7bebc90fc533d110d7c6d83097bcd057"
integrity sha1-OirSf3vryQ/FM9EQ18bYMJe80Fc=

express@^4.16.2, express@^4.16.3:
version "4.16.3"
resolved "http://registry.npmjs.org/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
Expand Down