build(deps): bump @emotion/react from 11.11.1 to 11.11.4

.dockerignore

@@ -0,0 +1,6 @@
+node_modules
+.netlify
+.next
+.vercel
+coverage
+.env.local

.github/actions/action-00-toolbox/action.yml

@@ -13,6 +13,6 @@ runs:
   using: "composite"
   steps:
     - name: Toolbox - Install CICD-Tools Toolbox
-      uses: cicd-tools-org/cicd-tools/.github/actions/action-00-toolbox@master
+      uses: cicd-tools-org/cicd-tools/.github/actions/action-00-toolbox@main
       with:
         PROJECT_ROOT_PATH: ${{ inputs.PROJECT_ROOT_PATH }}

.github/config/schemas/workflows/workflow-push.json

@@ -8,7 +8,7 @@
     "ci_commitizen_rev_range",
     "ci_concurrency_limit",
     "ci_extra_release_content",
-    "ci_netlify_production_url",
+    "ci_production_url",
     "ci_verbose_notifications",
     "ci_python_versions",
     "ci_trufflehog_extra_scan_args"
@@ -35,7 +35,7 @@
         "type": "string"
       }
     },
-    "ci_netlify_production_url": {
+    "ci_production_url": {
       "description": "This string is the url next auth will use in production, as it's not a standard netlify domain.",
       "pattern": "^https://.+",
       "type": "string"

.github/config/workflows/workflow-push.json

@@ -3,7 +3,7 @@
   "ci_commitizen_rev_range": "HEAD",
   "ci_concurrency_limit": 4,
   "ci_extra_release_content": [],
-  "ci_netlify_production_url": "https://mla.niallbyrne.ca",
+  "ci_production_url": "https://mla.niallbyrne.ca",
   "ci_python_versions": ["3.9"],
   "ci_trufflehog_extra_scan_args": "--only-verified",
   "ci_verbose_notifications": false

.github/dependabot.yml

@@ -2,7 +2,7 @@
 version: 2
 updates:
   - package-ecosystem: "npm"
-    target-branch: "master"
+    target-branch: "main"
     directory: "/"
     schedule:
       interval: "weekly"

.github/scripts/step-setup-environment.sh

@@ -10,7 +10,7 @@
 # NOTIFICATION_LINK:                Consumed by the notification script to provide a clickable link to the workflow run in GitHub.
 # PROJECT_NAME:                     The slugified name of the template project.  Should match the GitHub repository name.
 # PROJECT_OWNER:                    The GitHub owner of the project.
-# TEMPLATE_BRANCH_NAME_BASE:        The name of the templated repository's default branch name.  (Defaults to 'master'.)
+# TEMPLATE_BRANCH_NAME_BASE:        The name of the templated repository's default branch name.  (Defaults to 'main'.)
 # TEMPLATE_BRANCH_NAME_DEVELOPMENT: The name of the templated repository's development branch name.  (Defaults to 'dev'.)
 
 # CI only script.
@@ -22,7 +22,7 @@ WORKFLOW_NAME="${WORKFLOW_NAME:-""}"
 main() {
 
   PROJECT_NAME="mla"
-  PROJECT_OWNER="Music-Metadata-Analysis"
+  PROJECT_OWNER="music-metadata-analysis"
 
   BRANCH_OR_TAG="$(echo "${GITHUB_REF}" | sed -E 's,refs/heads/|refs/tags/,,g')"
   WORKFLOW_URL="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
@@ -35,7 +35,7 @@ main() {
     echo "NOTIFICATION_LINK=${PROJECT_NAME}${WORKFLOW_NAME} [<${WORKFLOW_URL}|${BRANCH_OR_TAG}>]"
     echo "PROJECT_NAME=${PROJECT_NAME}"
     echo "PROJECT_OWNER=${PROJECT_OWNER}"
-    echo "TEMPLATE_BRANCH_NAME_BASE=${TEMPLATE_BRANCH_NAME_BASE-master}"
+    echo "TEMPLATE_BRANCH_NAME_BASE=${TEMPLATE_BRANCH_NAME_BASE-main}"
     echo "TEMPLATE_BRANCH_NAME_DEVELOPMENT=${TEMPLATE_BRANCH_NAME_DEVELOPMENT-dev}"
   } >> "${GITHUB_ENV}"
 

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ on:
 
 jobs:
   configuration:
-    uses: cicd-tools-org/cicd-tools/.github/workflows/job-00-generic-read_json_file.yml@master
+    uses: cicd-tools-org/cicd-tools/.github/workflows/job-00-generic-read_json_file.yml@main
     with:
       JSON_FILE_PATH: ".github/config/workflows/workflow-push.json"
 
@@ -59,7 +59,7 @@ jobs:
     needs: [configuration]
     secrets:
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-    uses: cicd-tools-org/cicd-tools/.github/workflows/job-30-generic-markdown_links.yml@master
+    uses: cicd-tools-org/cicd-tools/.github/workflows/job-30-generic-markdown_links.yml@main
     with:
       CONFIG_FILE: ".github/config/actions/gaurav-nelson-github-action-markdown-link-check.json"
       DOCUMENTATION_PATH: "."
@@ -71,7 +71,7 @@ jobs:
       FILE_CONTENT: ${{ secrets.CI_ENVIRONMENT_CONTENT }}
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
       ENV_SECRET_1: ${{ secrets.INTEGRATION_TEST_LAST_FM_KEY }}
-    uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@master
+    uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@main
     with:
       ADDITIONAL_CACHE_PATHS: "~/.cache/Cypress"
       COMMAND: coverage
@@ -85,7 +85,7 @@ jobs:
     needs: [configuration]
     secrets:
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-    uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-poetry-rev_range_command.yml@master
+    uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-poetry-rev_range_command.yml@main
     with:
       COMMAND: |
         poetry run cz check --rev-range "${PUSHED_COMMIT_REV_RANGE}"
@@ -99,7 +99,7 @@ jobs:
     needs: [configuration]
     secrets:
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-    uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-poetry-rev_range_command.yml@master
+    uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-poetry-rev_range_command.yml@main
     with:
       COMMAND: |
         CICD_COMMIT_MESSAGES_FILE="$(mktemp XXXXXXXX.git_history_file)"
@@ -115,7 +115,7 @@ jobs:
     needs: [configuration]
     secrets:
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-    uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@master
+    uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@main
     with:
       ADDITIONAL_CACHE_PATHS: "~/.cache/Cypress"
       COMMAND: build:validators
@@ -125,21 +125,14 @@ jobs:
       VERBOSE_NOTIFICATIONS: ${{ fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_verbose_notifications }}
 
   deploy_stage:
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main'
     needs: [configuration, success_notification]
     secrets:
-      FILE_CONTENT: ${{ secrets.STAGE_ENVIRONMENT_CONTENT }}
+      FLYIO_API_TOKEN: ${{ secrets.FLYIO_API_TOKEN }}
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-      ENV_SECRET_1: ${{ secrets.NETLIFY_TOKEN }}
-      ENV_SECRET_2: ${{ secrets.STAGE_NETLIFY_SITE_ID }}
-    uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@master
+    uses: cicd-tools-org/cicd-tools/.github/workflows/job-95-container-flyio_deploy.yml@main
     with:
-      ADDITIONAL_CACHE_PATHS: "~/.cache/Cypress"
-      COMMAND: netlify:ci
-      COMMAND_NAME: Deploy to Stage
-      CONCURRENCY: ${{ fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_concurrency_limit }}
-      POST_COMMAND: NETLIFY_AUTH_TOKEN="${ENV_SECRET_1}" netlify deploy --build --prod -s "${ENV_SECRET_2}"
-      SECRET_CONTENT_FILENAME: .env.local
+      FLYIO_ENDPOINT_URL: "https://stage-mla.fly.dev"
       VERBOSE_NOTIFICATIONS: true
 
   deploy_production:
@@ -148,16 +141,16 @@ jobs:
     secrets:
       FILE_CONTENT: ${{ secrets.PRODUCTION_ENVIRONMENT_CONTENT }}
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-      ENV_SECRET_1: ${{ secrets.NETLIFY_TOKEN }}
-      ENV_SECRET_2: ${{ fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_netlify_production_url }}
-      ENV_SECRET_3: ${{ secrets.PRODUCTION_NETLIFY_SITE_ID }}
-    uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@master
+      ENV_SECRET_1: ${{ secrets.VERCEL_TOKEN }}
+      ENV_SECRET_2: ${{ secrets.PRODUCTION_VERCEL_CONFIG }}
+    uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@main
     with:
       ADDITIONAL_CACHE_PATHS: "~/.cache/Cypress"
-      COMMAND: netlify:ci
+      COMMAND: ci:vercel; vercel pull --yes --environment=production --token="${ENV_SECRET_1}"
       COMMAND_NAME: Deploy to Production
       CONCURRENCY: ${{ fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_concurrency_limit }}
-      POST_COMMAND: NETLIFY_AUTH_TOKEN="${ENV_SECRET_1}" NEXTAUTH_URL="${ENV_SECRET_2}" netlify deploy --build --prod -s "${ENV_SECRET_3}"
+      POST_COMMAND: vercel build --prod --token="${ENV_SECRET_1}" && vercel deploy --prebuilt --prod --token="${ENV_SECRET_1}"
+      PRE_COMMAND: mkdir -p .vercel && echo "${ENV_SECRET_2}" > .vercel/project.json
       SECRET_CONTENT_FILENAME: .env.local
       VERBOSE_NOTIFICATIONS: true
 
@@ -177,7 +170,7 @@ jobs:
     needs: [configuration]
     secrets:
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-    uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@master
+    uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@main
     with:
       ADDITIONAL_CACHE_PATHS: "~/.cache/Cypress"
       COMMAND: lint
@@ -189,7 +182,7 @@ jobs:
     needs: [configuration]
     secrets:
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-    uses: cicd-tools-org/cicd-tools/.github/workflows/job-10-generic-security_scan_credentials.yml@master
+    uses: cicd-tools-org/cicd-tools/.github/workflows/job-10-generic-security_scan_credentials.yml@main
     with:
       EXTRA_BINARY_ARGS: ${{ fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_trufflehog_extra_scan_args }}
       VERBOSE_NOTIFICATIONS: ${{ fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_verbose_notifications }}
@@ -198,7 +191,7 @@ jobs:
     needs: [configuration]
     secrets:
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-    uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@master
+    uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@main
     with:
       ADDITIONAL_CACHE_PATHS: "~/.cache/Cypress"
       COMMAND: security
@@ -219,7 +212,7 @@ jobs:
           - id: "lint-shell"
             name: "Shell Linting"
       max-parallel: ${{ fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_concurrency_limit }}
-    uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-poetry-precommit_commit_stage_hook.yml@master
+    uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-poetry-precommit_commit_stage_hook.yml@main
     with:
       CONCURRENCY: ${{ fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_concurrency_limit }}
       PRECOMMIT_HOOK_ID: ${{ matrix.hook.id }}
@@ -232,7 +225,7 @@ jobs:
     secrets:
       FILE_CONTENT: ${{ secrets.CI_ENVIRONMENT_CONTENT }}
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-    uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@master
+    uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@main
     with:
       ADDITIONAL_CACHE_PATHS: "~/.cache/Cypress"
       COMMAND: smoke:ci
@@ -246,17 +239,20 @@ jobs:
       VERBOSE_NOTIFICATIONS: ${{ fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_verbose_notifications }}
 
   smoke_tests_stage:
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/main'
     needs: [configuration, deploy_stage]
     secrets:
+      ENV_SECRET_1: "https://stage-mla.fly.dev"
       FILE_CONTENT: ${{ secrets.STAGE_ENVIRONMENT_CONTENT }}
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-    uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@master
+    uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@main
     with:
       ADDITIONAL_CACHE_PATHS: "~/.cache/Cypress"
       COMMAND: smoke:ci
       COMMAND_NAME: Smoke Tests (Stage)
       CONCURRENCY: ${{ fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_concurrency_limit }}
+      PRE_COMMAND: |
+        sed -i.bak "s,NEXTAUTH_URL=.*,NEXTAUTH_URL=${ENV_SECRET_1}," .env.local
       SECRET_CONTENT_FILENAME: .env.local
       VERBOSE_NOTIFICATIONS: true
 
@@ -266,7 +262,7 @@ jobs:
     secrets:
       FILE_CONTENT: ${{ secrets.PRODUCTION_ENVIRONMENT_CONTENT }}
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-    uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@master
+    uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@main
     with:
       ADDITIONAL_CACHE_PATHS: "~/.cache/Cypress"
       COMMAND: smoke:ci
@@ -278,7 +274,7 @@ jobs:
   start_notification:
     secrets:
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-    uses: cicd-tools-org/cicd-tools/.github/workflows/job-00-generic-notification.yml@master
+    uses: cicd-tools-org/cicd-tools/.github/workflows/job-00-generic-notification.yml@main
     with:
       NOTIFICATION_EMOJI: ":vertical_traffic_light:"
       NOTIFICATION_MESSAGE: "Workflow has started!"
@@ -305,7 +301,7 @@ jobs:
       ]
     secrets:
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-    uses: cicd-tools-org/cicd-tools/.github/workflows/job-00-generic-notification.yml@master
+    uses: cicd-tools-org/cicd-tools/.github/workflows/job-00-generic-notification.yml@main
     with:
       NOTIFICATION_EMOJI: ":checkered_flag:"
       NOTIFICATION_MESSAGE: "All checks have completed successfully!"
@@ -314,7 +310,7 @@ jobs:
     needs: [configuration]
     secrets:
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-    uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-poetry-precommit_commit_stage_hook.yml@master
+    uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-poetry-precommit_commit_stage_hook.yml@main
     with:
       CONCURRENCY: ${{ fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_concurrency_limit }}
       PRECOMMIT_HOOK_ID: "format-toml"
@@ -326,7 +322,7 @@ jobs:
     needs: [configuration]
     secrets:
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-    uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@master
+    uses: cicd-tools-org/cicd-tools/.github/workflows/job-40-npm-run_cached_command.yml@main
     with:
       ADDITIONAL_CACHE_PATHS: "~/.cache/Cypress"
       COMMAND: compile
@@ -338,7 +334,7 @@ jobs:
     needs: [configuration]
     secrets:
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-    uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-poetry-precommit_commit_stage_hook.yml@master
+    uses: cicd-tools-org/cicd-tools/.github/workflows/job-80-poetry-precommit_commit_stage_hook.yml@main
     with:
       CONCURRENCY: ${{ fromJSON(needs.configuration.outputs.JSON_FILE_DATA).ci_concurrency_limit }}
       PRECOMMIT_HOOK_ID: "lint-github-workflow"

.node-version

@@ -1 +1 @@
-v18.18.2
+18.18.2

.pre-commit-config.yaml

@@ -14,12 +14,12 @@ repos:
           - ".github/config/schemas/workflows/workflow-push.json"
         stages: [commit]
   - repo: https://github.com/commitizen-tools/commitizen
-    rev: 3.2.2
+    rev: v3.2.2
     hooks:
       - id: commitizen
         stages: [commit-msg]
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.3
+    rev: v3.1.0
     hooks:
       - id: prettier
         args:

.vale/Vocab/mla/accept.txt

@@ -5,6 +5,7 @@ axios
 checkin
 ci|CI
 clickthrough
+commitizen
 config|CONFIG
 css
 cve
@@ -17,6 +18,7 @@ eslint|ESLINT
 Flagsmith
 flipcard|FLIPCARD
 fn
+gcp|GCP
 github|GITHUB
 http
 http|HTTP
@@ -50,4 +52,5 @@ util
 util
 utilcve
 validator
+vercel|Vercel
 vscode|VSCODE

Dockerfile

@@ -0,0 +1,42 @@
+# Install dependencies only when needed
+FROM node:18-alpine AS builder
+# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
+RUN apk add --no-cache libc6-compat
+WORKDIR /app
+COPY . .
+# RUN yarn install --frozen-lockfile
+
+# If using npm with a `package-lock.json` comment out above and use below instead
+RUN npm ci
+
+ENV NEXT_TELEMETRY_DISABLED 1
+
+# Add `ARG` instructions below if you need `NEXT_PUBLIC_` variables
+# then put the value on your fly.toml
+# Example:
+# ARG NEXT_PUBLIC_EXAMPLE="value here"
+
+# RUN yarn build
+
+# If using npm comment out above and use below instead
+RUN npm run build
+
+# Production image, copy all the files and run next
+FROM node:18-alpine AS runner
+WORKDIR /app
+
+ENV ENV_LOCAL_MOUNT ""
+ENV NODE_ENV production
+ENV NEXT_TELEMETRY_DISABLED 1
+
+RUN addgroup --system --gid 1001 nodejs
+RUN adduser --system --uid 1001 nextjs
+
+COPY --from=builder /app ./
+
+USER nextjs
+
+# CMD ["yarn", "start"]
+
+# If using npm comment out above and use below instead
+CMD ["npm", "run", "start:container"]

README.md

@@ -14,7 +14,7 @@
 
 ### Stage
 
-[![MLA CI/CD](https://github.com/Music-Metadata-Analysis/mla/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/Music-Metadata-Analysis/mla/actions/workflows/ci.yml)
+[![MLA CI/CD](https://github.com/Music-Metadata-Analysis/mla/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/Music-Metadata-Analysis/mla/actions/workflows/ci.yml)
 
 <a href="https://www.statuscake.com" title="Website Uptime Monitoring"><img src="https://app.statuscake.com/button/index.php?Track=7031389&Days=1&Design=1" /></a>