Merge pull request #10 from lalalilo/fix-cache-invalidation

Fix cache invalidation

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/node:10.15
+      - image: circleci/node:12.16
 
     working_directory: ~/aws-spa
 
@@ -35,3 +35,11 @@ jobs:
       - run:
           name: Code coverage
           command: npx codecov
+
+      - run:
+          name: Build
+          command: yarn build
+
+      - run:
+          name: Release
+          command: npx semantic-release

.nvmrc

@@ -0,0 +1 @@
+12.16

package.json

@@ -33,7 +33,6 @@
   "scripts": {
     "build": "babel src -d lib --extensions '.ts'",
     "prebuild": "yarn check-types && yarn test",
-    "prepublish": "yarn build",
     "run-cli": "babel-node --extensions '.ts' src/cli.ts",
     "check-types": "tsc",
     "test": "jest"
@@ -49,6 +48,12 @@
       "pre-commit": "yarn check-types"
     }
   },
+  "release": {
+    "branches": [
+      "master",
+      "next"
+    ]
+  },
   "dependencies": {
     "adm-zip": "^0.4.13",
     "aws-sdk": "^2.569.0",
@@ -76,6 +81,7 @@
     "husky": "^3.0.9",
     "jest": "^24.9.0",
     "rimraf": "^3.0.0",
+    "semantic-release": "^17.0.4",
     "typescript": "^3.7.2"
   }
 }

src/cloudfront.spec.ts

@@ -5,7 +5,8 @@ import {
   invalidateCloudfrontCache,
   identifyingTag,
   createCloudFrontDistribution,
-  setSimpleAuthBehavior
+  setSimpleAuthBehavior,
+  getCacheInvalidations
 } from "./cloudfront";
 import { lambdaPrefix } from "./lambda";
 
@@ -298,4 +299,22 @@ describe("cloudfront", () => {
       ]);
     });
   });
+
+  describe("getCacheInvalidations", () => {
+    it.each([
+      { input: "index.html", expectedOutput: "/index.html" },
+      {
+        input: "index.html, hello.html",
+        subFolder: undefined,
+        expectedOutput: "/index.html,/hello.html"
+      },
+      {
+        input: "index.html",
+        subFolder: "some-branch",
+        expectedOutput: "/some-branch/index.html"
+      }
+    ])("add missing slash", ({ input, subFolder, expectedOutput }) => {
+      expect(getCacheInvalidations(input, subFolder)).toEqual(expectedOutput);
+    });
+  });
 });

src/cloudfront.ts

@@ -346,6 +346,16 @@ export const setSimpleAuthBehavior = async (
   );
 };
 
+export const getCacheInvalidations = (
+  cacheInvalidations: string,
+  subFolder: string | undefined
+) =>
+  cacheInvalidations
+    .split(",")
+    .map(string => string.trim().replace(/$\//, ""))
+    .map(string => (subFolder ? `/${subFolder}/${string}` : `/${string}`))
+    .join(",");
+
 const updateLambdaFunctionAssociations = async (
   distributionId: string,
   DistributionConfig: DistributionConfig,

src/deploy.ts

@@ -14,7 +14,8 @@ import {
   createCloudFrontDistribution,
   invalidateCloudfrontCache,
   DistributionIdentificationDetail,
-  setSimpleAuthBehavior
+  setSimpleAuthBehavior,
+  getCacheInvalidations
 } from "./cloudfront";
 import {
   findHostedZone,
@@ -101,5 +102,9 @@ export const deploy = async (
   }
 
   await syncToS3(folder, domainName, cacheBustedPrefix, s3Folder);
-  await invalidateCloudfrontCache(distribution.Id, cacheInvalidations, wait);
+  await invalidateCloudfrontCache(
+    distribution.Id,
+    getCacheInvalidations(cacheInvalidations, s3Folder),
+    wait
+  );
 };