-
Notifications
You must be signed in to change notification settings - Fork 43
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
Dependency update (FVTT types v9, etc) #392
Conversation
oh, btw, this PR also adds anyways, i should probably stop for the night; if webpack proves too stubborn, i can just roll back that upgrade |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for diving down the rabbit hole! The type updates look great, and it seems like we can still use Quill, we just have to avoid compiling Javascript? Not sure what's causing that.
tsconfig.json
Outdated
@@ -26,5 +27,5 @@ | |||
|
|||
"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */ | |||
}, | |||
"exclude": ["node_modules", "webpack.config.js"] | |||
"exclude": ["node_modules", "webpack.config.js", "**/*.js"] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems to be the thing that makes the compile succeed. Keep this and turn Quill back on everywhere, and it should work.
src/module/vue/sf-locationsheet.vue
Outdated
@@ -142,7 +142,7 @@ | |||
</section> | |||
|
|||
<section class="flexcol"> | |||
<quill-editor v-model="actor.data.description" /> | |||
<!-- <quill-editor v-model="actor.data.description" /> --> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Roll this back, should be fine.
@@ -1,6 +1,6 @@ | |||
<template> | |||
<div class="flexcol"> | |||
<quill-editor v-model="actor.data.notes" /> | |||
<!-- <quill-editor v-model="actor.data.notes" /> --> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Roll this back, should be fine.
@@ -132,4 +132,4 @@ export default { | |||
}, | |||
}, | |||
} | |||
</script> | |||
</script> --> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
git checkout main -- src/module/vue/components/quill-editor/
should be fine.
src/module/vue/character-sheet.vue
Outdated
@@ -111,7 +111,7 @@ | |||
<progress-controls :actor="actor" /> | |||
</div> | |||
|
|||
<quill-editor theme="bubble" v-model="actor.data.biography" /> | |||
<!-- <quill-editor theme="bubble" v-model="actor.data.biography" /> --> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Roll this back, should be fine.
Not sure what's causing your web socket error. Mind works okay using Chrome. |
instead of excluding JS files manually, i've flipped the switch on tsconfig's webpacks' gripes about websocket are still present. chromium causes more verbose errors for me than FF did: (always two there are. no more, no less) but the sheet itself still seems to work fine. weird. i have no evidence to support it but i'm inclined to blame monterey. ;) either way, i doubt it'll break anything user-facing, so i'll call this PR ready. |
i just noticed that |
actually, it might be fine - i forgot CJS |
I'll save you some effort: those two are the old way of importing, and should be retired. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I like it. Ready to merge?
src/module/chat/chatrollhelpers.ts
Outdated
@@ -416,7 +417,7 @@ export async function rollAndDisplayOracleResult( | |||
} | |||
|
|||
// Do the random roll | |||
const tableDraw = await (table as any).draw({ displayChat: false }) | |||
const tableDraw = await(table).draw({ displayChat: false } as RollTable.DrawOptions) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well that's an unfortunate typing. Too bad this call doesn't accept a Partial<RollTable.DrawOptions>
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ugh, yeah, that one made me grind my teeth. according to the API docs, the props on RollTable.DrawOptions
are all optional (and, i mean, the rolls work), so i'm guessing this is just an error in the LoFD typings package. TBH, i'm surprised that they're not just extracting them directly from FVTT's source to avoid that kind of error, but maybe there's a good reason not to do that.
either way, i'll add a note about it... and i should probably open a PR there, too.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, should be good to merge now 👍
tsc
to segfaultmost promising line of inquiry ive turned up is this: chimurai/http-proxy-middleware#171