From 5c5e82685d5ea8a67b8c3a062fd8e8c2bfa66f5d Mon Sep 17 00:00:00 2001 From: Jonas Hungershausen Date: Wed, 5 Feb 2025 16:15:34 +0100 Subject: [PATCH] chore: move storybooks to package --- .github/workflows/chromatic.yml | 3 +- eslint.config.mjs | 8 ++- package-lock.json | 52 ++++++++++++++++++ package.json | 1 + .../elements-react-stories/.storybook/main.ts | 37 ------------- packages/elements-react-stories/package.json | 14 ----- packages/elements-react-stories/project.json | 10 ---- .../components/login/1fa-refresh/.gitkeep | 0 .../components/login/2fa-refresh/.gitkeep | 0 .../components/login/2fa/.gitkeep | 0 .../components/login/organizations/.gitkeep | 0 .../components/recovery/.gitkeep | 0 .../components/settings/.gitkeep | 0 .../components/verification/.gitkeep | 0 packages/elements-react-stories/tsconfig.json | 35 ------------ .../tsconfig.storybook.json | 38 ------------- .../.storybook/global.css | 0 packages/elements-react/.storybook/main.ts | 51 +++++++++++++++++ .../.storybook/preview-head.html | 0 .../.storybook/preview.tsx | 1 - .../.storybook}/public/InterVariable.woff2 | Bin .../.storybook}/public/inter.css | 0 .../login/1fa/all-methods/initial-form.json | 0 .../login/1fa/all-methods/missing-email.json | 0 .../1fa/all-methods/wrong-credentials.json | 0 .../login/1fa/code/code-input.json | 0 .../login/1fa/code/initial-form.json | 0 .../login/1fa/code/invalid-account.json | 0 .../login/1fa/code/missing-email.json | 0 .../login/1fa/code/wrong-credentials.json | 0 .../login/1fa/none/initial-form.json | 0 .../login/1fa/oidc/initial-form.json | 0 .../login/1fa/passkey/initial-form.json | 0 .../login/1fa/password/initial-form.json | 0 .../login/1fa/password/missing-email.json | 0 .../login/1fa/password/wrong-credentials.json | 0 .../login/1fa/webauthn/initial-form.json | 0 .../login/1fa/webauthn/invalid-account.json | 0 .../login/1fa/webauthn/show-trigger.json | 0 .../recovery/disabled/initial-form.json | 0 .../recovery/none/initial-form.json | 0 .../one-step/all-methods/initial-form.json | 0 .../one-step/all-methods/missing-fields.json | 0 .../one-step/disabled/initial-form.json | 0 .../one-step/none/initial-form.json | 0 .../one-step/oidc/initial-form.json | 0 .../one-step/passkey/initial-form.json | 0 .../one-step/password/initial-form.json | 0 .../one-step/password/missing-fields.json | 0 .../one-step/password/second-step.json | 0 .../one-step/webauthn/initial-form.json | 0 .../two-step/all-methods/enter-password.json | 0 .../two-step/all-methods/initial-form.json | 0 .../two-step/all-methods/missing-fields.json | 0 .../password-validation-error.json | 0 .../two-step/password/enter-password.json | 0 .../two-step/password/initial-form.json | 0 .../two-step/password/missing-fields.json | 0 .../password/password-validation-error.json | 0 .../settings/all-methods/change-password.json | 0 .../settings/all-methods/change-trait.json | 0 .../settings/all-methods/initial-form.json | 0 .../settings/oidc/with-provider.json | 0 .../settings/passkey/initial-form.json | 0 .../settings/webauthn/initial-form.json | 0 .../verification/disabled/initial-form.json | 0 .../verification/none/initial-form.json | 0 .../src/components/card/card.tsx | 2 +- .../src/context/intl-context.tsx | 9 +-- packages/elements-react/src/index.ts | 2 +- packages/elements-react/src/locales/index.ts | 2 +- .../src/util/ui/__test__/ui.spec.ts | 2 +- .../components/login/1fa/all.stories.ts | 8 +-- .../components/login/1fa/code.stories.ts | 14 ++--- .../components/login/1fa/custom.stories.tsx | 10 +--- .../components/login/1fa/none.stories.tsx | 4 +- .../components/login/1fa/oidc.stories.tsx | 7 ++- .../components/login/1fa/passkey.stories.ts | 4 +- .../components/login/1fa/password.stories.ts | 8 +-- .../components/login/1fa/webauthn.stories.ts | 8 +-- .../one-step/all-methods.stories.ts | 6 +- .../registration/one-step/password.stories.ts | 6 +- .../registration/one-step/webauthn.stories.ts | 4 +- .../two-step/all-methods.stories.ts | 10 ++-- .../registration/two-step/password.stories.ts | 10 ++-- .../components/settings/all.stories.ts | 8 +-- .../components/settings/oidc.stories.ts | 4 +- .../components/settings/passkey.stories.ts | 4 +- .../components/settings/webauthn.stories.ts | 4 +- .../stories}/pages/error.tsx | 0 .../stories/utils.ts} | 0 packages/elements-react/tsconfig.json | 5 +- packages/elements-react/tsconfig.runtime.json | 4 ++ packages/elements-react/tsconfig.test.json | 9 --- 94 files changed, 185 insertions(+), 219 deletions(-) delete mode 100644 packages/elements-react-stories/.storybook/main.ts delete mode 100644 packages/elements-react-stories/package.json delete mode 100644 packages/elements-react-stories/project.json delete mode 100644 packages/elements-react-stories/src/elements-react/components/login/1fa-refresh/.gitkeep delete mode 100644 packages/elements-react-stories/src/elements-react/components/login/2fa-refresh/.gitkeep delete mode 100644 packages/elements-react-stories/src/elements-react/components/login/2fa/.gitkeep delete mode 100644 packages/elements-react-stories/src/elements-react/components/login/organizations/.gitkeep delete mode 100644 packages/elements-react-stories/src/elements-react/components/recovery/.gitkeep delete mode 100644 packages/elements-react-stories/src/elements-react/components/settings/.gitkeep delete mode 100644 packages/elements-react-stories/src/elements-react/components/verification/.gitkeep delete mode 100644 packages/elements-react-stories/tsconfig.json delete mode 100644 packages/elements-react-stories/tsconfig.storybook.json rename packages/{elements-react-stories => elements-react}/.storybook/global.css (100%) create mode 100644 packages/elements-react/.storybook/main.ts rename packages/{elements-react-stories => elements-react}/.storybook/preview-head.html (100%) rename packages/{elements-react-stories => elements-react}/.storybook/preview.tsx (96%) rename packages/{elements-react-stories => elements-react/.storybook}/public/InterVariable.woff2 (100%) rename packages/{elements-react-stories => elements-react/.storybook}/public/inter.css (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/login/1fa/all-methods/initial-form.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/login/1fa/all-methods/missing-email.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/login/1fa/all-methods/wrong-credentials.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/login/1fa/code/code-input.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/login/1fa/code/initial-form.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/login/1fa/code/invalid-account.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/login/1fa/code/missing-email.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/login/1fa/code/wrong-credentials.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/login/1fa/none/initial-form.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/login/1fa/oidc/initial-form.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/login/1fa/passkey/initial-form.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/login/1fa/password/initial-form.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/login/1fa/password/missing-email.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/login/1fa/password/wrong-credentials.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/login/1fa/webauthn/initial-form.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/login/1fa/webauthn/invalid-account.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/login/1fa/webauthn/show-trigger.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/recovery/disabled/initial-form.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/recovery/none/initial-form.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/registration/one-step/all-methods/initial-form.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/registration/one-step/all-methods/missing-fields.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/registration/one-step/disabled/initial-form.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/registration/one-step/none/initial-form.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/registration/one-step/oidc/initial-form.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/registration/one-step/passkey/initial-form.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/registration/one-step/password/initial-form.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/registration/one-step/password/missing-fields.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/registration/one-step/password/second-step.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/registration/one-step/webauthn/initial-form.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/registration/two-step/all-methods/enter-password.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/registration/two-step/all-methods/initial-form.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/registration/two-step/all-methods/missing-fields.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/registration/two-step/all-methods/password-validation-error.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/registration/two-step/password/enter-password.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/registration/two-step/password/initial-form.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/registration/two-step/password/missing-fields.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/registration/two-step/password/password-validation-error.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/settings/all-methods/change-password.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/settings/all-methods/change-trait.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/settings/all-methods/initial-form.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/settings/oidc/with-provider.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/settings/passkey/initial-form.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/settings/webauthn/initial-form.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/verification/disabled/initial-form.json (100%) rename packages/{elements-react-stories/src => }/elements-react/.stub-responses/verification/none/initial-form.json (100%) rename packages/{elements-react-stories/src/elements-react => elements-react/stories}/components/login/1fa/all.stories.ts (73%) rename packages/{elements-react-stories/src/elements-react => elements-react/stories}/components/login/1fa/code.stories.ts (71%) rename packages/{elements-react-stories/src/elements-react => elements-react/stories}/components/login/1fa/custom.stories.tsx (76%) rename packages/{elements-react-stories/src/elements-react => elements-react/stories}/components/login/1fa/none.stories.tsx (82%) rename packages/{elements-react-stories/src/elements-react => elements-react/stories}/components/login/1fa/oidc.stories.tsx (94%) rename packages/{elements-react-stories/src/elements-react => elements-react/stories}/components/login/1fa/passkey.stories.ts (81%) rename packages/{elements-react-stories/src/elements-react => elements-react/stories}/components/login/1fa/password.stories.ts (74%) rename packages/{elements-react-stories/src/elements-react => elements-react/stories}/components/login/1fa/webauthn.stories.ts (73%) rename packages/{elements-react-stories/src/elements-react => elements-react/stories}/components/registration/one-step/all-methods.stories.ts (75%) rename packages/{elements-react-stories/src/elements-react => elements-react/stories}/components/registration/one-step/password.stories.ts (75%) rename packages/{elements-react-stories/src/elements-react => elements-react/stories}/components/registration/one-step/webauthn.stories.ts (80%) rename packages/{elements-react-stories/src/elements-react => elements-react/stories}/components/registration/two-step/all-methods.stories.ts (68%) rename packages/{elements-react-stories/src/elements-react => elements-react/stories}/components/registration/two-step/password.stories.ts (69%) rename packages/{elements-react-stories/src/elements-react => elements-react/stories}/components/settings/all.stories.ts (73%) rename packages/{elements-react-stories/src/elements-react => elements-react/stories}/components/settings/oidc.stories.ts (81%) rename packages/{elements-react-stories/src/elements-react => elements-react/stories}/components/settings/passkey.stories.ts (81%) rename packages/{elements-react-stories/src/elements-react => elements-react/stories}/components/settings/webauthn.stories.ts (81%) rename packages/{elements-react-stories/src/elements-react => elements-react/stories}/pages/error.tsx (100%) rename packages/{elements-react-stories/src/elements-react/utils/index.ts => elements-react/stories/utils.ts} (100%) create mode 100644 packages/elements-react/tsconfig.runtime.json delete mode 100644 packages/elements-react/tsconfig.test.json diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index c645bac4c..ea1b803fc 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -34,7 +34,6 @@ jobs: with: projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN_ELEMENTS_REACT }} exitOnceUploaded: true - workingDir: packages/elements-react-stories + workingDir: packages/elements-react storybookBuildDir: storybook-static onlyChanged: true - externals: packages/elements-react/** diff --git a/eslint.config.mjs b/eslint.config.mjs index 043cb279c..665d3e312 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -15,7 +15,7 @@ const config = tseslint.config([ { ignores: [ "**/assets/*.js", - "!.storybook", + "**/.storybook/**", "**/dist/**", "**/storybook-static/**", "**/*.config.{js,mjs,cjs,ts}", @@ -217,6 +217,12 @@ const config = tseslint.config([ }, }, }, + { + files: ["packages/elements-react/stories/**/*.{js,jsx,ts,tsx}"], + rules: { + "@typescript-eslint/no-require-imports": "off", + }, + } ]) export default config diff --git a/package-lock.json b/package-lock.json index f530c47b1..b08906c6c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -103,6 +103,7 @@ "vite-plugin-dts": "4.1.0", "vite-plugin-require": "1.2.14", "vite-plugin-static-copy": "1.0.6", + "vite-plugin-svgr": "4.3.0", "vite-tsconfig-paths": "5.0.1", "which-builtin-type": "1.1.4" }, @@ -33527,6 +33528,57 @@ "node": ">=14.14" } }, + "node_modules/vite-plugin-svgr": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/vite-plugin-svgr/-/vite-plugin-svgr-4.3.0.tgz", + "integrity": "sha512-Jy9qLB2/PyWklpYy0xk0UU3TlU0t2UMpJXZvf+hWII1lAmRHrOUKi11Uw8N3rxoNk7atZNYO3pR3vI1f7oi+6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "@rollup/pluginutils": "^5.1.3", + "@svgr/core": "^8.1.0", + "@svgr/plugin-jsx": "^8.1.0" + }, + "peerDependencies": { + "vite": ">=2.6.0" + } + }, + "node_modules/vite-plugin-svgr/node_modules/@rollup/pluginutils": { + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.4.tgz", + "integrity": "sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "^1.0.0", + "estree-walker": "^2.0.2", + "picomatch": "^4.0.2" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0" + }, + "peerDependenciesMeta": { + "rollup": { + "optional": true + } + } + }, + "node_modules/vite-plugin-svgr/node_modules/picomatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/vite-tsconfig-paths": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-5.0.1.tgz", diff --git a/package.json b/package.json index 20e56452c..23499c20b 100644 --- a/package.json +++ b/package.json @@ -113,6 +113,7 @@ "vite-plugin-dts": "4.1.0", "vite-plugin-require": "1.2.14", "vite-plugin-static-copy": "1.0.6", + "vite-plugin-svgr": "4.3.0", "vite-tsconfig-paths": "5.0.1", "which-builtin-type": "1.1.4" }, diff --git a/packages/elements-react-stories/.storybook/main.ts b/packages/elements-react-stories/.storybook/main.ts deleted file mode 100644 index 1258f37d4..000000000 --- a/packages/elements-react-stories/.storybook/main.ts +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright © 2024 Ory Corp -// SPDX-License-Identifier: Apache-2.0 - -import type { StorybookConfig } from "@storybook/react-vite" - -import { nxViteTsPaths } from "@nx/vite/plugins/nx-tsconfig-paths.plugin" -import { mergeConfig } from "vite" -import vitePluginRequire from "vite-plugin-require" -import path from "path" - -const config: StorybookConfig = { - stories: ["../src/**/*.stories.@(js|jsx|ts|tsx|mdx)"], - addons: ["@storybook/addon-essentials", "@storybook/addon-interactions"], - framework: { - name: "@storybook/react-vite", - options: {}, - }, - - viteFinal: (config) => - mergeConfig(config, { - plugins: [nxViteTsPaths(), vitePluginRequire()], - resolve: { - alias: [ - { - find: "$", - replacement: path.resolve(__dirname, "../src/elements-react"), - }, - ], - }, - }), -} - -export default config - -// To customize your Vite configuration you can use the viteFinal field. -// Check https://storybook.js.org/docs/react/builders/vite#configuration -// and https://nx.dev/recipes/storybook/custom-builder-configs diff --git a/packages/elements-react-stories/package.json b/packages/elements-react-stories/package.json deleted file mode 100644 index abdc88e74..000000000 --- a/packages/elements-react-stories/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "elements-react-stories", - "version": "1.0.0", - "main": "index.js", - "keywords": [], - "author": "", - "license": "ISC", - "description": "", - "dependencies": { - "@originjs/vite-plugin-commonjs": "1.0.3", - "@ory/client-fetch": "1.15.0-next.0", - "@ory/elements-react": "*" - } -} diff --git a/packages/elements-react-stories/project.json b/packages/elements-react-stories/project.json deleted file mode 100644 index 215508ab4..000000000 --- a/packages/elements-react-stories/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "targets": { - "storybook": { - "dependsOn": ["@ory/elements-react:build"] - }, - "build-storybook": { - "dependsOn": ["@ory/elements-react:build"] - } - } -} diff --git a/packages/elements-react-stories/src/elements-react/components/login/1fa-refresh/.gitkeep b/packages/elements-react-stories/src/elements-react/components/login/1fa-refresh/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/elements-react-stories/src/elements-react/components/login/2fa-refresh/.gitkeep b/packages/elements-react-stories/src/elements-react/components/login/2fa-refresh/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/elements-react-stories/src/elements-react/components/login/2fa/.gitkeep b/packages/elements-react-stories/src/elements-react/components/login/2fa/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/elements-react-stories/src/elements-react/components/login/organizations/.gitkeep b/packages/elements-react-stories/src/elements-react/components/login/organizations/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/elements-react-stories/src/elements-react/components/recovery/.gitkeep b/packages/elements-react-stories/src/elements-react/components/recovery/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/elements-react-stories/src/elements-react/components/settings/.gitkeep b/packages/elements-react-stories/src/elements-react/components/settings/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/elements-react-stories/src/elements-react/components/verification/.gitkeep b/packages/elements-react-stories/src/elements-react/components/verification/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/elements-react-stories/tsconfig.json b/packages/elements-react-stories/tsconfig.json deleted file mode 100644 index 1e5b0f886..000000000 --- a/packages/elements-react-stories/tsconfig.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "compilerOptions": { - "target": "ES2019", - "esModuleInterop": true, - "forceConsistentCasingInFileNames": true, - "isolatedModules": true, - "moduleResolution": "Bundler", - "module": "ESNext", - "preserveWatchOutput": true, - "skipLibCheck": true, - "strict": true, - "emitDeclarationOnly": true, - "declaration": true, - "declarationMap": true, - "outDir": "dist", - "resolveJsonModule": true, - "declarationDir": "dist/types", - "jsx": "react-jsx", - "lib": ["ES6", "DOM", "WebWorker"], - "rootDir": "./" - }, - "exclude": [ - "node_modules", - "**/*.stories.ts", - "**/*.stories.js", - "**/*.stories.jsx", - "**/*.stories.tsx" - ], - "include": ["**/*.ts", "**/*.tsx", ".storybook/preview.tsx"], - "references": [ - { - "path": "./tsconfig.storybook.json" - } - ] -} diff --git a/packages/elements-react-stories/tsconfig.storybook.json b/packages/elements-react-stories/tsconfig.storybook.json deleted file mode 100644 index 8f2870b64..000000000 --- a/packages/elements-react-stories/tsconfig.storybook.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "composite": true, - "experimentalDecorators": true, - "emitDecoratorMetadata": true, - "outDir": "" - }, - "files": [ - "../../node_modules/@nx/react/typings/styled-jsx.d.ts", - "../../node_modules/@nx/react/typings/cssmodule.d.ts", - "../../node_modules/@nx/react/typings/image.d.ts" - ], - "exclude": [ - "src/**/*.spec.ts", - "src/**/*.test.ts", - "src/**/*.spec.js", - "src/**/*.test.js", - "src/**/*.spec.tsx", - "src/**/*.test.tsx", - "src/**/*.spec.jsx", - "src/**/*.test.js" - ], - "include": [ - "src/**/*.stories.ts", - "src/**/*.stories.js", - "src/**/*.stories.jsx", - "src/**/*.stories.tsx", - "src/**/*.stories.mdx", - "src/**/*.ts", - "src/**/*.tsx", - ".storybook/*.js", - ".storybook/*.ts", - "src/**/*.json", - ".storybook/*.ts", - ".storybook/*.tsx" - ] -} diff --git a/packages/elements-react-stories/.storybook/global.css b/packages/elements-react/.storybook/global.css similarity index 100% rename from packages/elements-react-stories/.storybook/global.css rename to packages/elements-react/.storybook/global.css diff --git a/packages/elements-react/.storybook/main.ts b/packages/elements-react/.storybook/main.ts new file mode 100644 index 000000000..779d2fe44 --- /dev/null +++ b/packages/elements-react/.storybook/main.ts @@ -0,0 +1,51 @@ +// Copyright © 2024 Ory Corp +// SPDX-License-Identifier: Apache-2.0 + +import type { StorybookConfig } from "@storybook/react-vite" + +import path from "path" +import { mergeConfig } from "vite" +import vitePluginRequire from "vite-plugin-require" +import svgr from "vite-plugin-svgr" + +const config: StorybookConfig = { + stories: ["../**/*.stories.@(ts|tsx)"], + addons: ["@storybook/addon-essentials", "@storybook/addon-interactions"], + framework: { + name: "@storybook/react-vite", + options: {}, + }, + staticDirs: ["./public"], + + viteFinal: (config) => { + console.log(path.resolve(__dirname, "../src")) + return mergeConfig(config, { + plugins: [vitePluginRequire(), svgr({ include: "**/*.svg" })], + build: { + rollupOptions: { + onwarn(warning, warn) { + // Suppress "Module level directives cause errors when bundled" warnings + if (warning.code === "MODULE_LEVEL_DIRECTIVE") { + return + } + warn(warning) + }, + }, + }, + resolve: { + alias: [ + { + find: "$snapshots", + replacement: path.resolve(__dirname, "../.stub-responses"), + }, + { + find: "@ory/elements-react", + replacement: path.resolve(__dirname, "../src"), + }, + ], + }, + }) + }, +} + +export default config diff --git a/packages/elements-react-stories/.storybook/preview-head.html b/packages/elements-react/.storybook/preview-head.html similarity index 100% rename from packages/elements-react-stories/.storybook/preview-head.html rename to packages/elements-react/.storybook/preview-head.html diff --git a/packages/elements-react-stories/.storybook/preview.tsx b/packages/elements-react/.storybook/preview.tsx similarity index 96% rename from packages/elements-react-stories/.storybook/preview.tsx rename to packages/elements-react/.storybook/preview.tsx index b0b45d046..3bc559d06 100644 --- a/packages/elements-react-stories/.storybook/preview.tsx +++ b/packages/elements-react/.storybook/preview.tsx @@ -1,7 +1,6 @@ // Copyright © 2024 Ory Corp // SPDX-License-Identifier: Apache-2.0 -import "@ory/elements-react/theme/styles.css" import type { Decorator, Preview } from "@storybook/react" import { merge } from "lodash" import "./global.css" diff --git a/packages/elements-react-stories/public/InterVariable.woff2 b/packages/elements-react/.storybook/public/InterVariable.woff2 similarity index 100% rename from packages/elements-react-stories/public/InterVariable.woff2 rename to packages/elements-react/.storybook/public/InterVariable.woff2 diff --git a/packages/elements-react-stories/public/inter.css b/packages/elements-react/.storybook/public/inter.css similarity index 100% rename from packages/elements-react-stories/public/inter.css rename to packages/elements-react/.storybook/public/inter.css diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/all-methods/initial-form.json b/packages/elements-react/.stub-responses/login/1fa/all-methods/initial-form.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/all-methods/initial-form.json rename to packages/elements-react/.stub-responses/login/1fa/all-methods/initial-form.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/all-methods/missing-email.json b/packages/elements-react/.stub-responses/login/1fa/all-methods/missing-email.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/all-methods/missing-email.json rename to packages/elements-react/.stub-responses/login/1fa/all-methods/missing-email.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/all-methods/wrong-credentials.json b/packages/elements-react/.stub-responses/login/1fa/all-methods/wrong-credentials.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/all-methods/wrong-credentials.json rename to packages/elements-react/.stub-responses/login/1fa/all-methods/wrong-credentials.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/code/code-input.json b/packages/elements-react/.stub-responses/login/1fa/code/code-input.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/code/code-input.json rename to packages/elements-react/.stub-responses/login/1fa/code/code-input.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/code/initial-form.json b/packages/elements-react/.stub-responses/login/1fa/code/initial-form.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/code/initial-form.json rename to packages/elements-react/.stub-responses/login/1fa/code/initial-form.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/code/invalid-account.json b/packages/elements-react/.stub-responses/login/1fa/code/invalid-account.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/code/invalid-account.json rename to packages/elements-react/.stub-responses/login/1fa/code/invalid-account.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/code/missing-email.json b/packages/elements-react/.stub-responses/login/1fa/code/missing-email.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/code/missing-email.json rename to packages/elements-react/.stub-responses/login/1fa/code/missing-email.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/code/wrong-credentials.json b/packages/elements-react/.stub-responses/login/1fa/code/wrong-credentials.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/code/wrong-credentials.json rename to packages/elements-react/.stub-responses/login/1fa/code/wrong-credentials.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/none/initial-form.json b/packages/elements-react/.stub-responses/login/1fa/none/initial-form.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/none/initial-form.json rename to packages/elements-react/.stub-responses/login/1fa/none/initial-form.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/oidc/initial-form.json b/packages/elements-react/.stub-responses/login/1fa/oidc/initial-form.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/oidc/initial-form.json rename to packages/elements-react/.stub-responses/login/1fa/oidc/initial-form.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/passkey/initial-form.json b/packages/elements-react/.stub-responses/login/1fa/passkey/initial-form.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/passkey/initial-form.json rename to packages/elements-react/.stub-responses/login/1fa/passkey/initial-form.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/password/initial-form.json b/packages/elements-react/.stub-responses/login/1fa/password/initial-form.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/password/initial-form.json rename to packages/elements-react/.stub-responses/login/1fa/password/initial-form.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/password/missing-email.json b/packages/elements-react/.stub-responses/login/1fa/password/missing-email.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/password/missing-email.json rename to packages/elements-react/.stub-responses/login/1fa/password/missing-email.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/password/wrong-credentials.json b/packages/elements-react/.stub-responses/login/1fa/password/wrong-credentials.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/password/wrong-credentials.json rename to packages/elements-react/.stub-responses/login/1fa/password/wrong-credentials.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/webauthn/initial-form.json b/packages/elements-react/.stub-responses/login/1fa/webauthn/initial-form.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/webauthn/initial-form.json rename to packages/elements-react/.stub-responses/login/1fa/webauthn/initial-form.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/webauthn/invalid-account.json b/packages/elements-react/.stub-responses/login/1fa/webauthn/invalid-account.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/webauthn/invalid-account.json rename to packages/elements-react/.stub-responses/login/1fa/webauthn/invalid-account.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/webauthn/show-trigger.json b/packages/elements-react/.stub-responses/login/1fa/webauthn/show-trigger.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/login/1fa/webauthn/show-trigger.json rename to packages/elements-react/.stub-responses/login/1fa/webauthn/show-trigger.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/recovery/disabled/initial-form.json b/packages/elements-react/.stub-responses/recovery/disabled/initial-form.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/recovery/disabled/initial-form.json rename to packages/elements-react/.stub-responses/recovery/disabled/initial-form.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/recovery/none/initial-form.json b/packages/elements-react/.stub-responses/recovery/none/initial-form.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/recovery/none/initial-form.json rename to packages/elements-react/.stub-responses/recovery/none/initial-form.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/registration/one-step/all-methods/initial-form.json b/packages/elements-react/.stub-responses/registration/one-step/all-methods/initial-form.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/registration/one-step/all-methods/initial-form.json rename to packages/elements-react/.stub-responses/registration/one-step/all-methods/initial-form.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/registration/one-step/all-methods/missing-fields.json b/packages/elements-react/.stub-responses/registration/one-step/all-methods/missing-fields.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/registration/one-step/all-methods/missing-fields.json rename to packages/elements-react/.stub-responses/registration/one-step/all-methods/missing-fields.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/registration/one-step/disabled/initial-form.json b/packages/elements-react/.stub-responses/registration/one-step/disabled/initial-form.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/registration/one-step/disabled/initial-form.json rename to packages/elements-react/.stub-responses/registration/one-step/disabled/initial-form.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/registration/one-step/none/initial-form.json b/packages/elements-react/.stub-responses/registration/one-step/none/initial-form.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/registration/one-step/none/initial-form.json rename to packages/elements-react/.stub-responses/registration/one-step/none/initial-form.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/registration/one-step/oidc/initial-form.json b/packages/elements-react/.stub-responses/registration/one-step/oidc/initial-form.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/registration/one-step/oidc/initial-form.json rename to packages/elements-react/.stub-responses/registration/one-step/oidc/initial-form.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/registration/one-step/passkey/initial-form.json b/packages/elements-react/.stub-responses/registration/one-step/passkey/initial-form.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/registration/one-step/passkey/initial-form.json rename to packages/elements-react/.stub-responses/registration/one-step/passkey/initial-form.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/registration/one-step/password/initial-form.json b/packages/elements-react/.stub-responses/registration/one-step/password/initial-form.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/registration/one-step/password/initial-form.json rename to packages/elements-react/.stub-responses/registration/one-step/password/initial-form.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/registration/one-step/password/missing-fields.json b/packages/elements-react/.stub-responses/registration/one-step/password/missing-fields.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/registration/one-step/password/missing-fields.json rename to packages/elements-react/.stub-responses/registration/one-step/password/missing-fields.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/registration/one-step/password/second-step.json b/packages/elements-react/.stub-responses/registration/one-step/password/second-step.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/registration/one-step/password/second-step.json rename to packages/elements-react/.stub-responses/registration/one-step/password/second-step.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/registration/one-step/webauthn/initial-form.json b/packages/elements-react/.stub-responses/registration/one-step/webauthn/initial-form.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/registration/one-step/webauthn/initial-form.json rename to packages/elements-react/.stub-responses/registration/one-step/webauthn/initial-form.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/registration/two-step/all-methods/enter-password.json b/packages/elements-react/.stub-responses/registration/two-step/all-methods/enter-password.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/registration/two-step/all-methods/enter-password.json rename to packages/elements-react/.stub-responses/registration/two-step/all-methods/enter-password.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/registration/two-step/all-methods/initial-form.json b/packages/elements-react/.stub-responses/registration/two-step/all-methods/initial-form.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/registration/two-step/all-methods/initial-form.json rename to packages/elements-react/.stub-responses/registration/two-step/all-methods/initial-form.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/registration/two-step/all-methods/missing-fields.json b/packages/elements-react/.stub-responses/registration/two-step/all-methods/missing-fields.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/registration/two-step/all-methods/missing-fields.json rename to packages/elements-react/.stub-responses/registration/two-step/all-methods/missing-fields.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/registration/two-step/all-methods/password-validation-error.json b/packages/elements-react/.stub-responses/registration/two-step/all-methods/password-validation-error.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/registration/two-step/all-methods/password-validation-error.json rename to packages/elements-react/.stub-responses/registration/two-step/all-methods/password-validation-error.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/registration/two-step/password/enter-password.json b/packages/elements-react/.stub-responses/registration/two-step/password/enter-password.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/registration/two-step/password/enter-password.json rename to packages/elements-react/.stub-responses/registration/two-step/password/enter-password.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/registration/two-step/password/initial-form.json b/packages/elements-react/.stub-responses/registration/two-step/password/initial-form.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/registration/two-step/password/initial-form.json rename to packages/elements-react/.stub-responses/registration/two-step/password/initial-form.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/registration/two-step/password/missing-fields.json b/packages/elements-react/.stub-responses/registration/two-step/password/missing-fields.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/registration/two-step/password/missing-fields.json rename to packages/elements-react/.stub-responses/registration/two-step/password/missing-fields.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/registration/two-step/password/password-validation-error.json b/packages/elements-react/.stub-responses/registration/two-step/password/password-validation-error.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/registration/two-step/password/password-validation-error.json rename to packages/elements-react/.stub-responses/registration/two-step/password/password-validation-error.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/settings/all-methods/change-password.json b/packages/elements-react/.stub-responses/settings/all-methods/change-password.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/settings/all-methods/change-password.json rename to packages/elements-react/.stub-responses/settings/all-methods/change-password.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/settings/all-methods/change-trait.json b/packages/elements-react/.stub-responses/settings/all-methods/change-trait.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/settings/all-methods/change-trait.json rename to packages/elements-react/.stub-responses/settings/all-methods/change-trait.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/settings/all-methods/initial-form.json b/packages/elements-react/.stub-responses/settings/all-methods/initial-form.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/settings/all-methods/initial-form.json rename to packages/elements-react/.stub-responses/settings/all-methods/initial-form.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/settings/oidc/with-provider.json b/packages/elements-react/.stub-responses/settings/oidc/with-provider.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/settings/oidc/with-provider.json rename to packages/elements-react/.stub-responses/settings/oidc/with-provider.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/settings/passkey/initial-form.json b/packages/elements-react/.stub-responses/settings/passkey/initial-form.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/settings/passkey/initial-form.json rename to packages/elements-react/.stub-responses/settings/passkey/initial-form.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/settings/webauthn/initial-form.json b/packages/elements-react/.stub-responses/settings/webauthn/initial-form.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/settings/webauthn/initial-form.json rename to packages/elements-react/.stub-responses/settings/webauthn/initial-form.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/verification/disabled/initial-form.json b/packages/elements-react/.stub-responses/verification/disabled/initial-form.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/verification/disabled/initial-form.json rename to packages/elements-react/.stub-responses/verification/disabled/initial-form.json diff --git a/packages/elements-react-stories/src/elements-react/.stub-responses/verification/none/initial-form.json b/packages/elements-react/.stub-responses/verification/none/initial-form.json similarity index 100% rename from packages/elements-react-stories/src/elements-react/.stub-responses/verification/none/initial-form.json rename to packages/elements-react/.stub-responses/verification/none/initial-form.json diff --git a/packages/elements-react/src/components/card/card.tsx b/packages/elements-react/src/components/card/card.tsx index b0a74dde1..c9fe5bdbb 100644 --- a/packages/elements-react/src/components/card/card.tsx +++ b/packages/elements-react/src/components/card/card.tsx @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 import { PropsWithChildren } from "react" -import { OryCardFooter } from "." +import { OryCardFooter } from "./footer" import { useComponents } from "../../context" import { OryCardContent } from "./content" import { OryCardHeader } from "./header" diff --git a/packages/elements-react/src/context/intl-context.tsx b/packages/elements-react/src/context/intl-context.tsx index 1e5174c51..6a061bda3 100644 --- a/packages/elements-react/src/context/intl-context.tsx +++ b/packages/elements-react/src/context/intl-context.tsx @@ -3,7 +3,8 @@ import { PropsWithChildren } from "react" import { IntlProvider as OriginalIntlProvider } from "react-intl" -import { LocaleMap, locales } from "../locales" +import { OryLocales } from ".." +import { LocaleMap } from "../locales" // ISO 639-1 language codes // https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes @@ -146,7 +147,7 @@ export const LanguageCodes = [ "zu", ] as const -export type Locale = keyof typeof locales +export type Locale = keyof typeof OryLocales export type IntlContextProps = { locale: Locale @@ -155,9 +156,9 @@ export type IntlContextProps = { function mergeTranslations(customTranslations: Partial) { return Object.keys(customTranslations).reduce((acc, key) => { - acc[key] = { ...locales[key], ...customTranslations[key] } + acc[key] = { ...OryLocales[key], ...customTranslations[key] } return acc - }, locales) + }, OryLocales) } export const IntlProvider = ({ diff --git a/packages/elements-react/src/index.ts b/packages/elements-react/src/index.ts index 81c2da38c..f3a8e21fa 100644 --- a/packages/elements-react/src/index.ts +++ b/packages/elements-react/src/index.ts @@ -5,4 +5,4 @@ export type * from "./types" export * from "./components" export * from "./context" export * from "./util" -export { locales as OryLocales } from "./locales" +export { OryLocales } from "./locales" diff --git a/packages/elements-react/src/locales/index.ts b/packages/elements-react/src/locales/index.ts index bd7203a94..98bba707a 100644 --- a/packages/elements-react/src/locales/index.ts +++ b/packages/elements-react/src/locales/index.ts @@ -19,7 +19,7 @@ import { default as sv } from "./sv.json" // A potential workaround is to have some code generation tool, that runs after the message extraction and produces a dts file containing all known keys. export type LocaleMap = Record> -export const locales: LocaleMap = { +export const OryLocales: LocaleMap = { en, de, es, diff --git a/packages/elements-react/src/util/ui/__test__/ui.spec.ts b/packages/elements-react/src/util/ui/__test__/ui.spec.ts index c7839da46..9f611bc8e 100644 --- a/packages/elements-react/src/util/ui/__test__/ui.spec.ts +++ b/packages/elements-react/src/util/ui/__test__/ui.spec.ts @@ -1,7 +1,7 @@ // Copyright © 2024 Ory Corp // SPDX-License-Identifier: Apache-2.0 -import allMethodsInitialForm from "../../../../../elements-react-stories/src/elements-react/.stub-responses/login/1fa/all-methods/initial-form.json" +import allMethodsInitialForm from "$stories/.stub-responses/login/1fa/all-methods/initial-form.json" import { useNodesGroups } from ".." import { UiNode } from "@ory/client-fetch" diff --git a/packages/elements-react-stories/src/elements-react/components/login/1fa/all.stories.ts b/packages/elements-react/stories/components/login/1fa/all.stories.ts similarity index 73% rename from packages/elements-react-stories/src/elements-react/components/login/1fa/all.stories.ts rename to packages/elements-react/stories/components/login/1fa/all.stories.ts index 3197882dc..bc11233ca 100644 --- a/packages/elements-react-stories/src/elements-react/components/login/1fa/all.stories.ts +++ b/packages/elements-react/stories/components/login/1fa/all.stories.ts @@ -3,8 +3,8 @@ import { LoginFlowFromJSON } from "@ory/client-fetch" import type { Meta, StoryObj } from "@storybook/react" -import { Login } from "@ory/elements-react/theme" import { config } from "../../../utils" +import { Login } from "../../../../src/theme/default" const meta = { title: "Ory Elements/First Factor Login/Methods/Everything", @@ -21,7 +21,7 @@ type Story = StoryObj export const ShowForm: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/login/1fa/all-methods/initial-form.json"), + require("$snapshots/login/1fa/all-methods/initial-form.json"), ), config, }, @@ -30,7 +30,7 @@ export const ShowForm: Story = { export const ValidationMissingFields: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/login/1fa/all-methods/missing-email.json"), + require("$snapshots/login/1fa/all-methods/missing-email.json"), ), config, }, @@ -39,7 +39,7 @@ export const ValidationMissingFields: Story = { export const ValidationIncorrectCredentials: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/login/1fa/all-methods/wrong-credentials.json"), + require("$snapshots/login/1fa/all-methods/wrong-credentials.json"), ), config, }, diff --git a/packages/elements-react-stories/src/elements-react/components/login/1fa/code.stories.ts b/packages/elements-react/stories/components/login/1fa/code.stories.ts similarity index 71% rename from packages/elements-react-stories/src/elements-react/components/login/1fa/code.stories.ts rename to packages/elements-react/stories/components/login/1fa/code.stories.ts index 93b9bd77b..4ff4bf5f4 100644 --- a/packages/elements-react-stories/src/elements-react/components/login/1fa/code.stories.ts +++ b/packages/elements-react/stories/components/login/1fa/code.stories.ts @@ -1,10 +1,10 @@ // Copyright © 2024 Ory Corp // SPDX-License-Identifier: Apache-2.0 -import { Login } from "@ory/elements-react/theme" -import { config } from "../../../utils" import { LoginFlowFromJSON } from "@ory/client-fetch" import type { Meta, StoryObj } from "@storybook/react" +import { config } from "../../../utils" +import { Login } from "../../../../src/theme/default" const meta = { title: "Ory Elements/First Factor Login/Methods/Code", @@ -21,7 +21,7 @@ type Story = StoryObj export const ShowForm: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/login/1fa/code/initial-form.json"), + require("$snapshots/login/1fa/code/initial-form.json"), ), config, }, @@ -30,7 +30,7 @@ export const ShowForm: Story = { export const ValidationMissingFields: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/login/1fa/code/missing-email.json"), + require("$snapshots/login/1fa/code/missing-email.json"), ), config, }, @@ -39,7 +39,7 @@ export const ValidationMissingFields: Story = { export const ValidationInvalidAccount: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/login/1fa/code/invalid-account.json"), + require("$snapshots/login/1fa/code/invalid-account.json"), ), config, }, @@ -48,7 +48,7 @@ export const ValidationInvalidAccount: Story = { export const CodeInput: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/login/1fa/code/code-input.json"), + require("$snapshots/login/1fa/code/code-input.json"), ), config, }, @@ -57,7 +57,7 @@ export const CodeInput: Story = { export const ValidationIncorrectCode: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/login/1fa/code/wrong-credentials.json"), + require("$snapshots/login/1fa/code/wrong-credentials.json"), ), config, }, diff --git a/packages/elements-react-stories/src/elements-react/components/login/1fa/custom.stories.tsx b/packages/elements-react/stories/components/login/1fa/custom.stories.tsx similarity index 76% rename from packages/elements-react-stories/src/elements-react/components/login/1fa/custom.stories.tsx rename to packages/elements-react/stories/components/login/1fa/custom.stories.tsx index 98d171b67..ceb667adb 100644 --- a/packages/elements-react-stories/src/elements-react/components/login/1fa/custom.stories.tsx +++ b/packages/elements-react/stories/components/login/1fa/custom.stories.tsx @@ -10,17 +10,13 @@ import { OryFormOidcButtons, OryNodeOidcButtonProps, } from "@ory/elements-react" -import { Login, LoginFlowContextProps } from "@ory/elements-react/theme" import { config } from "../../../utils" import type { Meta, StoryObj } from "@storybook/react" +import { Login, LoginFlowContextProps } from "../../../../src/theme/default" const CustomSocialButton = ({ node }: OryNodeOidcButtonProps) => ( -
+
Custom {node.meta.label?.text}
) @@ -69,7 +65,7 @@ type Story = StoryObj export const CustomSocialSignInButton: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/login/1fa/all-methods/initial-form.json"), + require("$snapshots/login/1fa/all-methods/initial-form.json"), ), config, }, diff --git a/packages/elements-react-stories/src/elements-react/components/login/1fa/none.stories.tsx b/packages/elements-react/stories/components/login/1fa/none.stories.tsx similarity index 82% rename from packages/elements-react-stories/src/elements-react/components/login/1fa/none.stories.tsx rename to packages/elements-react/stories/components/login/1fa/none.stories.tsx index 284b8921c..5b2347e4e 100644 --- a/packages/elements-react-stories/src/elements-react/components/login/1fa/none.stories.tsx +++ b/packages/elements-react/stories/components/login/1fa/none.stories.tsx @@ -3,8 +3,8 @@ import { config } from "../../../utils" import { LoginFlowFromJSON } from "@ory/client-fetch" -import { Login } from "@ory/elements-react/theme" import type { Meta, StoryObj } from "@storybook/react" +import { Login } from "../../../../src/theme/default" const meta = { title: "Ory Elements/First Factor Login/Methods/None", @@ -21,7 +21,7 @@ type Story = StoryObj export const NoMethodsAvailable: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/login/1fa/none/initial-form.json"), + require("$snapshots/login/1fa/none/initial-form.json"), ), config, }, diff --git a/packages/elements-react-stories/src/elements-react/components/login/1fa/oidc.stories.tsx b/packages/elements-react/stories/components/login/1fa/oidc.stories.tsx similarity index 94% rename from packages/elements-react-stories/src/elements-react/components/login/1fa/oidc.stories.tsx rename to packages/elements-react/stories/components/login/1fa/oidc.stories.tsx index 7e87d6250..43ef3c3d7 100644 --- a/packages/elements-react-stories/src/elements-react/components/login/1fa/oidc.stories.tsx +++ b/packages/elements-react/stories/components/login/1fa/oidc.stories.tsx @@ -2,12 +2,13 @@ // SPDX-License-Identifier: Apache-2.0 import { LoginFlow, LoginFlowFromJSON } from "@ory/client-fetch" -import { Login } from "@ory/elements-react/theme" import type { Meta, StoryObj } from "@storybook/react" import { config } from "../../../utils" +import { Login } from "../../../../src/theme/default" -const oidcNodes = - require("$/.stub-responses/login/1fa/oidc/initial-form.json") as LoginFlow +const oidcNodes = LoginFlowFromJSON( + require("$snapshots/login/1fa/oidc/initial-form.json"), +) const providers = [ "apple", diff --git a/packages/elements-react-stories/src/elements-react/components/login/1fa/passkey.stories.ts b/packages/elements-react/stories/components/login/1fa/passkey.stories.ts similarity index 81% rename from packages/elements-react-stories/src/elements-react/components/login/1fa/passkey.stories.ts rename to packages/elements-react/stories/components/login/1fa/passkey.stories.ts index b5c85958c..9a20dad30 100644 --- a/packages/elements-react-stories/src/elements-react/components/login/1fa/passkey.stories.ts +++ b/packages/elements-react/stories/components/login/1fa/passkey.stories.ts @@ -1,10 +1,10 @@ // Copyright © 2024 Ory Corp // SPDX-License-Identifier: Apache-2.0 -import { Login } from "@ory/elements-react/theme" import { config } from "../../../utils" import { LoginFlowFromJSON } from "@ory/client-fetch" import type { Meta, StoryObj } from "@storybook/react" +import { Login } from "../../../../src/theme/default" const meta = { title: "Ory Elements/First Factor Login/Methods/Passkey", @@ -21,7 +21,7 @@ type Story = StoryObj export const ShowForm: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/login/1fa/passkey/initial-form.json"), + require("$snapshots/login/1fa/passkey/initial-form.json"), ), config, }, diff --git a/packages/elements-react-stories/src/elements-react/components/login/1fa/password.stories.ts b/packages/elements-react/stories/components/login/1fa/password.stories.ts similarity index 74% rename from packages/elements-react-stories/src/elements-react/components/login/1fa/password.stories.ts rename to packages/elements-react/stories/components/login/1fa/password.stories.ts index 8ce8957fc..1db22bbdc 100644 --- a/packages/elements-react-stories/src/elements-react/components/login/1fa/password.stories.ts +++ b/packages/elements-react/stories/components/login/1fa/password.stories.ts @@ -1,10 +1,10 @@ // Copyright © 2024 Ory Corp // SPDX-License-Identifier: Apache-2.0 -import { Login } from "@ory/elements-react/theme" import { config } from "../../../utils" import { LoginFlowFromJSON } from "@ory/client-fetch" import type { Meta, StoryObj } from "@storybook/react" +import { Login } from "../../../../src/theme/default" const meta = { title: "Ory Elements/First Factor Login/Methods/Password", @@ -21,7 +21,7 @@ type Story = StoryObj export const ShowForm: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/login/1fa/password/initial-form.json"), + require("$snapshots/login/1fa/password/initial-form.json"), ), config, }, @@ -30,7 +30,7 @@ export const ShowForm: Story = { export const ValidationMissingFields: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/login/1fa/password/missing-email.json"), + require("$snapshots/login/1fa/password/missing-email.json"), ), config, }, @@ -39,7 +39,7 @@ export const ValidationMissingFields: Story = { export const ValidationIncorrectCredentials: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/login/1fa/password/wrong-credentials.json"), + require("$snapshots/login/1fa/password/wrong-credentials.json"), ), config, }, diff --git a/packages/elements-react-stories/src/elements-react/components/login/1fa/webauthn.stories.ts b/packages/elements-react/stories/components/login/1fa/webauthn.stories.ts similarity index 73% rename from packages/elements-react-stories/src/elements-react/components/login/1fa/webauthn.stories.ts rename to packages/elements-react/stories/components/login/1fa/webauthn.stories.ts index ad37aed8d..696a76bde 100644 --- a/packages/elements-react-stories/src/elements-react/components/login/1fa/webauthn.stories.ts +++ b/packages/elements-react/stories/components/login/1fa/webauthn.stories.ts @@ -1,10 +1,10 @@ // Copyright © 2024 Ory Corp // SPDX-License-Identifier: Apache-2.0 -import { Login } from "@ory/elements-react/theme" import { config } from "../../../utils" import { LoginFlowFromJSON } from "@ory/client-fetch" import type { Meta, StoryObj } from "@storybook/react" +import { Login } from "../../../../src/theme/default" const meta = { title: "Ory Elements/First Factor Login/Methods/WebAuthn", @@ -21,7 +21,7 @@ type Story = StoryObj export const ShowForm: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/login/1fa/webauthn/initial-form.json"), + require("$snapshots/login/1fa/webauthn/initial-form.json"), ), config, }, @@ -30,7 +30,7 @@ export const ShowForm: Story = { export const InvalidAccount: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/login/1fa/webauthn/invalid-account.json"), + require("$snapshots/login/1fa/webauthn/invalid-account.json"), ), config, }, @@ -39,7 +39,7 @@ export const InvalidAccount: Story = { export const ShowTrigger: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/login/1fa/webauthn/show-trigger.json"), + require("$snapshots/login/1fa/webauthn/show-trigger.json"), ), config, }, diff --git a/packages/elements-react-stories/src/elements-react/components/registration/one-step/all-methods.stories.ts b/packages/elements-react/stories/components/registration/one-step/all-methods.stories.ts similarity index 75% rename from packages/elements-react-stories/src/elements-react/components/registration/one-step/all-methods.stories.ts rename to packages/elements-react/stories/components/registration/one-step/all-methods.stories.ts index 5edb629d6..f58a6b15a 100644 --- a/packages/elements-react-stories/src/elements-react/components/registration/one-step/all-methods.stories.ts +++ b/packages/elements-react/stories/components/registration/one-step/all-methods.stories.ts @@ -1,10 +1,10 @@ // Copyright © 2024 Ory Corp // SPDX-License-Identifier: Apache-2.0 -import { Registration } from "@ory/elements-react/theme" import { config } from "../../../utils" import { LoginFlowFromJSON, RegistrationFlowFromJSON } from "@ory/client-fetch" import type { Meta, StoryObj } from "@storybook/react" +import { Registration } from "../../../../src/theme/default" const meta = { title: "Ory Elements/One Step Registration/Methods/Everything", @@ -21,7 +21,7 @@ type Story = StoryObj export const ShowForm: Story = { args: { flow: RegistrationFlowFromJSON( - require("$/.stub-responses/registration/one-step/all-methods/initial-form.json"), + require("$snapshots/registration/one-step/all-methods/initial-form.json"), ), config, }, @@ -30,7 +30,7 @@ export const ShowForm: Story = { export const ValidationError: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/registration/one-step/all-methods/missing-fields.json"), + require("$snapshots/registration/one-step/all-methods/missing-fields.json"), ), config, }, diff --git a/packages/elements-react-stories/src/elements-react/components/registration/one-step/password.stories.ts b/packages/elements-react/stories/components/registration/one-step/password.stories.ts similarity index 75% rename from packages/elements-react-stories/src/elements-react/components/registration/one-step/password.stories.ts rename to packages/elements-react/stories/components/registration/one-step/password.stories.ts index 1521783b9..90969330b 100644 --- a/packages/elements-react-stories/src/elements-react/components/registration/one-step/password.stories.ts +++ b/packages/elements-react/stories/components/registration/one-step/password.stories.ts @@ -1,10 +1,10 @@ // Copyright © 2024 Ory Corp // SPDX-License-Identifier: Apache-2.0 -import { Registration } from "@ory/elements-react/theme" import { config } from "../../../utils" import { LoginFlowFromJSON, RegistrationFlowFromJSON } from "@ory/client-fetch" import type { Meta, StoryObj } from "@storybook/react" +import { Registration } from "../../../../src/theme/default" const meta = { title: "Ory Elements/One Step Registration/Methods/Password", @@ -21,7 +21,7 @@ type Story = StoryObj export const ShowForm: Story = { args: { flow: RegistrationFlowFromJSON( - require("$/.stub-responses/registration/one-step/password/initial-form.json"), + require("$snapshots/registration/one-step/password/initial-form.json"), ), config, }, @@ -30,7 +30,7 @@ export const ShowForm: Story = { export const ValidationError: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/registration/one-step/password/missing-fields.json"), + require("$snapshots/registration/one-step/password/missing-fields.json"), ), config, }, diff --git a/packages/elements-react-stories/src/elements-react/components/registration/one-step/webauthn.stories.ts b/packages/elements-react/stories/components/registration/one-step/webauthn.stories.ts similarity index 80% rename from packages/elements-react-stories/src/elements-react/components/registration/one-step/webauthn.stories.ts rename to packages/elements-react/stories/components/registration/one-step/webauthn.stories.ts index 82416bf45..e7ce7e4a4 100644 --- a/packages/elements-react-stories/src/elements-react/components/registration/one-step/webauthn.stories.ts +++ b/packages/elements-react/stories/components/registration/one-step/webauthn.stories.ts @@ -1,10 +1,10 @@ // Copyright © 2024 Ory Corp // SPDX-License-Identifier: Apache-2.0 -import { Registration } from "@ory/elements-react/theme" import { config } from "../../../utils" import { RegistrationFlowFromJSON } from "@ory/client-fetch" import type { Meta, StoryObj } from "@storybook/react" +import { Registration } from "../../../../src/theme/default" const meta = { title: "Ory Elements/One Step Registration/Methods/WebAuthn", @@ -21,7 +21,7 @@ type Story = StoryObj export const ShowForm: Story = { args: { flow: RegistrationFlowFromJSON( - require("$/.stub-responses/registration/one-step/webauthn/initial-form.json"), + require("$snapshots/registration/one-step/webauthn/initial-form.json"), ), config, }, diff --git a/packages/elements-react-stories/src/elements-react/components/registration/two-step/all-methods.stories.ts b/packages/elements-react/stories/components/registration/two-step/all-methods.stories.ts similarity index 68% rename from packages/elements-react-stories/src/elements-react/components/registration/two-step/all-methods.stories.ts rename to packages/elements-react/stories/components/registration/two-step/all-methods.stories.ts index d7cba7350..628675cd8 100644 --- a/packages/elements-react-stories/src/elements-react/components/registration/two-step/all-methods.stories.ts +++ b/packages/elements-react/stories/components/registration/two-step/all-methods.stories.ts @@ -1,10 +1,10 @@ // Copyright © 2024 Ory Corp // SPDX-License-Identifier: Apache-2.0 -import { Registration } from "@ory/elements-react/theme" import { config } from "../../../utils" import { LoginFlowFromJSON, RegistrationFlowFromJSON } from "@ory/client-fetch" import type { Meta, StoryObj } from "@storybook/react" +import { Registration } from "../../../../src/theme/default" const meta = { title: "Ory Elements/Two Step Registration/Methods/Everything", @@ -21,7 +21,7 @@ type Story = StoryObj export const ShowForm: Story = { args: { flow: RegistrationFlowFromJSON( - require("$/.stub-responses/registration/two-step/all-methods/initial-form.json"), + require("$snapshots/registration/two-step/all-methods/initial-form.json"), ), config, }, @@ -30,7 +30,7 @@ export const ShowForm: Story = { export const FirstStepValidationError: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/registration/two-step/all-methods/missing-fields.json"), + require("$snapshots/registration/two-step/all-methods/missing-fields.json"), ), config, }, @@ -39,7 +39,7 @@ export const FirstStepValidationError: Story = { export const EnterPassword: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/registration/two-step/all-methods/enter-password.json"), + require("$snapshots/registration/two-step/all-methods/enter-password.json"), ), config, }, @@ -48,7 +48,7 @@ export const EnterPassword: Story = { export const SecondStepValidationError: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/registration/two-step/all-methods/password-validation-error.json"), + require("$snapshots/registration/two-step/all-methods/password-validation-error.json"), ), config, }, diff --git a/packages/elements-react-stories/src/elements-react/components/registration/two-step/password.stories.ts b/packages/elements-react/stories/components/registration/two-step/password.stories.ts similarity index 69% rename from packages/elements-react-stories/src/elements-react/components/registration/two-step/password.stories.ts rename to packages/elements-react/stories/components/registration/two-step/password.stories.ts index ce50fac68..f6500f6f1 100644 --- a/packages/elements-react-stories/src/elements-react/components/registration/two-step/password.stories.ts +++ b/packages/elements-react/stories/components/registration/two-step/password.stories.ts @@ -1,10 +1,10 @@ // Copyright © 2024 Ory Corp // SPDX-License-Identifier: Apache-2.0 -import { Registration } from "@ory/elements-react/theme" import { config } from "../../../utils" import { LoginFlowFromJSON, RegistrationFlowFromJSON } from "@ory/client-fetch" import type { Meta, StoryObj } from "@storybook/react" +import { Registration } from "../../../../src/theme/default" const meta = { title: "Ory Elements/Two Step Registration/Methods/Password", @@ -21,7 +21,7 @@ type Story = StoryObj export const ShowForm: Story = { args: { flow: RegistrationFlowFromJSON( - require("$/.stub-responses/registration/two-step/password/initial-form.json"), + require("$snapshots/registration/two-step/password/initial-form.json"), ), config, }, @@ -30,7 +30,7 @@ export const ShowForm: Story = { export const FirstStepValidationError: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/registration/two-step/password/missing-fields.json"), + require("$snapshots/registration/two-step/password/missing-fields.json"), ), config, }, @@ -39,7 +39,7 @@ export const FirstStepValidationError: Story = { export const EnterPassword: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/registration/two-step/password/enter-password.json"), + require("$snapshots/registration/two-step/password/enter-password.json"), ), config, }, @@ -48,7 +48,7 @@ export const EnterPassword: Story = { export const SecondStepValidationError: Story = { args: { flow: LoginFlowFromJSON( - require("$/.stub-responses/registration/two-step/password/password-validation-error.json"), + require("$snapshots/registration/two-step/password/password-validation-error.json"), ), config, }, diff --git a/packages/elements-react-stories/src/elements-react/components/settings/all.stories.ts b/packages/elements-react/stories/components/settings/all.stories.ts similarity index 73% rename from packages/elements-react-stories/src/elements-react/components/settings/all.stories.ts rename to packages/elements-react/stories/components/settings/all.stories.ts index 95ffd4ee2..81c7d7ec3 100644 --- a/packages/elements-react-stories/src/elements-react/components/settings/all.stories.ts +++ b/packages/elements-react/stories/components/settings/all.stories.ts @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 import { SettingsFlowFromJSON } from "@ory/client-fetch" -import { Settings } from "@ory/elements-react/theme" import { Meta, StoryObj } from "@storybook/react" import { config } from "../../utils" +import { Settings } from "../../../src/theme/default" const meta = { title: "Ory Elements/Settings/Methods/Everything", @@ -21,7 +21,7 @@ type Story = StoryObj export const ShowForm: Story = { args: { flow: SettingsFlowFromJSON( - require("$/.stub-responses/settings/all-methods/initial-form.json"), + require("$snapshots/settings/all-methods/initial-form.json"), ), config, }, @@ -30,7 +30,7 @@ export const ShowForm: Story = { export const ShowFormChangesSaved: Story = { args: { flow: SettingsFlowFromJSON( - require("$/.stub-responses/settings/all-methods/change-password.json"), + require("$snapshots/settings/all-methods/change-password.json"), ), config, }, @@ -39,7 +39,7 @@ export const ShowFormChangesSaved: Story = { export const ShowFormTraitValidationError: Story = { args: { flow: SettingsFlowFromJSON( - require("$/.stub-responses/settings/all-methods/change-trait.json"), + require("$snapshots/settings/all-methods/change-trait.json"), ), config, }, diff --git a/packages/elements-react-stories/src/elements-react/components/settings/oidc.stories.ts b/packages/elements-react/stories/components/settings/oidc.stories.ts similarity index 81% rename from packages/elements-react-stories/src/elements-react/components/settings/oidc.stories.ts rename to packages/elements-react/stories/components/settings/oidc.stories.ts index bc03d35a1..760f8c7a7 100644 --- a/packages/elements-react-stories/src/elements-react/components/settings/oidc.stories.ts +++ b/packages/elements-react/stories/components/settings/oidc.stories.ts @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 import { SettingsFlowFromJSON } from "@ory/client-fetch" -import { Settings } from "@ory/elements-react/theme" import { Meta, StoryObj } from "@storybook/react" import { config } from "../../utils" +import { Settings } from "../../../src/theme/default" const meta = { title: "Ory Elements/Settings/Methods/OIDC", @@ -21,7 +21,7 @@ type Story = StoryObj export const WithUnlinkProvider: Story = { args: { flow: SettingsFlowFromJSON( - require("$/.stub-responses/settings/oidc/with-provider.json"), + require("$snapshots/settings/oidc/with-provider.json"), ), config, }, diff --git a/packages/elements-react-stories/src/elements-react/components/settings/passkey.stories.ts b/packages/elements-react/stories/components/settings/passkey.stories.ts similarity index 81% rename from packages/elements-react-stories/src/elements-react/components/settings/passkey.stories.ts rename to packages/elements-react/stories/components/settings/passkey.stories.ts index d128c3a13..26cc838a7 100644 --- a/packages/elements-react-stories/src/elements-react/components/settings/passkey.stories.ts +++ b/packages/elements-react/stories/components/settings/passkey.stories.ts @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 import { SettingsFlowFromJSON } from "@ory/client-fetch" -import { Settings } from "@ory/elements-react/theme" import { Meta, StoryObj } from "@storybook/react" import { config } from "../../utils" +import { Settings } from "../../../src/theme/default" const meta = { title: "Ory Elements/Settings/Methods/Passkey", @@ -21,7 +21,7 @@ type Story = StoryObj export const ShowForm: Story = { args: { flow: SettingsFlowFromJSON( - require("$/.stub-responses/settings/passkey/initial-form.json"), + require("$snapshots/settings/passkey/initial-form.json"), ), config, }, diff --git a/packages/elements-react-stories/src/elements-react/components/settings/webauthn.stories.ts b/packages/elements-react/stories/components/settings/webauthn.stories.ts similarity index 81% rename from packages/elements-react-stories/src/elements-react/components/settings/webauthn.stories.ts rename to packages/elements-react/stories/components/settings/webauthn.stories.ts index 7b7d57812..7d1e810c3 100644 --- a/packages/elements-react-stories/src/elements-react/components/settings/webauthn.stories.ts +++ b/packages/elements-react/stories/components/settings/webauthn.stories.ts @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 import { SettingsFlowFromJSON } from "@ory/client-fetch" -import { Settings } from "@ory/elements-react/theme" import { Meta, StoryObj } from "@storybook/react" import { config } from "../../utils" +import { Settings } from "../../../src/theme/default" const meta = { title: "Ory Elements/Settings/Methods/Webauthn", @@ -21,7 +21,7 @@ type Story = StoryObj export const ShowForm: Story = { args: { flow: SettingsFlowFromJSON( - require("$/.stub-responses/settings/webauthn/initial-form.json"), + require("$snapshots/settings/webauthn/initial-form.json"), ), config, }, diff --git a/packages/elements-react-stories/src/elements-react/pages/error.tsx b/packages/elements-react/stories/pages/error.tsx similarity index 100% rename from packages/elements-react-stories/src/elements-react/pages/error.tsx rename to packages/elements-react/stories/pages/error.tsx diff --git a/packages/elements-react-stories/src/elements-react/utils/index.ts b/packages/elements-react/stories/utils.ts similarity index 100% rename from packages/elements-react-stories/src/elements-react/utils/index.ts rename to packages/elements-react/stories/utils.ts diff --git a/packages/elements-react/tsconfig.json b/packages/elements-react/tsconfig.json index 4dc7ba054..893b16acf 100644 --- a/packages/elements-react/tsconfig.json +++ b/packages/elements-react/tsconfig.json @@ -19,7 +19,8 @@ "lib": ["ES6", "DOM", "WebWorker"], "rootDir": ".", "paths": { - "@ory/elements-react": ["./src/index.ts"] + "@ory/elements-react": ["./src/index.ts"], + "$snapshots/*": ["./.stub-responses/*"] } }, "exclude": ["node_modules", "dist"], @@ -27,8 +28,6 @@ "**/*.ts", "**/*.tsx", "src/global.d.ts", - "src/tests/**/*.ts", - "src/tests/**/*.tsx", "tsup.config.ts", "jest.config.ts", "tailwind.config.ts" diff --git a/packages/elements-react/tsconfig.runtime.json b/packages/elements-react/tsconfig.runtime.json new file mode 100644 index 000000000..5efd1f23d --- /dev/null +++ b/packages/elements-react/tsconfig.runtime.json @@ -0,0 +1,4 @@ +{ + "extends": "./tsconfig.json", + "exclude": ["node_modules", "dist", "**/*.spec.ts", "**/*.spec.tsx"] +} diff --git a/packages/elements-react/tsconfig.test.json b/packages/elements-react/tsconfig.test.json deleted file mode 100644 index 4958d30ba..000000000 --- a/packages/elements-react/tsconfig.test.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "include": [ - "**/*.spec.ts", - "**/*.spec.tsx", - "playwright/", - "playwright-ct.config.ts" - ] -}