Skip to content

Commit

Permalink
Update node, remove babel
Browse files Browse the repository at this point in the history
  • Loading branch information
FranckKe committed Sep 8, 2024
1 parent c803fc4 commit 2d278b2
Show file tree
Hide file tree
Showing 12 changed files with 16,478 additions and 13,367 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2'

services:
nginx:
image: nginx:1.23-alpine
Expand Down
3 changes: 0 additions & 3 deletions frontend/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,5 @@ module.exports = {
singleQuote: true
}
]
},
parserOptions: {
parser: 'babel-eslint'
}
}
2 changes: 1 addition & 1 deletion frontend/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lts/gallium
lts/iron
1 change: 1 addition & 0 deletions frontend/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
3 changes: 2 additions & 1 deletion frontend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@

```bash
# Install dependencies manager
npm install -g yarn
corepack enable
yarn set version stable

# install dependencies
yarn install
Expand Down
10 changes: 0 additions & 10 deletions frontend/babel.config.js

This file was deleted.

1 change: 0 additions & 1 deletion frontend/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
'^@/(.*)$': '<rootDir>/src/$1'
Expand Down
71 changes: 34 additions & 37 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,60 +10,57 @@
"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://[email protected]/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%",
"last 5 versions",
"not ie <= 8",
"iOS > 5",
"Safari > 5"
]
],
"packageManager": "[email protected]"
}
2 changes: 1 addition & 1 deletion frontend/src/components/MenuNav.vue
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<lang-switcher></lang-switcher>
<div class="navbar-end buttons">
<b-dropdown v-if="$auth.check()" position="is-bottom-left" paddingless>
<button class="button is-primary" slot="trigger">
<button class="button is-primary" v-slot:trigger>
<span>{{ $auth.user().email }}</span>
<b-icon pack="fas" icon="caret-down"></b-icon>
</button>
Expand Down
1 change: 0 additions & 1 deletion frontend/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import es from 'vee-validate/dist/locale/es'
import fr from 'vee-validate/dist/locale/fr'
import VeeValidate, { Validator } from 'vee-validate'
import unorm from 'unorm'
import '@babel/polyfill'

import { library } from '@fortawesome/fontawesome-svg-core'
import {
Expand Down
Loading

0 comments on commit 2d278b2

Please sign in to comment.