Merge branch 'master' into renovate/fork-ts-checker-webpack-plugin-4.x

Author: mcabrams

.github/workflows/cd.yaml

@@ -36,5 +36,7 @@ jobs:
         token: ${{ github.token }}
         secrets: ${{ toJSON(secrets) }}
         version: ${{ github.sha }}
+        values: |
+          gitSha: ${{ github.sha }}
       env:
         KUBECONFIG_FILE: ${{ secrets.KUBECONFIG }}

dev-quickstart.sh

@@ -9,4 +9,5 @@ cd graphql_django_apollo_starter
 cp client/.env.example  client/.env
 cp .env.example  .env
 docker-compose down -v; docker-compose build; docker-compose up -d
+cd client
 npm install

{{ cookiecutter.project_slug }}/client/package-lock.json

@@ -32,8 +32,8 @@
     "@types/react-redux": "7.1.7",
     "@types/styled-components": "5.0.1",
     "@types/use-persisted-state": "0.3.0",
-    "@typescript-eslint/eslint-plugin": "2.24.0",
-    "@typescript-eslint/parser": "2.24.0",
+    "@typescript-eslint/eslint-plugin": "2.25.0",
+    "@typescript-eslint/parser": "2.25.0",
     "css-loader": "3.4.2",
     "dotenv": "8.2.0",
     "eslint": "6.8.0",
@@ -45,7 +45,7 @@
     "eslint-plugin-react-hooks": "2.5.1",
     "fork-ts-checker-notifier-webpack-plugin": "2.0.0",
     "fork-ts-checker-webpack-plugin": "4.1.1",
-    "html-webpack-plugin": "3.2.0",
+    "html-webpack-plugin": "4.0.1",
     "jest": "25.1.0",
     "npm-check": "5.9.2",
     "redux-devtools": "3.5.0",
@@ -55,15 +55,15 @@
     "ts-jest": "25.2.1",
     "ts-loader": "6.2.1",
     "typescript": "3.8.3",
-    "webpack": "4.42.0",
+    "webpack": "4.42.1",
     "webpack-cli": "3.3.11",
     "webpack-dev-server": "3.10.3"
   },
   "dependencies": {
     "@apollo/react-hooks": "3.1.3",
     "@reach/router": "1.3.3",
     "@sentry/browser": "5.15.0",
-    "antd": "4.0.3",
+    "antd": "4.0.4",
     "apollo-cache": "1.3.4",
     "apollo-cache-inmemory": "1.6.5",
     "apollo-client": "2.6.8",

{{ cookiecutter.project_slug }}/client/package.json

@@ -1,13 +1,13 @@
 import { Form, Input, Button } from 'antd';
-import { FormComponentProps } from 'antd/es/form';
+import { FormProps } from 'antd/es/form';
 import React, { useState } from 'react';
 import { RouteComponentProps } from '@reach/router';
 
 import { useIsLoggedIn } from '@src/hooks/useIsLoggedIn';
 import { useTokenAuthMutation } from '@src/generated/graphql';
 import { useRedirectIfLoggedIn } from '@src/hooks/useRedirectIfLoggedIn';
 
-interface LoginFormProps extends FormComponentProps {
+interface LoginFormProps extends FormProps {
   password: string;
   email: string;
 }

{{ cookiecutter.project_slug }}/client/src/components/Login.tsx

@@ -1,5 +1,5 @@
 import { Form, Input, Button } from 'antd';
-import { FormComponentProps } from 'antd/es/form';
+import { FormProps } from 'antd/es/form';
 import React, { useState } from 'react';
 import { RouteComponentProps } from '@reach/router';
 
@@ -9,7 +9,7 @@ import {
 } from '@src/generated/graphql';
 import { useRedirectIfLoggedIn } from '@src/hooks/useRedirectIfLoggedIn';
 
-interface SignupFormProps extends FormComponentProps {
+interface SignupFormProps extends FormProps {
   username: string;
   password: string;
   email: string;

{{ cookiecutter.project_slug }}/client/src/components/Signup.tsx

@@ -17,4 +17,4 @@ helm repo add stable https://kubernetes-charts.storage.googleapis.com/
 helm repo update
 helm dependency update ./kubernetes/{{ cookiecutter.kubernetes_project }}
 helm install stable/nfs-server-provisioner --generate-name --version 0.4.0
-helm install {{ cookiecutter.kubernetes_project }} ./kubernetes/{{ cookiecutter.kubernetes_project }} --namespace={{ cookiecutter.kubernetes_project }}
+helm install {{ cookiecutter.kubernetes_project }} ./kubernetes/{{ cookiecutter.kubernetes_project }} --namespace={{ cookiecutter.kubernetes_project }} --set gitSha="$(git rev-parse HEAD)"

{{ cookiecutter.project_slug }}/dev-kube-quickstart.sh

@@ -10,9 +10,9 @@ services:
     volumes:
       - ./client:/app
       - /app/node_modules
-      - ./server/schema:/app/schema # Need to keep schema up to date based off of server
       - /app/build
       - /app/public
+      - schema-test:/app/schema # Need to keep schema up to date based off of server
       - /app/src/generated/  # Don't want to overwrite what's generated via
                              # the non-test environment.
     depends_on:
@@ -41,8 +41,7 @@ services:
       - redis
     volumes:
       - ./server:/app
-      - /app/schema/  # Don't want to overwrite what's generated via
-                      # the non-test environment.
+      - schema-test:/app/schema # Need to keep schema up to date based off of server
     env_file:
       - ./server/.env
     environment:
@@ -51,6 +50,7 @@ services:
       DJANGO_CORS_ORIGIN_WHITELIST: http://localhost:8081,http://client-test:8080
       DJANGO_TRUSTED_ORIGINS: http://localhost:8081,http://client-test:8080
       DJANGO_DISABLE_CSRF: 'True'
+      GIT_SHA: '0123456789'
     tty: true
     stdin_open: true
     ports:
@@ -67,3 +67,6 @@ services:
     working_dir: /e2e
     volumes:
       - ./e2e:/e2e
+
+volumes:
+  schema-test:

{{ cookiecutter.project_slug }}/docker-compose.test.yml

@@ -12,9 +12,9 @@ services:
     volumes:
       - ./client:/app
       - /app/node_modules
-      - ./server/schema:/app/schema # Need to keep schema up to date based off of server
       - /app/build
       - /app/public
+      - schema:/app/schema # Need to keep schema up to date based off of server
     tty: true
     stdin_open: true
     ports:
@@ -36,10 +36,12 @@ services:
       - redis
     volumes:
       - ./server:/app
+      - schema:/app/schema
     env_file:
       - ./server/.env
     environment:
       - SENTRY_DSN=${SENTRY_DSN}
+      - GIT_SHA='0123456789'
     tty: true
     stdin_open: true
     ports:
@@ -91,3 +93,4 @@ services:
 volumes:
   postgres: ~
   redisdata: ~
+  schema:

{{ cookiecutter.project_slug }}/docker-compose.yml

@@ -74,6 +74,8 @@ env:
     value: {{ "{{" }} .Values.sentryDsn {{ "}}" }}
   - name: REDIS_URL
     value: redis://:{{ "{{" }} .Values.redis.password {{ "}}" }}@{{ cookiecutter.kubernetes_project }}-redis-master:6379/0
+  - name: GIT_SHA
+    value: {{ "{{" }} .Values.gitSha {{ "}}" }}
   - name: DATABASE_URL
     valueFrom:
       secretKeyRef: