Merge pull request #371 from labzero/develop

Merge to master
labzero · Nov 18, 2024 · c6a8872 · c6a8872
2 parents bd6098f + 8e6ec02
commit c6a8872
Show file tree

Hide file tree

Showing 3 changed files with 586 additions and 321 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -120,15 +120,14 @@ jobs:
 
   build:
     docker:
-      - image: cimg/aws:2023.01
+      - image: cimg/aws:2024.03
 
     # working_directory: ~/repo
 
     steps:
       - checkout
 
       - setup_remote_docker:
-          version: 20.10.11
           docker_layer_caching: true
 
       - run:
@@ -172,22 +171,9 @@ jobs:
             aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin ${CONTAINER_REGISTRY}
             docker push ${DOCKER_TAG}
 
-  deploy-staging:
-    docker:
-      - image: cimg/aws:2023.01
-
-    # working_directory: ~/repo
-
-    steps:
-      - aws-deploy:
-          task_family: lunch-staging
-          ecs_cluster: Lunch-Staging
-          service_name: lunch-staging
-          migration_task: staging_lunch_migrate
-
   deploy-production:
     docker:
-      - image: cimg/aws:2023.01
+      - image: cimg/aws:2024.03
 
     # working_directory: ~/repo
 
@@ -211,7 +197,7 @@ workflows:
                 - develop
                 - master
 
-  develop-test-deploy:
+  develop-test:
     jobs:
       - test:
           filters:
@@ -225,13 +211,6 @@ workflows:
             branches:
               only: develop
 
-      - deploy-staging:
-          requires:
-            - build
-          filters:
-            branches:
-              only: develop
-
   deploy:
     jobs:
       - build:
@@ -241,18 +220,10 @@ workflows:
             branches:
               ignore: /.*/
 
-      - deploy-staging:
-          requires:
-            - build
-          filters:
-            tags:
-              only: /^lunch-v.*/
-            branches:
-              ignore: /.*/
       - hold:
           type: approval
           requires:
-            - deploy-staging
+            - build
           filters:
             tags:
               only: /^lunch-v.*/

diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "@sendgrid/mail": "^7.7.0",
     "@ubilabs/react-geosuggest": "^2.16.1",
     "bcrypt": "^5.1.1",
-    "body-parser": "^1.18.3",
+    "body-parser": "^1.20.3",
     "bootstrap": "^5.2.3",
     "classnames": "^2.2.6",
     "common-password": "^0.1.2",
@@ -29,7 +29,7 @@
     "cors": "^2.8.3",
     "dayjs": "^1.11.7",
     "dotenv": "^2.0.0",
-    "express": "^4.17.3",
+    "express": "^4.20.0",
     "express-body-parser-error-handler": "^1.0.4",
     "express-jwt": "^8.4.1",
     "express-session": "^1.17.3",
@@ -172,11 +172,11 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.1.3",
     "url-loader": "^4.1.1",
-    "webpack": "^5.76.0",
+    "webpack": "^5.94.0",
     "webpack-assets-manifest": "^5.1.0",
     "webpack-bundle-analyzer": "^4.8.0",
     "webpack-cli": "^5.0.1",
-    "webpack-dev-middleware": "^6.0.1",
+    "webpack-dev-middleware": "^6.1.2",
     "webpack-hot-middleware": "^2.25.3",
     "webpack-node-externals": "^3.0.0",
     "workbox-webpack-plugin": "^6.5.4"