-
Notifications
You must be signed in to change notification settings - Fork 0
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
Merge remote-tracking branch 'template/main' into merge-webpack-changes-from-template #11
base: main
Are you sure you want to change the base?
Conversation
… es modules in production
… es modules in production (#7)
…rom web views are now exact matches
… variable instead of component name to prevent tree shaking
…ry imports (#11) Co-Authored-By: FoolRunning <[email protected]>
…ng extension code to show other features and such
…estor Paranext must have them installed to be able to provide them
…-changes-from-template # Conflicts: # .gitignore # .vscode/launch.json # .vscode/settings.json # README.md # package-lock.json # package.json # public/manifest.json # tsconfig.json
…uff-from-template # Conflicts: # .vscode/launch.json # README.md # package-lock.json # package.json # public/manifest.json # src/main.ts (I just reverted the changes - will attempt a separate commit with analogous changes) # webpack/webpack.config.main.ts
…vious merge, since the main.ts files in the template and in the sneeze board are so different that normal conflict resolution is impossible. I'm 99% sure that we are no longer sup[posed to return the unsubscriber (line 193) and I can see that the import of UnsubscriberAsync is no longer done in the template. But I'm not sure that ripping all this code is the correct thing to do because I don't understand how unsubscribing is supposed to work now.
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.
Nice work. Great that you were able to resolve the merge conflicts
Reviewed 26 of 26 files at r1, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @tombogle)
public/assets/heresy-warning.txt
line 1 at r1 (raw file):
Heresy count:
I think this file can be deleted
src/main.ts
line 176 at r1 (raw file):
logger.info(`Tim sneezed the ${timSneeze[timSneeze.length - 1].sneezeId} sneeze`), ); context.registrations.add(unsubGreetings);
The use of this section of code is unclear to me. I know it's not your code, but what is it supposed to do?
…d in the sneeze board. Also changed a comment to better explain the code that registers with PAPI the things that need to be unsubscribed when shutting down.
Previously, rolfheij-sil wrote…
It is kind of "my code" (closely supervised by TJ). Changed the comment to try to clarify its purpose. |
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.
Reviewable status: 24 of 26 files reviewed, 2 unresolved discussions (waiting on @rolfheij-sil)
public/assets/heresy-warning.txt
line 1 at r1 (raw file):
Previously, rolfheij-sil wrote…
I think this file can be deleted
Done.
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.
Reviewed 2 of 2 files at r2, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @tombogle)
src/main.ts
line 176 at r1 (raw file):
Previously, tombogle (Tom Bogle) wrote…
It is kind of "my code" (closely supervised by TJ). Changed the comment to try to clarify its purpose.
Thanks for updating the comment. I was reffering to the code above, where it seems that some sort of test-sneeze is configured to be added on unsubscribing, or something like that? I still don't get it 😆
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.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @tombogle)
Previously, rolfheij-sil wrote…
Yeah, I was unclear on that also and asked TJ. He wasn't 100% sure, but looking at it we surmised that we're subscribing to be notified any time Tim sneezes. If you don't know, then I guess maybe Katherine or maybe Tim must be the mastermind responsible for that code. I could comment it based on our educated guess... |
WIP!!! This is my attempt at merging in the vite-> webpack template changes. It currently does not build, and it's possible that I lost important stuff in my attempt to merge. It's more than likely that I have some major things wrong.
Conflicts:
.gitignore
.vscode/launch.json
.vscode/settings.json
README.md
package-lock.json
package.json
public/manifest.json
tsconfig.json
This change is