chore: update dependencies (remix-run#100)

daniel-seoane · Jun 9, 2022 · bd45001 · bd45001
1 parent c4f0afc
commit bd45001
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 34 deletions.
diff --git a/cypress.config.ts b/cypress.config.ts
@@ -0,0 +1,27 @@
+import { defineConfig } from "cypress";
+
+export default defineConfig({
+  e2e: {
+    setupNodeEvents: (on, config) => {
+      const isDev = config.watchForFileChanges;
+      const port = process.env.PORT ?? (isDev ? "3000" : "8811");
+      const configOverrides: Partial<Cypress.PluginConfigOptions> = {
+        baseUrl: `http://localhost:${port}`,
+        video: !process.env.CI,
+        screenshotOnRunFailure: !process.env.CI,
+      };
+
+      // To use this:
+      // cy.task('log', whateverYouWantInTheTerminal)
+      on("task", {
+        log: (message) => {
+          console.log(message);
+
+          return null;
+        },
+      });
+
+      return { ...config, ...configOverrides };
+    },
+  },
+});
diff --git a/cypress.json b/cypress.json
diff --git a/cypress/e2e/smoke.ts → cypress/e2e/smoke.cy.ts b/cypress/e2e/smoke.ts → cypress/e2e/smoke.cy.ts
@@ -1,4 +1,4 @@
-import faker from "@faker-js/faker";
+import { faker } from "@faker-js/faker";
 
 describe("smoke tests", () => {
   afterEach(() => {

diff --git a/cypress/plugins/index.ts b/cypress/plugins/index.ts
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
@@ -1,4 +1,4 @@
-import faker from "@faker-js/faker";
+import { faker } from "@faker-js/faker";
 
 declare global {
   namespace Cypress {

diff --git a/cypress/support/index.ts → cypress/support/e2e.ts b/cypress/support/index.ts → cypress/support/e2e.ts
diff --git a/cypress/tsconfig.json b/cypress/tsconfig.json
@@ -4,9 +4,7 @@
     "../node_modules/@testing-library/jest-dom"
   ],
   "include": [
-    "./index.ts",
     "e2e/**/*",
-    "plugins/**/*",
     "support/**/*",
     "../node_modules/cypress",
     "../node_modules/@testing-library/cypress"
@@ -16,7 +14,7 @@
     "noEmit": true,
     "types": ["node", "cypress", "@testing-library/cypress"],
     "esModuleInterop": true,
-    "jsx": "react",
+    "jsx": "react-jsx",
     "moduleResolution": "node",
     "target": "es2019",
     "strict": true,

diff --git a/package.json b/package.json
@@ -58,10 +58,10 @@
     "binode": "^1.0.5",
     "c8": "^7.11.3",
     "cross-env": "^7.0.3",
-    "cypress": "^9.7.0",
+    "cypress": "^10.0.3",
     "eslint": "^8.17.0",
     "eslint-config-prettier": "^8.5.0",
-    "happy-dom": "^3.2.2",
+    "happy-dom": "^5.2.0",
     "msw": "^0.42.1",
     "npm-run-all": "^4.1.5",
     "postcss": "^8.4.14",

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["./cypress"],
+  "exclude": ["./cypress", "./cypress.config.ts"],
   "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
   "compilerOptions": {
     "lib": ["DOM", "DOM.Iterable", "ES2019"],