From 0508597cebb6ad46beb992b2a6bcd673748813a3 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Tue, 26 Jul 2022 17:59:52 +0200 Subject: [PATCH] Update node modules to build with node 18 --- .drone.yml | 6 +- ui/package.json | 57 +- ui/src/App.vue | 4 +- ui/src/app.scss | 18 +- ui/src/components/ZoneList.vue | 4 +- ui/src/components/{Header.vue => hHeader.vue} | 0 ui/src/components/hList.vue | 2 +- ui/src/components/{logo.vue => hLogo.vue} | 0 ui/src/main.js | 2 +- ui/src/mixins/addDomainToProvider.js | 2 +- ui/src/router/index.js | 46 +- ui/src/views/{domain.vue => hDomain.vue} | 0 .../views/{domain-new.vue => hDomainNew.vue} | 0 ...il-validation.vue => hEmailValidation.vue} | 0 ...en-password.vue => hForgottenPassword.vue} | 0 ui/src/views/{home.vue => hHome.vue} | 0 ui/src/views/{Index.vue => hIndex.vue} | 4 +- ui/src/views/{loading.vue => hLoading.vue} | 0 ui/src/views/{login.vue => hLogin.vue} | 0 ui/src/views/{me.vue => hMe.vue} | 0 ui/src/views/{404.vue => hNotFound.vue} | 0 .../views/{onboarding.vue => hOnboarding.vue} | 2 +- ui/src/views/{provider.vue => hProvider.vue} | 0 .../{provider-list.vue => hProviderList.vue} | 0 .../{provider-new.vue => hProviderNew.vue} | 0 ...-new-choice.vue => hProviderNewChoice.vue} | 0 ...er-new-state.vue => hProviderNewState.vue} | 0 ui/src/views/{signup.vue => hSignup.vue} | 0 .../{tools-client.vue => hToolsClient.vue} | 0 ui/yarn.lock | 9620 ++++++----------- 30 files changed, 3430 insertions(+), 6337 deletions(-) rename ui/src/components/{Header.vue => hHeader.vue} (100%) rename ui/src/components/{logo.vue => hLogo.vue} (100%) rename ui/src/views/{domain.vue => hDomain.vue} (100%) rename ui/src/views/{domain-new.vue => hDomainNew.vue} (100%) rename ui/src/views/{email-validation.vue => hEmailValidation.vue} (100%) rename ui/src/views/{forgotten-password.vue => hForgottenPassword.vue} (100%) rename ui/src/views/{home.vue => hHome.vue} (100%) rename ui/src/views/{Index.vue => hIndex.vue} (97%) rename ui/src/views/{loading.vue => hLoading.vue} (100%) rename ui/src/views/{login.vue => hLogin.vue} (100%) rename ui/src/views/{me.vue => hMe.vue} (100%) rename ui/src/views/{404.vue => hNotFound.vue} (100%) rename ui/src/views/{onboarding.vue => hOnboarding.vue} (97%) rename ui/src/views/{provider.vue => hProvider.vue} (100%) rename ui/src/views/{provider-list.vue => hProviderList.vue} (100%) rename ui/src/views/{provider-new.vue => hProviderNew.vue} (100%) rename ui/src/views/{provider-new-choice.vue => hProviderNewChoice.vue} (100%) rename ui/src/views/{provider-new-state.vue => hProviderNewState.vue} (100%) rename ui/src/views/{signup.vue => hSignup.vue} (100%) rename ui/src/views/{tools-client.vue => hToolsClient.vue} (100%) diff --git a/.drone.yml b/.drone.yml index adeefee..d1b2d2b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,7 +9,7 @@ platform: steps: - name: frontend - image: node:14-alpine3.15 + image: node:18-alpine3.15 commands: - apk --no-cache add python2 build-base tar - yarn config set network-timeout 100000 @@ -216,7 +216,7 @@ platform: steps: - name: frontend - image: node:14-alpine3.15 + image: node:18-alpine3.15 commands: - apk --no-cache add python2 build-base - yarn config set network-timeout 100000 @@ -378,7 +378,7 @@ platform: steps: - name: frontend - image: node:14-alpine3.15 + image: node:18-alpine3.15 commands: - apk --no-cache add python2 build-base - yarn config set network-timeout 100000 diff --git a/ui/package.json b/ui/package.json index a5f4da6..a65263d 100644 --- a/ui/package.json +++ b/ui/package.json @@ -9,35 +9,37 @@ "i18n:report": "vue-cli-service i18n:report --src './src/**/*.?(js|vue)' --locales './src/locales/**/*.json'" }, "dependencies": { - "axios": "^0.26.0", - "bootstrap": "^4.5.3", - "bootstrap-vue": "^2.18.1", - "vue": "^2.6.14", - "vue-i18n": "^8.22.1", - "vue-router": "^3.4.8", - "vuex": "^3.5.1" + "axios": "^0.27.0", + "bootstrap": "^4.6.2", + "bootstrap-vue": "^2.22.0", + "sass": "^1.54.0", + "vue": "^2.7.8", + "vue-i18n": "^8.27.2", + "vue-router": "^3.5.4", + "vuex": "^3.6.2" }, "devDependencies": { + "@babel/eslint-parser": "^7.18.9", "@intlify/vue-i18n-loader": "^3.3.0", - "@vue/cli-plugin-eslint": "^4.5.17", - "@vue/cli-plugin-router": "^4.5.17", - "@vue/cli-plugin-vuex": "^4.5.17", - "@vue/cli-service": "^4.5.17", - "@vue/eslint-config-standard": "^6.1.0", - "babel-eslint": "^10.0.1", - "eslint": "^7.32.0", - "eslint-plugin-import": "^2.25.4", + "@vue/cli-plugin-eslint": "^5.0.8", + "@vue/cli-plugin-router": "^5.0.8", + "@vue/cli-plugin-vuex": "^5.0.8", + "@vue/cli-service": "^5.0.8", + "@vue/eslint-config-standard": "^7.0.0", + "eslint": "^8.0.1", + "eslint-config-standard": "^17.0.0", + "eslint-plugin-import": "^2.25.2", + "eslint-plugin-n": "^15.0.0", "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^6.0.0", "eslint-plugin-standard": "^5.0.0", - "eslint-plugin-vue": "^7.20.0", - "lint-staged": "^12.3.7", - "node-sass": "^5.0.0", - "register-service-worker": "^1.7.1", - "sass-loader": "^10.0.5", + "eslint-plugin-vue": "^9.3.0", + "lint-staged": "^13.0.3", + "register-service-worker": "^1.7.2", + "sass-loader": "^13.0.2", "vue-cli-plugin-i18n": "^2.3.1", - "vue-template-compiler": "^2.6.14", - "workbox-webpack-plugin": "^6.5.2" + "vue-template-compiler": "^2.7.8", + "workbox-webpack-plugin": "^6.5.3" }, "eslintConfig": { "root": true, @@ -46,11 +48,11 @@ }, "extends": [ "plugin:vue/recommended", - "@vue/standard" + "standard" + ], + "plugins": [ + "vue" ], - "parserOptions": { - "parser": "babel-eslint" - }, "rules": { "vue/html-closing-bracket-newline": "off", "vue/max-attributes-per-line": "off" @@ -63,7 +65,8 @@ }, "browserslist": [ "> 1%", - "last 2 versions" + "last 2 versions", + "not dead" ], "gitHooks": { "pre-commit": "lint-staged" diff --git a/ui/src/App.vue b/ui/src/App.vue index 374af0d..fb77a2d 100644 --- a/ui/src/App.vue +++ b/ui/src/App.vue @@ -33,7 +33,7 @@