Merge branch 'release' into upgrade-2025-02-15

AmazeeLabs · Feb 15, 2025 · c58676c · c58676c
2 parents 17280c2 + 46504a7
commit c58676c
Show file tree

Hide file tree

Showing 74 changed files with 21,625 additions and 23,804 deletions.
diff --git a/.github/workflows/fe_build.yml b/.github/workflows/fe_build.yml
@@ -29,7 +29,7 @@ jobs:
         uses: ./.github/actions/setup
 
       - name: TurboRepo local server
-        uses: felixmosh/turborepo-gh-artifacts@v2
+        uses: felixmosh/turborepo-gh-artifacts@v3
         with:
           server-token: 'local'
           repo-token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/high_content_volume.yml b/.github/workflows/high_content_volume.yml
@@ -16,7 +16,7 @@ jobs:
         uses: ./.github/actions/setup
 
       - name: TurboRepo local server
-        uses: felixmosh/turborepo-gh-artifacts@v2
+        uses: felixmosh/turborepo-gh-artifacts@v3
         with:
           server-token: 'local'
           repo-token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -35,7 +35,7 @@ jobs:
 
       - name: TurboRepo local server
         if: ${{ github.event.inputs.turborepo_caching != 'Off' }}
-        uses: felixmosh/turborepo-gh-artifacts@v2
+        uses: felixmosh/turborepo-gh-artifacts@v3
         with:
           server-token: 'local'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
@@ -92,8 +92,9 @@ jobs:
 
       - name: Deploy storybook to netlify
         run:
-          pnpm run --filter=@custom/ui build && npx netlify-cli deploy --prod
-          --filter @custom/ui --dir=packages/ui/storybook-static
+          pnpm run --filter=@custom/ui build && pnpm --package=netlify-cli dlx
+          netlify deploy --prod --filter @custom/ui
+          --dir=packages/ui/storybook-static
         env:
           VITEST_CLOUDINARY_CLOUDNAME: local
           NETLIFY_SITE_ID: ${{ vars.NETLIFY_STORYBOOK_ID }}
@@ -159,15 +160,14 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 1
+      - name: Set up Homebrew
+        id: set-up-homebrew
+        uses: Homebrew/actions/setup-homebrew@master
       - name: Install Pygmy
         run: |
           set -ex
-          git clone https://github.com/pygmystack/pygmy.git
-          cd pygmy
-          make build
-          ls -lisa ./builds
-          cp ./builds/pygmy-linux-amd64 /usr/local/bin/pygmy
-          chmod +x /usr/local/bin/pygmy
+          brew tap pygmystack/pygmy
+          brew install pygmy
       - name: Start Pygmy
         run: pygmy up
       - name: Docker Build & Up

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -2,11 +2,49 @@
   "version": "2.0.0",
   "tasks": [
     {
-      "label": "Rebuild website",
-      "command": "pnpm",
-      "args": ["run", "turbo:build:website"],
-      "type": "shell",
-      "problemMatcher": []
+      "label": "_root: install",
+      "command": "devbox run 'pnpm i'",
+      "type": "shell"
+    },
+    {
+      "label": "_root: turbo:prep",
+      "command": "devbox run 'pnpm run turbo:prep'",
+      "type": "shell"
+    },
+    {
+      "label": "_root: turbo:prep:force",
+      "command": "devbox run 'pnpm run turbo:prep:force'",
+      "type": "shell"
+    },
+    {
+      "label": "cms: dev",
+      "command": "devbox run 'cd apps/cms && pnpm run dev'",
+      "type": "shell"
+    },
+    {
+      "label": "cms: login",
+      "command": "devbox run 'cd apps/cms && pnpm run login'",
+      "type": "shell"
+    },
+    {
+      "label": "preview: dev",
+      "command": "devbox run 'cd apps/preview && pnpm run start'",
+      "type": "shell"
+    },
+    {
+      "label": "publisher: dev",
+      "command": "devbox run 'cd apps/publisher && pnpm run dev'",
+      "type": "shell"
+    },
+    {
+      "label": "publisher: open",
+      "command": "devbox run 'cd apps/publisher && pnpm run open'",
+      "type": "shell"
+    },
+    {
+      "label": "ui: dev",
+      "command": "devbox run 'cd packages/ui && pnpm run dev'",
+      "type": "shell"
     }
   ]
 }
diff --git a/apps/cms/composer.json b/apps/cms/composer.json
@@ -39,7 +39,7 @@
     "amazeelabs/silverback_external_preview": "^2.0.3",
     "amazeelabs/silverback_gatsby": "^3.0",
     "amazeelabs/silverback_graphql_persisted": "^1.1.6",
-    "amazeelabs/silverback_gutenberg": "^2.4.8",
+    "amazeelabs/silverback_gutenberg": "^2.5.23",
     "amazeelabs/silverback_iframe": "^1.3.5",
     "amazeelabs/silverback_iframe_theme": "^1.3.0",
     "amazeelabs/silverback_preview_link": "^1.6",
@@ -48,6 +48,7 @@
     "composer/installers": "^2.2",
     "drupal/admin_toolbar": "^3.4.1",
     "drupal/coffee": "^1.4",
+    "drupal/admin_user_language": "^1.2",
     "drupal/config_ignore": "^3.2",
     "drupal/config_notify": "^1.10",
     "drupal/config_pages": "^2.14",
@@ -102,7 +103,11 @@
   "extra": {
     "patches": {
       "drupal/core": {
-        "Multilingual-route-resolution-in-graphql": "./patches/multilingual-route-resolution-in-graphql.patch"
+        "Multilingual-route-resolution-in-graphql": "./patches/multilingual-route-resolution-in-graphql.patch",
+        "#2313309 - Admin toolbar and contextual links should always be rendered in the admin language (if set)": "https://www.drupal.org/files/issues/2023-12-19/2313309-179.patch",
+        "#2123543 - Add string context and location filters to the translate interface": "https://www.drupal.org/files/issues/2024-08-01/drupal-translate_string_context_filter-2123543-105.patch.patch",
+        "Default context for translation UI": "./patches/core/default-context-for-translation-ui.patch",
+        "3222997 - Allow disable non translatable fields on translation forms": "https://www.drupal.org/files/issues/2022-11-03/content_translation-disable_non_translatable_fields_translation_forms-3222997-15.patch"
       },
       "drupal/gutenberg": {
         "Gutenberg enabled hook": "https://www.drupal.org/files/issues/2024-05-07/gutenberg_enabled_hook_3445677-2.patch",