mirror of
https://github.com/zitadel/zitadel.git
synced 2025-12-12 01:12:19 +00:00
Revert "use cypress-app-watcher-preprocessor"
This reverts commit ae4c975a31.
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
import { defineConfig } from "cypress";
|
||||
const watchApp = require("cypress-app-watcher-preprocessor");
|
||||
|
||||
export default defineConfig({
|
||||
reporter: "list",
|
||||
@@ -7,7 +6,7 @@ export default defineConfig({
|
||||
baseUrl: "http://localhost:3000",
|
||||
specPattern: "cypress/integration/**/*.cy.{js,jsx,ts,tsx}",
|
||||
setupNodeEvents(on, config) {
|
||||
on("file:preprocessor", watchApp());
|
||||
// implement node event listeners here
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
@@ -1,16 +1,9 @@
|
||||
{
|
||||
"extends": "../tsconfig.json",
|
||||
"compilerOptions": {
|
||||
"noEmit": true,
|
||||
// be explicit about types included
|
||||
// to avoid clashing with Jest types
|
||||
"types": [
|
||||
"cypress",
|
||||
"node"
|
||||
]
|
||||
"target": "es5",
|
||||
"lib": ["es5", "dom"],
|
||||
"types": ["cypress", "node"]
|
||||
},
|
||||
"include": [
|
||||
"../node_modules/cypress",
|
||||
"./**/*.ts"
|
||||
]
|
||||
}
|
||||
"include": ["**/*.ts"]
|
||||
}
|
||||
|
||||
@@ -8,10 +8,9 @@
|
||||
"test:unit": "jest --config ./__test__/jest.config.ts",
|
||||
"test:unit:watch": "pnpm test:unit --watch",
|
||||
"test:integration": "pnpm mock:build && concurrently --group --names 'mock,test' --success command-test --kill-others 'pnpm:mock' 'ZITADEL_API_URL=http://localhost:22222 start-server-and-test dev http://localhost:3000 \"test:integration:run\"'",
|
||||
"test:integration:watch": "ZITADEL_API_URL=http://localhost:22222 concurrently --names 'mock,serve,open' --kill-others 'pnpm:mock' 'pnpm test:integration:rerunwhencompiled' 'pnpm test:integration:open'",
|
||||
"test:integration:watch": "concurrently --names 'mock,test' --kill-others 'pnpm:mock' 'ZITADEL_API_URL=http://localhost:22222 start-server-and-test dev http://localhost:3000 \"pnpm nodemon -e js,jsx,ts,tsx,css,scss --ignore \\\"__test__/**\\\" --exec \\\"pnpm test:integration:run\\\"\"'",
|
||||
"test:integration:run": "cypress run --config-file ./cypress/cypress.config.ts --quiet",
|
||||
"test:integration:open": "cypress open --config-file ./cypress/cypress.config.ts",
|
||||
"test:integration:rerunwhencompiled": "WAIT_FOR_MESSAGE='compiled client and server successfully' cypressAppWatcher pnpm dev",
|
||||
"mock": "pnpm mock:build && pnpm mock:run",
|
||||
"mock:run": "pnpm mock:destroy && docker run --rm --name zitadel-mock-grpc-server --publish 22220:22220 --publish 22222:22222 zitadel-mock-grpc-server",
|
||||
"mock:build": "DOCKER_BUILDKIT=1 docker build --tag zitadel-mock-grpc-server ./mock",
|
||||
@@ -69,7 +68,6 @@
|
||||
"autoprefixer": "10.4.13",
|
||||
"concurrently": "^8.1.0",
|
||||
"cypress": "^12.14.0",
|
||||
"cypress-app-watcher-preprocessor": "^1.1.2",
|
||||
"del-cli": "5.0.0",
|
||||
"eslint-config-zitadel": "workspace:*",
|
||||
"grpc-tools": "1.11.3",
|
||||
@@ -89,4 +87,4 @@
|
||||
"typescript": "5.0.4",
|
||||
"zitadel-tailwind-config": "workspace:*"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -87,7 +87,7 @@ export default function VerifyEmailForm({ userId, code, submit }: Props) {
|
||||
|
||||
function submitCodeAndContinue(value: Inputs): Promise<boolean | void> {
|
||||
return submitCode(value).then((resp: any) => {
|
||||
return router.push(`/userxname`);
|
||||
return router.push(`/username`);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -99,7 +99,7 @@ export default function VerifyEmailForm({ userId, code, submit }: Props) {
|
||||
autoComplete="one-time-code"
|
||||
{...register("code", { required: "This field is required" })}
|
||||
label="Code"
|
||||
// error={errors.username?.message as string}
|
||||
// error={errors.username?.message as string}
|
||||
/>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -4,11 +4,7 @@
|
||||
"extends": "./base.json",
|
||||
"compilerOptions": {
|
||||
"target": "es5",
|
||||
"lib": [
|
||||
"dom",
|
||||
"dom.iterable",
|
||||
"esnext"
|
||||
],
|
||||
"lib": ["dom", "dom.iterable", "esnext"],
|
||||
"allowJs": true,
|
||||
"skipLibCheck": true,
|
||||
"strict": true,
|
||||
@@ -28,11 +24,6 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"include": [
|
||||
"src",
|
||||
"next-env.d.ts"
|
||||
],
|
||||
"exclude": [
|
||||
"node_modules"
|
||||
]
|
||||
}
|
||||
"include": ["src", "next-env.d.ts"],
|
||||
"exclude": ["node_modules"]
|
||||
}
|
||||
|
||||
2832
pnpm-lock.yaml
generated
2832
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user