Update dependency Next.js to v9.1.4

.circleci/config.yml

@@ -107,8 +107,13 @@ workflows:
           # record: true         # record results to Cypress Dashboard
           build: |
             npx lerna bootstrap --ci
-            npm run build
+            # Build separately because TS 3.9.0 is not emitting .js files
+            # in api/dist
             cd packages/api
+            npm run build
+            cd ../web
+            npm run build
+            cd ../api
             # We're deploying prisma twice,
             # can we reuse the one from integration tests?
             npx prisma deploy

.editorconfig

@@ -17,3 +17,9 @@ end_of_line = lf
 charset = utf-8
 insert_final_newline = true
 max_line_length = 80
+
+[*.{yml,yaml}]
+indent_style = space
+
+[{package.json}]
+indent_style = space

package.json

@@ -49,6 +49,6 @@
     "test:watch": "jest --watch",
     "typecheck": "npm-run-all --parallel typecheck:*",
     "typecheck:api": "tsc --noEmit --composite false --project packages/api/tsconfig.json",
-    "typecheck:web": "tsc --noEmit --composite false --project packages/web/tsconfig.json"
+    "typecheck:web": "tsc --noEmit --project packages/web/tsconfig.json"
   }
 }

packages/api/package.json

@@ -10,7 +10,9 @@
     "@olimat/api": "dist"
   },
   "scripts": {
-    "prebuild": "rimraf dist && copyfiles -V -u 1 ./src/schema.graphql ./src/**/*.graphql ./dist",
+		"prebuild": "rimraf dist && copyfiles -V -u 1 ./src/schema.graphql ./src/**/*.graphql ./dist",
+		"build": "Uses an outdated version of TS, dependency of graphql-code-gen",
+		"build": "tsc --build --verbose .",
     "build:clean": "rimraf dist",
     "start": "node -r dotenv/config dist/index.js",
     "dev": "nodemon -e ts,graphql -x ts-node -r dotenv/config src/index.ts",

packages/web/.babelrc

@@ -1,16 +1,3 @@
 {
-  "presets": [
-    "next/babel",
-    "@zeit/next-typescript/babel"
-  ],
-  // I was getting a syntax error after moving Jest to monorepo root
-  // https://github.com/zeit/next.js/issues/2499
-  "env": {
-    "test": {
-      "presets": [
-        "next/babel",
-        "@zeit/next-typescript/babel"
-      ]
-    }
-  }
+	"presets": ["next/babel"]
 }

packages/web/next-env.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="next" />
+/// <reference types="next/types/global" />

packages/web/next.config.js

@@ -0,0 +1,24 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+const path = require('path');
+const { ANALYZE } = process.env;
+
+// Use next-compose-plugins if this gets weird
+module.exports = {
+	webpack: (config, { isServer }) => {
+		if (ANALYZE) {
+			const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
+
+			config.plugins.push(
+				new BundleAnalyzerPlugin({
+					analyzerMode: 'server',
+					analyzerPort: isServer ? 8888 : 8889,
+					openAnalyzer: true,
+				}),
+			);
+		}
+
+		config.resolve.alias['@olimat/web'] = path.join(__dirname, 'src');
+
+		return config;
+	},
+};

packages/web/next.d.ts

@@ -1,9 +1,8 @@
 import { ApolloClient } from '@apollo/client';
-import { NextContext as DefaultNextContext } from 'next';
+import { NextPageContext as DefaultNextContext } from 'next';
 
-// Extends default NextContext to include apolloClient
 declare module 'next' {
-	interface NextContext extends DefaultNextContext {
+	interface NextPageContext extends DefaultNextContext {
 		apolloClient: ApolloClient<any>;
 	}
 }