Node 14

.circleci/config.yml

@@ -23,7 +23,7 @@ jobs:
   # Note: the image used for this job is built from a docker file found in ../dockerfiles/build
   test_email_backend:
     docker:
-      - image: eaadtbs/ib-ci-build:v1.2
+      - image: eaadtbs/ib-ci-build:1.4
         <<: *dockerhub_auth
     working_directory: "~/InfoBase"
     steps:
@@ -65,7 +65,7 @@ jobs:
   # Note: the image used for this job is built from a docker file found in ../dockerfiles/build
   cleanup_dev_links:
     docker:
-      - image: eaadtbs/ib-ci-test:v1.1
+      - image: eaadtbs/ib-ci-test:1.4
         <<: *dockerhub_auth
     working_directory: "~/InfoBase"
     steps:
@@ -101,7 +101,7 @@ jobs:
   # Note: the image used for this job is built from a docker file found in ../dockerfiles/build
   build:
     docker:
-      - image: eaadtbs/ib-ci-build:1.3
+      - image: eaadtbs/ib-ci-build:1.4
         <<: *dockerhub_auth
     working_directory: "~/InfoBase"
     steps:
@@ -150,7 +150,7 @@ jobs:
             - prod-build-{{ .Branch }}-{{ .Revision }}
       - run:
           command: |
-            [ -f "client/$BUILD_DIR/InfoBase/app/app-a11y-en.min.js" ] || (cd client && ./deploy_scripts/build_all.sh -m 4096 -c "none")
+            [ -f "client/$BUILD_DIR/InfoBase/app/app-a11y-en.min.js" ] || (cd client && ./deploy_scripts/build_all.sh -m 1536 -c "none")
       - save_cache:
           paths:
             - client/build
@@ -169,12 +169,13 @@ jobs:
             - server/node_modules
             - scripts/common_node_scripts/node_modules
           key: server-dependencies-{{ checksum "server/package-lock.json" }}
+
       - restore_cache:
           keys:
             - server-transpiled-build-{{ .Branch }}-{{ .Revision }}
       - run:
           command: |
-            [ -f "server/transpiled_build/app.js" ] || (cd server && npm run build)
+            [ -f "server/transpiled_build/app.js" ] || (cd server && ./deploy_scripts/build.sh)
       - save_cache:
           paths:
             - server/transpiled_build
@@ -190,16 +191,16 @@ jobs:
             - ./test-data
             - ./package.json
             - ./.prettierignore
-            - ./prettier.config.js
+            - ./prettier.config.cjs
 
             - ./client/build
             - ./client/browser-tests
             - ./client/deploy_scripts
             - ./client/node_modules
             - ./client/package.json
 
-            - ./server/transpiled_build
             - ./server/src
+            - ./server/transpiled_build
             - ./server/deploy_scripts
             - ./server/.gcloudignore
             - ./server/jest_configs
@@ -212,7 +213,7 @@ jobs:
   # Note: the image used for this job is built from a docker file found in ../dockerfiles/test
   test_server:
     docker:
-      - image: eaadtbs/ib-ci-test:v1.1
+      - image: eaadtbs/ib-ci-test:1.4
         <<: *dockerhub_auth
     working_directory: "~/InfoBase"
     steps:
@@ -230,7 +231,7 @@ jobs:
           name: start_api_server
           command: (cd server && npm run start)
           background: true
-      - run: (cd server && npm run snapshot_tests) # the end to end snapshot tests, run against un-transpiled src for more useful coverage stats
+      - run: (cd server && npm run snapshot_tests)
 
       # halt here if not on the true repo, expected that means this is running in an env without the GCloud env vars required for the following steps
       - run: if [[ "$CIRCLE_PROJECT_REPONAME" != "infobase" ]]; then circleci step halt; fi
@@ -244,7 +245,7 @@ jobs:
   # Note: the image used for this job is built from a docker file found in ../dockerfiles/test
   test_end_to_end: # slower but more in-depth than the test job. Wait until these have passed before deploying the client
     docker:
-      - image: eaadtbs/ib-ci-test:1.2
+      - image: eaadtbs/ib-ci-test:1.4
         <<: *dockerhub_auth
     working_directory: "~/InfoBase"
     steps:
@@ -261,7 +262,7 @@ jobs:
           background: true
       - run: 
           name: start_api_server
-          command: (cd server && npm run start:transpiled) # run server end to end tests against the transpiled src, to be closer to production
+          command: (cd server && npm run start)
           background: true
       - run: (cd server && export TEST_AGAINST_TRANSPILIED='true' && npm run snapshot_tests)
 
@@ -281,7 +282,7 @@ jobs:
   deploy_data:
     working_directory: "~/InfoBase"
     docker:
-      - image: eaadtbs/ib-ci-test:v1.1
+      - image: eaadtbs/ib-ci-test:1.4
         <<: *dockerhub_auth
     steps:
       - attach_workspace:

.eslintrc.json

@@ -65,7 +65,9 @@
           }
         ]          
       }
-    ]
+    ],
+    "import/no-commonjs": 2,
+    "import/extensions": ["error", "always"]
   },
   "settings": {
     "import/resolver":{

client/.eslintrc.json

@@ -27,7 +27,7 @@
   },
   "settings": {
     "react": {
-      "version": "16"
+      "version": "17"
     },
     "import/resolver": {
       "node": {

client/README.md

@@ -22,8 +22,8 @@ Client-side code and content for the GC InfoBase. / Code et contenu pour le côt
 ## Getting Started
 
 ### Pre-requisite:
-- node@12.14.1 (`npm install -g n && n 12.14.1`)
-- npm@6.4.1 (`npm install -g npm@6.4.1`)
+- node@14.x (latest long term support) (`npm install -g n && n lts`)
+- npm@6.x (`npm install -g npm@6`)
 - Git
 
 ### First time setup

client/browser-tests/.eslintrc.json

@@ -1,4 +1,7 @@
 {
+  "rules": {
+    "import/no-commonjs": 0
+  },
   "globals": {
     "process": true,
     "fixture": true,

client/build_code/.eslintrc.json

@@ -1,4 +1,7 @@
 {
+  "rules": {
+    "import/no-commonjs": 0
+  },
   "globals": {
     "process": true,
     "__dirname": true

client/build_code/webpack_common.js

@@ -122,7 +122,7 @@ const get_rules = ({ language, target_ie11, is_prod_build }) => {
       use: [
         { loader: "json-loader" },
         {
-          loader: "./node_loaders/yaml-lang-loader.js",
+          loader: "./build_code/loaders/yaml-lang-loader.js",
           options: { lang: language },
         },
       ],

client/deploy_scripts/build_all.sh

@@ -2,8 +2,7 @@
 set -e # will exit if any command has non-zero exit value 
 
 concurrency="full"
-max_old_space_size=1024
-
+max_old_space_size=2048
 while getopts "c:m:" opt; do
   case ${opt} in
     c) concurrency=$OPTARG;;
@@ -16,89 +15,75 @@ if [[ ! $concurrency =~ ^(full|half|none)$ ]]; then
   exit 1
 fi
 
+# the prod no-watch scripts in client/package.json will use MAX_OLD_SPACE_SIZE if it exists
+export MAX_OLD_SPACE_SIZE=$max_old_space_size
+
 [ -e $BUILD_DIR/InfoBase ] && rm -r $BUILD_DIR/InfoBase # clean up build dir
 
 npm run IB_base
 
-# When exiting, either from finishing, being killed, or throwing an error, kill the spinner and dump the captured build process output to terminal
-function print_captured_output {
-  kill -9 $spinner_pid
-
-  [ -f $scratch/ib_prod_en_build_out ] && cat $scratch/ib_prod_en_build_out
-  [ -f $scratch/ib_prod_en_build_err ] && cat $scratch/ib_prod_en_build_err
-
-  [ -f $scratch/ib_prod_fr_build_out ] && cat $scratch/ib_prod_fr_build_out
-  [ -f $scratch/ib_prod_fr_build_err ] && cat $scratch/ib_prod_fr_build_err
-
-  [ -f $scratch/a11y_prod_en_build_out ] && cat $scratch/a11y_prod_en_build_out
-  [ -f $scratch/a11y_prod_en_build_err ] && cat $scratch/a11y_prod_en_build_err
-
-  [ -f $scratch/a11y_prod_fr_build_out ] && cat $scratch/a11y_prod_fr_build_out
-  [ -f $scratch/a11y_prod_fr_build_err ] && cat $scratch/a11y_prod_fr_build_err
-}
-
+if [ $concurrency == "none" ]; then
+  # Just running all builds one at a time, no backgrounding or output redirection
+  npm run IB_prod_no_watch_en  
+
+  npm run IB_prod_no_watch_fr  
+
+  npm run a11y_prod_no_watch_en  
 
-scratch=$(mktemp -d -t captured_build_output.XXXXXXXXXX)
-if [ $concurrency == "full" ]; then
+  npm run a11y_prod_no_watch_fr 
+else
   # Run standard and a11y builds in parallel as background processes, store thieir stdout and stderr in temp files and hold on to their pids, 
   # clean up and dump output on exit
-  trap print_captured_output EXIT
 
   echo ""
-  echo "Running prod builds in background, full concurrency..."
+  echo "Running prod builds in background, $concurrency concurrency..."
   spinner_pid=$(sh ../scripts/spinner.sh)
 
-  npm run IB_prod_no_watch_en -- --max_old_space_size=$max_old_space_size > $scratch/ib_prod_en_build_out 2> $scratch/ib_prod_en_build_err &
-  ib_prod_en_pid=$!
+  # When exiting, either from finishing, being killed, or throwing an error, kill the spinner and dump the captured build process output to terminal
+  scratch=$(mktemp -d -t captured_build_output.XXXXXXXXXX)
+  function print_captured_output {
+    kill -9 $spinner_pid
 
-  npm run IB_prod_no_watch_fr -- --max_old_space_size=$max_old_space_size > $scratch/ib_prod_fr_build_out 2> $scratch/ib_prod_fr_build_err &
-  ib_prod_fr_pid=$!
+    [ -f $scratch/ib_prod_en_build_out ] && cat $scratch/ib_prod_en_build_out3
+    [ -f $scratch/ib_prod_en_build_err ] && cat $scratch/ib_prod_en_build_err
 
-  npm run a11y_prod_no_watch_en -- --max_old_space_size=$max_old_space_size > $scratch/a11y_prod_en_build_out 2> $scratch/a11y_prod_en_build_err &
-  a11y_prod_en_pid=$!
+    [ -f $scratch/ib_prod_fr_build_out ] && cat $scratch/ib_prod_fr_build_out
+    [ -f $scratch/ib_prod_fr_build_err ] && cat $scratch/ib_prod_fr_build_err
 
-  npm run a11y_prod_no_watch_fr -- --max_old_space_size=$max_old_space_size > $scratch/a11y_prod_fr_build_out 2> $scratch/a11y_prod_fr_build_err &
-  a11y_prod_fr_pid=$!
-
-  wait $ib_prod_en_pid
-  wait $ib_prod_fr_pid
-  wait $a11y_prod_en_pid
-  wait $a11y_prod_fr_pid
-elif [ $concurrency == "half" ]; then
-  # Same as "full" concurrency, but only run two builds at a time 
+    [ -f $scratch/a11y_prod_en_build_out ] && cat $scratch/a11y_prod_en_build_out
+    [ -f $scratch/a11y_prod_en_build_err ] && cat $scratch/a11y_prod_en_build_err
+
+    [ -f $scratch/a11y_prod_fr_build_out ] && cat $scratch/a11y_prod_fr_build_out
+    [ -f $scratch/a11y_prod_fr_build_err ] && cat $scratch/a11y_prod_fr_build_err
+  }
   trap print_captured_output EXIT
 
-  echo ""
-  echo "Running prod builds in background, half concurrency..."
-  spinner_pid=$(sh ../scripts/spinner.sh)
-
-  npm run IB_prod_no_watch_en -- --max_old_space_size=$max_old_space_size > $scratch/ib_prod_en_build_out 2> $scratch/ib_prod_en_build_err &
+  npm run IB_prod_no_watch_en > $scratch/ib_prod_en_build_out 2> $scratch/ib_prod_en_build_err &
   ib_prod_en_pid=$!
 
-  npm run IB_prod_no_watch_fr -- --max_old_space_size=$max_old_space_size > $scratch/ib_prod_fr_build_out 2> $scratch/ib_prod_fr_build_err &
+  npm run IB_prod_no_watch_fr > $scratch/ib_prod_fr_build_out 2> $scratch/ib_prod_fr_build_err &
   ib_prod_fr_pid=$!
-
-  wait $ib_prod_en_pid
-  wait $ib_prod_fr_pid
 
-  npm run a11y_prod_no_watch_en -- --max_old_space_size=$max_old_space_size > $scratch/a11y_prod_en_build_out 2> $scratch/a11y_prod_en_build_err &
+  if [ $concurrency == "half" ]; then
+    wait $ib_prod_en_pid
+    wait $ib_prod_fr_pid
+  fi
+
+  npm run a11y_prod_no_watch_en > $scratch/a11y_prod_en_build_out 2> $scratch/a11y_prod_en_build_err &
   a11y_prod_en_pid=$!
 
-  npm run a11y_prod_no_watch_fr -- --max_old_space_size=$max_old_space_size > $scratch/a11y_prod_fr_build_out 2> $scratch/a11y_prod_fr_build_err &
+  npm run a11y_prod_no_watch_fr > $scratch/a11y_prod_fr_build_out 2> $scratch/a11y_prod_fr_build_err &
   a11y_prod_fr_pid=$!
-
-  wait $a11y_prod_en_pid
-  wait $a11y_prod_fr_pid
-elif [ $concurrency == "none" ]; then
-  # Just running all builds one at a time, no backgrounding or output redirection
-
-  npm run IB_prod_no_watch_en -- --max_old_space_size=$max_old_space_size 
-
-  npm run IB_prod_no_watch_fr -- --max_old_space_size=$max_old_space_size 
-
-  npm run a11y_prod_no_watch_en -- --max_old_space_size=$max_old_space_size 
 
-  npm run a11y_prod_no_watch_fr -- --max_old_space_size=$max_old_space_size
+  if [ $concurrency == "half" ]; then
+    wait $a11y_prod_en_pid
+    wait $a11y_prod_fr_pid
+  else 
+    wait $ib_prod_en_pid
+    wait $ib_prod_fr_pid
+    wait $a11y_prod_en_pid
+    wait $a11y_prod_fr_pid
+  fi
 fi
 
 exit