Merge remote-tracking branch 'origin/SLB-449-serve-local-dev-env-only…

…' into dev
AmazeeLabs · Aug 12, 2024 · daafa48 · daafa48
2 parents 3f1845b + af5de10
commit daafa48
Show file tree

Hide file tree

Showing 4 changed files with 106 additions and 56 deletions.
diff --git a/apps/website/package.json b/apps/website/package.json
@@ -8,7 +8,7 @@
     "@amazeelabs/gatsby-plugin-operations": "^1.1.3",
     "@amazeelabs/gatsby-plugin-static-dirs": "^1.0.1",
     "@amazeelabs/gatsby-source-silverback": "^1.14.0",
-    "@amazeelabs/publisher": "^2.4.32",
+    "@amazeelabs/publisher": "^2.4.33",
     "@amazeelabs/strangler-netlify": "^1.1.9",
     "@amazeelabs/token-auth-middleware": "^1.1.1",
     "@custom/cms": "workspace:*",

diff --git a/apps/website/publisher.config.ts b/apps/website/publisher.config.ts
@@ -20,12 +20,15 @@ export default defineConfig({
       outputTimeout: 1000 * 60 * 10,
     },
     clean: 'pnpm clean',
-    serve: {
-      command: 'pnpm netlify dev --cwd=. --dir=public --port=7999',
-      readyPattern: 'Server now ready',
-      readyTimeout: 1000 * 60,
-      port: 7999,
-    },
+    // Serve only on non Lagoon environments.
+    serve: !isLagoon
+      ? {
+          command: 'pnpm netlify dev --cwd=. --dir=public --port=7999',
+          readyPattern: 'Server now ready',
+          readyTimeout: 1000 * 60,
+          port: 7999,
+        }
+      : undefined,
     deploy: isNetlifyEnabled
       ? [
           `pnpm netlify env:set AWS_LAMBDA_JS_RUNTIME nodejs18.x`,

diff --git a/packages/drupal/gutenberg_blocks/src/blocks/accordion-item-text.tsx b/packages/drupal/gutenberg_blocks/src/blocks/accordion-item-text.tsx
@@ -76,7 +76,7 @@ registerBlockType('custom/accordion-item-text', {
             />
             <InnerBlocks
               templateLock={false}
-              allowedBlocks={['core/paragraph', 'core/list', 'core/heading']}
+              allowedBlocks={['core/paragraph', 'core/list', 'custom/heading']}
               template={[['core/paragraph', {}]]}
             />
           </div>