Separate predeploy and deploy commands

Author: Hyperkid123

.circleci/config.yml

@@ -48,34 +48,22 @@ jobs:
       - run:
           name: Predeploy demo
           command: |
-              yarn --cwd packages/react-renderer-demo/ predeploy
+              yarn --cwd packages/react-renderer-demo/ create-deploy-files
       - store_artifacts:
           when: on_fail
           name: Uploading predeploy failure artifact to assist with debugging
           path: /home/circleci/.npm/_logs/*.log
-      - persist_to_workspace:
-          root: ~/react-forms
-          paths:
-              - "*"
   deploy:
     working_directory: ~/react-forms
     docker:
       - image: circleci/node:10
     steps:
       - attach_workspace:
           at: ~/react-forms
-      - run:
-          name: 'Switch to correct folder'
-          command: |
-              cd ~/react-forms/packages/react-renderer-demo
-      - run:
-          name: Install Firebase Tools
-          command: |
-              npm install --prefix=./firebase-deploy firebase-tools
       - run:
           name: Deploy demo
           command: |
-             ~/react-forms/firebase-deploy/node_modules/.bin/firebase deploy --token=$FIREBASE_TOKEN
+             yarn --cwd packages/react-renderer-demo/ deploy --token=$FIREBASE_TOKEN
       - save_cache:
           key: dependency-cache-{{ checksum "yarn.lock" }}
           paths:

packages/react-renderer-demo/package.json

@@ -9,7 +9,7 @@
         "dev": "next \"src/app/\"",
         "preserve": "npm run build-public && npm run build-funcs && npm run build-app && npm run copy-deps && npm run install-deps",
         "serve": "cross-env NODE_ENV=production firebase serve",
-        "predeploy": "npm run build-public && npm run build-funcs && npm run build-app && npm run copy-deps",
+        "create-deploy-files": "npm run build-public; npm run build-funcs; npm run build-app; npm run copy-deps",
         "deploy": "NODE_ENV=production firebase deploy",
         "clean": "rimraf \"dist/functions/**\" && rimraf \"dist/public\"",
         "build-public": "cpx \"src/public/**/*.*\" \"dist/public\" -C",