gatsby-link 4.18.0-next.0 → 4.18.1

package/.babelrc

@@ -1,3 +1,3 @@
 {
-  "presets": [["babel-preset-gatsby-package", { "browser": true }]]
+  "presets": [["babel-preset-gatsby-package", { "browser": true, "esm": true }]]
 }

package/index.js

@@ -1,78 +1,45 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-exports.__esModule = true;
-exports.navigate = exports.default = void 0;
-exports.withAssetPrefix = withAssetPrefix;
-exports.withPrefix = withPrefix;
-
-var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
-
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-
-var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
-
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
-var _react = _interopRequireDefault(require("react"));
-
-var _reachRouter = require("@gatsbyjs/reach-router");
-
-var _parsePath = require("./parse-path");
-
-exports.parsePath = _parsePath.parsePath;
-
-var _isLocalLink = require("./is-local-link");
-
-var _rewriteLinkPath = require("./rewrite-link-path");
-
-var _excluded = ["to", "getProps", "onClick", "onMouseEnter", "activeClassName", "activeStyle", "innerRef", "partiallyActive", "state", "replace", "_location"];
-
-function withPrefix(path, prefix) {
-  var _ref, _prefix;
-
-  if (prefix === void 0) {
-    prefix = getGlobalBasePrefix();
-  }
-
-  if (!(0, _isLocalLink.isLocalLink)(path)) {
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
+import _extends from "@babel/runtime/helpers/extends";
+const _excluded = ["to", "getProps", "onClick", "onMouseEnter", "activeClassName", "activeStyle", "innerRef", "partiallyActive", "state", "replace", "_location"];
+import PropTypes from "prop-types";
+import React from "react";
+import { Link, Location } from "@gatsbyjs/reach-router";
+import { parsePath } from "./parse-path";
+import { isLocalLink } from "./is-local-link";
+import { rewriteLinkPath } from "./rewrite-link-path";
+export { parsePath };
+export function withPrefix(path, prefix = getGlobalBasePrefix()) {
+  var _ref;
+
+  if (!isLocalLink(path)) {
     return path;
   }
 
-  if (path.startsWith("./") || path.startsWith("../")) {
+  if (path.startsWith(`./`) || path.startsWith(`../`)) {
     return path;
   }
 
-  var base = (_ref = (_prefix = prefix) !== null && _prefix !== void 0 ? _prefix : getGlobalPathPrefix()) !== null && _ref !== void 0 ? _ref : "/";
-  return "" + (base !== null && base !== void 0 && base.endsWith("/") ? base.slice(0, -1) : base) + (path.startsWith("/") ? path : "/" + path);
+  const base = (_ref = prefix !== null && prefix !== void 0 ? prefix : getGlobalPathPrefix()) !== null && _ref !== void 0 ? _ref : `/`;
+  return `${base !== null && base !== void 0 && base.endsWith(`/`) ? base.slice(0, -1) : base}${path.startsWith(`/`) ? path : `/${path}`}`;
 } // These global values are wrapped in typeof clauses to ensure the values exist.
 // This is especially problematic in unit testing of this component.
 
+const getGlobalPathPrefix = () => process.env.NODE_ENV !== `production` ? typeof __PATH_PREFIX__ !== `undefined` ? __PATH_PREFIX__ : undefined : __PATH_PREFIX__;
 
-var getGlobalPathPrefix = function getGlobalPathPrefix() {
-  return process.env.NODE_ENV !== "production" ? typeof __PATH_PREFIX__ !== "undefined" ? __PATH_PREFIX__ : undefined : __PATH_PREFIX__;
-};
-
-var getGlobalBasePrefix = function getGlobalBasePrefix() {
-  return process.env.NODE_ENV !== "production" ? typeof __BASE_PATH__ !== "undefined" ? __BASE_PATH__ : undefined : __BASE_PATH__;
-};
+const getGlobalBasePrefix = () => process.env.NODE_ENV !== `production` ? typeof __BASE_PATH__ !== `undefined` ? __BASE_PATH__ : undefined : __BASE_PATH__;
 
-function withAssetPrefix(path) {
+export function withAssetPrefix(path) {
   return withPrefix(path, getGlobalPathPrefix());
 }
-
-var NavLinkPropTypes = {
-  activeClassName: _propTypes.default.string,
-  activeStyle: _propTypes.default.object,
-  partiallyActive: _propTypes.default.bool
+const NavLinkPropTypes = {
+  activeClassName: PropTypes.string,
+  activeStyle: PropTypes.object,
+  partiallyActive: PropTypes.bool
 }; // Set up IntersectionObserver
 
-var createIntersectionObserver = function createIntersectionObserver(el, cb) {
-  var io = new window.IntersectionObserver(function (entries) {
-    entries.forEach(function (entry) {
+const createIntersectionObserver = (el, cb) => {
+  const io = new window.IntersectionObserver(entries => {
+    entries.forEach(entry => {
       if (el === entry.target) {
         // Check if element is within viewport, remove listener, destroy observer, and run link callback.
         // MSEdge doesn't currently support isIntersecting, so also test for  an intersectionRatio > 0
@@ -84,67 +51,59 @@ var createIntersectionObserver = function createIntersectionObserver(el, cb) {
   io.observe(el);
   return {
     instance: io,
-    el: el
+    el
   };
 };
 
 function GatsbyLinkLocationWrapper(props) {
-  return /*#__PURE__*/_react.default.createElement(_reachRouter.Location, null, function (_ref2) {
-    var location = _ref2.location;
-    return /*#__PURE__*/_react.default.createElement(GatsbyLink, (0, _extends2.default)({}, props, {
-      _location: location
-    }));
-  });
+  return /*#__PURE__*/React.createElement(Location, null, ({
+    location
+  }) => /*#__PURE__*/React.createElement(GatsbyLink, _extends({}, props, {
+    _location: location
+  })));
 }
 
-var GatsbyLink = /*#__PURE__*/function (_React$Component) {
-  (0, _inheritsLoose2.default)(GatsbyLink, _React$Component);
-
-  function GatsbyLink(props) {
-    var _this;
-
-    _this = _React$Component.call(this, props) || this; // Default to no support for IntersectionObserver
+class GatsbyLink extends React.Component {
+  constructor(props) {
+    super(props); // Default to no support for IntersectionObserver
 
-    _this.defaultGetProps = function (_ref3) {
-      var isPartiallyCurrent = _ref3.isPartiallyCurrent,
-          isCurrent = _ref3.isCurrent;
-
-      if (_this.props.partiallyActive ? isPartiallyCurrent : isCurrent) {
+    this.defaultGetProps = ({
+      isPartiallyCurrent,
+      isCurrent
+    }) => {
+      if (this.props.partiallyActive ? isPartiallyCurrent : isCurrent) {
         return {
-          className: [_this.props.className, _this.props.activeClassName].filter(Boolean).join(" "),
-          style: (0, _extends2.default)({}, _this.props.style, _this.props.activeStyle)
+          className: [this.props.className, this.props.activeClassName].filter(Boolean).join(` `),
+          style: _extends({}, this.props.style, this.props.activeStyle)
         };
       }
 
       return null;
     };
 
-    var IOSupported = false;
+    let IOSupported = false;
 
-    if (typeof window !== "undefined" && window.IntersectionObserver) {
+    if (typeof window !== `undefined` && window.IntersectionObserver) {
       IOSupported = true;
     }
 
-    _this.state = {
-      IOSupported: IOSupported
+    this.state = {
+      IOSupported
     };
-    _this.abortPrefetch = null;
-    _this.handleRef = _this.handleRef.bind((0, _assertThisInitialized2.default)(_this));
-    return _this;
+    this.abortPrefetch = null;
+    this.handleRef = this.handleRef.bind(this);
   }
 
-  var _proto = GatsbyLink.prototype;
-
-  _proto._prefetch = function _prefetch() {
-    var currentPath = window.location.pathname + window.location.search; // reach router should have the correct state
+  _prefetch() {
+    let currentPath = window.location.pathname + window.location.search; // reach router should have the correct state
 
     if (this.props._location && this.props._location.pathname) {
       currentPath = this.props._location.pathname + this.props._location.search;
     }
 
-    var rewrittenPath = (0, _rewriteLinkPath.rewriteLinkPath)(this.props.to, currentPath);
-    var parsed = (0, _parsePath.parsePath)(rewrittenPath);
-    var newPathName = parsed.pathname + parsed.search; // Prefetch is used to speed up next navigations. When you use it on the current navigation,
+    const rewrittenPath = rewriteLinkPath(this.props.to, currentPath);
+    const parsed = parsePath(rewrittenPath);
+    const newPathName = parsed.pathname + parsed.search; // Prefetch is used to speed up next navigations. When you use it on the current navigation,
     // there could be a race-condition where Chrome uses the stale data instead of waiting for the network to complete
 
     if (currentPath !== newPathName) {
@@ -152,16 +111,17 @@ var GatsbyLink = /*#__PURE__*/function (_React$Component) {
     }
 
     return undefined;
-  };
+  }
 
-  _proto.componentWillUnmount = function componentWillUnmount() {
+  componentWillUnmount() {
     if (!this.io) {
       return;
     }
 
-    var _this$io = this.io,
-        instance = _this$io.instance,
-        el = _this$io.el;
+    const {
+      instance,
+      el
+    } = this.io;
 
     if (this.abortPrefetch) {
       this.abortPrefetch.abort();
@@ -169,12 +129,10 @@ var GatsbyLink = /*#__PURE__*/function (_React$Component) {
 
     instance.unobserve(el);
     instance.disconnect();
-  };
-
-  _proto.handleRef = function handleRef(ref) {
-    var _this2 = this;
+  }
 
-    if (this.props.innerRef && Object.prototype.hasOwnProperty.call(this.props.innerRef, "current")) {
+  handleRef(ref) {
+    if (this.props.innerRef && Object.prototype.hasOwnProperty.call(this.props.innerRef, `current`)) {
       this.props.innerRef.current = ref;
     } else if (this.props.innerRef) {
       this.props.innerRef(ref);
@@ -182,85 +140,80 @@ var GatsbyLink = /*#__PURE__*/function (_React$Component) {
 
     if (this.state.IOSupported && ref) {
       // If IO supported and element reference found, setup Observer functionality
-      this.io = createIntersectionObserver(ref, function (inViewPort) {
+      this.io = createIntersectionObserver(ref, inViewPort => {
         if (inViewPort) {
-          _this2.abortPrefetch = _this2._prefetch();
+          this.abortPrefetch = this._prefetch();
         } else {
-          if (_this2.abortPrefetch) {
-            _this2.abortPrefetch.abort();
+          if (this.abortPrefetch) {
+            this.abortPrefetch.abort();
           }
         }
       });
     }
-  };
+  }
 
-  _proto.render = function render() {
-    var _this3 = this;
-
-    var _this$props = this.props,
-        to = _this$props.to,
-        _this$props$getProps = _this$props.getProps,
-        getProps = _this$props$getProps === void 0 ? this.defaultGetProps : _this$props$getProps,
-        _onClick = _this$props.onClick,
-        _onMouseEnter = _this$props.onMouseEnter,
-        $activeClassName = _this$props.activeClassName,
-        $activeStyle = _this$props.activeStyle,
-        $innerRef = _this$props.innerRef,
-        partiallyActive = _this$props.partiallyActive,
-        state = _this$props.state,
-        replace = _this$props.replace,
-        _location = _this$props._location,
-        rest = (0, _objectWithoutPropertiesLoose2.default)(_this$props, _excluded);
-
-    if (process.env.NODE_ENV !== "production" && !(0, _isLocalLink.isLocalLink)(to)) {
-      console.warn("External link " + to + " was detected in a Link component. Use the Link component only for internal links. See: https://gatsby.dev/internal-links");
+  render() {
+    const _this$props = this.props,
+          {
+      to,
+      getProps = this.defaultGetProps,
+      onClick,
+      onMouseEnter,
+      state,
+      replace,
+      _location
+    } = _this$props,
+          rest = _objectWithoutPropertiesLoose(_this$props, _excluded);
+
+    if (process.env.NODE_ENV !== `production` && !isLocalLink(to)) {
+      console.warn(`External link ${to} was detected in a Link component. Use the Link component only for internal links. See: https://gatsby.dev/internal-links`);
     }
 
-    var prefixedTo = (0, _rewriteLinkPath.rewriteLinkPath)(to, _location.pathname);
+    const prefixedTo = rewriteLinkPath(to, _location.pathname);
 
-    if (!(0, _isLocalLink.isLocalLink)(prefixedTo)) {
-      return /*#__PURE__*/_react.default.createElement("a", (0, _extends2.default)({
+    if (!isLocalLink(prefixedTo)) {
+      return /*#__PURE__*/React.createElement("a", _extends({
         href: prefixedTo
       }, rest));
     }
 
-    return /*#__PURE__*/_react.default.createElement(_reachRouter.Link, (0, _extends2.default)({
+    return /*#__PURE__*/React.createElement(Link, _extends({
       to: prefixedTo,
       state: state,
       getProps: getProps,
       innerRef: this.handleRef,
-      onMouseEnter: function onMouseEnter(e) {
-        if (_onMouseEnter) {
-          _onMouseEnter(e);
+      onMouseEnter: e => {
+        if (onMouseEnter) {
+          onMouseEnter(e);
         }
 
-        var parsed = (0, _parsePath.parsePath)(prefixedTo);
+        const parsed = parsePath(prefixedTo);
 
         ___loader.hovering(parsed.pathname + parsed.search);
       },
-      onClick: function onClick(e) {
-        if (_onClick) {
-          _onClick(e);
+      onClick: e => {
+        if (onClick) {
+          onClick(e);
         }
 
         if (e.button === 0 && // ignore right clicks
-        !_this3.props.target && // let browser handle "target=_blank"
+        !this.props.target && // let browser handle "target=_blank"
         !e.defaultPrevented && // onClick prevented default
         !e.metaKey && // ignore clicks with modifier keys...
         !e.altKey && !e.ctrlKey && !e.shiftKey) {
           e.preventDefault();
-          var shouldReplace = replace;
+          let shouldReplace = replace;
 
-          var isCurrent = encodeURI(prefixedTo) === _location.pathname;
+          const isCurrent = encodeURI(prefixedTo) === _location.pathname;
 
-          if (typeof replace !== "boolean" && isCurrent) {
+          if (typeof replace !== `boolean` && isCurrent) {
             shouldReplace = true;
           } // Make sure the necessary scripts and data are
           // loaded before continuing.
 
 
           window.___navigate(prefixedTo, {
-            state: state,
+            state,
             replace: shouldReplace
           });
         }
@@ -268,28 +221,19 @@ var GatsbyLink = /*#__PURE__*/function (_React$Component) {
         return true;
       }
     }, rest));
-  };
-
-  return GatsbyLink;
-}(_react.default.Component);
+  }
 
-GatsbyLink.propTypes = (0, _extends2.default)({}, NavLinkPropTypes, {
-  onClick: _propTypes.default.func,
-  to: _propTypes.default.string.isRequired,
-  replace: _propTypes.default.bool,
-  state: _propTypes.default.object
-});
+}
 
-var _default = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
-  return /*#__PURE__*/_react.default.createElement(GatsbyLinkLocationWrapper, (0, _extends2.default)({
-    innerRef: ref
-  }, props));
+GatsbyLink.propTypes = _extends({}, NavLinkPropTypes, {
+  onClick: PropTypes.func,
+  to: PropTypes.string.isRequired,
+  replace: PropTypes.bool,
+  state: PropTypes.object
 });
-
-exports.default = _default;
-
-var navigate = function navigate(to, options) {
-  window.___navigate((0, _rewriteLinkPath.rewriteLinkPath)(to, window.location.pathname), options);
-};
-
-exports.navigate = navigate;
+export default /*#__PURE__*/React.forwardRef((props, ref) => /*#__PURE__*/React.createElement(GatsbyLinkLocationWrapper, _extends({
+  innerRef: ref
+}, props)));
+export const navigate = (to, options) => {
+  window.___navigate(rewriteLinkPath(to, window.location.pathname), options);
+};

package/is-local-link.js

@@ -1,21 +1,13 @@
-"use strict";
-
-exports.__esModule = true;
-exports.isLocalLink = void 0;
 // Copied from https://github.com/sindresorhus/is-absolute-url/blob/3ab19cc2e599a03ea691bcb8a4c09fa3ebb5da4f/index.js
-var ABSOLUTE_URL_REGEX = /^[a-zA-Z][a-zA-Z\d+\-.]*?:/;
+const ABSOLUTE_URL_REGEX = /^[a-zA-Z][a-zA-Z\d+\-.]*?:/;
 
-var isAbsolute = function isAbsolute(path) {
-  return ABSOLUTE_URL_REGEX.test(path);
-};
+const isAbsolute = path => ABSOLUTE_URL_REGEX.test(path);
 
-var isLocalLink = function isLocalLink(path) {
-  if (typeof path !== "string") {
+export const isLocalLink = path => {
+  if (typeof path !== `string`) {
     return undefined; // TODO(v5): Re-Add TypeError
     // throw new TypeError(`Expected a \`string\`, got \`${typeof path}\``)
   }
 
   return !isAbsolute(path);
-};
-
-exports.isLocalLink = isLocalLink;
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gatsby-link",
   "description": "An enhanced Link component for Gatsby sites with support for resource prefetching",
-  "version": "4.18.0-next.0",
+  "version": "4.18.1",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
@@ -9,14 +9,14 @@
   "dependencies": {
     "@babel/runtime": "^7.15.4",
     "@types/reach__router": "^1.3.10",
-    "gatsby-page-utils": "^2.18.0-next.0",
+    "gatsby-page-utils": "^2.18.1",
     "prop-types": "^15.8.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.15.4",
     "@babel/core": "^7.15.5",
     "@testing-library/react": "^11.2.7",
-    "babel-preset-gatsby-package": "^2.18.0-next.0",
+    "babel-preset-gatsby-package": "^2.18.0",
     "cross-env": "^7.0.3"
   },
   "peerDependencies": {
@@ -44,5 +44,5 @@
   "engines": {
     "node": ">=14.15.0"
   },
-  "gitHead": "e7136908e238d1bc6c3d66c306533c81394535ea"
+  "gitHead": "c6aa79d485c32ed81f22ec056669e8cd1766dd62"
 }

package/parse-path.js

@@ -1,20 +1,15 @@
-"use strict";
-
-exports.__esModule = true;
-exports.parsePath = parsePath;
-
-function parsePath(path) {
-  var pathname = path || "/";
-  var search = "";
-  var hash = "";
-  var hashIndex = pathname.indexOf("#");
+export function parsePath(path) {
+  let pathname = path || `/`;
+  let search = ``;
+  let hash = ``;
+  const hashIndex = pathname.indexOf(`#`);
 
   if (hashIndex !== -1) {
     hash = pathname.slice(hashIndex);
     pathname = pathname.slice(0, hashIndex);
   }
 
-  var searchIndex = pathname.indexOf("?");
+  const searchIndex = pathname.indexOf(`?`);
 
   if (searchIndex !== -1) {
     search = pathname.slice(searchIndex);
@@ -23,7 +18,7 @@ function parsePath(path) {
 
   return {
     pathname: pathname,
-    search: search === "?" ? "" : search,
-    hash: hash === "#" ? "" : hash
+    search: search === `?` ? `` : search,
+    hash: hash === `#` ? `` : hash
   };
 }

package/rewrite-link-path.js

@@ -1,26 +1,13 @@
-"use strict";
+import { resolve } from "@gatsbyjs/reach-router/lib/utils"; // Specific import to treeshake Node.js stuff
 
-exports.__esModule = true;
-exports.rewriteLinkPath = void 0;
+import { applyTrailingSlashOption } from "gatsby-page-utils/apply-trailing-slash-option";
+import { parsePath } from "./parse-path";
+import { isLocalLink } from "./is-local-link";
+import { withPrefix } from ".";
 
-var _utils = require("@gatsbyjs/reach-router/lib/utils");
+const isAbsolutePath = path => path === null || path === void 0 ? void 0 : path.startsWith(`/`);
 
-var _applyTrailingSlashOption = require("gatsby-page-utils/apply-trailing-slash-option");
-
-var _parsePath2 = require("./parse-path");
-
-var _isLocalLink = require("./is-local-link");
-
-var _ = require(".");
-
-// Specific import to treeshake Node.js stuff
-var isAbsolutePath = function isAbsolutePath(path) {
-  return path === null || path === void 0 ? void 0 : path.startsWith("/");
-};
-
-var getGlobalTrailingSlash = function getGlobalTrailingSlash() {
-  return typeof __TRAILING_SLASH__ !== "undefined" ? __TRAILING_SLASH__ : undefined;
-};
+const getGlobalTrailingSlash = () => typeof __TRAILING_SLASH__ !== `undefined` ? __TRAILING_SLASH__ : undefined;
 
 function absolutify(path, current) {
   // If it's already absolute, return as-is
@@ -28,39 +15,37 @@ function absolutify(path, current) {
     return path;
   }
 
-  var option = getGlobalTrailingSlash();
-  var absolutePath = (0, _utils.resolve)(path, current);
+  const option = getGlobalTrailingSlash();
+  const absolutePath = resolve(path, current);
 
-  if (option === "always" || option === "never") {
-    return (0, _applyTrailingSlashOption.applyTrailingSlashOption)(absolutePath, option);
+  if (option === `always` || option === `never`) {
+    return applyTrailingSlashOption(absolutePath, option);
   }
 
   return absolutePath;
 }
 
-var rewriteLinkPath = function rewriteLinkPath(path, relativeTo) {
-  if (typeof path === "number") {
+export const rewriteLinkPath = (path, relativeTo) => {
+  if (typeof path === `number`) {
     return path;
   }
 
-  if (!(0, _isLocalLink.isLocalLink)(path)) {
+  if (!isLocalLink(path)) {
     return path;
   }
 
-  var _parsePath = (0, _parsePath2.parsePath)(path),
-      pathname = _parsePath.pathname,
-      search = _parsePath.search,
-      hash = _parsePath.hash;
-
-  var option = getGlobalTrailingSlash();
-  var adjustedPath = path;
-
-  if (option === "always" || option === "never") {
-    var output = (0, _applyTrailingSlashOption.applyTrailingSlashOption)(pathname, option);
-    adjustedPath = "" + output + search + hash;
+  const {
+    pathname,
+    search,
+    hash
+  } = parsePath(path);
+  const option = getGlobalTrailingSlash();
+  let adjustedPath = path;
+
+  if (option === `always` || option === `never`) {
+    const output = applyTrailingSlashOption(pathname, option);
+    adjustedPath = `${output}${search}${hash}`;
   }
 
-  return isAbsolutePath(adjustedPath) ? (0, _.withPrefix)(adjustedPath) : absolutify(adjustedPath, relativeTo);
-};
-
-exports.rewriteLinkPath = rewriteLinkPath;
+  return isAbsolutePath(adjustedPath) ? withPrefix(adjustedPath) : absolutify(adjustedPath, relativeTo);
+};