Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove @ory/integrations #184

Merged
merged 5 commits into from
Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

module.exports = {
presets: [
["@babel/preset-env", { targets: { node: "current" } }],
"@babel/preset-typescript",
],
}
5 changes: 3 additions & 2 deletions examples/nextjs-spa/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@
"@types/react-dom": "18.2.7",
"eslint": "8.32.0",
"eslint-config-next": "13.1.5",
"next": "13.4.13",
"next": "13.5.6",
"react": "18.2.0",
"react-dom": "18.2.0",
"typescript": "5.2.2"
"typescript": "5.2.2",
"vite": "4.5.2"
},
"devDependencies": {
"@ory/elements": "*",
Expand Down
2 changes: 1 addition & 1 deletion examples/nextjs-spa/src/pages/settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ const Settings: NextPageWithLayout = () => {
// include scripts for webauthn support
includeScripts={true}
// submit the form data the user provides to Ory
onSubmit={({ body }) => onSubmit(body)}
onSubmit={({ body }) => onSubmit(body as UpdateSettingsFlowBody)}
/>
))}
</div>
Expand Down
4 changes: 3 additions & 1 deletion examples/nextjs-spa/src/pkg/hooks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ export const HandleError = (
defaultNav: string | undefined = undefined,
fatalToError = false,
) => {
return async (error: AxiosError): Promise<AxiosError | void> => {
return async (
error: AxiosError<any, unknown>,
): Promise<AxiosError | void> => {
if (!error.response || error.response?.status === 0) {
window.location.href = `/error?error=${encodeURIComponent(
JSON.stringify(error.response),
Expand Down
6 changes: 3 additions & 3 deletions examples/preact-spa/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
},
"dependencies": {
"preact": "10.13.1",
"wouter": "2.10.0"
"wouter-preact": "3.0.1"
},
"devDependencies": {
"@ory/elements-preact": "*",
"@ory/elements-test": "*",
"@playwright/test": "1.38.0",
"@preact/preset-vite": "2.5.0",
"eslint": "8.32.0",
"eslint-config-preact": "1.3.0",
"typescript": "5.2.2",
"@playwright/test": "1.38.0",
"vite": "4.0.5"
"vite": "4.5.2"
},
"eslintConfig": {
"extends": "preact"
Expand Down
2 changes: 1 addition & 1 deletion examples/preact-spa/src/app.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Session } from "@ory/client"
import { Typography } from "@ory/elements-preact"
import { useEffect, useState } from "preact/hooks"
import { useLocation } from "wouter"
import { useLocation } from "wouter-preact"
import "./app.css"
import { sdk, sdkError } from "./sdk"

Expand Down
2 changes: 1 addition & 1 deletion examples/preact-spa/src/login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { LoginFlow, UpdateLoginFlowBody } from "@ory/client"
import { UserAuthCard } from "@ory/elements-preact"
import { useCallback, useEffect, useState } from "preact/hooks"
import { sdk, sdkError, getSearchParam } from "./sdk"
import { useLocation } from "wouter"
import { useLocation } from "wouter-preact"

export const Login = () => {
const [flow, setFlow] = useState<LoginFlow | null>(null)
Expand Down
2 changes: 1 addition & 1 deletion examples/preact-spa/src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import "@ory/elements-preact/assets/normalize.css"

import { render } from "preact"
import { Route, Router } from "wouter/preact"
import { Route, Router } from "wouter-preact"
import { Dashboard } from "./app"
import { Error } from "./error"
import "./index.css"
Expand Down
2 changes: 1 addition & 1 deletion examples/preact-spa/src/recovery.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { RecoveryFlow, UpdateRecoveryFlowBody } from "@ory/client"
import { UserAuthCard } from "@ory/elements-preact"
import { useCallback, useEffect, useState } from "preact/hooks"
import { useLocation } from "wouter"
import { useLocation } from "wouter-preact"
import { getSearchParam, sdk, sdkError } from "./sdk"

export const Recovery = () => {
Expand Down
2 changes: 1 addition & 1 deletion examples/preact-spa/src/register.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { RegistrationFlow, UpdateRegistrationFlowBody } from "@ory/client"
import { UserAuthCard } from "@ory/elements-preact"
import { useCallback, useEffect, useState } from "preact/hooks"
import { getSearchParam, sdk, sdkError } from "./sdk"
import { useLocation } from "wouter"
import { useLocation } from "wouter-preact"

export const Register = () => {
const [flow, setFlow] = useState<RegistrationFlow | null>(null)
Expand Down
4 changes: 2 additions & 2 deletions examples/preact-spa/src/sdk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { FrontendApi, Configuration } from "@ory/client"
import { AxiosError } from "axios"
import { useCallback } from "preact/hooks"
import { StateUpdater } from "preact/compat"
import { useLocation } from "wouter"
import { useLocation } from "wouter-preact"

export const sdk = new FrontendApi(
new Configuration({
Expand Down Expand Up @@ -33,7 +33,7 @@ export const sdkError = (
const [location, setLocation] = useLocation()

return useCallback(
(error: AxiosError): Promise<AxiosError | void> => {
(error: AxiosError<any, unknown>): Promise<AxiosError | void> => {
const responseData = error.response?.data || {}

switch (error.response?.status) {
Expand Down
4 changes: 2 additions & 2 deletions examples/preact-spa/src/settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
} from "@ory/elements-preact"
import { useCallback, useEffect, useState } from "preact/hooks"
import { sdk, sdkError, getSearchParam } from "./sdk"
import { useLocation } from "wouter"
import { useLocation } from "wouter-preact"
import { SettingsFlow, UpdateSettingsFlowBody } from "@ory/client"

export const Settings = () => {
Expand Down Expand Up @@ -85,7 +85,7 @@ export const Settings = () => {
flow={flow}
method={flowType}
includeScripts={true}
onSubmit={({ body }) => onSubmit(body)}
onSubmit={({ body }) => onSubmit(body as UpdateSettingsFlowBody)}
/>
))}
</div>
Expand Down
2 changes: 1 addition & 1 deletion examples/preact-spa/src/verification.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { UpdateVerificationFlowBody, VerificationFlow } from "@ory/client"
import { UserAuthCard } from "@ory/elements-preact"
import { useCallback, useEffect, useState } from "preact/hooks"
import { getSearchParam, sdk, sdkError } from "./sdk"
import { useLocation } from "wouter"
import { useLocation } from "wouter-preact"

export const Verification = () => {
const [flow, setFlow] = useState<VerificationFlow | null>(null)
Expand Down
2 changes: 1 addition & 1 deletion examples/react-spa/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
"eslint-plugin-promise": "6.1.1",
"eslint-plugin-react": "7.32.2",
"typescript": "5.2.2",
"vite": "4.4.2"
"vite": "4.5.2"
}
}
2 changes: 1 addition & 1 deletion examples/react-spa/src/Settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export const Settings = () => {
// include scripts for webauthn support
includeScripts={true}
// submit the form data the user provides to Ory
onSubmit={({ body }) => onSubmit(body)}
onSubmit={({ body }) => onSubmit(body as UpdateSettingsFlowBody)}
/>
))}
</div>
Expand Down
2 changes: 1 addition & 1 deletion examples/react-spa/src/sdk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const sdkError = (
const navigate = useNavigate()

return useCallback(
(error: AxiosError): Promise<AxiosError | void> => {
(error: AxiosError<any, unknown>): Promise<AxiosError | void> => {
const responseData = error.response?.data || {}

switch (error.response?.status) {
Expand Down
194 changes: 194 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,194 @@
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

/*
* For a detailed explanation regarding each configuration property, visit:
* https://jestjs.io/docs/configuration
*/

module.exports = {
// All imported modules in your tests should be mocked automatically
// automock: false,

// Stop running tests after `n` failures
// bail: 0,

// The directory where Jest should store its cached dependency information
// cacheDirectory: "/private/var/folders/mt/m1dwr59n73zgsq7bk0q2lrmc0000gn/T/jest_dx",

// Automatically clear mock calls and instances between every test
clearMocks: true,

// Indicates whether the coverage information should be collected while executing the test
collectCoverage: false,

// An array of glob patterns indicating a set of files for which coverage information should be collected
// collectCoverageFrom: undefined,

// The directory where Jest should output its coverage files
coverageDirectory: "coverage",

// An array of regexp pattern strings used to skip coverage collection
// coveragePathIgnorePatterns: [
// "/node_modules/"
// ],

// Indicates which provider should be used to instrument code for coverage
// coverageProvider: "babel",

// A list of reporter names that Jest uses when writing coverage reports
// coverageReporters: [
// "json",
// "text",
// "lcov",
// "clover"
// ],

// An object that configures minimum threshold enforcement for coverage results
// coverageThreshold: undefined,

// A path to a custom dependency extractor
// dependencyExtractor: undefined,

// Make calling deprecated APIs throw helpful error messages
// errorOnDeprecated: false,

// Force coverage collection from ignored files using an array of glob patterns
// forceCoverageMatch: [],

// A path to a module which exports an async function that is triggered once before all test suites
// globalSetup: undefined,

// A path to a module which exports an async function that is triggered once after all test suites
// globalTeardown: undefined,

// A set of global variables that need to be available in all test environments
// globals: {},

// The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
// maxWorkers: "50%",

// An array of directory names to be searched recursively up from the requiring module's location
// moduleDirectories: [
// "node_modules"
// ],

// An array of file extensions your modules use
// moduleFileExtensions: [
// "js",
// "jsx",
// "ts",
// "tsx",
// "json",
// "node"
// ],

// A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
// moduleNameMapper: {},

// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
// modulePathIgnorePatterns: [],

// Activates notifications for test results
// notify: false,

// An enum that specifies notification mode. Requires { notify: true }
// notifyMode: "failure-change",

// A preset that is used as a base for Jest's configuration
// preset: undefined,

// Run tests from one or more projects
// projects: undefined,

// Use this configuration option to add custom reporters to Jest
// reporters: undefined,

// Automatically reset mock state between every test
// resetMocks: false,

// Reset the module registry before running each individual test
// resetModules: false,

// A path to a custom resolver
// resolver: undefined,

// Automatically restore mock state between every test
// restoreMocks: false,

// The root directory that Jest should scan for tests and modules within
// rootDir: undefined,

// A list of paths to directories that Jest should use to search for files in
// roots: [
// "<rootDir>"
// ],

// Allows you to use a custom runner instead of Jest's default test runner
// runner: "jest-runner",

// The paths to modules that run some code to configure or set up the testing environment before each test
// setupFiles: [],

// A list of paths to modules that run some code to configure or set up the testing framework before each test
// setupFilesAfterEnv: [],

// The number of seconds after which a test is considered as slow and reported as such in the results.
// slowTestThreshold: 5,

// A list of paths to snapshot serializer modules Jest should use for snapshot testing
// snapshotSerializers: [],

// The test environment that will be used for testing
// testEnvironment: "jest-environment-node",

// Options that will be passed to the testEnvironment
// testEnvironmentOptions: {},

// Adds a location field to test results
// testLocationInResults: false,

// The glob patterns Jest uses to detect test files
testMatch: ["**/ui/?(*.)+(spec|test).[tj]s?(x)"],

// An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
// testPathIgnorePatterns: [
// "/node_modules/"
// ],

// The regexp pattern or array of patterns that Jest uses to detect test files
// testRegex: [],

// This option allows the use of a custom results processor
// testResultsProcessor: undefined,

// This option allows use of a custom test runner
// testRunner: "jest-circus/runner",

// This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
// testURL: "http://localhost",

// Setting this value to "fake" allows the use of fake timers for functions such as "setTimeout"
// timers: "real",

// A map from regular expressions to paths to transformers
// transform: undefined,

// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
// transformIgnorePatterns: [
// "/node_modules/",
// "\\.pnp\\.[^\\/]+$"
// ],

// An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
// unmockedModulePathPatterns: undefined,

// Indicates whether each individual test should be reported during the run
// verbose: undefined,

// An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
// watchPathIgnorePatterns: [],

// Whether to use watchman for file crawling
// watchman: true,
}
Loading
Loading