chore: update cypress

.github/workflows/prerelease.yml

@@ -48,7 +48,7 @@ jobs:
       - name: Build all packages
         run: pnpm build
 
-      - run: echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} > .npmrc
+      - run: echo "" >> .npmrc && echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 

.github/workflows/test.yml

@@ -94,7 +94,7 @@ jobs:
 
       - id: set-dirs
         run: echo "::set-output name=dirs::$(ls | jq -R -s -c 'split("\n")[:-1]')"
-        working-directory: e2e/cypress/integration
+        working-directory: e2e/cypress/e2e
 
     outputs:
       dirs: ${{ steps.set-dirs.outputs.dirs }}

e2e/cypress.config.ts

@@ -0,0 +1,13 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+import { defineConfig } from 'cypress';
+
+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) {
+      // @ts-ignore
+      return require('./cypress/plugins/index.js')(on, config);
+    },
+  },
+});

e2e/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@tolgee/e2e",
   "version": "1.0.0-alpha.8",
+  "private": true,
   "description": "e2e tests for tolgee server & webapp",
   "scripts": {
     "start": "npm run services:start && npm run download-extension && npm run services:wait-for-start && npm run cy:run",
@@ -15,13 +16,13 @@
   "author": "Jan Cizmar",
   "license": "BSD",
   "devDependencies": {
-    "cypress": "^8.3.1",
+    "cypress": "^10.3.1",
     "cypress-browser-extension-plugin": "^0.1.0",
-    "cypress-dotenv": "^1.2.2",
-    "cypress-file-upload": "^4.1.1",
-    "cypress-xpath": "^1.6.1",
-    "dotenv": "^8.2.0",
+    "cypress-dotenv": "^2.0.0",
+    "cypress-file-upload": "^5.0.8",
+    "cypress-xpath": "^2.0.1",
+    "dotenv": "^16.0.1",
     "download-github-release": "^0.3.2",
-    "typescript": "^3.9.7"
+    "typescript": "^4.7.4"
   }
 }

e2e/scripts/startCypress.sh

@@ -4,7 +4,7 @@ set -x
 ARGS="--browser chrome --headed"
 
 if [ -n "$E2E_APP" ]; then
-  npx cypress run $ARGS --spec "cypress/integration/$E2E_APP/**"
+  npx cypress run $ARGS --spec "cypress/e2e/$E2E_APP/**"
 else
   npx cypress run $ARGS
 fi

e2e/tsconfig.json

@@ -2,7 +2,9 @@
   "compilerOptions": {
     "target": "es5",
     "lib": ["es5", "dom", "es2020"],
-    "types": ["cypress", "cypress-xpath/src"]
+    "types": ["cypress", "cypress-xpath/src"],
+    "checkJs": false,
+    "allowJs": true
   },
-  "include": ["**/*.ts"]
+  "include": ["**/*.ts", "cypress/plugins/index.js"]
 }

lerna.json

@@ -1,10 +1,6 @@
 {
-  "packages": [
-    "packages/*",
-    "testapps/*",
-    "packages/ngx/projects/ngx-tolgee"
-  ],
   "version": "4.7.2",
+  "useWorkspaces": true,
   "command": {
     "publish": {
       "conventionalCommits": true