Skip to content

Commit 4253ad5

Browse files
committed
Bump deps and use npm7
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
1 parent e069bc5 commit 4253ad5

18 files changed

+22974
-33599
lines changed

.eslintrc.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
module.exports = {
22
extends: [
3-
'@nextcloud'
3+
'@nextcloud',
44
],
55
globals: {
6+
__webpack_nonce__: true,
7+
__webpack_public_path__: true,
8+
appName: true,
9+
appVersion: true,
610
expect: true,
711
OC: true,
812
OCA: true,
913
OCP: true,
1014
t: true,
11-
__webpack_public_path__: true,
12-
__webpack_nonce__: true,
13-
}
15+
},
1416
}

.github/workflows/lint.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
runs-on: ubuntu-latest
77
steps:
88
- name: Checkout
9-
uses: actions/checkout@master
9+
uses: actions/checkout@v2
1010
- name: Download schema
1111
run: wget https://apps.nextcloud.com/schema/apps/info.xsd
1212
- name: Lint info.xml
@@ -23,7 +23,7 @@ jobs:
2323
name: php${{ matrix.php-versions }} lint
2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@master
26+
uses: actions/checkout@v2
2727
- name: Set up php${{ matrix.php-versions }}
2828
uses: shivammathur/setup-php@master
2929
with:
@@ -38,7 +38,7 @@ jobs:
3838
runs-on: ubuntu-latest
3939
steps:
4040
- name: Checkout
41-
uses: actions/checkout@master
41+
uses: actions/checkout@v2
4242
- name: Set up php
4343
uses: shivammathur/setup-php@master
4444
with:
@@ -54,11 +54,13 @@ jobs:
5454
runs-on: ubuntu-latest
5555
name: ESLint
5656
steps:
57-
- uses: actions/checkout@master
57+
- uses: actions/checkout@v2
5858
- name: Set up Node
59-
uses: actions/setup-node@v2.1.5
59+
uses: actions/setup-node@v2
6060
with:
61-
node-version: 12.x
61+
node-version: 14
62+
- name: Set up npm7
63+
run: npm i -g npm@7
6264
- name: npm install
6365
run: npm ci
6466
- name: eslint

.github/workflows/package.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ jobs:
88
name: Build release tarball
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@master
11+
uses: actions/checkout@v2
1212
- name: Set up Node
13-
uses: actions/setup-node@v2.1.5
13+
uses: actions/setup-node@v2
1414
with:
1515
node-version: 12.x
1616
- name: Set up php$

.github/workflows/static-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
name: Nextcloud ${{ matrix.ocp-version }}
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@master
19+
uses: actions/checkout@v2
2020
- name: Set up php
2121
uses: shivammathur/setup-php@master
2222
with:

.github/workflows/test.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
working-directory: nextcloud/3rdparty
3636
run: composer require nikic/php-parser:4.10
3737
- name: Checkout Mail
38-
uses: actions/checkout@master
38+
uses: actions/checkout@v2
3939
with:
4040
path: nextcloud/apps/mail
4141
- name: Install dependencies
@@ -114,7 +114,7 @@ jobs:
114114
- name: Install Nextcloud
115115
run: php -f nextcloud/occ maintenance:install --database-host 127.0.0.1 --database-name nextcloud --database-user nextcloud --database-pass nextcloud --admin-user admin --admin-pass admin --database ${{ matrix.db }}
116116
- name: Checkout Mail
117-
uses: actions/checkout@master
117+
uses: actions/checkout@v2
118118
with:
119119
path: nextcloud/apps/mail
120120
- name: Install dependencies
@@ -148,13 +148,15 @@ jobs:
148148
runs-on: ubuntu-latest
149149
name: Front-end unit tests
150150
steps:
151-
- uses: actions/checkout@master
151+
- uses: actions/checkout@v2
152152
- name: Set up Node
153-
uses: actions/setup-node@v2.1.5
153+
uses: actions/setup-node@v2
154154
with:
155-
node-version: 12.x
155+
node-version: 14
156+
- name: Set up npm7
157+
run: npm i -g npm@7
156158
- name: npm install
157-
run: npm install
159+
run: npm ci
158160
- name: run tests
159161
run: npm run test
160162
env:

babel.config.js

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
module.exports = {
2-
plugins: [
3-
'@babel/plugin-syntax-dynamic-import'
4-
],
5-
presets: [
6-
[
7-
'@babel/preset-env',
8-
{
9-
modules: process.env.NODE_ENV === 'testing' ? 'commonjs' : undefined,
10-
useBuiltIns: process.env.NODE_ENV === 'testing' ? 'usage' : 'entry',
11-
corejs: 3
12-
}
13-
]
14-
]
15-
};
1+
const babelConfig = require('@nextcloud/babel-config')
2+
3+
module.exports = babelConfig

lib/Dashboard/MailWidget.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public function getUrl(): ?string {
8989
* @inheritDoc
9090
*/
9191
public function load(): void {
92-
Util::addScript(Application::APP_ID, 'dashboard');
92+
Util::addScript(Application::APP_ID, 'mail-dashboard');
9393

9494
$this->initialState->provideInitialState(
9595
'mail-accounts',

0 commit comments

Comments
 (0)