Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Techdebt/noid/node14 npm7 #5773

Merged
merged 15 commits into from
Jun 17, 2021
Merged
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
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ module.exports = {
}
}
]
}
}
15 changes: 7 additions & 8 deletions .github/workflows/jest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,17 @@ jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
node-versions: [12.x]

name: node${{ matrix.node-versions }}
name: node
steps:
- uses: actions/checkout@v2

- name: Set up node ${{ matrix.node-versions }}
uses: actions/setup-node@v1
- name: Set up node
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-versions }}
node-version: 14

- name: Set up npm7
run: npm i -g npm@7

- name: Install dependencies
run: npm ci
Expand Down
30 changes: 14 additions & 16 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,17 @@ jobs:
node:
runs-on: ubuntu-latest

strategy:
matrix:
node-versions: [12.x]

name: eslint node${{ matrix.node-versions }}
name: eslint node
steps:
- uses: actions/checkout@v2

- name: Set up node ${{ matrix.node-versions }}
uses: actions/setup-node@v1
- name: Set up node
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-versions }}
node-version: 14

- name: Set up npm7
run: npm i -g npm@7

- name: Install dependencies
run: npm ci
Expand All @@ -77,18 +76,17 @@ jobs:
stylelint:
runs-on: ubuntu-latest

strategy:
matrix:
node-versions: [12.x]

name: stylelint node${{ matrix.node-versions }}
name: stylelint node
steps:
- uses: actions/checkout@v2

- name: Set up node ${{ matrix.node-versions }}
uses: actions/setup-node@v1
- name: Set up node
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-versions }}
node-version: 14

- name: Set up npm7
run: npm i -g npm@7

- name: Install dependencies
run: npm ci
Expand Down
14 changes: 3 additions & 11 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
module.exports = {
presets: [
[
'@babel/preset-env',
{
corejs: 3,
useBuiltIns: 'entry',
},
],
],
}
const babelConfig = require('@nextcloud/babel-config')

module.exports = babelConfig
2 changes: 1 addition & 1 deletion lib/AppInfo/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ protected function registerCollaborationResourceProvider(IServerContainer $serve
$resourceManager = $server->query(IProviderManager::class);
$resourceManager->registerResourceProvider(ConversationProvider::class);
$server->getEventDispatcher()->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', function () {
\OCP\Util::addScript(self::APP_ID, 'collections');
\OCP\Util::addScript(self::APP_ID, 'talk-collections');
});
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Dashboard/TalkWidget.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,6 @@ public function getUrl(): ?string {
*/
public function load(): void {
Util::addStyle('spreed', 'icons');
Util::addScript('spreed', 'dashboard');
Util::addScript('spreed', 'talk-dashboard');
}
}
4 changes: 2 additions & 2 deletions lib/Deck/DeckPluginLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ public function handle(Event $event): void {
}

if (strpos($this->request->getPathInfo(), '/apps/deck') === 0) {
Util::addScript('spreed', 'collections');
Util::addScript('spreed', 'deck');
Util::addScript('spreed', 'talk-collections');
Util::addScript('spreed', 'talk-deck');
}
}
}
2 changes: 1 addition & 1 deletion lib/Flow/RegisterOperationsListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ public function handle(Event $event): void {
}

$event->registerOperation($this->operation);
Util::addScript('spreed', 'flow');
Util::addScript('spreed', 'talk-flow');
}
}
Loading