From 2d278b2ab7d40cd5ea7d34ebb4074140524b2e92 Mon Sep 17 00:00:00 2001 From: Franck Kerbiriou Date: Sun, 8 Sep 2024 16:53:22 +0200 Subject: [PATCH] Update node, remove babel --- README.md | 10 +- docker-compose.yml | 2 - frontend/.eslintrc.js | 3 - frontend/.nvmrc | 2 +- frontend/.yarnrc.yml | 1 + frontend/README.md | 3 +- frontend/babel.config.js | 10 - frontend/jest.config.js | 1 - frontend/package.json | 71 +- frontend/src/components/MenuNav.vue | 2 +- frontend/src/main.js | 1 - frontend/yarn.lock | 29739 ++++++++++++++------------ 12 files changed, 16478 insertions(+), 13367 deletions(-) create mode 100644 frontend/.yarnrc.yml delete mode 100644 frontend/babel.config.js diff --git a/README.md b/README.md index acf43fbe..d70bb792 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -![license](https://img.shields.io/dub/l/vibe-d.svg) - # Mersea +![license](https://img.shields.io/dub/l/vibe-d.svg) + ## Requirements - Ruby MRI 2.7.x ([rbenv](https://github.com/rbenv/rbenv) recommended) @@ -58,13 +58,13 @@ To setup frontend, see readme in `./frontend`. ## Production with Docker -**Configure your reCaptcha keys as environment variables** +Configure your reCaptcha keys as environment variables - Start server via Docker Compose ```sh -$ cd /path/to/mersea -$ docker-compose up -d +cd /path/to/mersea +docker-compose up -d ``` > Feel free to modifies the provided docker-compose.yml to your needs. diff --git a/docker-compose.yml b/docker-compose.yml index 4e818a75..d44b12a6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '2' - services: nginx: image: nginx:1.23-alpine diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js index 61a77168..c4c3579a 100644 --- a/frontend/.eslintrc.js +++ b/frontend/.eslintrc.js @@ -14,8 +14,5 @@ module.exports = { singleQuote: true } ] - }, - parserOptions: { - parser: 'babel-eslint' } } diff --git a/frontend/.nvmrc b/frontend/.nvmrc index 53d838af..9de22568 100644 --- a/frontend/.nvmrc +++ b/frontend/.nvmrc @@ -1 +1 @@ -lts/gallium +lts/iron diff --git a/frontend/.yarnrc.yml b/frontend/.yarnrc.yml new file mode 100644 index 00000000..3186f3f0 --- /dev/null +++ b/frontend/.yarnrc.yml @@ -0,0 +1 @@ +nodeLinker: node-modules diff --git a/frontend/README.md b/frontend/README.md index 7327e123..4c2c6080 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -6,7 +6,8 @@ ```bash # Install dependencies manager -npm install -g yarn +corepack enable +yarn set version stable # install dependencies yarn install diff --git a/frontend/babel.config.js b/frontend/babel.config.js deleted file mode 100644 index faf734b7..00000000 --- a/frontend/babel.config.js +++ /dev/null @@ -1,10 +0,0 @@ -module.exports = { - presets: [ - [ - '@babel/preset-env', - { - useBuiltIns: 'entry' - } - ] - ] -} diff --git a/frontend/jest.config.js b/frontend/jest.config.js index 22b8c3b4..9441a2d9 100644 --- a/frontend/jest.config.js +++ b/frontend/jest.config.js @@ -4,7 +4,6 @@ module.exports = { '^.+\\.vue$': 'vue-jest', '.+\\.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$': 'jest-transform-stub', - '^.+\\.jsx?$': 'babel-jest' }, moduleNameMapper: { '^@/(.*)$': '/src/$1' diff --git a/frontend/package.json b/frontend/package.json index 3ceac882..67e6773b 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -10,54 +10,50 @@ "test:e2e": "vue-cli-service test:e2e" }, "dependencies": { - "@bugsnag/js": "^6.4.1", - "@bugsnag/plugin-vue": "^6.4.1", - "@fortawesome/fontawesome-free": "^5.11.2", - "@fortawesome/fontawesome-svg-core": "^1.2.25", - "@fortawesome/free-solid-svg-icons": "^5.11.2", - "@fortawesome/vue-fontawesome": "^0.1.7", - "@mapbox/mapbox-gl-geocoder": "^4.4.2", + "@bugsnag/js": "^6.5.2", + "@bugsnag/plugin-vue": "^6.5.0", + "@fortawesome/fontawesome-free": "^5.15.4", + "@fortawesome/fontawesome-svg-core": "^1.2.36", + "@fortawesome/free-solid-svg-icons": "^5.15.4", + "@fortawesome/vue-fontawesome": "^0.1.10", + "@mapbox/mapbox-gl-geocoder": "^4.7.4", "@mapbox/mapbox-gl-language": "^0.10.1", "@websanova/vue-auth": "^2.21.14-beta", - "axios": "^0.21.2", - "buefy": "^0.7.3", - "bulma-steps": "https://git@github.com/FranckKe/bulma-steps.git", - "lodash-es": "^4.17.15", + "axios": "^1.7.7", + "buefy": "^0.7.10", + "bulma-steps": "^2.2.1", + "lodash-es": "^4.17.21", "mapbox-gl": "^1.4.0", - "moment": "^2.29.4", - "register-service-worker": "^1.0.0", - "slugify": "^1.3.5", + "moment": "^2.30.1", + "register-service-worker": "^1.7.2", + "slugify": "^1.6.6", "unorm": "^1.6.0", "vee-validate": "^2.2.15", - "vue": "^2.6.4", - "vue-axios": "^2.1.4", - "vue-i18n": "^8.14.1", - "vue-router": "^3.1.3", - "vuex": "^3.1.0", - "vuex-persistedstate": "^2.5.4" + "vue": "^2.7.16", + "vue-axios": "^2.1.5", + "vue-i18n": "^8.28.2", + "vue-router": "^3.6.5", + "vuex": "^3.6.2", + "vuex-persistedstate": "^2.7.1" }, "devDependencies": { - "@babel/core": "7.6.2", - "@kazupon/vue-i18n-loader": "^0.4.1", - "@vue/cli-plugin-babel": "^3.11.0", - "@vue/cli-plugin-e2e-cypress": "^3.11.0", - "@vue/cli-plugin-eslint": "^3.11.0", - "@vue/cli-plugin-pwa": "^3.11.0", - "@vue/cli-plugin-unit-jest": "^3.11.0", - "@vue/cli-service": "^3.11.0", - "@vue/eslint-config-prettier": "^5.0.0", - "@vue/test-utils": "^1.0.0-beta.29", - "babel-eslint": "^10.0.3", - "babel-jest": "^24.9.0", - "eslint": "^6.4.0", + "@kazupon/vue-i18n-loader": "^0.5.0", + "@vue/cli-plugin-e2e-cypress": "^3.12.1", + "@vue/cli-plugin-eslint": "^3.12.1", + "@vue/cli-plugin-pwa": "^3.12.1", + "@vue/cli-plugin-unit-jest": "^3.12.1", + "@vue/cli-service": "^3.12.1", + "@vue/eslint-config-prettier": "^5.1.0", + "@vue/test-utils": "^1.3.6", + "eslint": "^6.8.0", "eslint-plugin-prettier": "^3.1.1", "eslint-plugin-vue": "^5.2.3", - "glob-all": "^3.1.0", + "glob-all": "^3.3.1", "node-sass": "^8.0.0", "prettier": "^1.18.2", "sass-loader": "^10.0.0", - "vue-cli-plugin-i18n": "^0.6.0", - "vue-template-compiler": "^2.5.16" + "vue-cli-plugin-i18n": "^0.6.1", + "vue-template-compiler": "^2.7.16" }, "browserslist": [ "> 2%", @@ -65,5 +61,6 @@ "not ie <= 8", "iOS > 5", "Safari > 5" - ] + ], + "packageManager": "yarn@4.4.1" } diff --git a/frontend/src/components/MenuNav.vue b/frontend/src/components/MenuNav.vue index 90f55c5f..69c42504 100644 --- a/frontend/src/components/MenuNav.vue +++ b/frontend/src/components/MenuNav.vue @@ -58,7 +58,7 @@