Merge 25da88f into 0678e66

react-next-boilerplate · Feb 21, 2020 · b1977ca · b1977ca
2 parents 0678e66 + 25da88f
commit b1977ca
Show file tree

Hide file tree

Showing 6 changed files with 290 additions and 78 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -6,6 +6,6 @@ coverage/
 # Cruft
 .DS_Store
 npm-debug.log
-src/.next/
+.next/
 
 next-seo.config.js
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 # Don't check auto-generated stuff into git
-src/.next/
+.next/
 coverage
 node_modules
 stats.json

diff --git a/.prettierignore b/.prettierignore
@@ -1,5 +1,5 @@
 # Don't check auto-generated stuff into git
-src/.next
+.next
 
 node_modules
 .cache

diff --git a/package.json b/package.json
@@ -40,8 +40,8 @@
     "immer": "^5.3.2",
     "invariant": "2.2.4",
     "lodash": "^4.17.15",
-    "next": "^9.2.1",
-    "next-i18next": "^4.1.0",
+    "next": "^9.2.2",
+    "next-i18next": "^4.2.0",
     "prop-types": "^15.7.2",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
@@ -61,7 +61,7 @@
     "babel-plugin-dynamic-import-node": "^2.3.0",
     "babel-plugin-emotion": "^10.0.21",
     "babel-plugin-module-resolver": "^3.2.0",
-    "coveralls": "3.0.3",
+    "coveralls": "^3.0.9",
     "cross-env": "^7.0.0",
     "eslint": "^6.0.0",
     "eslint-config-prettier": "^5.0.0",

diff --git a/server/app.js b/server/app.js
@@ -10,7 +10,7 @@ const nextI18NextMiddleware = require('next-i18next/middleware').default;
 const nextI18next = require('../i18n');
 
 const port = process.env.PORT || 3000;
-const app = next({ dir: './src', dev });
+const app = next({ dev });
 
 const handle = app.getRequestHandler();