Merge remote-tracking branch 'node-ts-webpack-sapling/main'

Author: mdnorman

.github/workflows/ci.yml

@@ -22,3 +22,5 @@ jobs:
         run: npm run build
       - name: Test
         run: npm run test -- --ci --maxWorkers=1 --reporters=default
+      - name: Check Serverless
+        run: npx serverless package --verbose --stage dev

serverless.yml

@@ -13,7 +13,7 @@ provider:
 custom:
   stage: ${opt:stage, self:provider.stage}
   client:
-    bucketName: ${self:service.name}-${self:custom.stage}
+    bucketName: ${self:service}-${self:custom.stage}
     distributionFolder: dist
     indexDocument: index.html
     errorDocument: index.html
@@ -29,13 +29,14 @@ custom:
           value: no-cache
   domainName: ${self:custom.domainNameStage.${self:custom.stage}}
   domainNameStage:
+    dev: dev.${self:custom.baseDomainName}
     test: test.${self:custom.baseDomainName}
     prod: www.${self:custom.baseDomainName}
   baseDomainName: ${custom.hostedZone}
   hostedZone: CHANGEME.com
   logs:
     bucket: CHANGEME
-    path: websites/${self:service.name}/${self:custom.stage}/cloudfront
+    path: websites/${self:service}/${self:custom.stage}/cloudfront
 
 resources:
   Resources:
@@ -50,7 +51,7 @@ resources:
       Type: AWS::CloudFront::CloudFrontOriginAccessIdentity
       Properties:
         CloudFrontOriginAccessIdentityConfig:
-          Comment: ${self:service.name}-${self:custom.stage}-oai
+          Comment: ${self:service}-${self:custom.stage}-oai
 
     WebAppS3BucketPolicy:
       Type: AWS::S3::BucketPolicy

webpack.config.js

@@ -1,7 +1,7 @@
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
 
-const WEBPACK_SERVER_PORT = process.env.WEBPACK_SERVER_PORT || 5000;
+const WEBPACK_SERVER_PORT = process.env.WEBPACK_SERVER_PORT || 5001;
 
 const webpackConfig = (env, argv) => {
   const { mode } = argv;