Merge branch 'master' of github.com:isaacphysics/isaac-react-app into feature/fasttrack-graphics

Author: mlt47

.env

@@ -1 +1 @@
-REACT_APP_API_VERSION=v2.10.3
+REACT_APP_API_VERSION=v2.10.5

.gitignore

@@ -4,6 +4,7 @@
 /node_modules
 /.pnp
 .pnp.js
+bundle-stats-*.json
 
 # testing
 /coverage

Dockerfile

@@ -3,8 +3,7 @@ FROM nginx:stable
 ARG API_VERSION
 ARG SUBJECT
 
-COPY ./build-$SUBJECT/ /usr/share/nginx/html
 COPY nginx.conf /etc/nginx/nginx.conf
-EXPOSE 80
+COPY ./build-$SUBJECT/ /usr/share/nginx/html
 
 LABEL apiVersion=$API_VERSION

README.md

@@ -1,10 +1,10 @@
-# isaac-cs-app
+# isaac-react-app
 
-[![Build Status](https://travis-ci.com/isaacphysics/isaac-cs-app.svg?branch=master)](https://travis-ci.com/isaacphysics/isaac-cs-app)
-[![codecov](https://codecov.io/gh/isaacphysics/isaac-cs-app/branch/master/graph/badge.svg)](https://codecov.io/gh/isaacphysics/isaac-cs-app)
-[![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/isaacphysics/isaac-cs-app.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/isaacphysics/isaac-cs-app/context:javascript)
+[![Build Status](https://travis-ci.com/isaacphysics/isaac-react-app.svg?branch=master)](https://travis-ci.com/isaacphysics/isaac-react-app)
+[![codecov](https://codecov.io/gh/isaacphysics/isaac-react-app/branch/master/graph/badge.svg)](https://codecov.io/gh/isaacphysics/isaac-react-app)
+[![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/isaacphysics/isaac-react-app.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/isaacphysics/isaac-react-app/context:javascript)
 
-`isaac-cs-app` is the front end interface for the [Isaac Computer Science project](https://isaaccomputerscience.org/about) and, soon, the [Isaac Physics project](https://isaacphysics.org/about). Together with [`isaac-api`](https://github.com/ucam-cl-dtg/isaac-api), it forms the core stack of the Isaac platform.
+`isaac-react-app` is the front end interface for the [Isaac Computer Science project](https://isaaccomputerscience.org/about) and, soon, the [Isaac Physics project](https://isaacphysics.org/about). Together with [`isaac-api`](https://github.com/ucam-cl-dtg/isaac-api), it forms the core stack of the Isaac platform.
 
 The web interface is a [React app](https://github.com/facebook/create-react-app), served by [nginx](https://nginx.org/en/) in [Docker](https://www.docker.com/).
 The front-end application was initially generated from [create-react-app](https://github.com/facebook/create-react-app).

build.sh

@@ -3,7 +3,7 @@
 set -e # Exit on failure
 
 if test -z "$1"; then
-  read -p "isaac-cs-app version to build (e.g. v1.3.0 or ['master']): " VERSION_TO_DEPLOY
+  read -p "isaac-react-app version to build (e.g. v1.3.0 or ['master']): " VERSION_TO_DEPLOY
   VERSION_TO_DEPLOY=${VERSION_TO_DEPLOY:-master}
 else
   VERSION_TO_DEPLOY="$1"
@@ -17,8 +17,8 @@ rm -rf $BUILD_DIR
 mkdir -p $BUILD_DIR
 cd $BUILD_DIR
 
-git clone -b $VERSION_TO_DEPLOY --depth 1 https://github.com/isaacphysics/isaac-cs-app.git
-cd isaac-cs-app
+git clone -b $VERSION_TO_DEPLOY --depth 1 https://github.com/isaacphysics/isaac-react-app.git
+cd isaac-react-app
 
 # Determine segue version to use. Honest.
 if [[ $VERSION_TO_DEPLOY == v* ]]; then
@@ -45,7 +45,7 @@ docker push "docker.isaacscience.org/isaac-cs-app:${VERSION_TO_DEPLOY}"
 docker push "docker.isaacscience.org/isaac-phy-app:${VERSION_TO_DEPLOY}"
 
 cd ..
-rm -rf isaac-cs-app
+rm -rf isaac-react-app
 
 git clone -b $SEGUE_VERSION --depth 1 https://github.com/isaacphysics/isaac-api.git
 cd isaac-api

config/env.js

@@ -15,6 +15,14 @@ module.exports = (isProd) => {
     return {
         mode: isProd ? "production" : "development",
 
+        devServer: {
+            headers: {
+                "Content-Security-Policy-Report-Only": "default-src 'self' https://cdn.isaacphysics.org https://cdn.isaaccomputerscience.org localhost:8080 https://www.google-analytics.com https://maps.googleapis.com; object-src 'none'; frame-src 'self' https://anvil.works https://*.anvil.app https://www.youtube-nocookie.com; img-src 'self' localhost:8080 data: https://cdn.isaacphysics.org https://cdn.isaaccomputerscience.org https://www.google-analytics.com https://i.ytimg.com https://maps.googleapis.com https://maps.gstatic.com; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://cdn.isaacphysics.org https://cdn.isaaccomputerscience.org https://fonts.gstatic.com;",
+                "Feature-Policy": "geolocation 'none'; camera 'none'; microphone 'none'; accelerometer 'none';",
+                "X-Clacks-Overhead": "GNU Terry Pratchett",
+            },
+        },
+
         output: {
             publicPath: "/",
             pathinfo: !isProd,
@@ -52,7 +60,7 @@ module.exports = (isProd) => {
                             ],
                         },
                         {
-                            test: /node_modules[\/\\](query-string|split-on-first|strict-uri-encode)[\/\\].*\.js$/,
+                            test: /node_modules[\/\\](query-string|split-on-first|strict-uri-encode|d3.*)[\/\\].*\.js$/,
                             use: [
                                 {
                                     loader: 'babel-loader',

config/paths.js

@@ -31,6 +31,12 @@ module.exports = env => {
             new CopyWebpackPlugin([{
                 from: resolve('public/manifest-cs.json'),
                 to: 'manifest-cs.json',
+            }, {
+                from: resolve('public/unsupported_browsers/unsupported-cs.html'),
+                to: 'unsupported_browser.html',
+            }, {
+                from: resolve('public/unsupported_browsers/unsupported-cs.js'),
+                to: 'unsupported_browser.js',
             }]),
         ],
     };