Skip to content

Commit

Permalink
Revert "fix(serverless-component): when adding primary domain name to…
Browse files Browse the repository at this point in the history
… CloudFront distribution aliases, don't replace other aliases (serverless-nextjs#658)"

This reverts commit 4428d5c.
  • Loading branch information
kouhei-fuji committed Oct 18, 2020
1 parent 899baa6 commit 298acef
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions packages/serverless-components/domain/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -392,19 +392,21 @@ const addDomainToCloudfrontDistribution = async (
params.Id = subdomain.distributionId;

// 5. then make our changes
params.DistributionConfig.Aliases.Items.push(subdomain.domain);
params.DistributionConfig.Aliases.Quantity += 1;
params.DistributionConfig.Aliases = {
Quantity: 1,
Items: [subdomain.domain]
};

if (subdomain.domain.startsWith("www.")) {
if (domainType === "apex") {
params.DistributionConfig.Aliases.Items[-1] = `${subdomain.domain.replace(
"www.",
""
)}`;
params.DistributionConfig.Aliases.Items = [
`${subdomain.domain.replace("www.", "")}`
];
} else if (domainType !== "www") {
params.DistributionConfig.Aliases.Quantity = 2;
params.DistributionConfig.Aliases.Items.push(
`${subdomain.domain.replace("www.", "")}`
);
params.DistributionConfig.Aliases.Quantity += 1;
}
}

Expand Down

0 comments on commit 298acef

Please sign in to comment.