Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Bump dependencies and use npm7
Signed-off-by: Marco Ambrosini <[email protected]>
  • Loading branch information
marcoambrosini authored and nickvergessen committed Jun 17, 2021
commit 29b2dd55ac8d7d593d0a1fb0b4bf09e01137ee42
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 = {
}
}
]
}
}
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