Merge branch 'master' of github.com:armada-inc/gatsby-wordpress-theme-libre

Author: thandaanda

gatsby-wordpress-theme-libre/fix-source-nodes.js

@@ -45,7 +45,7 @@ const createTag = {
 
 const currentTimeImage = new Date().getTime();
 const createImage = {
-  wordpress_id: currentTimeImage,
+  wordpress_id: `wordpress-media-placeholder`,
   date: new Date().toISOString(),
   guid:
     "https://wordpress.theasdfghjkl.com/wp-content/uploads/2020/05/wordpress-balsa.png",
@@ -113,19 +113,19 @@ const createImage = {
     replies: [
       {
         embeddable: true,
-        href:
-          `https://wordpress.theasdfghjkl.com/wp-json/wp/v2/comments?post=${currentTimeImage}`,
+        href: `https://wordpress.theasdfghjkl.com/wp-json/wp/v2/comments?post=${currentTimeImage}`,
       },
     ],
   },
-  id: currentTimeImage.toString(),
-  author___NODE: currentTimeImage.toString(),
+  id: `wordpress-media-placeholder`,
+  author___NODE: `wordpress-media-placeholder`,
   path: "/wordpress-balsa/",
 };
 
 module.exports = async function sourceNodes({
   actions,
   getNodesByType,
+  getNodes,
   store,
   cache,
   createNodeId,
@@ -135,9 +135,15 @@ module.exports = async function sourceNodes({
 }) {
   const { createNode } = actions;
 
-  const wordPressTagExists = getNodesByType("wordpress__TAG");
+  const wordPressTag = getNodesByType("wordpress__TAG");
+
+  const wordPressTagExists =
+    wordPressTag &&
+    wordPressTag.length > 0 &&
+    wordPressTag[0].internal &&
+    wordPressTag[0].internal.owner === "gatsby-source-wordpress";
 
-  if (!wordPressTagExists || wordPressTagExists.length === 0) {
+  if (!wordPressTagExists) {
     let node = {
       ...createTag,
       children: [],
@@ -150,33 +156,43 @@ module.exports = async function sourceNodes({
     createNode(node);
   }
 
-  const mediaExists = getNodesByType("wordpress__wp_media");
+  const wordpressMedia = getNodesByType("wordpress__wp_media");
 
-  if (!mediaExists || mediaExists.length === 0) {
-    
+  const mediaExists =
+    wordpressMedia &&
+    wordpressMedia.length > 0 &&
+    wordpressMedia[0].internal &&
+    wordpressMedia[0].internal.owner === "gatsby-source-wordpress";
+
+  if (!mediaExists) {
     const encodedSourceUrl = encodeURI(createImage.source_url);
-    const mediaDataCacheKey = `wordpress-media-${createImage.wordpress_id}`;
+    const mediaDataCacheKey = `wordpress-media-placeholder`;
 
     try {
-      const fileNode = await createRemoteFileNode({
-        url: encodedSourceUrl,
-        store,
-        cache,
-        createNode,
-        createNodeId,
-        getCache,
-        parentNodeId: createImage.id,
-        reporter,
-      });
+      const cachedFileNode = await cache.get(mediaDataCacheKey);
 
-      if (fileNode) {
-        fileNodeID = fileNode.id;
-        await cache.set(mediaDataCacheKey, {
-          fileNodeID,
-          modified: createImage.modified,
+      if (cachedFileNode) {
+        createImage.localFile___NODE = cachedFileNode.fileNodeID;
+      } else {
+        const fileNode = await createRemoteFileNode({
+          url: encodedSourceUrl,
+          store,
+          cache,
+          createNode,
+          createNodeId,
+          getCache,
+          parentNodeId: createImage.id,
+          reporter,
         });
 
-        createImage.localFile___NODE = fileNodeID;
+        if (fileNode) {
+          fileNodeID = fileNode.id;
+          await cache.set(mediaDataCacheKey, {
+            fileNodeID,
+            modified: createImage.modified,
+          });
+          createImage.localFile___NODE = fileNodeID;
+        }
       }
 
       let node = {
@@ -191,8 +207,8 @@ module.exports = async function sourceNodes({
 
       createNode(node);
     } catch (e) {
-      console.log(e, "error creating remote nodeF");
+      console.log(e, "error creating remote node");
       // Ignore
     }
   }
-};
+};

gatsby-wordpress-theme-libre/gatsby-config.js

@@ -159,7 +159,7 @@ module.exports = (themeOptions) => {
         },
       },
       {
-        resolve: "@armada-inc/gatsby-plugin-amp",
+        resolve: "@draftbox-co/gatsby-plugin-amp",
         options: {
           canonicalBaseUrl: siteConfig.siteUrl,
           components: [`amp-form`],

gatsby-wordpress-theme-libre/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbox-co/gatsby-wordpress-theme-libre",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "license": "MIT",
   "resolutions": {
     "sharp": "0.23.4"
@@ -46,7 +46,7 @@
     "react-dom": "^16.13.0"
   },
   "dependencies": {
-    "@armada-inc/gatsby-plugin-amp": "^0.2.3",
+    "@draftbox-co/gatsby-plugin-amp": "^0.2.4",
     "@reach/router": "^1.3.3",
     "disqus-react": "^1.0.8",
     "gatsby-awesome-pagination": "^0.3.5",

yarn.lock

@@ -2,16 +2,6 @@
 # yarn lockfile v1
 
 
-"@armada-inc/gatsby-plugin-amp@^0.2.3":
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/@armada-inc/gatsby-plugin-amp/-/gatsby-plugin-amp-0.2.3.tgz#27b0796dd2851644238e45b4ab03ef74e4bcaa46"
-  integrity sha512-UuZkWSM7Kzvk8Zuu8+hmLpfNm9e7DMfTm1WYr6qWssOvQpxmFm3VNjIdJPrlBo4II7cmeMw11z4z+gNkKF9d6A==
-  dependencies:
-    jsdom "^13.0.0"
-    lodash.flattendeep "^4.4.0"
-    minimatch "^3.0.4"
-    react "^16.6.1"
-
 "@babel/code-frame@7.5.5":
   version "7.5.5"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d"
@@ -1293,6 +1283,16 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
+"@draftbox-co/gatsby-plugin-amp@^0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@draftbox-co/gatsby-plugin-amp/-/gatsby-plugin-amp-0.2.4.tgz#736717349fe9d0961d2b16ad3ebb45cb80629c0e"
+  integrity sha512-nERnqPbfvzCr20aH2z2XWcHRLHdbIhh+D3wZg8SBw/1b0JYGU2vZxVeXaV7RngV1VMKQiZV/ty0UVXy4tinXBw==
+  dependencies:
+    jsdom "^13.0.0"
+    lodash.flattendeep "^4.4.0"
+    minimatch "^3.0.4"
+    react "^16.6.1"
+
 "@ember-data/rfc395-data@^0.0.4":
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/@ember-data/rfc395-data/-/rfc395-data-0.0.4.tgz#ecb86efdf5d7733a76ff14ea651a1b0ed1f8a843"
@@ -1913,6 +1913,11 @@
   version "2.30.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.30.0.tgz#7681c305a6f4341ae2579f5e3a75846c29eee9ce"
   integrity sha512-9kDOxzp0K85UnpmPJqUzdWaCNorYYgk1yZmf4IKzpeTlSAclnFsrLjfwD9mQExctLoLoGAUXq1co+fbr+3HeFw==
+  dependencies:
+    "@types/eslint-visitor-keys" "^1.0.0"
+    "@typescript-eslint/experimental-utils" "2.30.0"
+    "@typescript-eslint/typescript-estree" "2.30.0"
+    eslint-visitor-keys "^1.1.0"
 
 "@typescript-eslint/typescript-estree@2.30.0":
   version "2.30.0"