Merge remote-tracking branch 'origin/release' into dev

# Conflicts:
#       packages/schema/package.json
#       pnpm-lock.yaml

apps/cms/package.json

@@ -7,14 +7,13 @@
   "description": "Drupal based content management system.",
   "sideEffects": false,
   "scripts": {
-    "prep:composer": "if command -v composer; then composer install; else echo 'Skipping composer install.'; fi",
+    "prep:composer": "if command -v composer; then COMPOSER_ALLOW_SUPERUSER=1 composer install; else echo 'Skipping composer install.'; fi",
     "prep:database": "./prep-database.sh",
     "prep:schema": "pnpm drush silverback-gatsby:schema-export ../../../tests/schema || true",
     "fix-premissions": "chmod +w web/sites/default/files/.htaccess && chmod +w web/sites/default/files/private/.htaccess",
-    "ensure-working-db": "pnpm drush sqlq 'select * from node'",
     "drush": "SB_ENVIRONMENT=1 SIMPLETEST_DB=sqlite://localhost/sites/default/files/.sqlite DRUSH_OPTIONS_URI=http://127.0.0.1:8888 vendor/bin/drush",
     "silverback": "SB_ENVIRONMENT=1 SIMPLETEST_DB=sqlite://localhost/sites/default/files/.sqlite SB_ADMIN_USER=admin SB_ADMIN_PASS=admin vendor/bin/silverback",
-    "drupal-install": "SB_SETUP=1 pnpm silverback setup --profile minimal && pnpm content:import && pnpm drush php-eval 'node_access_rebuild();' && rm -rf install-cache.zip && pnpm fix-premissions && pnpm ensure-working-db",
+    "drupal-install": "SB_SETUP=1 pnpm silverback setup --profile minimal && pnpm content:import && pnpm drush php-eval 'node_access_rebuild();' && rm -rf install-cache.zip && pnpm fix-premissions",
     "export-webforms": "pnpm turbo --filter '@custom-tests/e2e' webform-snapshots",
     "start": "cd web; SB_ENVIRONMENT=1 SIMPLETEST_DB=sqlite://localhost/sites/default/files/.sqlite DRUSH_OPTIONS_URI=http://127.0.0.1:8888 php -S 0.0.0.0:8888 .ht.router.php # no drush to avoid the drush server timeout",
     "dev": "pnpm start",

apps/cms/turbo.json

@@ -1,6 +1,6 @@
 {
   "extends": ["//"],
-  "pipeline": {
+  "tasks": {
     "prep": {
       "dependsOn": ["prep:schema"]
     },
@@ -27,7 +27,7 @@
       "outputs": [
         "drush/**",
         "vendor/**",
-        "!**/.git/**",
+        "!*/**/.git/**",
         "web/**",
         "!web/modules/custom/**",
         "!web/themes/custom/**",

apps/decap/src/helpers/preview.tsx

@@ -1,8 +1,8 @@
 import { buildResponsiveImage } from '@amazeelabs/cloudinary-responsive-image';
 import { createResolveConfig } from '@amazeelabs/graphql-directives';
 import {
+  AnyOperationId,
   ImageSource,
-  OperationId,
   OperationResult,
   OperationVariables,
 } from '@custom/schema';
@@ -51,7 +51,7 @@ const responsiveImage: GraphQLFieldResolver<
   ) as ImageSource;
 };
 
-export async function query<TOperation extends OperationId<any, any>>(
+export async function query<TOperation extends AnyOperationId>(
   operation: TOperation,
   rootValue: any,
   variables: OperationVariables<TOperation> = {},
@@ -84,7 +84,7 @@ export async function query<TOperation extends OperationId<any, any>>(
   return result.data;
 }
 
-export function useQuery<TOperation extends OperationId<any, any>>(
+export function useQuery<TOperation extends AnyOperationId>(
   operation: TOperation,
   rootValue: any,
   variables: OperationVariables<TOperation> = {},
@@ -114,9 +114,7 @@ export function useQuery<TOperation extends OperationId<any, any>>(
 
 export type useQueryType = typeof useQuery;
 
-export function createPreview<
-  TOperation extends OperationId<{ preview?: any }, any>,
->(
+export function createPreview<TOperation extends AnyOperationId>(
   query: TOperation,
   schema: ZodType<any, ZodTypeDef, unknown>,
   Component: React.FC<{

apps/decap/turbo.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://turborepo.org/schema.json",
   "extends": ["//"],
-  "pipeline": {
+  "tasks": {
     "prep:vite": {
       "dependsOn": ["^prep"],
       "inputs": ["src/**", "vite.config.ts", "index.html"],

apps/preview/src/App.tsx

@@ -13,7 +13,7 @@ declare global {
   }
 }
 
-const updates$ = webSocket({
+const updates$ = webSocket<any>({
   url: `${window.location.origin.replace('http', 'ws')}/__preview`,
 }).pipe(
   retry({

apps/preview/turbo.json

@@ -1,6 +1,6 @@
 {
   "extends": ["//"],
-  "pipeline": {
+  "tasks": {
     "prep": {
       "dependsOn": ["prep:app", "prep:server"]
     },

apps/website/turbo.json

@@ -1,6 +1,6 @@
 {
   "extends": ["//"],
-  "pipeline": {
+  "tasks": {
     "dev": {
       "persistent": true,
       "dependsOn": ["prep", "^prep"]

package.json

@@ -7,6 +7,7 @@
     "node": "^18.19.0",
     "pnpm": "8.6.12"
   },
+  "packageManager": "[email protected]",
   "scripts": {
     "postinstall": "husky install || true",
     "commit": "git-cz",
@@ -16,11 +17,11 @@
     "test:format:root": "pnpm prettier --ignore-unknown '**/**'",
     "test:format:workspaces": "pnpm --workspace-concurrency=1 -r exec prettier --ignore-unknown '**/**'",
     "turbo:local": "if [ -z $CI ]; then echo $(date)$RANDOM > apps/cms/turbo-seed.txt; fi",
-    "turbo:test": "pnpm turbo:local && pnpm tb test:unit --no-daemon --go-fallback --output-logs=new-only && pnpm tb test:integration --no-daemon --go-fallback --output-logs=new-only --concurrency=1",
-    "turbo:test:force": "pnpm tb test:unit --no-daemon --go-fallback --output-logs=new-only --force && pnpm tb test:integration --no-daemon --go-fallback --output-logs=new-only --concurrency=1 --force",
-    "turbo:test:quick": "pnpm turbo:local && pnpm tb test:unit --no-daemon --go-fallback --output-logs=new-only",
-    "turbo:prep": "pnpm turbo:local && pnpm tb prep --no-daemon --go-fallback --output-logs=new-only",
-    "turbo:prep:force": "rm -f apps/cms/web/sites/default/files/.sqlite && pnpm tb prep --no-daemon --go-fallback --force",
+    "turbo:test": "pnpm turbo:local && pnpm turbo test:unit --output-logs=new-only && pnpm turbo test:integration --output-logs=new-only --concurrency=1",
+    "turbo:test:force": "pnpm turbo test:unit --output-logs=new-only --force && pnpm turbo test:integration --output-logs=new-only --concurrency=1 --force",
+    "turbo:test:quick": "pnpm turbo:local && pnpm turbo test:unit --output-logs=new-only",
+    "turbo:prep": "pnpm turbo:local && pnpm turbo prep --output-logs=new-only",
+    "turbo:prep:force": "rm -f apps/cms/web/sites/default/files/.sqlite && pnpm turbo prep --force",
     "gutenberg:generate": "pnpm run --filter \"@custom/gutenberg_blocks\" gutenberg:generate"
   },
   "private": true,
@@ -39,7 +40,7 @@
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "husky": "^8.0.3",
     "prettier": "^3.2.5",
-    "turbo": "^1.11.2",
+    "turbo": "^2.0.6",
     "typescript": "^5.3.3",
     "vitest": "^1.1.1"
   },

packages/drupal/gutenberg_blocks/turbo.json

@@ -1,6 +1,6 @@
 {
   "extends": ["//"],
-  "pipeline": {
+  "tasks": {
     "test:static": {
       "inputs": ["src/**"]
     },

packages/schema/package.json

@@ -62,7 +62,7 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@amazeelabs/executors": "^3.0.2",
+    "@amazeelabs/executors": "^3.0.3",
     "@amazeelabs/gatsby-silverback-cloudinary": "^1.2.7",
     "@amazeelabs/gatsby-source-silverback": "^1.14.0",
     "@amazeelabs/scalars": "^1.6.13",

packages/schema/turbo.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://turborepo.org/schema.json",
   "extends": ["//"],
-  "pipeline": {
+  "tasks": {
     "prep:directives": {
       "dependsOn": ["@custom/cms#prep:composer"],
       "inputs": ["package.json"],

packages/ui/turbo.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://turborepo.org/schema.json",
   "extends": ["//"],
-  "pipeline": {
+  "tasks": {
     "prep:fonts": {
       "inputs": ["static/public/fonts/preload/**"],
       "outputs": ["build/preloaded-fonts.json"]