Skip to content

Commit 15955ce

Browse files
committed
Move to webpack vue global config & bump deps
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
1 parent 0f3891c commit 15955ce

18 files changed

Lines changed: 1952 additions & 2701 deletions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ coverage/
1919

2020
cypress/screenshots
2121
cypress/snapshots
22+
vendor

js/viewer.js renamed to js/viewer-main.js

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/viewer-main.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/viewer.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

lib/Listener/LoadViewerScript.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ public function handle(Event $event): void {
3737
return;
3838
}
3939

40-
Util::addScript(Application::APP_ID, 'viewer');
40+
Util::addScript(Application::APP_ID, 'viewer-main');
4141
}
4242
}

package-lock.json

Lines changed: 1840 additions & 2557 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
"license": "agpl",
2626
"private": true,
2727
"scripts": {
28-
"dev": "NODE_ENV=development webpack --config webpack.dev.js",
29-
"watch": "NODE_ENV=development webpack --progress --watch --config webpack.dev.js",
30-
"build": "NODE_ENV=production webpack --progress --hide-modules --config webpack.prod.js",
28+
"build": "NODE_ENV=production webpack --progress --hide-modules --config webpack.js",
29+
"dev": "NODE_ENV=development webpack --progress --config webpack.js",
30+
"watch": "NODE_ENV=development webpack --progress --watch --config webpack.js",
3131
"lint": "eslint --ext .js,.vue src",
3232
"lint:fix": "eslint --ext .js,.vue src --fix",
3333
"stylelint": "stylelint src",
@@ -37,9 +37,9 @@
3737
"wait-on": "wait-on -i 500 -t 300000"
3838
},
3939
"dependencies": {
40-
"@nextcloud/auth": "^1.2.3",
40+
"@nextcloud/auth": "^1.3.0",
4141
"@nextcloud/axios": "^1.3.2",
42-
"@nextcloud/router": "^1.0.2",
42+
"@nextcloud/router": "^1.1.0",
4343
"@nextcloud/vue": "^1.5.0",
4444
"camelcase": "^6.0.0",
4545
"core-js": "^3.6.5",
@@ -62,42 +62,43 @@
6262
"node": ">=10.0.0"
6363
},
6464
"devDependencies": {
65-
"@babel/core": "^7.9.6",
66-
"@babel/plugin-proposal-class-properties": "^7.8.3",
65+
"@babel/core": "^7.10.4",
66+
"@babel/plugin-proposal-class-properties": "^7.10.4",
6767
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
68-
"@babel/preset-env": "^7.9.6",
68+
"@babel/preset-env": "^7.10.4",
6969
"@nextcloud/browserslist-config": "^1.0.0",
70-
"@nextcloud/eslint-config": "^1.0.0",
70+
"@nextcloud/eslint-config": "^2.2.0",
7171
"@nextcloud/eslint-plugin": "^1.4.0",
72+
"@nextcloud/webpack-vue-config": "^1.1.0",
7273
"babel-eslint": "^10.1.0",
7374
"babel-loader": "^8.1.0",
75+
"babel-loader-exclude-node-modules-except": "^1.0.3",
7476
"browserslist-config-nextcloud": "0.1.0",
75-
"css-loader": "^3.5.3",
77+
"css-loader": "^3.6.0",
7678
"cypress": "^3.8.3",
7779
"cypress-image-snapshot": "^3.1.1",
78-
"eslint": "^5.16.0",
79-
"eslint-config-standard": "^12.0.0",
80-
"eslint-import-resolver-webpack": "^0.12.1",
81-
"eslint-loader": "^3.0.4",
82-
"eslint-plugin-import": "^2.20.2",
83-
"eslint-plugin-node": "^10.0.0",
80+
"eslint": "^6.8.0",
81+
"eslint-config-standard": "^14.1.1",
82+
"eslint-import-resolver-webpack": "^0.12.2",
83+
"eslint-loader": "^4.0.2",
84+
"eslint-plugin-import": "^2.21.2",
85+
"eslint-plugin-node": "^11.1.0",
8486
"eslint-plugin-promise": "^4.2.1",
8587
"eslint-plugin-standard": "^4.0.1",
86-
"eslint-plugin-vue": "^5.2.3",
88+
"eslint-plugin-vue": "^6.2.2",
8789
"file-loader": "^6.0.0",
8890
"jest": "^24.9.0",
89-
"node-sass": "^4.14.0",
91+
"node-sass": "^4.14.1",
9092
"sass-loader": "^8.0.2",
91-
"stylelint": "^8.4.0",
92-
"stylelint-config-recommended-scss": "^3.3.0",
93-
"stylelint-scss": "^3.17.1",
94-
"stylelint-webpack-plugin": "^0.10.5",
93+
"stylelint": "^13.6.1",
94+
"stylelint-config-recommended-scss": "^4.2.0",
95+
"stylelint-scss": "^3.18.0",
96+
"stylelint-webpack-plugin": "^2.1.0",
9597
"url-loader": "^4.1.0",
96-
"vue-loader": "^15.9.2",
98+
"vue-loader": "^15.9.3",
9799
"vue-template-compiler": "^2.6.11",
98100
"webpack": "^4.43.0",
99-
"webpack-cli": "^3.3.11",
100-
"webpack-merge": "^4.2.2",
101-
"webpack-node-externals": "^1.7.2"
101+
"webpack-cli": "^3.3.12",
102+
"webpack-merge": "^5.0.9"
102103
}
103104
}

src/components/Images.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export default {
100100
},
101101
},
102102
watch: {
103-
active: function(val, old) {
103+
active(val, old) {
104104
// the item was hidden before and is now the current view
105105
if (val === true && old === false) {
106106
this.resetZoom()

src/components/Videos.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export default {
8787
},
8888
8989
watch: {
90-
active: function(val, old) {
90+
active(val, old) {
9191
// the item was hidden before and is now the current view
9292
if (val === true && old === false) {
9393
this.player.play()

src/mixins/Mime.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export default {
105105
},
106106

107107
watch: {
108-
active: function(val, old) {
108+
active(val, old) {
109109
// the item was hidden before and is now the current view
110110
if (val === true && old === false) {
111111
// just in case the file was preloaded, let's warn the viewer
@@ -115,7 +115,7 @@ export default {
115115
}
116116
},
117117
// update image size on sidebar toggle
118-
isSidebarShown: function() {
118+
isSidebarShown() {
119119
// wait for transition to complete (100ms)
120120
setTimeout(this.updateHeightWidth, 200)
121121
},

0 commit comments

Comments
 (0)