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

clean up console of warnings and errors #1197

Merged
merged 3 commits into from
Feb 13, 2025
Merged

clean up console of warnings and errors #1197

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
ec5e08a
remove client webSocketURL devServer config
jgadsden Feb 10, 2025
684017d
add passive events support to touchstart and mousewheel events
jgadsden Feb 10, 2025
378e272
add passive-events-support to Jest ignore pattern
jgadsden Feb 12, 2025
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 td.vue/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module.exports = async () => {
resetMocks: true,
restoreMocks: true,
transformIgnorePatterns: [
'<rootDir>/node_modules/(?!lodash-es|axios)'
'<rootDir>/node_modules/(?!lodash-es|axios|passive-events-support)'
]
};
};
Expand Down
7 changes: 7 additions & 0 deletions td.vue/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.

1 change: 1 addition & 0 deletions td.vue/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
"electron-updater": "^6.3.0",
"is-electron": "^2.2.1",
"jquery": "^3.7.1",
"passive-events-support": "^1.1.0",
"uuid": "^8.3.2",
"vue": "^2.7.3",
"vue-i18n": "^8.27.2",
Expand Down
5 changes: 5 additions & 0 deletions td.vue/src/service/migration/diagram.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@ import graphFactory from '@/service/x6/graph/graph.js';
import events from '@/service/x6/graph/events.js';
import store from '@/store/index.js';
import tmActions from '@/store/actions/threatmodel.js';
import { passiveSupport } from 'passive-events-support/src/utils';

const appVersion = require('../../../package.json').version;

passiveSupport({
events: ['touchstart', 'mousewheel']
});

const drawV1 = (diagram, graph) => {
const { nodes, edges } = cells.map(diagram);
const batchName = 'td-init';
Expand Down
8 changes: 1 addition & 7 deletions td.vue/vue.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,7 @@ const devServerConfig = hasTlsCredentials
allowedHosts: [appHostname],
}
: {
client: {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ericfitz and @lreading , is this OK to remove? It was the cause of console errors for the desktop app - but seems a bit brutal of me just to delete it

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe it's fine to delete, unless @ericfitz disagrees! :)

webSocketURL: {
protocol: 'wss', // Use secure WebSocket protocol
hostname: appHostname,
port: 443, // HTTPS port
},
},
// note that client webSocketURL config has been removed, as it was incompatible with desktop version
port: 8080,
proxy: {
'^/api': {
Expand Down
Loading