chore: upgrade cypress to run on node 18

.github/workflows/ci-api.yml

@@ -25,14 +25,14 @@ jobs:
  runs-on: ubuntu-latest
 
  steps:
- - uses: actions/checkout@v2
- - name: Set up Node 14
- uses: actions/setup-node@v2
+ - uses: actions/checkout@v3
+ - name: Set up Node 18
+ uses: actions/setup-node@v3
  with:
- node-version: '14'
+ node-version: 18
 
  - name: Cache node modules
- uses: actions/cache@v2
+ uses: actions/cache@v3
  env:
  cache-name: cache-node-modules
  with:
@@ -75,22 +75,22 @@ jobs:
  needs:
  - build
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
 
  - name: Set up QEMU
- uses: docker/setup-qemu-action@v1
+ uses: docker/setup-qemu-action@v2
 
  - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v1
+ uses: docker/setup-buildx-action@v2
 
  - name: Dashboard to DockerHub
- uses: docker/login-action@v1
+ uses: docker/login-action@v2
  with:
  username: ${{ secrets.DOCKERHUB_USERNAME }}
  password: ${{ secrets.DOCKERHUB_TOKEN }}
 
  - name: Build and push
- uses: docker/build-push-action@v2
+ uses: docker/build-push-action@v3
  with:
  context: .
  file: Dockerfile.api
@@ -106,7 +106,7 @@ jobs:
  needs:
  - package
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - name: Add Server key
  run: |
  touch key.txt && echo "${{ secrets.SERVER_KEY }}" > key.txt

.github/workflows/ci-web.yml

@@ -25,14 +25,14 @@ jobs:
  runs-on: ubuntu-latest
 
  steps:
- - uses: actions/checkout@v2
- - name: Set up Node 14
- uses: actions/setup-node@v2
+ - uses: actions/checkout@v3
+ - name: Set up Node 18
+ uses: actions/setup-node@v3
  with:
- node-version: '14'
+ node-version: 18
 
  - name: Cache node modules
- uses: actions/cache@v2
+ uses: actions/cache@v3
  env:
  cache-name: cache-node-modules
  with:
@@ -67,7 +67,7 @@ jobs:
  needs:
  - build
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - name: Copy configuration file for production
  uses: prewk/s3-cp-action@v2
  with:
@@ -81,19 +81,19 @@ jobs:
  run: mv frontend.env .env.production.local
 
  - name: Set up QEMU
- uses: docker/setup-qemu-action@v1
+ uses: docker/setup-qemu-action@v2
 
  - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v1
+ uses: docker/setup-buildx-action@v2
 
  - name: Dashboard to DockerHub
- uses: docker/login-action@v1
+ uses: docker/login-action@v2
  with:
  username: ${{ secrets.DOCKERHUB_USERNAME }}
  password: ${{ secrets.DOCKERHUB_TOKEN }}
 
  - name: Build and push
- uses: docker/build-push-action@v2
+ uses: docker/build-push-action@v3
  with:
  context: ..
  file: Dockerfile.web

backend/app/__tests__/shared/utils/helpers.test.ts

@@ -45,7 +45,7 @@ describe('Test Helpers - extractQueryFields', () => {
  });
 });
 
-describe.only('Others helpers functions', () => {
+describe('Others helpers functions', () => {
  test('remove query string from the URL path', () => {
  expect(removeQueryStringIfExist('/languages?fields=id,name')).toMatchInlineSnapshot(`"/languages"`);
  expect(removeQueryStringIfExist('/years-groups')).toMatchInlineSnapshot(`"/years-groups"`);
@@ -60,7 +60,7 @@ describe.only('Others helpers functions', () => {
  expect(generateRoutePrefix('/')).toMatchObject(['/', '/private']);
  });
 
- test.only('Verify if the url is from scam', () => {
+ test('Verify if the url is from scam', () => {
  expect(isScamRoute('/languages?fields=id,name')).toEqual(false);
  expect(isScamRoute('/?XDEBUG_SESSION_START=phpstorm')).toEqual(true);
  expect(isScamRoute('/years-groups')).toEqual(false);

backend/app/shared/core/middleware/logRequestMiddleware.ts

@@ -6,7 +6,6 @@ import { getDurationInMilliseconds } from '../../utils/request';
 import { CLIENT_ORIGIN } from '../config';
 
 const isWhiteListedURL = (requestURL: string) => {
- console.log('youherelle => ', requestURL);
  const urls = ['/', '/health', '/spec/prolang.yaml'];
 
  return urls.includes(requestURL);

frontend/.gitignore

@@ -38,4 +38,5 @@ mockServiceWorker.js
 
 # sitemap
 /public/robots.txt
-/public/sitemap.xml
+/public/sitemap.xml
+/public/sitemap-0.xml

frontend/__tests__/cypress.config.ts

@@ -0,0 +1,11 @@
+import { defineConfig } from "cypress";
+
+export default defineConfig({
+ e2e: {
+ setupNodeEvents(on, config) {
+ // implement node event listeners here
+ },
+ "baseUrl": "https://localhost:5701",
+ "video": false
+ },
+});

frontend/__tests__/cypress/support/index.ts → frontend/__tests__/cypress/support/e2e.ts

@@ -17,4 +17,4 @@ declare global {
 }
 
 // Import commands.js using ES2015 syntax:
-import './commands';
+import './commands';

frontend/next-sitemap.js → frontend/next-sitemap.config.js

@@ -1,14 +1,20 @@
 const SITE_URL = process.env.NEXT_PUBLIC_APP_URL;
 
 module.exports = {
- siteUrl: SITE_URL,
+ exclude: ['/login', '/dashboard', '/profile', '/settings', '/authors*', '/users*', '/languages*'],
  generateRobotsTxt: true,
  robotsTxtOptions: {
+ additionalSitemaps: [`${SITE_URL}/sitemap.xml`],
  policies: [
- { userAgent: '*', disallow: '/login' },
- { userAgent: '*', allow: '/' },
+ {
+ disallow: '/login',
+ userAgent: '*'
+ },
+ {
+ allow: '/',
+ userAgent: '*'
+ },
  ],
- additionalSitemaps: [`${SITE_URL}/sitemap.xml`],
  },
- exclude: ['/login', '/dashboard', '/profile', '/settings', '/authors*', '/users*', '/languages*'],
+ siteUrl: SITE_URL,
 };

frontend/package.json

@@ -57,21 +57,20 @@
  "babel-jest": "^27.3.1",
  "color": "^3.1.3",
  "cross-env": "^7.0.3",
- "cypress": "9.1.0",
- "cypress-localstorage-commands": "^1.5.0",
+ "cypress": "12.2.0",
+ "cypress-localstorage-commands": "^2.2.2",
  "eslint": "7.30.0",
  "eslint-config-next": "11.0.1",
  "eslint-config-prettier": "^8.3.0",
  "eslint-plugin-jest-dom": "^3.9.2",
  "eslint-plugin-testing-library": "^5.0.0",
  "eslint-plugin-use-encapsulation": "^1.0.0",
- "eventsourcemock": "^2.0.0",
- "jest": "^27.3.1",
- "msw": "^0.35.0",
- "next-sitemap": "^1.6.203",
+ "jest": "^29.3.1",
+ "msw": "^0.49.2",
+ "next-sitemap": "^3.1.43",
  "postcss": "^8.3.5",
  "prettier": "^2.3.2",
- "start-server-and-test": "^1.14.0",
+ "start-server-and-test": "^1.15.2",
  "tailwindcss": "^2.2.19",
  "typescript": "4.5.5"
  },