Skip to content

Commit

Permalink
Fixes for CI
Browse files Browse the repository at this point in the history
  • Loading branch information
scottlovegrove committed May 25, 2022
1 parent 90e8d63 commit 3cc0fed
Showing 8 changed files with 102 additions and 355 deletions.
437 changes: 88 additions & 349 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion packages/ui-extensions-react/package.json
Original file line number Diff line number Diff line change
@@ -51,9 +51,11 @@
"@storybook/addon-essentials": "^6.3.12",
"@storybook/addon-links": "^6.3.12",
"@storybook/react": "^6.3.12",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/dom": "^8.13.0",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^9.5.0",
"@testing-library/react-hooks": "^3.3.0",
"@types/testing-library__jest-dom": "^5.14.3",
"eslint-config-react-app": "^7.0.0",
"msw": "^0.36.8",
"react": "^17.0.2",
1 change: 1 addition & 0 deletions packages/ui-extensions-react/setup-tests.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
import '@testing-library/jest-dom/extend-expect'
import '@testing-library/jest-dom'
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/* eslint-disable @typescript-eslint/no-empty-function */
import React from 'react'

import { render, screen } from '@testing-library/react'
import { screen } from '@testing-library/dom'
import { render } from '@testing-library/react'

import { getDefaultCard } from '../test/fixtures'

Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@ import { processRequest } from '../api/adaptive-cards-server'
import type {
DoistCardAction,
DoistCardActionParams,
DoistCardBridge,
DoistCardError,
DoistCardExtensionType,
DoistCardRequest,
@@ -77,7 +78,7 @@ export function useAdaptiveCardsConnection({
const { card, bridge, bridges } = response

if (bridges) {
bridges.forEach((bridge) => {
bridges.forEach((bridge: DoistCardBridge) => {
const callback = bridgeActionCallbacks[bridge.bridgeActionType]
callback?.(bridge)
})
@@ -110,6 +111,7 @@ export function useAdaptiveCardsConnection({
[context, bridgeActionCallbacks, endpointUrl, extensionType, params, version, token],
)

// eslint-disable-next-line @typescript-eslint/no-misused-promises
return { result, onAction }
}

2 changes: 1 addition & 1 deletion packages/ui-extensions-react/src/test/polyfills.ts
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ export function polyfillFetch(): void {
}

globalThis.fetch = fetch as unknown as (
input: RequestInfo,
input: RequestInfo | URL,
init?: RequestInit,
) => Promise<Response>
}
3 changes: 2 additions & 1 deletion packages/ui-extensions-react/src/types/doist-rendering.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import type { Orientation } from '@doist/ui-extensions-core'
import {
Action,
ActionProperty,
@@ -15,6 +14,8 @@ import {
Versions,
} from 'adaptivecards'

import type { Orientation } from '@doist/ui-extensions-core'

export type AdaptiveCardistVersion = '0.2' | '0.3' | '0.4'
export type InputStyle = 'text' | 'tel' | 'url' | 'email' | 'search'

3 changes: 2 additions & 1 deletion packages/ui-extensions-react/tsconfig.json
Original file line number Diff line number Diff line change
@@ -6,7 +6,8 @@
"rootDir": "./src",
"declarationDir": "./dist",
"module": "CommonJS",
"jsx": "react"
"jsx": "react",
"types": ["node", "jest", "@testing-library/jest-dom"]
},
"include": ["src", "test", "stories"],
"exclude": ["node_modules"]

0 comments on commit 3cc0fed

Please sign in to comment.