v2018.4.26-11

ptb · Apr 26, 2018 · 0d70515 · 0d70515
1 parent 2553c14
commit 0d70515
Show file tree

Hide file tree

Showing 19 changed files with 44 additions and 19 deletions.
diff --git a/lerna.json b/lerna.json
@@ -4,5 +4,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "2018.4.26-10"
+  "version": "2018.4.26-11"
 }
diff --git a/packages/amory/package.json b/packages/amory/package.json
@@ -1,11 +1,11 @@
 {
   "name": "amory",
-  "version": "2018.4.26-10",
+  "version": "2018.4.26-11",
   "main": "index.js",
   "author": "Peter T Bosse II <ptb@ioutime.com> (http://ptb2.me/)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@ptb/queue": "^2018.4.26-10",
+    "@ptb/queue": "^2018.4.26-11",
     "tapable": "^1.0.0"
   }
 }
diff --git a/packages/animated-transition/package.json b/packages/animated-transition/package.json
@@ -29,5 +29,5 @@
     "build": "babel src --out-dir . --ignore __tests__",
     "watch": "babel -w src --out-dir . --ignore __tests__"
   },
-  "version": "2018.4.26-10"
+  "version": "2018.4.26-11"
 }
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -28,5 +28,5 @@
     "postinstall": "npx npm-run-all 'postinstall:*'",
     "postinstall:merge": "find '.amory' -maxdepth 1 -name '*.json' -print0 | xargs -0 -I {} -n1 basename '{}' | xargs -I {} -n1 npx -p @ptb/merge-json -c 'merge-json ../../../{} .amory/{}'"
   },
-  "version": "2018.4.26-10"
+  "version": "2018.4.26-11"
 }
diff --git a/packages/gatsby-image/package.json b/packages/gatsby-image/package.json
@@ -47,5 +47,5 @@
     "prepare": "cross-env NODE_ENV=production npm run build",
     "watch": "babel -w src/index.js --out-file index.js --ignore __tests__"
   },
-  "version": "2018.4.26-10"
+  "version": "2018.4.26-11"
 }
diff --git a/packages/gatsby-image/src/index.js b/packages/gatsby-image/src/index.js
@@ -225,7 +225,7 @@ class GatsbyImage extends Component {
       "proxy": (alt, src, isLoaded, style, title) => ({
         "alt": alt,
         "className": css (this.getStyle ().image (0, null, isLoaded, style)),
-        "srcset": src,
+        "src": src,
         "title": title
       }),
       "ratio": (img) => ({

diff --git a/packages/gatsby-plugin-pug/package.json b/packages/gatsby-plugin-pug/package.json
@@ -22,5 +22,5 @@
     "postinstall:merge": "find '.amory' -maxdepth 1 -name '*.json' -print0 | xargs -0 -I {} -n1 basename '{}' | xargs -I {} -n1 npx -p @ptb/merge-json -c 'merge-json ../../../{} .amory/{}'",
     "postinstall:setup": "find '.amory' -maxdepth 1 -not -name '.amory' -not -name '*.json' -exec cp -R '{}' '../../../' \\;"
   },
-  "version": "2018.4.26-10"
+  "version": "2018.4.26-11"
 }
diff --git a/packages/gatsby-plugin-react-helmet/package.json b/packages/gatsby-plugin-react-helmet/package.json
@@ -15,5 +15,5 @@
     "postinstall:merge": "find '.amory' -maxdepth 1 -name '*.json' -print0 | xargs -0 -I {} -n1 basename '{}' | xargs -I {} -n1 npx -p @ptb/merge-json -c 'merge-json ../../../{} .amory/{}'",
     "postinstall:setup": "find '.amory' -maxdepth 1 -not -name '.amory' -not -name '*.json' -exec cp -R '{}' '../../../' \\;"
   },
-  "version": "2018.4.26-10"
+  "version": "2018.4.26-11"
 }
diff --git a/packages/gatsby-plugin-styletron/package.json b/packages/gatsby-plugin-styletron/package.json
@@ -30,5 +30,5 @@
     "postinstall:merge": "find '.amory' -maxdepth 1 -name '*.json' -print0 | xargs -0 -I {} -n1 basename '{}' | xargs -I {} -n1 npx -p @ptb/merge-json -c 'merge-json ../../../{} .amory/{}'",
     "postinstall:setup": "find '.amory' -maxdepth 1 -not -name '.amory' -not -name '*.json' -exec cp -R '{}' '../../../' \\;"
   },
-  "version": "2018.4.26-10"
+  "version": "2018.4.26-11"
 }
diff --git a/packages/gatsby-source-filesystem/package.json b/packages/gatsby-source-filesystem/package.json
@@ -44,5 +44,5 @@
     "prepare": "cross-env NODE_ENV=production npm run build",
     "watch": "babel -w src --out-dir . --ignore __tests__"
   },
-  "version": "2018.4.26-10"
+  "version": "2018.4.26-11"
 }
diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
@@ -21,5 +21,5 @@
     "postinstall:merge": "find '.amory' -maxdepth 1 -name '*.json' -print0 | xargs -0 -I {} -n1 basename '{}' | xargs -I {} -n1 npx -p @ptb/merge-json -c 'merge-json ../../../{} .amory/{}'",
     "postinstall:setup": "find '.amory' -maxdepth 1 -not -name '.amory' -not -name '*.json' -exec cp -R '{}' '../../../' \\;"
   },
-  "version": "2018.4.26-10"
+  "version": "2018.4.26-11"
 }
diff --git a/packages/gatsby/patches-next/9-jsdir-2.diff b/packages/gatsby/patches-next/9-jsdir-2.diff
@@ -32,3 +32,28 @@
            };
 
          default:
+@@ -222,24 +222,6 @@
+       )
+     })
+
+-  if (page.jsonName in staticDataPaths) {
+-    const dataPath = `${pathPrefix}js/p/${
+-      staticDataPaths[page.jsonName]
+-    }.json`
+-    // Insert json data path after app
+-    headComponents.splice(
+-      1,
+-      0,
+-      <link
+-        rel="preload"
+-        key={dataPath}
+-        href={dataPath}
+-        as="script"
+-        crossorigin="use-credentials"
+-      />
+-    )
+-  }
+-
+   styles
+     .slice(0)
+     .reverse()
diff --git a/packages/git-setup/package.json b/packages/git-setup/package.json
@@ -10,5 +10,5 @@
     "postinstall": "npx npm-run-all 'postinstall:*'",
     "postinstall:setup": "source autokeep.command 0 && cd ../../../ && autokeep"
   },
-  "version": "2018.4.26-10"
+  "version": "2018.4.26-11"
 }
diff --git a/packages/http-server/package.json b/packages/http-server/package.json
@@ -13,5 +13,5 @@
     "postinstall": "npx npm-run-all 'postinstall:*'",
     "postinstall:merge": "find '.amory' -maxdepth 1 -name '*.json' -print0 | xargs -0 -I {} -n1 basename '{}' | xargs -I {} -n1 npx -p @ptb/merge-json -c 'merge-json ../../../{} .amory/{}'"
   },
-  "version": "2018.4.26-10"
+  "version": "2018.4.26-11"
 }
diff --git a/packages/merge-json/package.json b/packages/merge-json/package.json
@@ -15,5 +15,5 @@
     "access": "public"
   },
   "repository": "https://github.com/ptb/amory/tree/master/packages/merge-json",
-  "version": "2018.4.26-10"
+  "version": "2018.4.26-11"
 }
diff --git a/packages/prettier-eslint/package.json b/packages/prettier-eslint/package.json
@@ -15,5 +15,5 @@
     "postinstall": "npx npm-run-all 'postinstall:*'",
     "postinstall:merge": "find '.amory' -maxdepth 1 -name '*.json' -print0 | xargs -0 -I {} -n1 basename '{}' | xargs -I {} -n1 npx -p @ptb/merge-json -c 'merge-json ../../../{} .amory/{}'"
   },
-  "version": "2018.4.26-10"
+  "version": "2018.4.26-11"
 }
diff --git a/packages/queue/package.json b/packages/queue/package.json
@@ -11,5 +11,5 @@
     "access": "public"
   },
   "repository": "https://github.com/ptb/amory/tree/master/packages/queue",
-  "version": "2018.4.26-10"
+  "version": "2018.4.26-11"
 }
diff --git a/packages/sort-json/package.json b/packages/sort-json/package.json
@@ -14,5 +14,5 @@
     "postinstall": "npx npm-run-all 'postinstall:*'",
     "postinstall:merge": "find '.amory' -maxdepth 1 -name '*.json' -print0 | xargs -0 -I {} -n1 basename '{}' | xargs -I {} -n1 npx -p @ptb/merge-json -c 'merge-json ../../../{} .amory/{}'"
   },
-  "version": "2018.4.26-10"
+  "version": "2018.4.26-11"
 }
diff --git a/packages/uncssstyle/package.json b/packages/uncssstyle/package.json
@@ -6,5 +6,5 @@
     "access": "public"
   },
   "repository": "https://github.com/ptb/amory/tree/master/packages/uncssstyle",
-  "version": "2018.4.26-10"
+  "version": "2018.4.26-11"
 }