Skip to content

Commit

Permalink
chore: bump js deps
Browse files Browse the repository at this point in the history
  • Loading branch information
imorland committed Sep 26, 2023
1 parent e430bcb commit 0bac011
Show file tree
Hide file tree
Showing 7 changed files with 486 additions and 480 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"test:setup": "Sets up a database for use with integration tests. Execute this only once."
},
"require-dev": {
"flarum/core": "*@dev",
"flarum/core": "*",
"flarum/testing": "^1.0.0",
"symfony/var-dumper": "*"
},
Expand Down
922 changes: 477 additions & 445 deletions js/package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"flarum-webpack-config": "^2.0.0",
"@flarum/prettier-config": "^1.0.0",
"flarum-tsconfig": "^1.0.2",
"webpack": "^5.73.0",
"webpack-cli": "^4.10.0"
"webpack": "^5.88.2",
"webpack-cli": "^5.1.4"
},
"scripts": {
"dev": "webpack --mode development --watch",
Expand All @@ -16,6 +16,6 @@
"format-check": "prettier --check src"
},
"devDependencies": {
"prettier": "^2.7.0"
"prettier": "^3.0.3"
}
}
3 changes: 2 additions & 1 deletion js/src/admin/extendEditTagModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import ItemList from 'flarum/common/utils/ItemList';
import Tag from 'flarum/tags/models/Tag';
import Model from 'flarum/common/Model';
import Stream from 'flarum/common/utils/Stream';
import type Mithril from 'mithril';

export default function () {
if (app.initializers.has('flarum-tags')) {
Expand All @@ -23,7 +24,7 @@ export default function () {
return data;
});

extend(EditTagModal.prototype, 'fields', function (items: ItemList) {
extend(EditTagModal.prototype, 'fields', function (items: ItemList<Mithril.Children>) {
items.add(
'synopsis-excerpt-length',
<div className="Form-group">
Expand Down
4 changes: 2 additions & 2 deletions js/src/forum/addSummaryExcerpt.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { truncate } from 'flarum/common/utils/string';
import ItemList from 'flarum/common/utils/ItemList';
import Tag from 'flarum/tags/models/Tag';
import Model from 'flarum/common/Model';
import { getPlainContent } from './util/getPlainContent';
import type Mithril from 'mithril';

export default function addSummaryExcerpt() {
if (app.initializers.has('flarum-tags')) {
Expand All @@ -19,7 +19,7 @@ export default function addSummaryExcerpt() {
else params.include.push('lastPost');
});

extend(DiscussionListItem.prototype, 'infoItems', function (items: ItemList) {
extend(DiscussionListItem.prototype, 'infoItems', function (items: ItemList<Mithril.Children>) {
// Skip if we are searching to preserve most relevant post content as excerpt,
// that way we also preserve highlighting of search terms in the most relevant post.
if (app.forum.attribute('synopsis.disable_when_searching') && app.discussions.params.q) return;
Expand Down
2 changes: 1 addition & 1 deletion js/src/forum/addUserPreference.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type * as Mithril from 'mithril';
import type Mithril from 'mithril';
import app from 'flarum/forum/app';
import { extend } from 'flarum/common/extend';
import SettingsPage from 'flarum/forum/components/SettingsPage';
Expand Down
27 changes: 0 additions & 27 deletions js/src/forum/util/getPlainContent.ts

This file was deleted.

0 comments on commit 0bac011

Please sign in to comment.