Merge branch 'canary' into bugfix/vercel#2825-changing-hash-triggers-…

…getInitialProps
michaeljonathanblack · Nov 21, 2018 · 1a87ac0 · 1a87ac0
2 parents f5a3766 + 19db04f
commit 1a87ac0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/packages/next-server/server/next-server.js b/packages/next-server/server/next-server.js
@@ -256,8 +256,6 @@ export default class Server {
     if (!fs.existsSync(resolve(this.distDir, BUILD_ID_FILE))) {
       throw new Error(`Could not find a valid build in the '${this.distDir}' directory! Try building your app with 'next build' before starting the server.`)
     }
-    const buildIdPath = join(this.distDir, BUILD_ID_FILE)
-    const buildId = fs.readFileSync(buildIdPath, 'utf8')
-    return buildId.trim()
+    return fs.readFileSync(join(this.distDir, BUILD_ID_FILE), 'utf8').trim()
   }
 }
diff --git a/packages/next/README.md b/packages/next/README.md
@@ -536,7 +536,7 @@ Router.beforePopState(({ url, as, options }) => {
 });
 ```
 
-If you return a `false` value from `beforePopState`, `Router` will not handle `popstate`;
+If the function you pass into `beforePopState` returns `false`, `Router` will not handle `popstate`;
 you'll be responsible for handling it, in that case.
 See [Disabling File-System Routing](#disabling-file-system-routing).