Merge branch 'develop'

Author: Perlkonig

.github/workflows/deploy-dev.js.yml

@@ -85,15 +85,15 @@ jobs:
     #     aws-secret-access-key: ${{ secrets.AWS_SECRET }}
     #     aws-region: us-east-1
 
+    - name: Deploy
+      run: serverless client deploy --no-confirm
+
     - name: Create CloudFront invalidation
       uses: josemando/aws-cloudfront-create-invalidation@v1
       with:
-        distribution-id: E2FD1T2JUN28HB
+        distribution-id: E621UP8SM3SXE
         paths: /*
 
-    - name: Deploy
-      run: serverless client deploy --no-confirm
-
     # Optional (to use with serverless-finch serverless plugin)
     #- name: Deploy assets to S3
     #  run: sls client deploy --no-delete-contents --no-confirm -s dev

serverless.yml

@@ -48,97 +48,30 @@ custom:
   client:
     bucketName: ${self:custom.rootName}
     distributionFolder: build
-  # s3LocalPath: C:\Projects\AbstractPlay\front\build\
-  s3LocalPath: ./build/
 
-resources:
-  Resources:
-    ## Specifying the S3 Bucket
-    WebAppS3Bucket:
-      Type: AWS::S3::Bucket
-      Properties:
-        BucketName: ${self:custom.s3Bucket}
-        AccessControl: PublicRead
-        WebsiteConfiguration:
-          IndexDocument: index.html
-          ErrorDocument: index.html
-    ## Specifying the policies to make sure all files inside the Bucket are available to CloudFront
-    WebAppS3BucketPolicy:
-      Type: AWS::S3::BucketPolicy
-      Properties:
-        Bucket:
-          Ref: WebAppS3Bucket
-        PolicyDocument:
-          Statement:
-            - Sid: PublicReadGetObject
-              Effect: Allow
-              Principal: "*"
-              Action:
-              - s3:GetObject
-              Resource: arn:aws:s3:::${self:custom.s3Bucket}/*
-    ## Specifying the CloudFront Distribution to serve your Web Application
-    WebAppCloudFrontDistribution:
-      Type: AWS::CloudFront::Distribution
-      Properties:
-        DistributionConfig:
-          PriceClass: "PriceClass_100"
-          Origins:
-            - DomainName: ${self:custom.s3Bucket}.s3.amazonaws.com
-              ## An identifier for the origin which must be unique within the distribution
-              Id: WebApp
-              CustomOriginConfig:
-                HTTPPort: 80
-                HTTPSPort: 443
-                OriginProtocolPolicy: https-only
-              ## In case you want to restrict the bucket access use S3OriginConfig and remove CustomOriginConfig
-              # S3OriginConfig:
-              #   OriginAccessIdentity: origin-access-identity/cloudfront/E127EXAMPLE51Z
-          Enabled: 'true'
-          ## Uncomment the following section in case you are using a custom domain
-          Aliases:
-            - ${param:url}
-          DefaultRootObject: index.html
-          ## Since the Single Page App is taking care of the routing we need to make sure ever path is served with index.html
-          ## The only exception are files that actually exist e.h. app.js, reset.css
-          CustomErrorResponses:
-            - ErrorCode: 404
-              ResponseCode: 200
-              ResponsePagePath: /index.html
-          DefaultCacheBehavior:
-            AllowedMethods:
-              - DELETE
-              - GET
-              - HEAD
-              - OPTIONS
-              - PATCH
-              - POST
-              - PUT
-            ## The origin id defined above
-            TargetOriginId: WebApp
-            ## Defining if and how the QueryString and Cookies are forwarded to the origin which in this case is S3
-            ForwardedValues:
-              QueryString: 'false'
-              Cookies:
-                Forward: none
-            ## The protocol that users can use to access the files in the origin. To allow HTTP use `allow-all`
-            ViewerProtocolPolicy: redirect-to-https
-          ## The certificate to use when viewers use HTTPS to request objects.
-          ViewerCertificate:
-            AcmCertificateArn: arn:aws:acm:us-east-1:153672715141:certificate/0138b8fd-1159-4928-a072-2eb1c999f53c
-            SslSupportMethod: "sni-only"
-            MinimumProtocolVersion: "TLSv1.1_2016"
-          #            CloudFrontDefaultCertificate: 'true'
-          ## Uncomment the following section in case you want to enable logging for CloudFront requests
-          # Logging:
-          #   IncludeCookies: 'false'
-          #   Bucket: mylogs.s3.amazonaws.com
-          #   Prefix: myprefix
+    objectHeaders:
+      # Cache-bustable assets (fingerprinted)
+      "static/**/*":
+        - name: Cache-Control
+          value: "public, max-age=31536000, immutable"
+
+      "flags/**/*":
+        - name: Cache-Control
+          value: "public, max-age=31536000, immutable"
+
+      # HTML should never be cached
+      "index.html":
+        - name: Cache-Control
+          value: "no-cache, no-store, must-revalidate"
 
-  ## In order to print out the hosted domain via `serverless info` we need to define the DomainName output for CloudFormation
-  Outputs:
-    WebAppS3BucketOutput:
-      Value:
-        'Ref': WebAppS3Bucket
-    WebAppCloudFrontDistributionOutput:
-      Value:
-        'Fn::GetAtt': [ WebAppCloudFrontDistribution, DomainName ]
+      "error.html":
+        - name: Cache-Control
+          value: "no-cache, no-store, must-revalidate"
+
+      # Optional: catch-all fallback
+      ALL_OBJECTS:
+        - name: Cache-Control
+          value: "public, max-age=3600"
+
+  # s3LocalPath: C:\Projects\AbstractPlay\front\build\
+  s3LocalPath: ./build/