gatsby-link 4.7.0-next.0 → 4.7.1

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.6.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-link@4.6.0/packages/gatsby-link) (2022-01-25)
+
+[🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v4.6)
+
+**Note:** Version bump only for package gatsby-link
+
 ## [4.5.0](https://github.com/gatsbyjs/gatsby/commits/gatsby-link@4.5.0/packages/gatsby-link) (2022-01-11)
 
 [🧾 Release notes](https://www.gatsbyjs.com/docs/reference/release-notes/v4.5)

package/index.js

@@ -21,16 +21,15 @@ var _react = _interopRequireDefault(require("react"));
 
 var _reachRouter = require("@gatsbyjs/reach-router");
 
-var _utils = require("@gatsbyjs/reach-router/lib/utils");
-
 var _parsePath = require("./parse-path");
 
 exports.parsePath = _parsePath.parsePath;
-var _excluded = ["to", "getProps", "onClick", "onMouseEnter", "activeClassName", "activeStyle", "innerRef", "partiallyActive", "state", "replace", "_location"];
 
-var isAbsolutePath = function isAbsolutePath(path) {
-  return path === null || path === void 0 ? void 0 : path.startsWith("/");
-};
+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;
@@ -39,7 +38,7 @@ function withPrefix(path, prefix) {
     prefix = getGlobalBasePrefix();
   }
 
-  if (!isLocalLink(path)) {
+  if (!(0, _isLocalLink.isLocalLink)(path)) {
     return path;
   }
 
@@ -61,35 +60,10 @@ var getGlobalBasePrefix = function getGlobalBasePrefix() {
   return process.env.NODE_ENV !== "production" ? typeof __BASE_PATH__ !== "undefined" ? __BASE_PATH__ : undefined : __BASE_PATH__;
 };
 
-var isLocalLink = function isLocalLink(path) {
-  return path && !path.startsWith("http://") && !path.startsWith("https://") && !path.startsWith("//");
-};
-
 function withAssetPrefix(path) {
   return withPrefix(path, getGlobalPathPrefix());
 }
 
-function absolutify(path, current) {
-  // If it's already absolute, return as-is
-  if (isAbsolutePath(path)) {
-    return path;
-  }
-
-  return (0, _utils.resolve)(path, current);
-}
-
-var rewriteLinkPath = function rewriteLinkPath(path, relativeTo) {
-  if (typeof path === "number") {
-    return path;
-  }
-
-  if (!isLocalLink(path)) {
-    return path;
-  }
-
-  return isAbsolutePath(path) ? withPrefix(path) : absolutify(path, relativeTo);
-};
-
 var NavLinkPropTypes = {
   activeClassName: _propTypes.default.string,
   activeStyle: _propTypes.default.object,
@@ -168,7 +142,7 @@ var GatsbyLink = /*#__PURE__*/function (_React$Component) {
       currentPath = this.props._location.pathname + this.props._location.search;
     }
 
-    var rewrittenPath = rewriteLinkPath(this.props.to, currentPath);
+    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,
     // there could be a race-condition where Chrome uses the stale data instead of waiting for the network to complete
@@ -238,13 +212,13 @@ var GatsbyLink = /*#__PURE__*/function (_React$Component) {
         _location = _this$props._location,
         rest = (0, _objectWithoutPropertiesLoose2.default)(_this$props, _excluded);
 
-    if (process.env.NODE_ENV !== "production" && !isLocalLink(to)) {
+    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");
     }
 
-    var prefixedTo = rewriteLinkPath(to, _location.pathname);
+    var prefixedTo = (0, _rewriteLinkPath.rewriteLinkPath)(to, _location.pathname);
 
-    if (!isLocalLink(prefixedTo)) {
+    if (!(0, _isLocalLink.isLocalLink)(prefixedTo)) {
       return /*#__PURE__*/_react.default.createElement("a", (0, _extends2.default)({
         href: prefixedTo
       }, rest));
@@ -315,7 +289,7 @@ var _default = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
 exports.default = _default;
 
 var navigate = function navigate(to, options) {
-  window.___navigate(rewriteLinkPath(to, window.location.pathname), options);
+  window.___navigate((0, _rewriteLinkPath.rewriteLinkPath)(to, window.location.pathname), options);
 };
 
 exports.navigate = navigate;

package/is-local-link.js

@@ -11,7 +11,8 @@ var isAbsolute = function isAbsolute(path) {
 
 var isLocalLink = function isLocalLink(path) {
   if (typeof path !== "string") {
-    throw new TypeError("Expected a `string`, got `" + typeof path + "`");
+    return undefined; // TODO(v5): Re-Add TypeError
+    // throw new TypeError(`Expected a \`string\`, got \`${typeof path}\``)
   }
 
   return !isAbsolute(path);

package/package.json

@@ -1,21 +1,22 @@
 {
   "name": "gatsby-link",
   "description": "An enhanced Link component for Gatsby sites with support for resource prefetching",
-  "version": "4.7.0-next.0",
+  "version": "4.7.1",
   "author": "Kyle Mathews <mathews.kyle@gmail.com>",
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
   },
   "dependencies": {
     "@babel/runtime": "^7.15.4",
-    "@types/reach__router": "^1.3.9",
+    "@types/reach__router": "^1.3.10",
+    "gatsby-page-utils": "^2.7.0",
     "prop-types": "^15.7.2"
   },
   "devDependencies": {
     "@babel/cli": "^7.15.4",
     "@babel/core": "^7.15.5",
     "@testing-library/react": "^11.2.7",
-    "babel-preset-gatsby-package": "^2.7.0-next.0",
+    "babel-preset-gatsby-package": "^2.7.0",
     "cross-env": "^7.0.3"
   },
   "peerDependencies": {
@@ -43,5 +44,5 @@
   "engines": {
     "node": ">=14.15.0"
   },
-  "gitHead": "3659ec236ad54e87dff26effe11593c5663c31ed"
+  "gitHead": "f672a67d65176c8e3e624ae0ad797bf5ab7b3263"
 }

package/rewrite-link-path.js

@@ -19,7 +19,7 @@ var isAbsolutePath = function isAbsolutePath(path) {
 };
 
 var getGlobalTrailingSlash = function getGlobalTrailingSlash() {
-  return process.env.NODE_ENV !== "production" ? typeof __TRAILING_SLASH__ !== "undefined" ? __TRAILING_SLASH__ : undefined : __TRAILING_SLASH__;
+  return typeof __TRAILING_SLASH__ !== "undefined" ? __TRAILING_SLASH__ : undefined;
 };
 
 function absolutify(path, current) {