Merge branch 'release' into lagoon-waku

AmazeeLabs · Sep 3, 2024 · 596f77e · 596f77e
2 parents 5de3d47 + 5019542
commit 596f77e
Show file tree

Hide file tree

Showing 102 changed files with 3,977 additions and 2,458 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -4,7 +4,7 @@ runs:
   using: 'composite'
   steps:
     - name: Setup Node.js
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: 18
 
@@ -23,7 +23,7 @@ runs:
       shell: bash
       run: echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       name: Setup pnpm cache
       with:
         path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
@@ -34,7 +34,3 @@ runs:
     - name: Install dependencies
       shell: bash
       run: pnpm i
-
-    - name: Check formatting
-      shell: bash
-      run: pnpm test:format
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -8,10 +8,10 @@ on:
 jobs:
   test:
     name: Deploy
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

diff --git a/.github/workflows/estimate.yml b/.github/workflows/estimate.yml
@@ -6,7 +6,7 @@ jobs:
   estimate:
     name: Estimate
     if: vars.JIRA_PROJECT_ID != ''
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Start Check Run
         id: check
@@ -27,7 +27,7 @@ jobs:
         run: npm install -g @amazeelabs/estimator
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

diff --git a/.github/workflows/high_content_volume.yml b/.github/workflows/high_content_volume.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
 

diff --git a/.github/workflows/merge_dev_to_stage.yml b/.github/workflows/merge_dev_to_stage.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: 'dev'
 

diff --git a/.github/workflows/tag_release.yml b/.github/workflows/tag_release.yml
@@ -15,11 +15,11 @@ jobs:
         id: date
         run: echo "::set-output name=date::$(date +'%Y-%m-%d/%H/%M/%S')"
       - name: Checkout branch "prod"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: prod
       - name: Create Git tag for PR
-        uses: actions/github-script@v4
+        uses: actions/github-script@v7
         with:
           script: |
             github.git.createRef({

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   test:
     name: Test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Init check
         if: ${{ github.repository != 'AmazeeLabs/silverback-template'}}
@@ -14,7 +14,7 @@ jobs:
           instructions.' && false
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -38,7 +38,7 @@ jobs:
           TURBO_TEAM: 'local'
 
       - name: Upload Playwright report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: playwright-report
@@ -56,7 +56,7 @@ jobs:
           fi
 
       - name: Publish to Chromatic
-        uses: chromaui/action@v1
+        uses: chromaui/action@v11
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
@@ -94,13 +94,13 @@ jobs:
   update_dashboard:
     name: Update dashboard
     if: github.ref == 'refs/heads/release' && vars.JIRA_PROJECT_ID != ''
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Install estimator
         run: npm install -g @amazeelabs/estimator
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -118,7 +118,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - name: Setup Ruby

diff --git a/.github/workflows/test_without_turbo_cache.yml b/.github/workflows/test_without_turbo_cache.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   test:
     name: Test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Init check
         if: ${{ github.repository != 'AmazeeLabs/silverback-template'}}
@@ -14,7 +14,7 @@ jobs:
           instructions.' && false
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -35,7 +35,7 @@ jobs:
           TURBO_TEAM: 'local'
 
       - name: Upload Playwright report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: playwright-report

diff --git a/.github/workflows/write-dashboard.yml b/.github/workflows/write-dashboard.yml
@@ -6,13 +6,13 @@ jobs:
   write_dashboard:
     name: Write dashboard history
     if: github.ref == 'refs/heads/release' && vars.JIRA_PROJECT_ID != ''
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Install estimator
         run: npm install -g @amazeelabs/estimator
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
diff --git a/.idea/prettier.xml b/.idea/prettier.xml
diff --git a/.lagoon/Dockerfile b/.lagoon/Dockerfile
@@ -60,6 +60,7 @@ COPY --from=builder /tmp/.deploy/cms /app
 
 WORKDIR /app
 ENV WEBROOT=web
+ENV PHP_MEMORY_LIMIT=2048
 
 # ====================================================================================================
 # PHP IMAGE
@@ -73,6 +74,7 @@ COPY --from=cli /app /app
 
 WORKDIR /app
 ENV WEBROOT=web
+ENV PHP_MEMORY_LIMIT=2048
 
 # ====================================================================================================
 # NGINX IMAGE

diff --git a/INIT.md b/INIT.md
@@ -74,17 +74,34 @@ replace(
   'PROJECT_NAME=example',
   'PROJECT_NAME=' + process.env.PROJECT_NAME_MACHINE,
 );
-const clientSecret = randomString(32);
+const publisherClientSecret = randomString(32);
 replace(
   ['apps/cms/.lagoon.env', 'apps/website/.lagoon.env'],
   'PUBLISHER_OAUTH2_CLIENT_SECRET=REPLACE_ME',
-  'PUBLISHER_OAUTH2_CLIENT_SECRET=' + clientSecret,
+  'PUBLISHER_OAUTH2_CLIENT_SECRET=' + publisherClientSecret,
 );
-const sessionSecret = randomString(32);
+const publisherSessionSecret = randomString(32);
 replace(
   ['apps/website/.lagoon.env'],
   'PUBLISHER_OAUTH2_SESSION_SECRET=REPLACE_ME',
-  'PUBLISHER_OAUTH2_SESSION_SECRET=' + sessionSecret,
+  'PUBLISHER_OAUTH2_SESSION_SECRET=' + publisherSessionSecret,
+);
+const previewClientSecret = randomString(32);
+replace(
+  ['apps/cms/.lagoon.env'],
+  'PREVIEW_OAUTH2_CLIENT_SECRET=REPLACE_ME',
+  'PREVIEW_OAUTH2_CLIENT_SECRET=' + previewClientSecret,
+);
+replace(
+  ['apps/preview/.lagoon.env'],
+  'OAUTH2_CLIENT_SECRET=REPLACE_ME',
+  'OAUTH2_CLIENT_SECRET=' + previewClientSecret,
+);
+const previewSessionSecret = randomString(32);
+replace(
+  ['apps/preview/.lagoon.env'],
+  'OAUTH2_SESSION_SECRET=REPLACE_ME',
+  'OAUTH2_SESSION_SECRET=' + previewSessionSecret,
 );
 // Template's prod domain is special.
 replace(

diff --git a/apps/cms/.lagoon.env b/apps/cms/.lagoon.env
@@ -5,3 +5,4 @@ PREVIEW_URL="https://preview.${LAGOON_ENVIRONMENT}.${LAGOON_PROJECT}.ch4.amazee.
 
 # Used to set the original client secret.
 PUBLISHER_OAUTH2_CLIENT_SECRET=REPLACE_ME
+PREVIEW_OAUTH2_CLIENT_SECRET=REPLACE_ME
diff --git a/apps/cms/composer.json b/apps/cms/composer.json
@@ -44,6 +44,7 @@
     "amazeelabs/silverback_gutenberg": "^2.4.8",
     "amazeelabs/silverback_iframe": "^1.3.5",
     "amazeelabs/silverback_iframe_theme": "^1.3.0",
+    "amazeelabs/silverback_preview_link": "^1.6",
     "amazeelabs/silverback_publisher_monitor": "^2.3.2",
     "amazeelabs/silverback_translations": "^1.0.4",
     "composer/installers": "^2.2",
@@ -103,12 +104,12 @@
       "drupal/userprotect": {
         "Fix site install": "https://www.drupal.org/files/issues/2023-07-28/3349663-8.patch"
       },
-      "amazeelabs/silverback_gatsby": {
-        "Autosave preview": "./patches/fetch-entity.patch"
-      },
       "drupal/gutenberg": {
         "Gutenberg enabled hook": "https://www.drupal.org/files/issues/2024-05-07/gutenberg_enabled_hook_3445677-2.patch",
         "Remove !important from sidebar": "./patches/gutenberg_remove-important-sidebar.patch"
+      },
+      "drupal/graphql": {
+        "Check if translation exists when loading an entity by its uuid": "./patches/graphql_load_by_uuid_translation_check.patch"
       }
     },
     "patchLevel": {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,4 @@ PREVIEW_URL="https://preview.${LAGOON_ENVIRONMENT}.${LAGOON_PROJECT}.ch4.amazee.

		# Used to set the original client secret.
		PUBLISHER_OAUTH2_CLIENT_SECRET=REPLACE_ME
		PREVIEW_OAUTH2_CLIENT_SECRET=REPLACE_ME