@khanacademy/wonder-blocks-link 3.9.0 → 3.9.1

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @khanacademy/wonder-blocks-link
 
+## 3.9.1
+
+### Patch Changes
+
+-   91cb727c: Remove file extensions from imports
+-   91cb727c: Merge disjoint prop types since the codemod doesn't handle these properly.
+-   Updated dependencies [91cb727c]
+-   Updated dependencies [91cb727c]
+-   Updated dependencies [91cb727c]
+    -   @khanacademy/wonder-blocks-clickable@2.4.5
+    -   @khanacademy/wonder-blocks-color@1.2.1
+    -   @khanacademy/wonder-blocks-core@4.7.0
+
 ## 3.9.0
 
 ### Minor Changes

package/dist/index.js.flow

@@ -1,2 +1,2 @@
 // @flow
-export * from "../src/index.js";
+export * from "../src/index";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@khanacademy/wonder-blocks-link",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "design": "v1",
   "publishConfig": {
     "access": "public"
@@ -16,9 +16,9 @@
   "license": "MIT",
   "dependencies": {
     "@babel/runtime": "^7.18.6",
-    "@khanacademy/wonder-blocks-clickable": "^2.4.4",
-    "@khanacademy/wonder-blocks-color": "^1.2.0",
-    "@khanacademy/wonder-blocks-core": "^4.6.2"
+    "@khanacademy/wonder-blocks-clickable": "^2.4.5",
+    "@khanacademy/wonder-blocks-color": "^1.2.1",
+    "@khanacademy/wonder-blocks-core": "^4.7.0"
   },
   "peerDependencies": {
     "aphrodite": "^1.2.5",
@@ -27,6 +27,6 @@
     "react-router-dom": "5.3.0"
   },
   "devDependencies": {
-    "wb-dev-build-settings": "^0.7.0"
+    "wb-dev-build-settings": "^0.7.1"
   }
 }

package/src/__tests__/custom-snapshot.test.js

@@ -2,8 +2,8 @@
 import React from "react";
 import renderer from "react-test-renderer";
 
-import LinkCore from "../components/link-core.js";
-import Link from "../components/link.js";
+import LinkCore from "../components/link-core";
+import Link from "../components/link";
 
 const defaultHandlers = {
     onClick: () => void 0,

package/src/components/__docs__/link.stories.js

@@ -20,8 +20,8 @@ import {
 } from "@khanacademy/wonder-blocks-typography";
 import type {StoryComponentType} from "@storybook/react";
 
-import LinkArgTypes from "./link.argtypes.js";
-import ComponentInfo from "../../../../../.storybook/components/component-info.js";
+import LinkArgTypes from "./link.argtypes";
+import ComponentInfo from "../../../../../.storybook/components/component-info";
 import {name, version} from "../../../package.json";
 
 export default {

package/src/components/__tests__/link.flowtest.js

@@ -2,13 +2,15 @@
 /* eslint-disable ft-flow/no-unused-expressions */
 import * as React from "react";
 
-import Link from "../link.js";
+import Link from "../link";
 
 // $FlowExpectedError[incompatible-type]: href must be used with beforeNav
-<Link beforeNav={() => Promise.resolve()}>Hello, world!</Link>;
+// TODO(FEI-5000): Re-enable test after updating props to be conditional.
+// <Link beforeNav={() => Promise.resolve()}>Hello, world!</Link>;
 
 // $FlowExpectedError[incompatible-type]: href must be used with safeWithNav
-<Link safeWithNav={() => Promise.resolve()}>Hello, world!</Link>;
+// TODO(FEI-5000): Re-enable test after updating props to be conditional.
+// <Link safeWithNav={() => Promise.resolve()}>Hello, world!</Link>;
 
 // It's okay to use onClick with href
 <Link href="/foo" onClick={() => {}}>

package/src/components/__tests__/link.test.js

@@ -6,7 +6,7 @@ import userEvent from "@testing-library/user-event";
 
 import Color from "@khanacademy/wonder-blocks-color";
 
-import Link from "../link.js";
+import Link from "../link";
 
 describe("Link", () => {
     beforeEach(() => {

package/src/components/link-core.js

@@ -13,7 +13,7 @@ import type {
     ClickableState,
 } from "@khanacademy/wonder-blocks-clickable";
 import type {StyleDeclaration} from "aphrodite";
-import type {SharedProps} from "./link.js";
+import type {SharedProps} from "./link";
 
 type Props = {|
     ...SharedProps,

package/src/components/link.js

@@ -5,9 +5,10 @@ import {getClickableBehavior} from "@khanacademy/wonder-blocks-clickable";
 
 import type {AriaProps, StyleType} from "@khanacademy/wonder-blocks-core";
 import type {Typography} from "@khanacademy/wonder-blocks-typography";
-import LinkCore from "./link-core.js";
+import LinkCore from "./link-core";
 
-type CommonProps = {|
+// TODO(FEI-5000): Convert back to conditional props after TS migration is complete.
+export type SharedProps = {|
     ...AriaProps,
 
     /**
@@ -132,38 +133,30 @@ type CommonProps = {|
      * Respond to raw "keyup" event.
      */
     onKeyUp?: (e: SyntheticKeyboardEvent<>) => mixed,
-|};
-
-export type SharedProps =
-    | {|
-          ...CommonProps,
 
-          /**
-           * A target destination window for a link to open in.  We only support
-           * "_blank" which opens the URL in a new tab.
-           *
-           * TODO(WB-1262): only allow this prop when `href` is also set.t
-           */
-          target?: "_blank",
-      |}
-    | {|
-          ...CommonProps,
+    /**
+     * A target destination window for a link to open in.  We only support
+     * "_blank" which opens the URL in a new tab.
+     *
+     * TODO(WB-1262): only allow this prop when `href` is also set.t
+     */
+    target?: "_blank",
 
-          /**
-           * Run async code before navigating to the URL passed to `href`. If the
-           * promise returned rejects then navigation will not occur.
-           *
-           * If both safeWithNav and beforeNav are provided, beforeNav will be run
-           * first and safeWithNav will only be run if beforeNav does not reject.
-           *
-           * WARNING: Using this with `target="_blank"` will trigger built-in popup
-           * blockers in Firefox and Safari.  This is because we do navigation
-           * programmatically and `beforeNav` causes a delay which means that the
-           * browser can't make a directly link between a user action and the
-           * navigation.
-           */
-          beforeNav?: () => Promise<mixed>,
-      |};
+    /**
+     * Run async code before navigating to the URL passed to `href`. If the
+     * promise returned rejects then navigation will not occur.
+     *
+     * If both safeWithNav and beforeNav are provided, beforeNav will be run
+     * first and safeWithNav will only be run if beforeNav does not reject.
+     *
+     * WARNING: Using this with `target="_blank"` will trigger built-in popup
+     * blockers in Firefox and Safari.  This is because we do navigation
+     * programmatically and `beforeNav` causes a delay which means that the
+     * browser can't make a directly link between a user action and the
+     * navigation.
+     */
+    beforeNav?: () => Promise<mixed>,
+|};
 
 type DefaultProps = {|
     inline: $PropertyType<SharedProps, "inline">,

package/src/index.js

@@ -1,4 +1,4 @@
 // @flow
-import Link from "./components/link.js";
+import Link from "./components/link";
 
 export {Link as default};