dependency headaches

.circleci/config.yml

@@ -4,6 +4,7 @@ version: 2.1
 
 references:
   # the key used to pull FRONTEND npm dependencies from the cache
+  cache-key: &cache-key 'dishzero-{{checksum "package-lock.json"}}'
   app-cache-key: &app-cache-key 'dishzero-app-{{checksum "app/package-lock.json"}}'
   server-cache-key: &server-cache-key 'dishzero-server-{{checksum "backend/package-lock.json"}}'
 
@@ -13,17 +14,19 @@ commands:
       - restore_cache:
           key: *app-cache-key
 
-  restore-server:
-    steps:
-      - restore_cache:
-          key: *server-cache-key
+#  restore-server:
+#    steps:
+#      - restore_cache:
+#          key: *server-cache-key
 
   restore-all:
     steps:
       - restore_cache:
-          key: *app-cache-key
+          key: *cache-key
       - restore_cache:
-          key: *server-cache-key
+          key: *app-cache-key
+#      - restore_cache:
+#          key: *server-cache-key
 
 executors:
   ci-node:
@@ -41,20 +44,27 @@ jobs:
     steps:
       - checkout
       - restore-all
+      - run:
+          name: "Install base dependencies"
+          command: npm install --include dev
+      - save_cache:
+          paths:
+            - node_modules
+          key: *cache-key
       - run:
           name: "Install frontend dependencies"
           command: cd app && npm install --include dev
       - save_cache:
           paths:
             - app/node_modules
           key: *app-cache-key
-      - run:
-          name: "Install server dependencies"
-          command: cd backend && npm install --include dev
-      - save_cache:
-          paths:
-            - backend/node_modules
-          key: *server-cache-key
+#      - run:
+#          name: "Install server dependencies"
+#          command: cd backend && npm install --include dev
+#      - save_cache:
+#          paths:
+#            - backend/node_modules
+#          key: *server-cache-key
 
   # run eslint on frontend
   lint-app:
@@ -70,7 +80,7 @@ jobs:
     executor: ci-node
     steps:
       - checkout
-      - restore-app
+      - restore-all
       - run:
           environment:
             JEST_JUNIT_OUTPUT_DIR: ./test-results/