diff --git a/frontend/cypress.config.js b/frontend/cypress.config.js index 1bd369e..0bcf2f2 100644 --- a/frontend/cypress.config.js +++ b/frontend/cypress.config.js @@ -1,13 +1,17 @@ const { defineConfig } = require("cypress"); +const { loadEnv } = require("vite"); const {downloadFile} = require('cypress-downloadfile/lib/addPlugin'); +const env = loadEnv(process.env.NODE_ENV || "development", __dirname, ""); +const vitePort = Number(env.VITE_PORT) || 3069; + module.exports = defineConfig({ e2e: { setupNodeEvents(on, config) { // implement node event listeners here on('task', {downloadFile}); }, - baseUrl: 'http://localhost:3000', + baseUrl: `http://localhost:${vitePort}`, video: false }, -}); \ No newline at end of file +}); diff --git a/frontend/vite.config.js b/frontend/vite.config.js index 7f50aca..3d30c57 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -1,37 +1,40 @@ -import { defineConfig } from 'vite' +import { defineConfig, loadEnv } from 'vite' import react from '@vitejs/plugin-react' -export default defineConfig({ - base: './', - plugins: [ - react({ - include: '**/*.{jsx,js}', - }) - ], - esbuild: { - loader: 'jsx', - include: /src\/.*\.[jt]sx?$/, - exclude: [], - }, - optimizeDeps: { - esbuildOptions: { - loader: { - '.js': 'jsx', +export default defineConfig(({ mode }) => { + const env = loadEnv(mode, process.cwd(), '') + + return { + base: './', + plugins: [ + react({ + include: '**/*.{jsx,js}', + }) + ], + esbuild: { + loader: 'jsx', + include: /src\/.*\.[jt]sx?$/, + exclude: [], + }, + optimizeDeps: { + esbuildOptions: { + loader: { + '.js': 'jsx', + }, }, }, - }, - server: { - port: 3000, - open: true - }, - build: { - outDir: 'build' - }, - test: { - globals: true, // This enables test, describe, it, expect globally - environment: 'happy-dom', - setupFiles: './src/setupTests.js' + server: { + port: Number(env.VITE_PORT) || 3069, + open: true + }, + build: { + outDir: 'build' + }, + test: { + globals: true, // This enables test, describe, it, expect globally + environment: 'happy-dom', + setupFiles: './src/setupTests.js' + } } }) - diff --git a/website/src/components/InstallerTable/InstallerTable.js b/website/src/components/InstallerTable/InstallerTable.js index 5ee72c8..cb0e20c 100644 --- a/website/src/components/InstallerTable/InstallerTable.js +++ b/website/src/components/InstallerTable/InstallerTable.js @@ -1,7 +1,7 @@ import React, { useState, useEffect } from 'react'; function parseProjectVersionNumber(text, projectName) { - const regex = new RegExp(`${projectName} version: (\\d+(?:\\.\\d+)*(?:\\w+)?)`, 'i'); + const regex = new RegExp(`${projectName} version: (\\d+(?:\\.[0-9A-Za-z]+)*)`, 'i'); const match = text.match(regex); return match ? match[1] : null; }