Skip to content

Commit d9e33ed

Browse files
aschemppaschempp
committed
Upgrade to vue-cli v5
1 parent 12c8eeb commit d9e33ed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+2906
-5272
lines changed

‎babel.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = {
22
presets: [
3-
'@vue/app'
3+
'@vue/cli-plugin-babel/preset'
44
],
55
plugins: [
66
'@babel/plugin-proposal-optional-chaining'

‎package.json

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"dependencies": {
1313
"algoliasearch": "^3.35.1",
1414
"contao-package-list": "git+https://github.com/contao/package-list.git",
15+
"core-js": "^3.8.3",
1516
"details-element-polyfill": "^2.4.0",
1617
"jszip": "^3.10.1",
1718
"treeify-paths": "^1.0",
@@ -26,18 +27,21 @@
2627
"vuex": "^2.5.0"
2728
},
2829
"devDependencies": {
30+
"@babel/core": "^7.12.16",
31+
"@babel/eslint-parser": "^7.12.16",
2932
"@babel/plugin-proposal-optional-chaining": "^7.13.12",
30-
"@vue/cli-plugin-babel": "^3.12.1",
31-
"@vue/cli-plugin-eslint": "^3.12.1",
32-
"@vue/cli-service": "^3.12.1",
33-
"babel-eslint": "^10.1.0",
34-
"eslint": "^5.16.0",
35-
"eslint-plugin-vue": "^5.2.3",
33+
"@vue/cli-plugin-babel": "~5.0.8",
34+
"@vue/cli-plugin-eslint": "~5.0.8",
35+
"@vue/cli-service": "~5.0.8",
36+
"eslint": "^7.32.0",
37+
"eslint-plugin-vue": "^8.0.3",
38+
"favicons": "^7.1.5",
39+
"favicons-webpack-plugin": "^6.0.1",
3640
"image-webpack-loader": "^6.0.0",
3741
"sass": "^1.53.0",
3842
"sass-loader": "^7.3.1",
39-
"vue-template-compiler": "^2.6.12",
40-
"webpack-pwa-manifest": "^4.3.0"
43+
"sharp": "^0.33.2",
44+
"vue-template-compiler": "^2.6.12"
4145
},
4246
"eslintConfig": {
4347
"root": true,
@@ -50,7 +54,7 @@
5054
],
5155
"rules": {},
5256
"parserOptions": {
53-
"parser": "babel-eslint"
57+
"parser": "@babel/eslint-parser"
5458
}
5559
},
5660
"postcss": {

‎public/index.html

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,6 @@
77
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1" />
88
<meta name="description" content="">
99
<meta name="robots" content="noindex,follow">
10-
11-
<link rel="apple-touch-icon" sizes="180x180" href="<%= require('../node_modules/contao-package-list/src/assets/icons/apple-touch-icon.png') %>">
12-
<link class="favicon" rel="icon" type="image/png" sizes="32x32" href="<%= require('../node_modules/contao-package-list/src/assets/icons/favicon-32x32.png') %>">
13-
<link class="favicon" rel="icon" type="image/png" sizes="16x16" href="<%= require('../node_modules/contao-package-list/src/assets/icons/favicon-16x16.png') %>">
14-
<link class="favicon" rel="shortcut icon" href="<%= require('../node_modules/contao-package-list/src/assets/icons/favicon.ico') %>">
15-
<link rel="mask-icon" href="<%= require('../node_modules/contao-package-list/src/assets/icons/safari-pinned-tab.svg') %>" color="#ff7900">
16-
<meta name="msapplication-TileColor" content="#00a300">
17-
<meta name="msapplication-square150x150logo" content="<%= require('../node_modules/contao-package-list/src/assets/icons/mstile-150x150.png') %>">
18-
<meta name="theme-color" content="#ffffff">
1910
<meta http-equiv="Content-Security-Policy" content="img-src 'self' data: blob: contao.github.io extensions.contao.org; object-src none" />
2011
</head>
2112
<body>

‎src/components/App.vue

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<a :href="$t('ui.app.httpsHref')" target="_blank" class="https-warning__link">{{ $t('ui.app.httpsLink') }}</a>
1313
</div>
1414

15-
<error v-if="error"/>
15+
<error-view v-if="error"/>
1616

1717
<transition name="animate-fade" mode="out-in" style="height:100%">
1818

@@ -23,7 +23,7 @@
2323
</div>
2424
</div>
2525

26-
<task :class="hasModal ? 'animate-blur-in' : 'animate-blur-out'" v-else-if="username && taskStatus"/>
26+
<task-view :class="hasModal ? 'animate-blur-in' : 'animate-blur-out'" v-else-if="username && taskStatus"/>
2727
<component :is="currentView" :class="hasModal ? 'animate-blur-in' : 'animate-blur-out'" v-else-if="currentView"/>
2828

2929
<div v-else>
@@ -41,29 +41,28 @@
4141
import views from '../router/views';
4242
4343
import PackageDetails from './fragments/PackageDetails';
44-
import Loader from 'contao-package-list/src/components/fragments/Loader';
45-
46-
import Error from './views/Error';
47-
import Account from './views/Account';
48-
import Login from './views/Login';
49-
import Task from './views/Task';
50-
import Boot from './views/Boot';
51-
import Setup from './views/Setup';
52-
import Recovery from './views/Recovery';
53-
import Migration from './views/Migration';
44+
45+
import ErrorView from './views/ErrorView';
46+
import AccountView from './views/AccountView';
47+
import LoginView from './views/LoginView';
48+
import TaskView from './views/TaskView';
49+
import BootView from './views/BootView';
50+
import SetupView from './views/SetupView';
51+
import RecoveryView from './views/RecoveryView';
52+
import MigrationView from './views/MigrationView';
5453
import Vue from 'vue';
5554
5655
export default {
57-
components: { Loader, Error, Task },
56+
components: { ErrorView, TaskView },
5857
5958
data: () => ({
6059
views: {
61-
[views.ACCOUNT]: Account,
62-
[views.LOGIN]: Login,
63-
[views.BOOT]: Boot,
64-
[views.SETUP]: Setup,
65-
[views.RECOVERY]: Recovery,
66-
[views.MIGRATION]: Migration,
60+
[views.ACCOUNT]: AccountView,
61+
[views.LOGIN]: LoginView,
62+
[views.BOOT]: BootView,
63+
[views.SETUP]: SetupView,
64+
[views.RECOVERY]: RecoveryView,
65+
[views.MIGRATION]: MigrationView,
6766
},
6867
loaded: false,
6968
}),
@@ -126,7 +125,7 @@
126125
try {
127126
const config = (await this.$http.get(`${chunks.join('/')}/contao-manager/users.json`, { responseType: 'json' })).body;
128127
129-
if (!config.hasOwnProperty('users') && !config.hasOwnProperty('version')) {
128+
if (!config.users && !config.version) {
130129
continue;
131130
}
132131

‎src/components/boot/Composer.vue renamed to ‎src/components/boot/BootComposer.vue

File renamed without changes.

‎src/components/boot/Config.vue renamed to ‎src/components/boot/BootConfig.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</ul>
3030
</div>
3131

32-
<checkbox name="cloud" :label="$t('ui.server.config.cloud')" :disabled="processing" v-model="cloud"/>
32+
<check-box name="cloud" :label="$t('ui.server.config.cloud')" :disabled="processing" v-model="cloud"/>
3333
</fieldset>
3434

3535
<loading-button submit color="primary" :disabled="!php_cli" :loading="processing">{{ $t('ui.server.config.save') }}</loading-button>
@@ -48,14 +48,14 @@
4848
import boot from '../../mixins/boot';
4949
5050
import BootCheck from '../fragments/BootCheck';
51-
import BoxedLayout from '../layouts/Boxed';
51+
import BoxedLayout from '../layouts/BoxedLayout';
5252
import TextField from '../widgets/TextField';
53-
import Checkbox from '../widgets/Checkbox';
53+
import CheckBox from '../widgets/CheckBox';
5454
import LoadingButton from 'contao-package-list/src/components/fragments/LoadingButton';
5555
5656
export default {
5757
mixins: [boot],
58-
components: { BootCheck, BoxedLayout, TextField, Checkbox, LoadingButton },
58+
components: { BootCheck, BoxedLayout, TextField, CheckBox, LoadingButton },
5959
6060
6161
data: () => ({

‎src/components/boot/Contao.vue renamed to ‎src/components/boot/BootContao.vue

File renamed without changes.

‎src/components/boot/PhpCli.vue renamed to ‎src/components/boot/BootPhpCli.vue

File renamed without changes.

‎src/components/boot/PhpWeb.vue renamed to ‎src/components/boot/BootPhpWeb.vue

File renamed without changes.

‎src/components/boot/SelfUpdate.vue renamed to ‎src/components/boot/BootSelfUpdate.vue

File renamed without changes.

0 commit comments

Comments
 (0)