fix(SLB-201): move gatsby directive autoloading entirely into schema …

…package
AmazeeLabs · Jan 23, 2024 · 972dc30 · 972dc30
1 parent a922a77
commit 972dc30
Show file tree

Hide file tree

Showing 11 changed files with 120 additions and 71 deletions.
diff --git a/apps/website/gatsby-autoload.mjs b/apps/website/gatsby-autoload.mjs
diff --git a/apps/website/gatsby-config.mjs b/apps/website/gatsby-config.mjs
@@ -7,10 +7,9 @@
 // pick it up instead of the JS file.
 
 import { getPages } from '@custom/decap';
+import autoload from '@custom/schema/gatsby-autoload';
 import { resolve } from 'path';
 
-import autoload from './gatsby-autoload.mjs';
-
 const dir = resolve('node_modules/@custom/decap/data/page');
 
 process.env.GATSBY_DRUPAL_URL =

diff --git a/apps/website/package.json b/apps/website/package.json
@@ -5,9 +5,8 @@
     "@amazeelabs/bridge-gatsby": "^1.2.7",
     "@amazeelabs/cloudinary-responsive-image": "^1.6.15",
     "@amazeelabs/gatsby-plugin-operations": "^1.1.3",
-    "@amazeelabs/gatsby-silverback-cloudinary": "^1.2.7",
-    "@amazeelabs/gatsby-source-silverback": "^1.13.10",
     "@amazeelabs/gatsby-plugin-static-dirs": "workspace:*",
+    "@amazeelabs/gatsby-source-silverback": "^1.13.10",
     "@amazeelabs/publisher": "^2.4.17",
     "@amazeelabs/strangler-netlify": "^1.1.9",
     "@custom/decap": "workspace:*",

diff --git a/packages/schema/.graphqlrc.json b/packages/schema/.graphqlrc.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://unpkg.com/[email protected]/config-schema.json",
   "schema": [
-    "../../apps/website/node_modules/@amazeelabs/*/directives.graphql",
+    "node_modules/@amazeelabs/*/directives.graphql",
     "../../apps/cms/web/modules/contrib/*/directives.graphql",
     "../../apps/cms/web/modules/custom/*/directives.graphql",
     "src/schema.graphql"

diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -15,6 +15,9 @@
     ],
     "./operations": [
       "./build/operations.json"
+    ],
+    "./gatsby-autoload": [
+      "./build/gatsby-autoload.mjs"
     ]
   },
   "typesVersions": {
@@ -24,6 +27,9 @@
       ],
       "/source": [
         "build/generated/source.d.ts"
+      ],
+      "gatsby-autoload": [
+        "src/types/gatsby-autoload.d.ts"
       ]
     }
   },
@@ -43,14 +49,20 @@
     "@graphql-codegen/typescript-operations": "^4.0.1",
     "@swc/cli": "^0.1.62",
     "@swc/core": "^1.3.67",
+    "@types/image-size": "^0.8.0",
+    "@types/node": "^18",
     "concurrently": "^8.2.2",
     "graphql": "16.8.1",
     "typescript": "^5.3.3"
   },
   "dependencies": {
     "@amazeelabs/executors": "^1.1.0",
+    "@amazeelabs/gatsby-silverback-cloudinary": "^1.2.7",
+    "@amazeelabs/gatsby-source-silverback": "^1.13.10",
     "@amazeelabs/scalars": "^1.6.13",
     "@swc/cli": "^0.1.63",
-    "@swc/core": "^1.3.102"
+    "@swc/core": "^1.3.102",
+    "image-size": "^1.1.1",
+    "mime-types": "^2.1.35"
   }
 }
diff --git a/apps/website/image.mjs → packages/schema/src/image.ts b/apps/website/image.mjs → packages/schema/src/image.ts
@@ -1,10 +1,8 @@
+import type { GraphQLFieldResolver } from 'graphql';
 import sizeOf from 'image-size';
-import mime from 'mime-types';
+import { lookup } from 'mime-types';
 
-/**
- * @param {string | undefined} source
- */
-export function imageProps(source) {
+export const imageProps: GraphQLFieldResolver<string, any> = (source) => {
   // If its a decap image, process it.
   // Otherwise, it comes from Drupal and
   // already has all necessary props.
@@ -20,8 +18,8 @@ export function imageProps(source) {
       originalSrc: imageSrc,
       width: dimensions.width || 0,
       height: dimensions.height || 0,
-      mime: mime.lookup(relativeSource) || 'application/octet-stream',
+      mime: lookup(relativeSource) || 'application/octet-stream',
     });
   }
   return source;
-}
+};
diff --git a/packages/schema/src/schema.graphql b/packages/schema/src/schema.graphql
@@ -6,7 +6,7 @@ scalar ImageSource @default @value(json: "\"\"")
 Retrieve the properties of an image.
 TODO: Move to a shared "image" package.
 
-implementation(gatsby): ./image.mjs#imageProps
+implementation(gatsby): ./image.js#imageProps
 """
 directive @imageProps repeatable on FIELD_DEFINITION | SCALAR | UNION | ENUM | INTERFACE | OBJECT
 

diff --git a/packages/schema/src/types/gatsby-autoload.d.ts b/packages/schema/src/types/gatsby-autoload.d.ts
@@ -0,0 +1,3 @@
+import { GraphQLFieldResolver } from 'graphql';
+
+export default Record<string, GraphQLFieldResolver<any, any>>;
diff --git a/apps/website/src/types/mime-types.d.ts → packages/schema/src/types/mime-types.d.ts b/apps/website/src/types/mime-types.d.ts → packages/schema/src/types/mime-types.d.ts
diff --git a/packages/schema/tsconfig.json b/packages/schema/tsconfig.json
@@ -6,7 +6,8 @@
     "forceConsistentCasingInFileNames": true,
     "declaration": true,
     "declarationDir": "build",
-    "outDir": "build"
+    "outDir": "build",
+    "lib": ["ES2015"]
   },
   "include": ["src"]
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import { GraphQLFieldResolver } from 'graphql';

		export default Record<string, GraphQLFieldResolver<any, any>>;