Merge pull request #6842 from nextcloud/dependachristoph/npm_and_yarn…

…/webpack-5

Bump webpack from v4 to v5

.eslintrc.js

@@ -10,5 +10,8 @@ module.exports = {
 		t: true,
 		__webpack_public_path__: true,
 		__webpack_nonce__: true,
-	}
+	},
+	rules: {
+		'jsdoc/require-jsdoc': 'off',
+	},
 }

package.json

@@ -46,6 +46,7 @@
     "@nextcloud/vue-dashboard": "^2",
     "@riophae/vue-treeselect": "^0.4.0",
     "@vue/babel-preset-app": "^5.0.6",
+    "buffer": "^6.0.3",
     "color-convert": "^2.0.1",
     "core-js": "^3.23.3",
     "debounce-promise": "^3.1.2",
@@ -61,7 +62,9 @@
     "printscout": "2.0.3",
     "ramda": "^0.28.0",
     "raw-loader": "^4.0.2",
+    "stream-browserify": "^3.0.0",
     "stylelint": "^14.9.1",
+    "util": "^0.12.4",
     "uuid": "^8.3.2",
     "v-tooltip": "^2.1.3",
     "vue": "^2.6.14",
@@ -92,7 +95,7 @@
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/preset-env": "^7.18.2",
     "@nextcloud/browserslist-config": "^2.2.0",
-    "@nextcloud/eslint-config": "^4.0.0",
+    "@nextcloud/eslint-config": "^6.1.0",
     "@nextcloud/eslint-plugin": "^2.0.0",
     "@types/jest": "^28.1.4",
     "@vue/test-utils": "^1.3.0",
@@ -107,7 +110,6 @@
     "eslint-loader": "^4.0.2",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.3.1",
     "eslint-plugin-standard": "^4.1.0",
     "eslint-plugin-vue": "^7.20.0",
     "file-loader": "^6.2.0",
@@ -126,7 +128,7 @@
     "vue-loader": "^15.9.7",
     "vue-server-renderer": "^2.7.3",
     "vue-template-compiler": "^2.6.14",
-    "webpack": "^4.46.0",
+    "webpack": "^5.73.0",
     "webpack-cli": "^4.10.0",
     "webpack-merge": "^5.8.0"
   }

src/App.vue

@@ -36,7 +36,7 @@ export default {
 	},
 	methods: {
 		sync() {
-			setTimeout(async() => {
+			setTimeout(async () => {
 				try {
 					await this.$store.dispatch('syncInboxes')
 

src/ReplyBuilder.js

@@ -28,9 +28,9 @@ import { html } from './util/text'
 /**
  * @param {Text} original original
  * @param {object} from from
- * @param {Number} date date
+ * @param {number} date date
  * @param {boolean} replyOnTop put reply on top?
- * @returns {Text}
+ * @return {Text}
  */
 export const buildReplyBody = (original, from, date, replyOnTop = true) => {
 	const startEnd = '<p></p><p></p>'

src/ckeditor/signature/InsertSignatureCommand.js

@@ -77,7 +77,7 @@ export default class InsertSignatureCommand extends Command {
 	 *
 	 * @param {*} editor the editor instance
 	 * @param {*} writer the writer instance
-	 * @returns {*} the position above the quoted text; position 1 if no quote found
+	 * @return {*} the position above the quoted text; position 1 if no quote found
 	 */
 	findPositionAboveQuote(editor, writer) {
 		// Create a range spanning over the entire root content:

src/components/AccountForm.vue

@@ -428,7 +428,7 @@ export default {
 						port,
 					}))
 				})
-				const results = await Promise.all(imapAndSmtpHosts.map(async({ host, port }) => {
+				const results = await Promise.all(imapAndSmtpHosts.map(async ({ host, port }) => {
 					return {
 						host,
 						port,

src/components/Composer.vue

@@ -846,7 +846,7 @@ export default {
 			this.mailvelope.keysMissing = recipients.filter((r) => keysValid[r] === false)
 		},
 		initBody() {
-			/** @var {Text} body **/
+			/** @member {Text} body */
 			let body
 			if (this.replyTo) {
 				body = buildReplyBody(
@@ -915,7 +915,7 @@ export default {
 
 					return uid
 				})
-				.catch(async(error) => {
+				.catch(async (error) => {
 					await matchError(error, {
 						[NoDraftsMailboxConfiguredError.getName()]() {
 							return false
@@ -1056,7 +1056,7 @@ export default {
 				.then((data) => this.send({ ...data, force }))
 				.then(() => logger.info('message sent'))
 				.then(() => (this.state = STATES.FINISHED))
-				.catch(async(error) => {
+				.catch(async (error) => {
 					logger.error('could not send message', { error });
 					[this.errorText, this.state] = await matchError(error, {
 						[NoSentMailboxConfiguredError.getName()]() {
@@ -1116,8 +1116,9 @@ export default {
 		},
 		/**
 		 * Format aliases for the Multiselect
-		 * @param {Object} alias the alias to format
-		 * @returns {string}
+		 *
+		 * @param {object} alias the alias to format
+		 * @return {string}
 		 */
 		formatAliases(alias) {
 			if (!alias.name) {
@@ -1134,7 +1135,7 @@ export default {
 		 * Whether the date is acceptable
 		 *
 		 * @param {Date} date The date to compare to
-		 * @returns {boolean}
+		 * @return {boolean}
 		 */
 		disabledDatetimepickerDate(date) {
 			const minimumDate = new Date()
@@ -1149,7 +1150,7 @@ export default {
 		 * Whether the time for date is acceptable
 		 *
 		 * @param {Date} date The date to compare to
-		 * @returns {boolean}
+		 * @return {boolean}
 		 */
 		disabledDatetimepickerTime(date) {
 			const now = new Date()

src/components/Dashboard.vue

@@ -103,7 +103,7 @@ export default {
 		},
 	},
 	async mounted() {
-		const accountInboxes = await Promise.all(this.accounts.map(async(account) => {
+		const accountInboxes = await Promise.all(this.accounts.map(async (account) => {
 			logger.debug('account', {
 				account,
 			})
@@ -122,7 +122,7 @@ export default {
 			inboxes,
 		})
 
-		await Promise.all(inboxes.map(async(mailbox) => {
+		await Promise.all(inboxes.map(async (mailbox) => {
 			const messages = await fetchEnvelopes(mailbox.accountId, mailbox.databaseId, this.query, undefined, 10)
 			this.messages = this.messages !== null ? [...this.messages, ...messages] : messages
 			this.fetchedAccounts++

src/components/Envelope.vue

@@ -431,7 +431,8 @@ export default {
 		},
 		/**
 		 * Subject of envelope or "No Subject".
-		 * @returns {string}
+		 *
+		 * @return {string}
 		 */
 		subjectForSubtitle() {
 			// We have to use || here (instead of ??) because the subject might be '', null

src/components/EnvelopeList.vue

@@ -398,7 +398,7 @@ export default {
 				}
 			}
 
-			await Promise.all(this.selectedEnvelopes.map(async(envelope) => {
+			await Promise.all(this.selectedEnvelopes.map(async (envelope) => {
 				logger.info(`deleting thread ${envelope.threadRootId}`)
 				await this.$store.dispatch('deleteThread', {
 					envelope,

src/components/Mailbox.vue

@@ -250,14 +250,14 @@ export default {
 				}
 			} catch (error) {
 				await matchError(error, {
-					[MailboxLockedError.getName()]: async(error) => {
+					[MailboxLockedError.getName()]: async (error) => {
 						logger.info(`Mailbox ${this.mailbox.databaseId} (${this.searchQuery}) is locked`, { error })
 
 						await wait(15 * 1000)
 						// Keep trying
 						await this.loadEnvelopes()
 					},
-					[MailboxNotCachedError.getName()]: async(error) => {
+					[MailboxNotCachedError.getName()]: async (error) => {
 						logger.info(`Mailbox ${this.mailbox.databaseId} (${this.searchQuery}) not cached. Triggering initialization`, { error })
 						this.loadingEnvelopes = false
 

src/components/NavigationMailbox.vue

@@ -386,15 +386,17 @@ export default {
 	methods: {
 		/**
 		 * Generate unique key id for a specific mailbox
-		 * @param {Object} mailbox the mailbox to gen id for
-		 * @returns {string}
+		 *
+		 * @param {object} mailbox the mailbox to gen id for
+		 * @return {string}
 		 */
 		genId(mailbox) {
 			return 'mailbox-' + mailbox.databaseId
 		},
 
 		/**
 		 * On menu toggle, fetch stats
+		 *
 		 * @param {boolean} open menu opened state
 		 */
 		onMenuToggle(open) {

src/components/Outbox.vue

@@ -93,7 +93,7 @@ export default {
 	},
 	created() {
 		// Reload outbox contents every 60 seconds
-		this.refreshInterval = setInterval(async() => {
+		this.refreshInterval = setInterval(async () => {
 			await this.fetchMessages()
 		}, 60000)
 	},

src/components/OutboxMessageListItem.vue

@@ -117,7 +117,8 @@ export default {
 		},
 		/**
 		 * Subject of message or "No Subject".
-		 * @returns {string}
+		 *
+		 * @return {string}
 		 */
 		subjectForSubtitle() {
 			// We have to use || here (instead of ??) because the subject might be '', null

src/crypto/mailvelope.js

@@ -30,7 +30,7 @@ const loadMailvelopeDynamically = () =>
 		window.addEventListener('mailvelope', () => resolve(window.mailvelope), false)
 	})
 
-export const getMailvelope = async() => {
+export const getMailvelope = async () => {
 	if (mailvelope) {
 		return mailvelope
 	}

src/crypto/pgp.js

@@ -17,11 +17,12 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
 /**
  * @param {Text} message the message
- * @returns {boolean|*}
+ * @return {boolean|*}
  */
 export const isPgpgMessage = (message) =>
 	message.format === 'plain' && message.value.startsWith('-----BEGIN PGP MESSAGE-----')

src/errors/MailboxLockedError.js

@@ -17,6 +17,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
 export default class MailboxLockedError extends Error {

src/errors/ManyRecipientsError.js

@@ -15,6 +15,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
 export default class ManyRecipientsError extends Error {

src/errors/NoDraftsMailboxConfiguredError.js

@@ -17,6 +17,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
 export default class NoDraftsMailboxConfiguredError extends Error {

src/errors/NoSentMailboxConfiguredError.js

@@ -17,6 +17,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
 export default class NoSentMailboxConfiguredError extends Error {

src/errors/NoTrashMailboxConfiguredError.js

@@ -17,6 +17,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
 export default class NoTrashMailboxConfiguredError extends Error {

src/errors/convert.js

@@ -17,6 +17,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
 import MailboxLockedError from './MailboxLockedError'
@@ -40,8 +41,8 @@ const map = {
 }
 
 /**
- * @param {Object} axiosError the axios Error
- * @returns {Error}
+ * @param {object} axiosError the axios Error
+ * @return {Error}
  */
 export const convertAxiosError = (axiosError) => {
 	if (!('response' in axiosError)) {

src/errors/match.js

@@ -17,13 +17,14 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
 /**
  * @param {Error} error error
  * @param {object} matches matches
  */
-export const matchError = async(error, matches) => {
+export const matchError = async (error, matches) => {
 	if (error.name in matches) {
 		return await Promise.resolve(matches[error.name](error))
 	}

src/html-response.js

@@ -17,6 +17,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
 // injected styles

src/main-settings.js

@@ -17,6 +17,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
 import { generateFilePath } from '@nextcloud/router'

src/main.js

@@ -27,7 +27,7 @@ import { generateFilePath } from '@nextcloud/router'
 import '@nextcloud/dialogs/styles/toast.scss'
 import './directives/drag-and-drop/styles/drag-and-drop.scss'
 import VueShortKey from 'vue-shortkey'
-import VTooltip from 'v-tooltip'
+import vToolTip from 'v-tooltip'
 import VueClipboard from 'vue-clipboard2'
 
 import App from './App'
@@ -47,7 +47,7 @@ sync(store, router)
 Vue.mixin(Nextcloud)
 
 Vue.use(VueShortKey, { prevent: ['input', 'div'] })
-Vue.use(VTooltip)
+Vue.use(vToolTip)
 Vue.use(VueClipboard)
 
 const getPreferenceFromPage = (key) => {

src/service/AccountService.js

@@ -81,7 +81,7 @@ export const fetch = (id) => {
 	return axios.get(url).then((resp) => fixAccountId(resp.data))
 }
 
-export const fetchQuota = async(id) => {
+export const fetchQuota = async (id) => {
 	const url = generateUrl('/apps/mail/api/accounts/{id}/quota', {
 		id,
 	})