Merge branch 'staging' into refactor/glimmer-components-model-form

csvalpha · Oct 14, 2023 · 121d987 · 121d987
2 parents c143779 + 098ea29
commit 121d987
Show file tree

Hide file tree

Showing 740 changed files with 9,179 additions and 5,885 deletions.
diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -53,6 +53,7 @@
       "prBodyNotes": "### Upgrade Instructions\n\
 * Wait until both `danlynn/ember-cli` and `ember-cli` have the same update{{#unless isPatch}}\n\
 * Then follow this guide: https://cli.emberjs.com/release/basic-use/upgrading/#upgradinganemberappitself\n\
+* Then update `.nvmrc` with the version used in dalynn/ember-cli and validate everything works with this Node version\n\
 * Finally, make sure any package that was added to `package.json` by this process is added to `ignoreDeps` in [`renovate.json5`](https://github.com/csvalpha/amber-ui/blob/staging/.github/renovate.json5){{/unless}}"
     },
     {

diff --git a/.github/workflows/cleanup-registry.yml b/.github/workflows/cleanup-registry.yml
@@ -14,11 +14,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Delete old versions
-        uses: snok/container-retention-policy@6601a342b42bf08909bbd5b48736d4176100365b # tag=v1.5.1
+        uses: snok/container-retention-policy@f617f1ca161a52bce48417eedd76924e71d0b4d9 # v2.1.0
         with:
           image-names: ${{ env.IMAGE_NAMES }}
           cut-off: 2 days ago UTC
           account-type: org
           org-name: ${{ github.repository_owner }}
           skip-tags: latest,staging
-          token: ${{ secrets.PAT }}
+          token: ${{ secrets.GH_PAT }}
diff --git a/.github/workflows/continuous-delivery.yml b/.github/workflows/continuous-delivery.yml
@@ -13,8 +13,6 @@ concurrency:
 
 env:
   PROJECT_NAME: amber-ui
-  SENTRY_ORG: csvalpha
-  APP_ID: 152333
 
 jobs:
   branch_check:
@@ -37,7 +35,7 @@ jobs:
       stage: ${{ steps.get_metadata.outputs.stage }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
       - name: Get metadata
         id: get_metadata
@@ -82,7 +80,7 @@ jobs:
 
       - name: Checkout code
         if: fromJSON(needs.metadata.outputs.has_diff)
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
       - name: Run merge
         if: fromJSON(needs.metadata.outputs.has_diff)
@@ -137,19 +135,19 @@ jobs:
           fi
 
       - name: Checkout code
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
           ref: ${{ needs.merge.outputs.sha }}
 
       - name: Start deployment
-        uses: bobheadxi/deployments@9d4477fdaa4120020cd10ab7e97f68c801422e73 # tag=v1.3.0
+        uses: bobheadxi/deployments@88ce5600046c82542f8246ac287d0a53c461bca3 # v1.4.0
         id: start_deployment
         with:
           step: start
           env: ${{ needs.metadata.outputs.stage }}
 
       - name: Deploy
-        uses: appleboy/ssh-action@4a03da89e5c43da56e502053be4bbcb293411883 # v0.1.6
+        uses: appleboy/ssh-action@334f9259f2f8eb3376d33fa4c684fff373f2c2a6 # v0.1.10
         env:
           STAGE: ${{ needs.metadata.outputs.stage }}
         with:
@@ -163,17 +161,18 @@ jobs:
             docker-compose up -d
 
       - name: Finalize Sentry release
-        uses: getsentry/action-release@bd5f874fcda966ba48139b0140fb3ec0cb3aabdd # v1.2.1
+        uses: getsentry/action-release@4744f6a65149f441c5f396d5b0877307c0db52c7 # v1.4.1
         env:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_ORG: ${{ vars.SENTRY_ORG_NAME }}
           SENTRY_PROJECT: ${{ env.PROJECT_NAME }}
         with:
           environment: ${{ needs.metadata.outputs.stage }}
           version: ${{ needs.merge.outputs.sha }}
           set_commits: skip
 
       - name: Finish deployment
-        uses: bobheadxi/deployments@9d4477fdaa4120020cd10ab7e97f68c801422e73 # tag=v1.3.0
+        uses: bobheadxi/deployments@88ce5600046c82542f8246ac287d0a53c461bca3 # v1.4.0
         if: steps.start_deployment.conclusion == 'success' && always()
         with:
           step: finish
@@ -212,8 +211,8 @@ jobs:
       - name: Update Continuous Delivery check run
         uses: guidojw/actions/update-check-run@abb0ee8d1336edf73383f2e5a09abd3a22f25b13 # v1.3.3
         with:
-          app_id: ${{ env.APP_ID }}
-          private_key: ${{ secrets.APP_PRIVATE_KEY }}
+          app_id: ${{ vars.GH_APP_ID }}
+          private_key: ${{ secrets.GH_APP_PRIVATE_KEY }}
           sha: ${{ needs.merge.outputs.sha }}
           name: Continuous Delivery
           conclusion: ${{ steps.get_conclusion.outputs.conclusion }}

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches: [staging, master]
   pull_request:
+  merge_group:
   workflow_call:
     inputs:
       sha:
@@ -17,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
           ref: ${{ inputs.sha }}
 
@@ -34,7 +35,7 @@ jobs:
     needs: build
     steps:
       - name: Checkout code
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
           ref: ${{ inputs.sha }}
 
@@ -46,7 +47,7 @@ jobs:
 
       - name: Download actionlint
         run: |
-          bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) 1.6.22
+          bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) 1.6.24
 
       - name: Load test image
         uses: guidojw/actions/load-docker-image@abb0ee8d1336edf73383f2e5a09abd3a22f25b13 # v1.3.3
@@ -56,7 +57,7 @@ jobs:
       - name: Lint
         run: |
           EXIT_STATUS=0
-          ./actionlint -ignore 'property "app_private_key" is not defined' -ignore 'SC2153:' \
+          ./actionlint -ignore 'property "gh_app_private_key" is not defined' -ignore 'SC2153:' \
             -ignore 'property "sha" is not defined in object type {}' || EXIT_STATUS=$?
           docker run app yarn lint:hbs || EXIT_STATUS=$?
           docker run app yarn lint:js || EXIT_STATUS=$?

diff --git a/.github/workflows/publish-image.yml b/.github/workflows/publish-image.yml
@@ -17,9 +17,6 @@ on:
 
 env:
   PROJECT_NAME: amber-ui
-  REGISTRY_URL: ghcr.io
-  SENTRY_ORG: csvalpha
-  APP_ID: 152333
 
 jobs:
   metadata:
@@ -48,7 +45,7 @@ jobs:
             {
               echo 'build_args<<EOF'
               echo "$BUILD_ARGS"
-              echo 'EOF' 
+              echo 'EOF'
             } >> "$GITHUB_OUTPUT"
           fi
 
@@ -58,32 +55,32 @@ jobs:
     needs: metadata
     steps:
       - name: Checkout code
-        uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
           ref: ${{ inputs.sha }}
           fetch-depth: 0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@8c0edbc76e98fa90f69d9a2c020dcb50019dc325 # tag=v2.2.1
+        uses: docker/setup-buildx-action@4b4e9c3e2d4531116a6f8ba8e71fc6e2cb6e6c8c # v2.5.0
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # tag=v2.1.0
         with:
-          registry: ${{ env.REGISTRY_URL }}
+          registry: ${{ vars.DOCKER_REGISTRY_URL }}
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push image
         id: build_push_image
-        uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 # tag=v3.2.0
+        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 # v4.0.0
         with:
           push: true
           context: .
           build-args: ${{ needs.metadata.outputs.build_args }}
           cache-from: type=gha,scope=main
           cache-to: type=gha,mode=max,scope=main
           tags: |
-            ${{ env.REGISTRY_URL }}/${{ github.repository_owner }}/${{ env.PROJECT_NAME }}:${{
+            ${{ vars.DOCKER_REGISTRY_URL }}/${{ github.repository_owner }}/${{ env.PROJECT_NAME }}:${{
             needs.metadata.outputs.tag }}
 
       - name: Get sourcemaps from image
@@ -95,9 +92,10 @@ jobs:
 
       - name: Create Sentry release
         if: ${{ !(github.event_name == 'workflow_dispatch' && github.workflow == 'Publish Image') }}
-        uses: getsentry/action-release@bd5f874fcda966ba48139b0140fb3ec0cb3aabdd # v1.2.1
+        uses: getsentry/action-release@4744f6a65149f441c5f396d5b0877307c0db52c7 # v1.4.1
         env:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_ORG: ${{ vars.SENTRY_ORG_NAME }}
           SENTRY_PROJECT: ${{ env.PROJECT_NAME }}
         with:
           finalize: false
@@ -127,8 +125,8 @@ jobs:
       - name: Update Publish Image check run
         uses: guidojw/actions/update-check-run@abb0ee8d1336edf73383f2e5a09abd3a22f25b13 # v1.3.3
         with:
-          app_id: ${{ env.APP_ID }}
-          private_key: ${{ secrets.APP_PRIVATE_KEY }}
+          app_id: ${{ vars.GH_APP_ID }}
+          private_key: ${{ secrets.GH_APP_PRIVATE_KEY }}
           name: Publish Image
           conclusion: ${{ steps.get_conclusion.outputs.conclusion }}
           details_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
diff --git a/.gitignore b/.gitignore
@@ -42,6 +42,7 @@ testem.log
 # IDE Folders #
 ###############
 /.idea/*
+/.vscode/*
 
 # ember-try
 /.node_modules.ember-try/

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-14.21.2
+18.14.2
diff --git a/.stylelintrc.js b/.stylelintrc.js
@@ -6,8 +6,6 @@ module.exports = {
     'stylelint-config-standard',
     // Configuration based on https://sass-guidelin.es
     'stylelint-config-sass-guidelines',
-    // Configuration that turns off all Stylelint rules conflicting with prettier.
-    'stylelint-config-prettier',
     // Concentric order of declarations based on http://rhodesmill.org/brandon/2011/concentric-css/
     './.stylelintrc.order.js',
   ],
@@ -20,5 +18,27 @@ module.exports = {
     'scss/at-rule-no-unknown': null,
     'scss/dollar-variable-colon-space-after': null,
     'selector-class-pattern': null,
+
+    // All these disables are rules enabled by stylelint-config-sass-guidelines
+    // that are deprecated in stylelint v15, remove these when
+    // stylelint-config-sass-guidelines is upgraded to support v15.
+    'block-opening-brace-space-before': null,
+    'color-hex-case': null,
+    'declaration-bang-space-after': null,
+    'declaration-bang-space-before': null,
+    'declaration-block-semicolon-newline-after': null,
+    'declaration-block-semicolon-space-before': null,
+    'declaration-block-trailing-semicolon': null,
+    'declaration-colon-space-after': null,
+    'declaration-colon-space-before': null,
+    'function-comma-space-after': null,
+    'function-parentheses-space-inside': null,
+    indentation: null,
+    'media-feature-parentheses-space-inside': null,
+    'no-missing-end-of-source-newline': null,
+    'number-leading-zero': null,
+    'number-no-trailing-zeros': null,
+    'selector-list-comma-newline-after': null,
+    'string-quotes': null,
   },
 };