- Merge and update

Signed-off-by: Dave Richer <dave@imexsystems.ca>

.circleci/config.yml

@@ -48,25 +48,16 @@ jobs:
     steps:
       - checkout:
           path: ~/repo
-
-      - restore_cache:
-          name: Restore Yarn Package Cache
-          keys:
-            - yarn-packages-{{ checksum "yarn.lock" }}
       - run:
           name: Install Dependencies
-          command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
-      - save_cache:
-          name: Save Yarn Package Cache
-          key: yarn-packages-{{ checksum "yarn.lock" }}
-          paths:
-            - ~/.cache/yarn
+          command: npm i
 
-      - run: yarn run build
+      - run: npm run build
 
       - aws-s3/sync:
           from: build
           to: "s3://imex-online-production/"
+          arguments: "--exclude '*.map'"
       - jira/notify
       
   rome-api-deploy:
@@ -185,7 +176,7 @@ jobs:
   app-beta-build:
     docker:
       - image: cimg/node:18.18.2
-    resource_class: large
+    resource_class: xlarge
     working_directory: ~/repo/client
 
     steps:
@@ -200,6 +191,7 @@ jobs:
       - aws-s3/sync:
           from: build
           to: "s3://imex-online-beta/"
+          arguments: "--exclude '*.map'"
       - jira/notify
 
   rome-app-beta-build:
@@ -251,31 +243,23 @@ jobs:
     steps:
       - checkout:
           path: ~/repo
-
-      - restore_cache:
-          name: Restore Yarn Package Cache
-          keys:
-            - yarn-packages-{{ checksum "yarn.lock" }}
       - run:
           name: Install Dependencies
-          command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
-      - save_cache:
-          name: Save Yarn Package Cache
-          key: yarn-packages-{{ checksum "yarn.lock" }}
-          paths:
-            - ~/.cache/yarn
+          command: npm i
 
-      - run: yarn run build:test
+      - run: npm run build:test
 
       - aws-s3/sync:
           from: build
           to: "s3://imex-online-test/"
+          arguments: "--exclude '*.map'"
       - jira/notify
 
   test-app-beta-build:
     docker:
       - image: cimg/node:18.18.2
-    resource_class: large
+    machine: true
+    resource_class: snaptsoft/dell
     working_directory: ~/repo/client
 
     steps:
@@ -291,6 +275,7 @@ jobs:
       - aws-s3/sync:
           from: build
           to: "s3://imex-online-test-beta/"
+          arguments: "--exclude '*.map'"
       - jira/notify
 
   rome-test-app-beta-build: