Maintenance: refactoring, dependency updates, ...

.github/workflows/test.yml

@@ -58,9 +58,7 @@ jobs:
         php occ user:setting quotatest files quota "0"
     - name: Setup Notes app
       working-directory: ../server/
-      run: |
-        php occ app:enable notes
-        php occ app:check-code notes
+      run: php occ app:enable notes
     - name: Create some reference notes
       working-directory: ../
       run: |

Makefile

@@ -116,7 +116,7 @@ lint-php-phpcs:
 
 lint-php-cs-fixer:
 	# PHP Coding Standards Fixer (with Nextcloud coding standards)
-	vendor/bin/php-cs-fixer fix --dry-run --diff --format=checkstyle | vendor/bin/cs2pr --colorize
+	vendor/bin/php-cs-fixer fix --dry-run --diff
 
 
 lint-js:

babel.config.js

@@ -1,8 +1 @@
-module.exports = {
-	plugins: [
-		'@babel/plugin-syntax-dynamic-import',
-	],
-	presets: [
-		[ '@babel/preset-env', { useBuiltIns: 'usage', corejs: 3 } ],
-	]
-}
+module.exports = require('@nextcloud/babel-config')

composer.json

@@ -2,7 +2,7 @@
 	"require-dev": {
 		"christophwurst/nextcloud": ">=20",
 		"nextcloud/coding-standard": "^0.5.0",
-		"friendsofphp/php-cs-fixer": "!=2.18.4",
+		"friendsofphp/php-cs-fixer": "^2.18.6",
 		"squizlabs/php_codesniffer": "3.*",
 		"phan/phan": "^4.0",
 		"guzzlehttp/guzzle": "^7.0",

package.json

@@ -17,14 +17,12 @@
 		"@nextcloud/dialogs": "^3.1.2",
 		"@nextcloud/event-bus": "^1.2.0",
 		"@nextcloud/moment": "^1.1.1",
-		"@nextcloud/router": "^1.2.0",
-		"@nextcloud/vue": "^3.8.0",
+		"@nextcloud/router": "^2.0.0",
+		"@nextcloud/vue": "^3.9.0",
 		"@nextcloud/vue-dashboard": "^2.0.0",
-		"@nextcloud/webpack-vue-config": "^4.0.1",
 		"diff": "^5.0.0",
-		"easymde": "^2.14.0",
-		"markdown-it": "^12.0.4",
-		"stylelint-webpack-plugin": "^2.1.1",
+		"easymde": "^2.15.0",
+		"markdown-it": "^12.0.6",
 		"vue": "^2.6.12",
 		"vue-fragment": "1.5.1",
 		"vue-material-design-icons": "^4.11.0",
@@ -39,37 +37,38 @@
 		"node": ">=10.0.0"
 	},
 	"devDependencies": {
-		"@babel/core": "^7.13.14",
+		"@babel/core": "^7.14.0",
 		"@babel/eslint-parser": "^7.13.14",
 		"@babel/plugin-syntax-dynamic-import": "^7.8.3",
-		"@babel/preset-env": "^7.13.12",
+		"@babel/preset-env": "^7.14.0",
+		"@nextcloud/babel-config": "^1.0.0-beta.1",
 		"@nextcloud/browserslist-config": "^2.1.0",
 		"@nextcloud/eslint-config": "^5.0.0",
 		"@nextcloud/eslint-plugin": "^2.0.0",
+		"@nextcloud/webpack-vue-config": "^4.0.3",
 		"babel-loader": "^8.2.2",
-		"core-js": "^3.10.0",
 		"css-loader": "^4.3.0",
-		"eslint": "^7.23.0",
+		"eslint": "^7.25.0",
 		"eslint-config-standard": "^16.0.2",
 		"eslint-plugin-import": "^2.22.1",
 		"eslint-plugin-node": "^11.1.0",
 		"eslint-plugin-promise": "^4.3.1",
 		"eslint-plugin-standard": "^4.1.0",
-		"eslint-plugin-vue": "^7.8.0",
-		"eslint-webpack-plugin": "^2.5.3",
+		"eslint-plugin-vue": "^7.9.0",
+		"eslint-webpack-plugin": "^2.5.4",
 		"file-loader": "^6.2.0",
 		"node-polyfill-webpack-plugin": "^1.1.0",
-		"sass": "^1.32.8",
+		"sass": "^1.32.12",
 		"sass-loader": "^10.1.1",
 		"style-loader": "^2.0.0",
-		"stylelint": "^13.12.0",
+		"stylelint": "^13.13.0",
 		"stylelint-config-recommended-scss": "^4.2.0",
 		"stylelint-scss": "^3.19.0",
+		"stylelint-webpack-plugin": "^2.1.1",
 		"url-loader": "^4.1.1",
 		"vue-loader": "^15.9.6",
 		"vue-template-compiler": "^2.6.12",
-		"webpack": "^5.28.0",
-		"webpack-cli": "^4.6.0",
-		"webpack-merge": "^5.7.3"
+		"webpack": "^5.36.2",
+		"webpack-cli": "^4.6.0"
 	}
 }

src/NotesService.js

@@ -373,11 +373,3 @@ export const getCategories = (maxLevel, details) => {
 		return categories
 	}
 }
-
-export const categoryLabel = (category) => {
-	return category === '' ? t('notes', 'Uncategorized') : category.replace(/\//g, ' / ')
-}
-
-export const routeIsNewNote = ($route) => {
-	return {}.hasOwnProperty.call($route.query, 'new')
-}

src/Util.js

@@ -19,3 +19,11 @@ export const copyNote = (from, to, exclude) => {
 	})
 	return to
 }
+
+export const categoryLabel = (category) => {
+	return category === '' ? t('notes', 'Uncategorized') : category.replace(/\//g, ' / ')
+}
+
+export const routeIsNewNote = ($route) => {
+	return {}.hasOwnProperty.call($route.query, 'new')
+}

src/components/Dashboard.vue

@@ -35,7 +35,8 @@
 import { DashboardWidget, DashboardWidgetItem } from '@nextcloud/vue-dashboard'
 import { EmptyContent } from '@nextcloud/vue'
 import { generateUrl } from '@nextcloud/router'
-import { getDashboardData, categoryLabel } from '../NotesService'
+import { getDashboardData } from '../NotesService'
+import { categoryLabel } from '../Util'
 
 export default {
 	name: 'Dashboard',
@@ -96,7 +97,7 @@ export default {
 </script>
 <style scoped>
 .note-item-favorite {
-	background: var(--icon-star-dark-fc0);
+	background: var(--icon-star-dark-FC0, var(--icon-star-dark-fc0));
 }
 
 .note-item {

src/components/NavigationCategoriesItem.vue

@@ -37,7 +37,8 @@ import {
 	AppNavigationCounter,
 } from '@nextcloud/vue'
 
-import { getCategories, categoryLabel } from '../NotesService'
+import { getCategories } from '../NotesService'
+import { categoryLabel } from '../Util'
 
 import store from '../store'
 

src/components/NavigationList.vue

@@ -43,7 +43,7 @@ import {
 } from '@nextcloud/vue'
 import { Fragment } from 'vue-fragment'
 
-import { categoryLabel } from '../NotesService'
+import { categoryLabel } from '../Util'
 import NavigationCategoriesItem from './NavigationCategoriesItem'
 import NavigationNoteItem from './NavigationNoteItem'
 import store from '../store'

src/components/NavigationNoteItem.vue

@@ -34,7 +34,8 @@ import {
 } from '@nextcloud/vue'
 import { showError } from '@nextcloud/dialogs'
 
-import { categoryLabel, setFavorite, setTitle, fetchNote, deleteNote, routeIsNewNote } from '../NotesService'
+import { setFavorite, setTitle, fetchNote, deleteNote } from '../NotesService'
+import { categoryLabel, routeIsNewNote } from '../Util'
 
 export default {
 	name: 'NavigationNoteItem',

src/components/Note.vue

@@ -88,7 +88,8 @@ import { emit } from '@nextcloud/event-bus'
 import SyncAlertIcon from 'vue-material-design-icons/SyncAlert'
 
 import { config } from '../config'
-import { fetchNote, refreshNote, saveNote, saveNoteManually, autotitleNote, routeIsNewNote, conflictSolutionLocal, conflictSolutionRemote } from '../NotesService'
+import { fetchNote, refreshNote, saveNote, saveNoteManually, autotitleNote, conflictSolutionLocal, conflictSolutionRemote } from '../NotesService'
+import { routeIsNewNote } from '../Util'
 import TheEditor from './EditorEasyMDE'
 import ThePreview from './EditorMarkdownIt'
 import ConflictSolution from './ConflictSolution'

src/components/Sidebar.vue

@@ -61,7 +61,8 @@ import {
 } from '@nextcloud/vue'
 import moment from '@nextcloud/moment'
 
-import { categoryLabel, getCategories, setFavorite, setCategory, saveNoteManually } from '../NotesService'
+import { getCategories, setFavorite, setCategory, saveNoteManually } from '../NotesService'
+import { categoryLabel } from '../Util'
 import store from '../store'
 
 export default {

tests/api/AbstractAPITest.php

@@ -121,7 +121,7 @@ protected function checkReferenceNote(
 					$messagePrefix.': Property '.$key.' (reference note: '.$refNote->title.')'
 				);
 				if (strlen($refNote->$key) !== strlen($note->$key)) {
-					$this->assertRegExp(
+					$this->assertMatchesRegularExpression(
 						'/^ \(\d+\)$/',
 						substr($note->$key, strlen($refNote->$key)),
 						$messagePrefix.': Property '.$key.' suffix (reference note: '.$refNote->title.')'

tests/api/CommonAPITest.php

@@ -65,7 +65,7 @@ public function testGetNotesWithEtag(array $refNotes) : void {
 		$this->checkResponse($response1, 'Initial response', 200);
 		$this->assertTrue($response1->hasHeader('ETag'), 'Initial response has ETag header');
 		$etag = $response1->getHeaderLine('ETag');
-		$this->assertRegExp('/^"[[:alnum:]]{32}"$/', $etag, 'ETag format');
+		$this->assertMatchesRegularExpression('/^"[[:alnum:]]{32}"$/', $etag, 'ETag format');
 
 		// Test If-None-Match with ETag
 		$response2 = $this->http->request('GET', 'notes', [ 'headers' => [ 'If-None-Match' => $etag ] ]);

webpack.js

@@ -1,11 +1,6 @@
 const webpackConfig = require('@nextcloud/webpack-vue-config')
 const path = require('path')
-const { merge } = require('webpack-merge')
 
-const config = {
-	entry: {
-		dashboard: path.join(__dirname, 'src', 'dashboard.js'),
-	},
-}
+webpackConfig.entry.dashboard = path.join(__dirname, 'src', 'dashboard.js')
 
-module.exports = merge(webpackConfig, config)
+module.exports = webpackConfig