Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
module.exports = {
extends: [
'@nextcloud'
'@nextcloud',
],
globals: {
__webpack_nonce__: true,
__webpack_public_path__: true,
appName: true,
appVersion: true,
expect: true,
OC: true,
OCA: true,
OCP: true,
t: true,
__webpack_public_path__: true,
__webpack_nonce__: true,
}
},
}
14 changes: 8 additions & 6 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@v2
- name: Download schema
run: wget https://apps.nextcloud.com/schema/apps/info.xsd
- name: Lint info.xml
Expand All @@ -23,7 +23,7 @@ jobs:
name: php${{ matrix.php-versions }} lint
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@v2
- name: Set up php${{ matrix.php-versions }}
uses: shivammathur/setup-php@master
with:
Expand All @@ -38,7 +38,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@v2
- name: Set up php
uses: shivammathur/setup-php@master
with:
Expand All @@ -54,11 +54,13 @@ jobs:
runs-on: ubuntu-latest
name: ESLint
steps:
- uses: actions/checkout@master
- uses: actions/checkout@v2
- name: Set up Node
uses: actions/setup-node@v2.1.5
uses: actions/setup-node@v2
with:
node-version: 12.x
node-version: 14
- name: Set up npm7
run: npm i -g npm@7
- name: npm install
run: npm ci
- name: eslint
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
name: Build release tarball
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@v2
- name: Set up Node
uses: actions/setup-node@v2.1.5
uses: actions/setup-node@v2
with:
node-version: 12.x
- name: Set up php$
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
name: Nextcloud ${{ matrix.ocp-version }}
steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@v2
- name: Set up php
uses: shivammathur/setup-php@master
with:
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
working-directory: nextcloud/3rdparty
run: composer require nikic/php-parser:4.10
- name: Checkout Mail
uses: actions/checkout@master
uses: actions/checkout@v2
with:
path: nextcloud/apps/mail
- name: Install dependencies
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
- name: Install Nextcloud
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 }}
- name: Checkout Mail
uses: actions/checkout@master
uses: actions/checkout@v2
with:
path: nextcloud/apps/mail
- name: Install dependencies
Expand Down Expand Up @@ -148,13 +148,15 @@ jobs:
runs-on: ubuntu-latest
name: Front-end unit tests
steps:
- uses: actions/checkout@master
- uses: actions/checkout@v2
- name: Set up Node
uses: actions/setup-node@v2.1.5
uses: actions/setup-node@v2
with:
node-version: 12.x
node-version: 14
- name: Set up npm7
run: npm i -g npm@7
- name: npm install
run: npm install
run: npm ci
- name: run tests
run: npm run test
env:
Expand Down
18 changes: 3 additions & 15 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
module.exports = {
plugins: [
'@babel/plugin-syntax-dynamic-import'
],
presets: [
[
'@babel/preset-env',
{
modules: process.env.NODE_ENV === 'testing' ? 'commonjs' : undefined,
useBuiltIns: process.env.NODE_ENV === 'testing' ? 'usage' : 'entry',
corejs: 3
}
]
]
};
const babelConfig = require('@nextcloud/babel-config')

module.exports = babelConfig
2 changes: 1 addition & 1 deletion lib/Dashboard/MailWidget.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public function getUrl(): ?string {
* @inheritDoc
*/
public function load(): void {
Util::addScript(Application::APP_ID, 'dashboard');
Util::addScript(Application::APP_ID, 'mail-dashboard');

$this->initialState->provideInitialState(
'mail-accounts',
Expand Down
Loading