Merge pull request #10 from TylerBarnes/layouts

v1.2.5

Author: TylerBarnes

src/.babelrc renamed to .babelrc

@@ -1,10 +1,9 @@
 {
   "presets": [
-    "@babel/preset-react",
     [
-      "@babel/preset-env",
+      "babel-preset-gatsby-package",
       {
-        "useBuiltIns": "entry"
+        "browser": true
       }
     ]
   ],

.eslintrc.json

@@ -0,0 +1,5 @@
+{
+  "globals": {
+    "GATSBY_LAYOUT_COMPONENT_PATH": false
+  }
+}

.gitignore

@@ -4,4 +4,5 @@ node_modules/
 yarn-error.log
 src/package.json
 src/package-lock.json
-src/yarn-lock.json
+src/yarn-lock.json
+/*.js

.npmignore

@@ -0,0 +1,35 @@
+# Logs
+logs
+*.log
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directory
+# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
+node_modules
+*.un~
+yarn.lock
+src
+flow-typed
+coverage
+decls
+examples
+example

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-plugin-transition-link",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "A link component for page transitions in gatsby.",
   "repository": "https://github.com/TylerBarnes/gatsby-plugin-transition-link",
   "homepage": "https://gatsby-plugin-transition-link.netlify.com/",
@@ -16,14 +16,18 @@
     "css",
     "react animation"
   ],
-  "main": "src/index.js",
+  "main": "index.js",
   "author": "Tyler Barnes <[email protected]>",
   "license": "MIT",
   "scripts": {
-    "develop": "cp -rf package.json src && cd example && gatsby develop",
-    "copy-npm-files": "cp -rf package.json lib && cp -rf readme.md lib",
-    "clean-lib": "node_modules/.bin/rimraf ./lib",
-    "build": "rm src/package.json || true && yarn clean-lib && babel --preset preset-env src --out-dir lib --ignore __tests__ && yarn copy-npm-files"
+    "copy-files": "mkdir lib || true && cp .eslintrc.json package.json lib",
+    "build": "yarn copy-files && babel src --out-dir lib --ignore **/__tests__",
+    "watch": "yarn copy-files && babel -w src --out-dir lib --ignore **/__tests__",
+    "prepare-files": "cross-env NODE_ENV=production yarn build",
+    "publish-repo": "yarn copy-files && cd lib && npm publish && cd ../",
+    "publish-patch": "yarn prepare-files && npx json-bump --patch=1 package.json && yarn publish-repo",
+    "publish-minor": "yarn prepare-files && npx json-bump --minor=1 package.json && yarn publish-repo",
+    "publish-major": "yarn prepare-files && npx json-bump --major=1 package.json && yarn publish-repo"
   },
   "devDependencies": {
     "@babel/cli": "^7.1.2",
@@ -34,7 +38,10 @@
     "rimraf": "^2.6.2"
   },
   "dependencies": {
+    "babel-preset-gatsby-package": "^0.1.2",
     "color-convert": "^1.9.3",
+    "cross-env": "^5.2.0",
+    "json-bump": "^0.1.3",
     "polyfill-array-includes": "^1.0.0",
     "react": "^16.6.0",
     "react-transition-group": "^2.5.0",

src/.browserslistrc

@@ -1,7 +1,7 @@
 const React = require("react");
 
 const preferDefault = m => (m && m.default) || m;
-let Layout;
+let Layout = false;
 
 if (
   typeof GATSBY_LAYOUT_COMPONENT_PATH !== `undefined` &&
@@ -25,7 +25,7 @@ if (
 }
 
 const LayoutComponent = ({ children, ...props }) => {
-  if (GATSBY_LAYOUT_COMPONENT_PATH) {
+  if (Layout) {
     return <Layout {...props}>{children}</Layout>;
   } else {
     return children;

src/components/Layout.js

@@ -1,20 +1,18 @@
 const onEnter = ({
   node,
-  action,
   inTransition,
   entryTrigger,
   entryProps,
   exitProps,
   pathname,
   e
 }) => {
-  // fix scroll jumping when navigating with browser buttons
-  if (typeof action !== `undefined` && action !== "PUSH") {
+  if (inTransition) {
+    window.scrollTo(0, 0);
+  } else {
     const storageKey = `@@scroll|${pathname}`;
     const savedPosition = sessionStorage.getItem(storageKey);
     window.scrollTo(...JSON.parse(savedPosition));
-  } else {
-    window.scrollTo(0, 0);
   }
 
   if (!inTransition) return;

src/functions/onEnter.js

@@ -2,7 +2,6 @@ import { TransitionLink } from "./components/TransitionLink";
 import TransitionHandler from "./components/TransitionHandler";
 import { PublicConsumer as TransitionState } from "./context/createTransitionContext";
 import TransitionPortal from "./components/TransitionPortal";
-// import AniLink from "./components/AniLink";
 
 export { TransitionHandler, TransitionState, TransitionPortal };
 export default TransitionLink;