@teambit/react-router 0.0.763 → 0.0.766

package/dist/route-context.js

@@ -78,16 +78,6 @@ function _routingMethod() {
   return data;
 }
 
-function _legacyRouting() {
-  const data = require("./legacy-routing");
-
-  _legacyRouting = function () {
-    return data;
-  };
-
-  return data;
-}
-
 /**
  * Setup context needed for routing.
  */
@@ -101,7 +91,7 @@ function RouteContext({
     location: location
   }, /*#__PURE__*/_react().default.createElement(_baseReactNavigation().NavigationProvider, {
     implementation: _uiFoundationUiNavigation().reactRouterAdapter
-  }, /*#__PURE__*/_react().default.createElement(_legacyRouting().LegacyNavProvider, null, children)));
+  }, children));
 }
 
 function RootRoute({

package/dist/route-context.js.map

@@ -1 +1 @@
-{"version":3,"names":["RouteContext","routing","Routing","url","children","location","reactRouterAdapter","RootRoute","rootRoutes","routeSlot","Router","type","static","inMemory","hash"],"sources":["route-context.tsx"],"sourcesContent":["import React, { ReactNode } from 'react';\nimport { BrowserRouter, MemoryRouter, HashRouter, RouteProps } from 'react-router-dom';\nimport { StaticRouter } from 'react-router-dom/server';\nimport { RouteSlot, SlotRouter } from '@teambit/ui-foundation.ui.react-router.slot-router';\nimport { NavigationProvider } from '@teambit/base-react.navigation.link';\nimport { reactRouterAdapter } from '@teambit/ui-foundation.ui.navigation.react-router-adapter';\nimport { ReactRouterUI } from './react-router.ui.runtime';\nimport { Routing } from './routing-method';\nimport { LegacyNavProvider } from './legacy-routing';\n\ntype RouterContextProps = {\n  reactRouterUi: ReactRouterUI;\n  routing?: Routing;\n  children: ReactNode;\n  location?: string;\n};\n\ntype RootRouteProps = {\n  rootRoutes: RouteProps[];\n  routeSlot: RouteSlot;\n};\n\n/**\n * Setup context needed for routing.\n */\nexport function RouteContext({ routing = Routing.url, children, location }: RouterContextProps) {\n  return (\n    <Router type={routing} location={location}>\n      <NavigationProvider implementation={reactRouterAdapter}>\n        <LegacyNavProvider>\n          {/* route tree root: */}\n          {children}\n        </LegacyNavProvider>\n      </NavigationProvider>\n    </Router>\n  );\n}\n\nexport function RootRoute({ rootRoutes, routeSlot }: RootRouteProps) {\n  return <SlotRouter slot={routeSlot} rootRoutes={rootRoutes} />;\n}\n\n/** provides the router engine (browser, inMemory, etc) */\nfunction Router({ type, children, location }: { type: Routing; children: ReactNode; location?: string }) {\n  switch (type) {\n    case Routing.static:\n      return <StaticRouter location={location || '/'}>{children}</StaticRouter>;\n    case Routing.inMemory:\n      return (\n        <MemoryRouter initialEntries={[location || '/']} initialIndex={1}>\n          {children}\n        </MemoryRouter>\n      );\n    case Routing.hash:\n      // @ts-ignore - https://github.com/teambit/bit/issues/5746\n      return <HashRouter>{children}</HashRouter>;\n    case Routing.url:\n    default:\n      // @ts-ignore - https://github.com/teambit/bit/issues/5746\n      return <BrowserRouter>{children}</BrowserRouter>;\n  }\n}\n"],"mappings":";;;;;;;;;;AAAA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAcA;AACA;AACA;AACO,SAASA,YAAT,CAAsB;EAAEC,OAAO,GAAGC,wBAAA,CAAQC,GAApB;EAAyBC,QAAzB;EAAmCC;AAAnC,CAAtB,EAAyF;EAC9F,oBACE,+BAAC,MAAD;IAAQ,IAAI,EAAEJ,OAAd;IAAuB,QAAQ,EAAEI;EAAjC,gBACE,+BAAC,yCAAD;IAAoB,cAAc,EAAEC;EAApC,gBACE,+BAAC,kCAAD,QAEGF,QAFH,CADF,CADF,CADF;AAUD;;AAEM,SAASG,SAAT,CAAmB;EAAEC,UAAF;EAAcC;AAAd,CAAnB,EAA8D;EACnE,oBAAO,+BAAC,uCAAD;IAAY,IAAI,EAAEA,SAAlB;IAA6B,UAAU,EAAED;EAAzC,EAAP;AACD;AAED;;;AACA,SAASE,MAAT,CAAgB;EAAEC,IAAF;EAAQP,QAAR;EAAkBC;AAAlB,CAAhB,EAAyG;EACvG,QAAQM,IAAR;IACE,KAAKT,wBAAA,CAAQU,MAAb;MACE,oBAAO,+BAAC,sBAAD;QAAc,QAAQ,EAAEP,QAAQ,IAAI;MAApC,GAA0CD,QAA1C,CAAP;;IACF,KAAKF,wBAAA,CAAQW,QAAb;MACE,oBACE,+BAAC,8BAAD;QAAc,cAAc,EAAE,CAACR,QAAQ,IAAI,GAAb,CAA9B;QAAiD,YAAY,EAAE;MAA/D,GACGD,QADH,CADF;;IAKF,KAAKF,wBAAA,CAAQY,IAAb;MACE;MACA,oBAAO,+BAAC,4BAAD,QAAaV,QAAb,CAAP;;IACF,KAAKF,wBAAA,CAAQC,GAAb;IACA;MACE;MACA,oBAAO,+BAAC,+BAAD,QAAgBC,QAAhB,CAAP;EAfJ;AAiBD"}
+{"version":3,"names":["RouteContext","routing","Routing","url","children","location","reactRouterAdapter","RootRoute","rootRoutes","routeSlot","Router","type","static","inMemory","hash"],"sources":["route-context.tsx"],"sourcesContent":["import React, { ReactNode } from 'react';\nimport { BrowserRouter, MemoryRouter, HashRouter, RouteProps } from 'react-router-dom';\nimport { StaticRouter } from 'react-router-dom/server';\nimport { RouteSlot, SlotRouter } from '@teambit/ui-foundation.ui.react-router.slot-router';\nimport { NavigationProvider } from '@teambit/base-react.navigation.link';\nimport { reactRouterAdapter } from '@teambit/ui-foundation.ui.navigation.react-router-adapter';\nimport { ReactRouterUI } from './react-router.ui.runtime';\nimport { Routing } from './routing-method';\n\ntype RouterContextProps = {\n  reactRouterUi: ReactRouterUI;\n  routing?: Routing;\n  children: ReactNode;\n  location?: string;\n};\n\ntype RootRouteProps = {\n  rootRoutes: RouteProps[];\n  routeSlot: RouteSlot;\n};\n\n/**\n * Setup context needed for routing.\n */\nexport function RouteContext({ routing = Routing.url, children, location }: RouterContextProps) {\n  return (\n    <Router type={routing} location={location}>\n      <NavigationProvider implementation={reactRouterAdapter}>{children}</NavigationProvider>\n    </Router>\n  );\n}\n\nexport function RootRoute({ rootRoutes, routeSlot }: RootRouteProps) {\n  return <SlotRouter slot={routeSlot} rootRoutes={rootRoutes} />;\n}\n\n/** provides the router engine (browser, inMemory, etc) */\nfunction Router({ type, children, location }: { type: Routing; children: ReactNode; location?: string }) {\n  switch (type) {\n    case Routing.static:\n      return <StaticRouter location={location || '/'}>{children}</StaticRouter>;\n    case Routing.inMemory:\n      return (\n        <MemoryRouter initialEntries={[location || '/']} initialIndex={1}>\n          {children}\n        </MemoryRouter>\n      );\n    case Routing.hash:\n      // @ts-ignore - https://github.com/teambit/bit/issues/5746\n      return <HashRouter>{children}</HashRouter>;\n    case Routing.url:\n    default:\n      // @ts-ignore - https://github.com/teambit/bit/issues/5746\n      return <BrowserRouter>{children}</BrowserRouter>;\n  }\n}\n"],"mappings":";;;;;;;;;;AAAA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAcA;AACA;AACA;AACO,SAASA,YAAT,CAAsB;EAAEC,OAAO,GAAGC,wBAAA,CAAQC,GAApB;EAAyBC,QAAzB;EAAmCC;AAAnC,CAAtB,EAAyF;EAC9F,oBACE,+BAAC,MAAD;IAAQ,IAAI,EAAEJ,OAAd;IAAuB,QAAQ,EAAEI;EAAjC,gBACE,+BAAC,yCAAD;IAAoB,cAAc,EAAEC;EAApC,GAAyDF,QAAzD,CADF,CADF;AAKD;;AAEM,SAASG,SAAT,CAAmB;EAAEC,UAAF;EAAcC;AAAd,CAAnB,EAA8D;EACnE,oBAAO,+BAAC,uCAAD;IAAY,IAAI,EAAEA,SAAlB;IAA6B,UAAU,EAAED;EAAzC,EAAP;AACD;AAED;;;AACA,SAASE,MAAT,CAAgB;EAAEC,IAAF;EAAQP,QAAR;EAAkBC;AAAlB,CAAhB,EAAyG;EACvG,QAAQM,IAAR;IACE,KAAKT,wBAAA,CAAQU,MAAb;MACE,oBAAO,+BAAC,sBAAD;QAAc,QAAQ,EAAEP,QAAQ,IAAI;MAApC,GAA0CD,QAA1C,CAAP;;IACF,KAAKF,wBAAA,CAAQW,QAAb;MACE,oBACE,+BAAC,8BAAD;QAAc,cAAc,EAAE,CAACR,QAAQ,IAAI,GAAb,CAA9B;QAAiD,YAAY,EAAE;MAA/D,GACGD,QADH,CADF;;IAKF,KAAKF,wBAAA,CAAQY,IAAb;MACE;MACA,oBAAO,+BAAC,4BAAD,QAAaV,QAAb,CAAP;;IACF,KAAKF,wBAAA,CAAQC,GAAb;IACA;MACE;MACA,oBAAO,+BAAC,+BAAD,QAAgBC,QAAhB,CAAP;EAfJ;AAiBD"}

package/package.json

@@ -1,24 +1,22 @@
 {
   "name": "@teambit/react-router",
-  "version": "0.0.763",
+  "version": "0.0.766",
   "homepage": "https://bit.dev/teambit/ui-foundation/react-router",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.ui-foundation",
     "name": "react-router",
-    "version": "0.0.763"
+    "version": "0.0.766"
   },
   "dependencies": {
     "@babel/runtime": "7.12.18",
     "core-js": "^3.0.0",
     "@teambit/base-react.navigation.link": "2.0.27",
-    "@teambit/base-ui.routing.native-nav-link": "1.0.0",
-    "@teambit/base-ui.routing.routing-provider": "1.0.0",
     "@teambit/harmony": "0.3.3",
     "@teambit/ui-foundation.ui.navigation.react-router-adapter": "6.1.1",
     "@teambit/ui-foundation.ui.is-browser": "0.0.486",
     "@teambit/ui-foundation.ui.react-router.slot-router": "0.0.490",
-    "@teambit/ui": "0.0.763"
+    "@teambit/ui": "0.0.766"
   },
   "devDependencies": {
     "@types/react": "^17.0.8",
@@ -30,7 +28,7 @@
   },
   "peerDependencies": {
     "react-router-dom": "^6.0.0",
-    "@teambit/legacy": "1.0.284",
+    "@teambit/legacy": "1.0.286",
     "react-dom": "^16.8.0 || ^17.0.0",
     "react": "^16.8.0 || ^17.0.0"
   },
@@ -58,7 +56,7 @@
         "react": "-"
       },
       "peerDependencies": {
-        "@teambit/legacy": "1.0.284",
+        "@teambit/legacy": "1.0.286",
         "react-dom": "^16.8.0 || ^17.0.0",
         "react": "^16.8.0 || ^17.0.0"
       }

package/{preview-1655373564849.js → preview-1655695598583.js}

@@ -1,2 +1,2 @@
-export const compositions = [require('/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.ui-foundation_react-router@0.0.763/dist/react-router.composition.js')]
-export const overview = [require('/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.ui-foundation_react-router@0.0.763/dist/react-router.docs.mdx')]
+export const compositions = [require('/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.ui-foundation_react-router@0.0.766/dist/react-router.composition.js')]
+export const overview = [require('/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.ui-foundation_react-router@0.0.766/dist/react-router.docs.mdx')]

package/route-context.tsx

@@ -6,7 +6,6 @@ import { NavigationProvider } from '@teambit/base-react.navigation.link';
 import { reactRouterAdapter } from '@teambit/ui-foundation.ui.navigation.react-router-adapter';
 import { ReactRouterUI } from './react-router.ui.runtime';
 import { Routing } from './routing-method';
-import { LegacyNavProvider } from './legacy-routing';
 
 type RouterContextProps = {
   reactRouterUi: ReactRouterUI;
@@ -26,12 +25,7 @@ type RootRouteProps = {
 export function RouteContext({ routing = Routing.url, children, location }: RouterContextProps) {
   return (
     <Router type={routing} location={location}>
-      <NavigationProvider implementation={reactRouterAdapter}>
-        <LegacyNavProvider>
-          {/* route tree root: */}
-          {children}
-        </LegacyNavProvider>
-      </NavigationProvider>
+      <NavigationProvider implementation={reactRouterAdapter}>{children}</NavigationProvider>
     </Router>
   );
 }

package/dist/legacy-routing.d.ts

@@ -1,2 +0,0 @@
-import { PropsWithChildren } from 'react';
-export declare function LegacyNavProvider({ children }: PropsWithChildren<{}>): JSX.Element;

package/dist/legacy-routing.js

@@ -1,102 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.LegacyNavProvider = LegacyNavProvider;
-
-function _extends2() {
-  const data = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
-  _extends2 = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _objectWithoutProperties2() {
-  const data = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-
-  _objectWithoutProperties2 = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _react() {
-  const data = _interopRequireWildcard(require("react"));
-
-  _react = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _baseUiRouting() {
-  const data = require("@teambit/base-ui.routing.routing-provider");
-
-  _baseUiRouting = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _baseReactNavigation() {
-  const data = require("@teambit/base-react.navigation.link");
-
-  _baseReactNavigation = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-function useLegacyRouting() {
-  return {
-    Link: _baseReactNavigation().Link,
-    // eslint-disable-next-line react/prop-types
-    NavLink: /*#__PURE__*/(0, _react().forwardRef)(function NavLinkAdapter(_ref, ref) {
-      let {
-        isActive
-      } = _ref,
-          props = (0, _objectWithoutProperties2().default)(_ref, ["isActive"]);
-      const active = isActive === null || isActive === void 0 ? void 0 : isActive();
-      return /*#__PURE__*/_react().default.createElement(_baseReactNavigation().Link, (0, _extends2().default)({}, props, {
-        active: active,
-        ref: ref
-      }));
-    }),
-    useLocation: () => {
-      var _useLocation;
-
-      return (// @ts-ignore
-        (_useLocation = (0, _baseReactNavigation().useLocation)()) !== null && _useLocation !== void 0 ? _useLocation : {
-          pathname: '/',
-          hash: '',
-          search: ''
-        }
-      );
-    }
-  };
-}
-
-function LegacyNavProvider({
-  children
-}) {
-  const legacyRouting = useLegacyRouting();
-  return /*#__PURE__*/_react().default.createElement(_baseUiRouting().RoutingProvider, {
-    value: legacyRouting
-  }, children);
-}
-
-//# sourceMappingURL=legacy-routing.js.map

package/dist/legacy-routing.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["useLegacyRouting","Link","NavLink","forwardRef","NavLinkAdapter","ref","isActive","props","active","useLocation","pathname","hash","search","LegacyNavProvider","children","legacyRouting"],"sources":["legacy-routing.tsx"],"sourcesContent":["import React, { PropsWithChildren, forwardRef } from 'react';\nimport { RoutingProvider, Routing } from '@teambit/base-ui.routing.routing-provider';\nimport type { NavLinkProps } from '@teambit/base-ui.routing.native-nav-link';\nimport { Link, useLocation } from '@teambit/base-react.navigation.link';\n\nfunction useLegacyRouting(): Routing {\n  return {\n    Link,\n    // eslint-disable-next-line react/prop-types\n    NavLink: forwardRef<HTMLAnchorElement, NavLinkProps>(function NavLinkAdapter({ isActive, ...props }, ref) {\n      const active = isActive?.();\n      return <Link {...props} active={active} ref={ref} />;\n    }),\n    useLocation: () =>\n      // @ts-ignore\n      useLocation() ?? { pathname: '/', hash: '', search: '' },\n  };\n}\n\nexport function LegacyNavProvider({ children }: PropsWithChildren<{}>) {\n  const legacyRouting = useLegacyRouting();\n\n  return <RoutingProvider value={legacyRouting}>{children}</RoutingProvider>;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AACA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;AAEA;EAAA;;EAAA;IAAA;EAAA;;EAAA;AAAA;;;;;;AAEA,SAASA,gBAAT,GAAqC;EACnC,OAAO;IACLC,IAAI,EAAJA,2BADK;IAEL;IACAC,OAAO,eAAE,IAAAC,mBAAA,EAA4C,SAASC,cAAT,OAAgDC,GAAhD,EAAqD;MAAA,IAA7B;QAAEC;MAAF,CAA6B;MAAA,IAAdC,KAAc;MACxG,MAAMC,MAAM,GAAGF,QAAH,aAAGA,QAAH,uBAAGA,QAAQ,EAAvB;MACA,oBAAO,+BAAC,2BAAD,+BAAUC,KAAV;QAAiB,MAAM,EAAEC,MAAzB;QAAiC,GAAG,EAAEH;MAAtC,GAAP;IACD,CAHQ,CAHJ;IAOLI,WAAW,EAAE;MAAA;;MAAA,OACX;QADW,gBAEX,IAAAA,kCAAA,GAFW,uDAEM;UAAEC,QAAQ,EAAE,GAAZ;UAAiBC,IAAI,EAAE,EAAvB;UAA2BC,MAAM,EAAE;QAAnC;MAFN;IAAA;EAPR,CAAP;AAWD;;AAEM,SAASC,iBAAT,CAA2B;EAAEC;AAAF,CAA3B,EAAgE;EACrE,MAAMC,aAAa,GAAGf,gBAAgB,EAAtC;EAEA,oBAAO,+BAAC,gCAAD;IAAiB,KAAK,EAAEe;EAAxB,GAAwCD,QAAxC,CAAP;AACD"}

package/legacy-routing.tsx

@@ -1,24 +0,0 @@
-import React, { PropsWithChildren, forwardRef } from 'react';
-import { RoutingProvider, Routing } from '@teambit/base-ui.routing.routing-provider';
-import type { NavLinkProps } from '@teambit/base-ui.routing.native-nav-link';
-import { Link, useLocation } from '@teambit/base-react.navigation.link';
-
-function useLegacyRouting(): Routing {
-  return {
-    Link,
-    // eslint-disable-next-line react/prop-types
-    NavLink: forwardRef<HTMLAnchorElement, NavLinkProps>(function NavLinkAdapter({ isActive, ...props }, ref) {
-      const active = isActive?.();
-      return <Link {...props} active={active} ref={ref} />;
-    }),
-    useLocation: () =>
-      // @ts-ignore
-      useLocation() ?? { pathname: '/', hash: '', search: '' },
-  };
-}
-
-export function LegacyNavProvider({ children }: PropsWithChildren<{}>) {
-  const legacyRouting = useLegacyRouting();
-
-  return <RoutingProvider value={legacyRouting}>{children}</RoutingProvider>;
-}