Commit 43fe9ace authored by Tim Neutkens's avatar Tim Neutkens

Merge branch 'canary' of github.com:zeit/next.js into canary

parents c07cf5e8 b39958e7
......@@ -43,13 +43,9 @@ npm run dev
#### Run Firebase locally for testing:
Unfortunately I have been unable to get any combination of
```bash
firebase serve --only functions,hosting
```
to locally host the built Next.js app as expected. [This issue is where solutions are being explored](https://github.com/firebase/firebase-tools/issues/535) and they will be shared here and on the [Next.js repo's similar issue](https://github.com/zeit/next.js/issues/3167) when discovered.
npm run serve
```
#### Deploy it to the cloud with Firebase:
......
......@@ -4,7 +4,7 @@
"description": "Host Next.js SSR app on Firebase Cloud Functions with Firebase Hosting redirects.",
"scripts": {
"dev": "next src/app",
"serve": "echo \"for details see:\n\thttps://github.com/firebase/firebase-tools/issues/535 \n\thttps://github.com/zeit/next.js/issues/3167\";",
"serve": "NODE_ENV=production firebase serve --only functions,hosting",
"deploy": "firebase deploy",
"clean": "rimraf \"dist/functions\" && rimraf \"dist/public\"",
"build-public": "cpx \"src/public/**/*.*\" \"dist/public\" -C",
......
......@@ -77,7 +77,7 @@
"fresh": "0.5.2",
"friendly-errors-webpack-plugin": "1.6.1",
"glob": "7.1.2",
"hoist-non-react-statics": "2.3.1",
"hoist-non-react-statics": "2.5.0",
"htmlescape": "1.1.1",
"http-errors": "1.6.2",
"http-status": "1.0.1",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment