From 4a1a09ef6fadc76db76651bc13684afdf82e5f35 Mon Sep 17 00:00:00 2001 From: Milos Stojanovic Date: Fri, 13 Dec 2024 11:26:14 +0100 Subject: [PATCH] remove cypress --- Dockerfile.multiarch | 7 ++++--- docs/development.md | 2 +- package.json | 26 +++++++++++++------------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Dockerfile.multiarch b/Dockerfile.multiarch index 3a0e6f2..3731c88 100644 --- a/Dockerfile.multiarch +++ b/Dockerfile.multiarch @@ -43,7 +43,7 @@ ################################# FROM php:8.3-apache-bullseye AS builder -RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - +RUN curl -sL https://deb.nodesource.com/setup_22.x | bash - RUN apt-get update > /dev/null RUN apt-get install -y git libzip-dev nodejs python2 libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb @@ -59,10 +59,11 @@ RUN cp configuration_sample.php configuration.php RUN composer install RUN composer require league/flysystem-sftp:^1.0 -W RUN composer require league/flysystem-aws-s3-v3:^1.0 -W -RUN npm install +RUN rm -rf package-lock.json +RUN npm install --omit=dev RUN npm run build RUN vendor/bin/phpunit -RUN npm run lint +#RUN npm run lint #RUN npm run test:e2e RUN rm -rf node_modules frontend tests docs .git .github RUN rm README.md couscous.yml repository/.gitignore babel.config.js cypress* .env* .eslint* .gitignore jest.* .php_cs* phpunit* postcss* vue* diff --git a/docs/development.md b/docs/development.md index 24b5007..d5bd1da 100644 --- a/docs/development.md +++ b/docs/development.md @@ -15,7 +15,7 @@ See `docker-compose-dev.yml` for more informations about configurations and depe ## Project setup for development (Linux) -You must have `git`, `php`, `node (v14)`, `npm`, and `composer` installed. +You must have `git`, `php`, `node`, `npm`, and `composer` installed. ``` git clone https://github.com/filegator/filegator.git diff --git a/package.json b/package.json index 00b0418..3f16aeb 100644 --- a/package.json +++ b/package.json @@ -11,28 +11,19 @@ "e2e": "vue-cli-service test:e2e" }, "dependencies": { + "@fortawesome/fontawesome-free": "^5.13.0", + "@vue/cli-plugin-babel": "^4.3.1", + "@vue/cli-service": "^4.3.1", "core-js": "^3.6.5", "js-base64": "^2.5.2", "prismjs": "^1.20.0", "vue-lazyload": "^1.3.3", - "vue-prism-editor": "^0.5.1" - }, - "devDependencies": { - "@fortawesome/fontawesome-free": "^5.13.0", - "@vue/cli-plugin-babel": "^4.3.1", - "@vue/cli-plugin-e2e-cypress": "^4.3.1", - "@vue/cli-plugin-eslint": "^4.3.1", - "@vue/cli-plugin-unit-jest": "^4.3.1", - "@vue/cli-service": "^4.3.1", - "@vue/test-utils": "1.0.0-beta.29", + "vue-prism-editor": "^0.5.1", "axios": "^0.21.1", "babel-core": "7.0.0-bridge.0", "babel-eslint": "^10.1.0", "babel-jest": "^24.9.0", "buefy": "^0.7.10", - "concurrently": "^4.1.2", - "eslint": "^5.16.0", - "eslint-plugin-vue": "^5.0.0", "sass": "^1.82.0", "resumablejs": "^1.1.0", "sass-loader": "^7.3.1", @@ -41,5 +32,14 @@ "vue-router": "^3.1.6", "vue-template-compiler": "^2.6.11", "vuex": "^3.4.0" + }, + "devDependencies": { + "@vue/test-utils": "1.0.0-beta.29", + "@vue/cli-plugin-e2e-cypress": "^4.3.1", + "@vue/cli-plugin-eslint": "^4.3.1", + "@vue/cli-plugin-unit-jest": "^4.3.1", + "eslint": "^5.16.0", + "eslint-plugin-vue": "^5.0.0", + "concurrently": "^4.1.2" } }