Merge branch 'canary' into trailing-slash-basepath

docs/basic-features/typescript.md

@@ -43,7 +43,7 @@ You're now ready to start converting files from `.js` to `.tsx` and leveraging t
 
 > Next.js `strict` mode is turned off by default. When you feel comfortable with TypeScript, it's recommended to turn it on in your `tsconfig.json`.
 
-By default, Next.js reports TypeScript errors during development for pages you are actively working on. TypeScript errors for inactive pages **do not** block the development process.
+By default, Next.js will do type checking as part of `next build`. We recommend using code editor type checking during development.
 
 If you want to silence the error reports, refer to the documentation for [Ignoring TypeScript errors](/docs/api-reference/next.config.js/ignoring-typescript-errors.md).
 

examples/blog-starter-typescript/.gitignore

@@ -1,2 +1,31 @@
-.env
-.now
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+
+# testing
+/coverage
+
+# Next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# local env files
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+# Vercel
+.vercel

examples/with-iron-session/package.json

@@ -8,11 +8,11 @@
     "start": "next start"
   },
   "dependencies": {
-    "next": "9.3.6",
-    "next-iron-session": "4.0.0",
+    "next": "^9.4.4",
+    "next-iron-session": "4.1.7",
     "prop-types": "15.7.2",
     "react": "16.13.1",
     "react-dom": "16.13.1",
-    "swr": "0.2.0"
+    "swr": "0.2.3"
   }
 }