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.

Sign up for GitHub

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

Jump to bottom

fix(ActivityModel): Migrate to TypeScript and fix some type issues #1393

Merged
merged 3 commits into from
Nov 6, 2023
Merged

fix(ActivityModel): Migrate to TypeScript and fix some type issues #1393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
876493d
fix(ActivityModel): Migrate to TypeScript and fix some type issues
susnux Nov 5, 2023
bcf066c
fix(tests): Adjusts tests to allow Typescript
susnux Nov 5, 2023
2d274f8
chore: Compile assets
susnux Nov 5, 2023
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: 2 additions & 0 deletions babel.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
const babelConfig = require('@nextcloud/babel-config')

babelConfig.presets.push('@babel/preset-typescript')

module.exports = babelConfig
1 change: 0 additions & 1 deletion js/activity-389.js.map
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions js/activity-389.js → js/activity-629.js
View file
Open in desktop

Large diffs are not rendered by default.

0 js/activity-389.js.LICENSE.txt → js/activity-629.js.LICENSE.txt
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions js/activity-629.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/activity-sidebar.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/activity-sidebar.js.map
View file
Open in desktop

Large diffs are not rendered by default.

185 changes: 131 additions & 54 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,12 @@
"moduleFileExtensions": [
"js",
"json",
"ts",
"vue"
],
"testEnvironment": "jest-environment-jsdom",
"transform": {
"^.+\\.js$": "babel-jest",
"^.+\\.m?(j|t)s$": "babel-jest",
"^.+\\.vue$": "@vue/vue2-jest"
},
"transformIgnorePatterns": [
Expand Down Expand Up @@ -93,6 +94,7 @@
"vuex": "^3.6.2"
},
"devDependencies": {
"@babel/preset-typescript": "^7.23.2",
"@cypress/browserify-preprocessor": "^3.0.2",
"@nextcloud/babel-config": "^1.0.0",
"@nextcloud/browserslist-config": "^3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Activity.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js'
import NcUserBubble from '@nextcloud/vue/dist/Components/NcUserBubble.js'
import RichText from '@nextcloud/vue-richtext'

import ActivityModel from '../models/ActivityModel.js'
import ActivityModel from '../models/ActivityModel.ts'

import FileRichArgument from './richArgumentsTypes/FileRichArgument.vue'
import EmailRichArgument from './richArgumentsTypes/EmailRichArgument.vue'
Expand Down
Loading
Loading