Merge pull request #593 from nextcloud/update/npm7

.eslintrc.js

@@ -1,5 +1,12 @@
 module.exports = {
 	extends: [
 		'@nextcloud',
-	]
+	],
+	rules: {
+		// Allow shallow import of @vue/test-utils in order to be able to use it in
+		// the src folder
+		'node/no-unpublished-import': ['error', {
+			allowModules: ['@vue/test-utils', '@testing-library/vue'],
+		}],
+	},
 }

.github/workflows/cypress.yml

@@ -10,14 +10,11 @@ env:
 
 jobs:
   cypress:
-    name: cypress ${{ matrix.node-version }}
+    name: cypress
     runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
-      matrix:
-        node-version: [12.x]
-        # containers: [1, 2, 3]
 
     steps:
       - name: Checkout server
@@ -38,6 +35,8 @@ jobs:
           php-version: ${{ env.PHP_VERSION }}
           extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, zip, gd, apcu
           coverage: none
+          ini-values:
+            apc.enable_cli=on
 
       - name: Set up Nextcloud
         env:

.github/workflows/lint.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['7.3', '7.4']
+        php-versions: ['7.2', '7.3', '7.4']
 
     name: php${{ matrix.php-versions }}
     steps:
@@ -52,46 +52,44 @@ jobs:
     - name: Run coding standards check
       run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )
 
-#  node:
-#    runs-on: ubuntu-latest
-#
-#    strategy:
-#      matrix:
-#        node-version: [12.x]
-#
-#    name: eslint node${{ matrix.node-version }}
-#    steps:
-#      - uses: actions/checkout@v2
-#
-#      - name: Set up node ${{ matrix.node-version }}
-#        uses: actions/setup-node@v1
-#        with:
-#          node-version: ${{ matrix.node-version }}
-#
-#      - name: Install dependencies
-#        run: npm ci
-#
-#      - name: Lint
-#        run: npm run lint
-#
-#  stylelint:
-#    runs-on: ubuntu-latest
-#
-#    strategy:
-#      matrix:
-#        node-version: [12.x]
-#
-#    name: stylelint node${{ matrix.node-version }}
-#    steps:
-#      - uses: actions/checkout@v2
-#
-#      - name: Set up node ${{ matrix.node-version }}
-#        uses: actions/setup-node@v1
-#        with:
-#          node-version: ${{ matrix.node-version }}
-#
-#      - name: Install dependencies
-#        run: npm ci
-#
-#      - name: Lint
-#        run: npm run stylelint
+  node:
+    runs-on: ubuntu-latest
+
+    name: eslint node
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 14
+
+      - name: Set up npm7
+        run: npm i -g npm@7
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Lint
+        run: npm run lint
+
+  stylelint:
+    runs-on: ubuntu-latest
+
+    name: stylelint node
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 14
+
+      - name: Set up npm7
+        run: npm i -g npm@7
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Lint
+        run: npm run stylelint

.github/workflows/node.yml

@@ -11,18 +11,17 @@ jobs:
   build:
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        node-version: [12]
-
-    name: node${{ matrix.node-version }}
+    name: node
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up node ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+      - name: Set up node
+        uses: actions/setup-node@v2
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: 14
+
+      - name: Set up npm7
+        run: npm i -g npm@7
 
       - name: Install dependencies & build
         run: |

.github/workflows/npm-test.yml

@@ -11,18 +11,17 @@ jobs:
   jest:
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        node-version: [12]
-
-    name: node${{ matrix.node-version }}
+    name: node
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up node ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+      - name: Set up node
+        uses: actions/setup-node@v2
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version: 14
+
+      - name: Set up npm7
+        run: npm i -g npm@7
 
       - name: Install dependencies
         run: npm ci

__mocks__/@nextcloud/axios.js

@@ -2,7 +2,7 @@ const axios = jest.createMockFromModule('@nextcloud/axios')
 
 const wsData = require('./activity_ws.json')
 
-axios.get = async function(url) {
+axios.get = function(url) {
 	return new Promise((resolve, reject) => {
 		if (url === 'http://localhostundefined/ocs/v2.php/apps/activity/api/v2/activity/filter') {
 			resolve({ data: wsData })

css/style.scss

@@ -11,11 +11,13 @@
 	margin-left: 5px;
 	text-overflow: ellipsis;
 }
+
 .activitymessage {
 	margin-left: 25px;
 	color: var(--color-text-maxcontrast);
 	text-overflow: ellipsis;
 }
+
 .activity-previews {
 	margin-left: 24px;
 }
@@ -120,6 +122,7 @@
 	margin-right: 6px;
 	width: 16px;
 }
+
 #app-navigation li span.no-icon {
 	padding-left: 25px;
 }
@@ -173,6 +176,7 @@
 	background-size: contain;
 	opacity: .5;
 }
+
 .activity-icon img {
 	max-width: 16px;
 	max-height: 16px;

cypress/support/commands.js

@@ -20,11 +20,8 @@
  *
  */
 
-import { addMatchImageSnapshotCommand } from 'cypress-image-snapshot/command'
 import axios from '@nextcloud/axios'
 
-addMatchImageSnapshotCommand()
-
 const url = Cypress.config('baseUrl').replace(/\/index.php\/?$/g, '')
 Cypress.env('baseUrl', url)
 

js/activity-sidebar.js.LICENSE.txt

@@ -21,13 +21,13 @@ object-assign
 /*!
  * The buffer module from node.js, for the browser.
  *
- * @author   Feross Aboukhadijeh <http://feross.org>
+ * @author   Feross Aboukhadijeh <https://feross.org>
  * @license  MIT
  */
 
 /*!
- * Vue.js v2.6.12
- * (c) 2014-2020 Evan You
+ * Vue.js v2.6.14
+ * (c) 2014-2021 Evan You
  * Released under the MIT License.
  */
 

lib/CurrentUser.php

@@ -119,6 +119,10 @@ public function getCloudId() {
 	protected function getCloudIDFromToken() {
 		if (!empty($this->request->server['PHP_AUTH_USER'])) {
 			$token = $this->request->server['PHP_AUTH_USER'];
+			/**
+			 * Until https://github.com/nextcloud/server/pull/26681 is merged
+			 * @psalm-suppress InvalidCatch
+			 */
 			try {
 				$share = $this->shareManager->getShareByToken($token);
 				if ($share->getShareType() === IShare::TYPE_REMOTE) {