Merge branch 'develop' into fix/light-mode-color-improvement

Author: 3ru

.babelrc

@@ -40,7 +40,8 @@
         ],
         "@babel/plugin-proposal-nullish-coalescing-operator",
         "@babel/plugin-proposal-do-expressions",
-        "@babel/plugin-proposal-function-bind"
+        "@babel/plugin-proposal-function-bind",
+        ["@babel/plugin-proposal-private-methods", { "loose": true }]
       ],
       "presets": [
         "@babel/preset-env",
@@ -85,6 +86,8 @@
     ],
     "@babel/plugin-proposal-nullish-coalescing-operator",
     "@babel/plugin-proposal-do-expressions",
-    "@babel/plugin-proposal-function-bind"
+    "@babel/plugin-proposal-function-bind",
+    ["@babel/plugin-proposal-private-methods", { "loose": true }],
+    ["@babel/plugin-proposal-private-property-in-object", { "loose": true }]
   ]
 }

.eslintrc

@@ -1,6 +1,6 @@
 {
 	"extends": ["airbnb", "prettier"],
-	"parser": "babel-eslint",
+	"parser": "@babel/eslint-parser",
 	"env": {
     "browser": true,
     "node": true,
@@ -69,7 +69,7 @@
     "react", "jsx-a11y", "import", "prettier"
   ],
   "settings": {
-    "import/parser": "babel-eslint",
+    "import/parser": "@babel/eslint-parser",
     "import/resolve": {
       "moduleDirectory": ["node_modules"]
     }

.github/workflows/deploy-staging.yml

@@ -8,8 +8,8 @@ on:
       - completed
 env:
   PROJECT_ID: ${{ secrets.GKE_PROJECT }}
-  GKE_CLUSTER: p5js-web-editor-cluster
-  GKE_ZONE: us-east1-c
+  GKE_CLUSTER: p5-gke-cluster
+  GKE_ZONE: us-east4
   DEPLOYMENT_NAME: web-editor-node
   IMAGE: ${{ secrets.DOCKER_USERNAME }}/p5.js-web-editor-staging
 jobs:

.github/workflows/deploy.yml

@@ -8,8 +8,8 @@ on:
       - completed
 env:
   PROJECT_ID: ${{ secrets.GKE_PROJECT }}
-  GKE_CLUSTER: p5js-web-editor-cluster
-  GKE_ZONE: us-east1-c
+  GKE_CLUSTER: p5-gke-cluster
+  GKE_ZONE: us-east4
   DEPLOYMENT_NAME: web-editor-node
   IMAGE: ${{ secrets.DOCKER_USERNAME }}/p5.js-web-editor
 jobs:
@@ -60,6 +60,6 @@ jobs:
       # Deploy the Docker image to the GKE cluster
       - name: Deploy
         run: |-
-          kubectl set image deployment/$DEPLOYMENT_NAME web-editor-app=index.docker.io/$IMAGE:$GITHUB_SHA
+          kubectl set image deployment/$DEPLOYMENT_NAME web-editor-app=index.docker.io/$IMAGE:$GITHUB_SHA --namespace=production
           kubectl get services -o wide
 

.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
     - name: Use Node.js
       uses: actions/setup-node@v1
       with:
-        node-version: '12.x'
+        node-version: '16.14.x'
     - run: npm install
     - run: npm run test
     - run: npm run lint

.gitignore

@@ -16,6 +16,7 @@ cert_chain.crt
 localhost.crt
 localhost.key
 privkey.pem
+terraform/.terraform/
 
 storybook-static
 duplicates.json

.nvmrc

@@ -1 +1 @@
-12.16.1
+16.14.2

.travis.yml

@@ -1,7 +1,7 @@
 sudo: required
 language: node_js
 node_js:
- - "12.16.1"
+ - "16.14.2"
 
 cache:
   directories:

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12.16.1 as base
+FROM node:16.14.2 as base
 ENV APP_HOME=/usr/src/app \
   TERM=xterm
 RUN mkdir -p $APP_HOME

client/index.integration.test.jsx

@@ -3,14 +3,7 @@ import { rest } from 'msw';
 import React from 'react';
 import { Router, browserHistory } from 'react-router';
 
-import {
-  reduxRender,
-  act,
-  waitFor,
-  fireEvent,
-  screen,
-  within
-} from './test-utils';
+import { reduxRender, act, waitFor, screen, within } from './test-utils';
 import configureStore from './store';
 import routes from './routes';
 import * as Actions from './modules/User/actions';