@toptal/davinci-ci 7.2.1-alpha-fx-5090-purge-cloudflare-cache-on-staff-portal-release-e9305443.0 → 7.3.1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change Log
 
+## 7.3.1
+
+### Patch Changes
+
+- [#2332](https://github.com/toptal/davinci/pull/2332) [`52995862`](https://github.com/toptal/davinci/commit/529958625a8bda2e74ef281a5ed0e6bfea109526) Thanks [@augustobmoura](https://github.com/augustobmoura)!
+
+### davinci-ci danger
+
+- check danger against `origin/master`
+
+## 7.3.0
+
+### Minor Changes
+
+- [#2366](https://github.com/toptal/davinci/pull/2366) [`738535a0`](https://github.com/toptal/davinci/commit/738535a09ea98a79a4a5a8aabd4b6eebdade3fd1) Thanks [@augustobmoura](https://github.com/augustobmoura)!
+
+### davinci-ci
+
+- add variable for HTML CDN cache tags customization
+
 ## 7.2.0
 
 ### Minor Changes

package/README.md

@@ -72,6 +72,19 @@ master:
 
 If you have it set as false or if this config is not present in your project `davinci.yaml` file, cypress step will be skipped.
 
+### Pre-configured davinci docker image
+
+Davinci CI has a pre-configured docker image recipe, which can be used to build optimized docker images for your frontend applications.
+The image is present on path `src/configs/docker/Dockerfile.gha-deploy` and have a few build arguments that have to be provided:
+
+| Build argument           | Description                                                                                              | Required |
+| ------------------------ | -------------------------------------------------------------------------------------------------------- | -------- |
+| `DIST_FOLDER`            | Static build location                                                                                    | Yes      |
+| `ENV_RUNTIME_ENTRYPOINT` | Entrypoint script, davinci has an example file present at `src/configs/docker/env-runtime.entrypoint.sh` | Yes      |
+| `VERSION`                | Current release version                                                                                  | Yes      |
+| `NGINX_CONFIG`           | Ngninx config, davinci has an example file present at `src/configs/docker/nginx-vhost.conf`              | Yes      |
+| `HTML_CDN_CACHE_TAG`     | `Cache-Tag` header for HTML documents, used for specific cache purging                                   | No       |
+
 ### IDE Tooling
 
 This package can be used directly in your IDE through these extensions

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toptal/davinci-ci",
-  "version": "7.2.1-alpha-fx-5090-purge-cloudflare-cache-on-staff-portal-release-e9305443.0+e9305443",
+  "version": "7.3.1",
   "keywords": [
     "ci",
     "docker",
@@ -30,7 +30,7 @@
   "dependencies": {
     "@commitlint/cli": "^17.6.7",
     "@commitlint/config-conventional": "^17.1.0",
-    "@toptal/davinci-cli-shared": "2.3.10-alpha-fx-5090-purge-cloudflare-cache-on-staff-portal-release-e9305443.128+e9305443",
+    "@toptal/davinci-cli-shared": "^2.3.9",
     "chalk": "^4.1.2",
     "danger": "^11.2.2",
     "markdown-table": "^2.0.0"
@@ -40,6 +40,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "gitHead": "e93054438294181ba916a51fc987462c80960538"
+  }
 }

package/src/commands/danger.js

@@ -1,13 +1,14 @@
 import {
   davinciProjectConfig,
-  runSync,
   print,
   convertToCLIParameters,
   files,
+  $,
+  echo,
+  chalk,
 } from '@toptal/davinci-cli-shared'
-import chalk from 'chalk'
 
-export const dangerCommand = options => {
+export const dangerCommand = async options => {
   print.header('Running danger check')
   const { local, dangerfile, ...rest } = options
   const dangerfilePath =
@@ -18,25 +19,20 @@ export const dangerCommand = options => {
     )
 
   if (davinciProjectConfig.master.conventionalCommits) {
-    console.log(`\
-${chalk.red(
-  '[UNSUPPORTED]'
-)} Since https://toptal-core.atlassian.net/wiki/x/YQFawQ
-Convention commits are now discouraged, support for it on davinci have been removed. Please use toptal commits instead.`)
+    const UNSUPPORTED = chalk.red('[UNSUPPORTED]')
+
+    echo(`${UNSUPPORTED} Since https://toptal-core.atlassian.net/wiki/x/YQFawQ`)
+    echo(
+      'Convention commits are now discouraged, support for it on davinci have been removed. Please use toptal commits instead.'
+    )
     process.exit(10)
   }
 
-  runSync(
-    'yarn',
-    [
-      'danger',
-      local ? 'local' : 'ci',
-      local ? '--failOnErrors' : undefined,
-      '--dangerfile',
-      `${dangerfilePath}`,
-      ...convertToCLIParameters(rest),
-    ].filter(Boolean)
-  )
+  const scope = local ? 'local' : 'ci'
+  const extraArgs = convertToCLIParameters(rest)
+
+  // We use --base origin/master in case local master is not up to date, or diverging from remote
+  await $`yarn -s danger ${scope} --dangerfile ${dangerfilePath} --base origin/master ${extraArgs}`
 }
 
 export const createDangerCommand = program => {