simplify deploy scripts

Author: skshetry

scripts/clear-cloudfront-cache.js

@@ -1,9 +1,12 @@
-const {
+#!/usr/bin/env node
+'use strict'
+
+import {
   CloudFrontClient,
   CreateInvalidationCommand
-} = require('@aws-sdk/client-cloudfront')
+} from '@aws-sdk/client-cloudfront'
 
-module.exports = async function () {
+async function clearCloudfrontCache() {
   const {
     CLOUDFRONT_DISTRIBUTION_ID,
     CONTEXT,
@@ -47,3 +50,5 @@ module.exports = async function () {
     `Cleared CloudFront cache successfully: ${response.Invalidation.Id}`
   )
 }
+
+await clearCloudfrontCache()

scripts/deploy-with-s3.js

@@ -2,18 +2,10 @@
 'use strict'
 
 require('dotenv').config()
-const { rm, rename } = require('node:fs/promises')
 const { exit } = require('node:process')
 const path = require('path')
 
-const { s3Prefix } = require('../src/server/config')
-
-const clearCloudfrontCache = require('./clear-cloudfront-cache')
-const { uploadToS3 } = require('./s3-utils')
-
-const rootDir = process.cwd()
-const publicDir = path.join(rootDir, 'public')
-const cacheDir = path.join(rootDir, '.cache')
+const { uploadToS3, s3Prefix } = require('./s3-utils')
 
 /**
  * Deploy public/ to s3.
@@ -31,16 +23,9 @@ const cacheDir = path.join(rootDir, '.cache')
  *  - AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY: auth token to access the bucket.
  *  - HEROKU_APP_NAME: (optional) app name to specify the ID of the PR if any.
  **/
-async function main() {
-  await uploadToS3(publicDir, '/', s3Prefix)
-  // Move the 404 HTML file from public into the root dir for Heroku
-  await rename(path.join(publicDir, '404.html'), '404.html')
-  // await rm(publicDir, { recursive: true, force: true })
-  await rm(cacheDir, { recursive: true, force: true })
-  await clearCloudfrontCache()
-}
-
-main().catch(e => {
+const rootDir = process.cwd()
+const publicDir = path.join(rootDir, 'public')
+uploadToS3(publicDir, '/', s3Prefix).catch(e => {
   console.error(e)
   exit(1)
 })

scripts/heroku-deploy.sh

@@ -7,5 +7,8 @@ mv $OLDPWD $NEWPWD
 ln -s $NEWPWD $OLDPWD
 cd $NEWPWD
 yarn build
+rm -rf static .cache
 ./scripts/deploy-with-s3.js
-rm -rf static
+# Move the 404 HTML file from public into the root dir for Heroku
+mv public/404.html 404.html
+./scripts/clear-cloudfront-cache.js

scripts/s3-utils.js

@@ -46,5 +46,6 @@ async function uploadToS3(dir, childPrefix, basePrefix = s3Prefix) {
 }
 
 module.exports = {
+  s3Prefix,
   uploadToS3
 }