fix: case error (#43)

ttoss · Feb 24, 2022 · 95be09c · 95be09c
1 parent f53c384
commit 95be09c
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 15 deletions.
diff --git a/cicd/carlin.ts b/cicd/carlin.ts
@@ -1,7 +1,7 @@
 import { secrets } from './secrets';
 
 export default {
-  pipelines: ['pr', 'main', 'tag'],
+  pipelines: ['pr', 'main'],
   slackWebhookUrl: secrets.slackWebhookUrl,
   sshKey: './ssh-key',
   sshUrl: '[email protected]:ttoss/carlin.git',

diff --git a/cicd/commands/main b/cicd/commands/main
@@ -2,4 +2,5 @@
 
 yarn lerna run "build" --stream
 yarn lerna run "test" --stream
-yarn lerna version --yes
+yarn lerna version --yes
+yarn lerna run "deploy" --stream
diff --git a/cicd/commands/tag b/cicd/commands/tag
diff --git a/packages/cli/src/deploy/staticApp/staticApp.ts b/packages/cli/src/deploy/staticApp/staticApp.ts
@@ -139,7 +139,7 @@ const removeOldVersions = async ({ bucket }: { bucket: string }) => {
     const versions = CommonPrefixes?.map(({ Prefix }) =>
       Prefix?.replace('/', ''),
     )
-      .filter((version) => !!version)
+      .filter((version) => semver.valid(version))
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       .sort((a, b) => (semver.gt(a!, b!) ? -1 : 1));
 
@@ -233,7 +233,6 @@ export const deployStaticApp = async ({
   hostedZoneName,
   region,
   skipUpload,
-  invalidate = false,
 }: {
   acm?: string;
   aliases?: string[];
@@ -243,7 +242,6 @@ export const deployStaticApp = async ({
   hostedZoneName?: string;
   region: string;
   skipUpload?: boolean;
-  invalidate?: boolean;
 }) => {
   try {
     const { stackName } = await handleDeployInitialization({ logPrefix });
@@ -272,9 +270,7 @@ export const deployStaticApp = async ({
 
       const { Outputs } = await deploy({ params, template });
 
-      if (invalidate) {
-        await invalidateCloudFront({ outputs: Outputs });
-      }
+      await invalidateCloudFront({ outputs: Outputs });
 
       if (!skipUpload) {
         await removeOldVersions({ bucket });

diff --git a/packages/cli/src/utils/getProjectName.ts b/packages/cli/src/utils/getProjectName.ts
@@ -19,6 +19,14 @@ export const getProjectName = () => {
 
   const name = getPackageName();
 
+  /**
+   * This case happens when user executes `carlin` outside of project.
+   * Even commands like `carlin --help` raise an error.
+   */
+  if (!name) {
+    return '';
+  }
+
   try {
     return pascalCase(name.split(/[@/]/)[1]);
   } catch (err) {

diff --git a/packages/website/carlin.yml b/packages/website/carlin.yml
@@ -3,8 +3,6 @@ environments:
   Production:
     aliases:
       - carlin.ttoss.dev
-    csp:
-      default-src: ["* 'unsafe-inline' 'unsafe-eval'", replace]
     cloudfront: true
     skipDeploy: false
     stackName: CarlinWebsite