fix(plugin): prevent type collision with projectRoot due to partial (#…

…766)
prescottprue · Dec 31, 2022 · 16754da · 16754da
1 parent bdd94a8
commit 16754da
Show file tree

Hide file tree

Showing 12 changed files with 1,364 additions and 1,493 deletions.
diff --git a/README.md b/README.md
@@ -41,10 +41,10 @@ If you are interested in what drove the need for this checkout [the why section]
    import { defineConfig } from 'cypress';
    import { plugin as cypressFirebasePlugin } from 'cypress-firebase';
 
-   const cypressConfig = defineConfig({
+   export default defineConfig({
      e2e: {
        baseUrl: 'http://localhost:3000',
-       // NOTE: Make supportFile exists if separate location is provided
+       // NOTE: Add "supportFile" setting if separate location is used
        setupNodeEvents(on, config) {
          // e2e testing node events setup code
          return cypressFirebasePlugin(on, config, admin);
@@ -53,8 +53,6 @@ If you are interested in what drove the need for this checkout [the why section]
        },
      },
    });
-
-   export default cypressConfig;
    ```
 
    or if you are not using TS, then within `cypress.config.js`:

diff --git a/examples/basic/package.json b/examples/basic/package.json
@@ -15,19 +15,19 @@
     "test:emulate": "cross-env FIREBASE_AUTH_EMULATOR_HOST=\"localhost:$(cat firebase.json | jq .emulators.auth.port)\" FIREBASE_DATABASE_EMULATOR_HOST=\"localhost:$(cat firebase.json | jq .emulators.database.port)\" FIRESTORE_EMULATOR_HOST=\"localhost:$(cat firebase.json | jq .emulators.firestore.port)\" yarn test:open"
   },
   "dependencies": {
-    "firebase": "^9.5.0",
+    "firebase": "^9.15.0",
     "lodash": "^4.17.21",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "devDependencies": {
     "cross-env": "7.0.3",
-    "cypress": "10.11.0",
-    "cypress-firebase": "2.2.5",
+    "cypress": "12.2.0",
+    "cypress-firebase": "3.0.0",
     "eslint-plugin-chai-friendly": "0.7.2",
     "eslint-plugin-cypress": "2.12.1",
-    "firebase-admin": "10.3.0",
-    "firebase-tools": "11.1.0",
+    "firebase-admin": "11.4.1",
+    "firebase-tools": "11.19.0",
     "react-scripts": "5.0.1"
   },
   "eslintConfig": {

diff --git a/examples/basic/yarn.lock b/examples/basic/yarn.lock
diff --git a/examples/typescript/cypress.config.ts b/examples/typescript/cypress.config.ts
@@ -1,11 +1,11 @@
 import { defineConfig } from 'cypress'
+import { plugin as cypressFirebasePlugin } from 'cypress-firebase'
+import admin from 'firebase-admin'
 
 export default defineConfig({
   e2e: {
-    // We've imported your old cypress plugins here.
-    // You may want to clean this up later by importing these.
     setupNodeEvents(on, config) {
-      return require('./cypress/plugins/index.ts')(on, config)
+      return cypressFirebasePlugin(on, config, admin)
     },
   },
 })
diff --git a/examples/typescript/cypress/plugins/index.ts b/examples/typescript/cypress/plugins/index.ts
diff --git a/examples/typescript/package.json b/examples/typescript/package.json
@@ -15,28 +15,28 @@
     "test:emulate": "cross-env FIREBASE_AUTH_EMULATOR_HOST=\"localhost:$(cat firebase.json | jq .emulators.auth.port)\" FIREBASE_DATABASE_EMULATOR_HOST=\"localhost:$(cat firebase.json | jq .emulators.database.port)\" FIRESTORE_EMULATOR_HOST=\"localhost:$(cat firebase.json | jq .emulators.firestore.port)\" yarn test:open"
   },
   "dependencies": {
-    "firebase": "^9.5.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-scripts": "5.0.1",
-    "typescript": "^4.1.2",
-    "web-vitals": "^2.0.0"
+    "firebase": "9.15.0",
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "5.15.1",
-    "@testing-library/react": "12.1.3",
-    "@testing-library/user-event": "13.5.0",
-    "@types/jest": "28.1.8",
+    "@testing-library/jest-dom": "5.16.5",
+    "@testing-library/react": "13.4.0",
+    "@testing-library/user-event": "14.4.3",
+    "@types/jest": "29.2.5",
     "@types/node": "16.18.11",
-    "@types/react": "17.0.52",
-    "@types/react-dom": "17.0.11",
+    "@types/react": "18.0.26",
+    "@types/react-dom": "18.0.10",
     "cross-env": "7.0.3",
     "cypress": "12.2.0",
-    "cypress-firebase": "2.2.5",
+    "cypress-firebase": "3.0.0",
     "eslint-plugin-chai-friendly": "0.7.2",
     "eslint-plugin-cypress": "2.12.1",
+    "react-scripts": "5.0.1",
     "firebase-admin": "11.4.1",
-    "firebase-tools": "11.19.0"
+    "firebase-tools": "11.19.0",
+    "typescript": "4.9.4",
+    "web-vitals": "2.0.0"
   },
   "eslintConfig": {
     "extends": [