A set of tweaks to simplify electron packaging #421
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Replace `ormconfig.js` with a newer mechanism of configuring
TypeORM that can be included in the source code properly.
The path to `ormconfig.js` has always been awkward to handle,
and eliminating the file makes building different Grist setups
a bit simpler.
* Remove `electron` package. It is barely used, just for some old
remnants of an older attempt at electron packaging. It was used
for two types, which I left at `any` for now. More code pruning is
no doubt possible here, but I'd rather do it when Electron packaging
has solidified.
* Add a hook for replacing the login system, and for adding some
extra middleware the login system may need.
* Add support for some more possible locations of Python, which
arise when a standalone version of it is included in the Electron
package. This isn't very general purpose, just configurations
that I found useful.
* Support using grist-core within a yarn workspace - the only tweak
needed was webpack related.
* Allow an external ID to be optionally associated with documents.
app/server/lib/dbUtils.ts
Outdated
Comment on lines
145
to
149
| // "cli": { | ||
| // "entitiesDir": `${codeRoot}/app/gen-server/entity`, | ||
| // "migrationsDir": `${codeRoot}/app/gen-server/migration`, | ||
| // "subscribersDir": `${codeRoot}/app/gen-server/subscriber` | ||
| // } |
There was a problem hiding this comment.
Just wondering why this was commented out.
There was a problem hiding this comment.
These settings aren't a thing anymore. typeorm/typeorm#9659
Deleted the code fully now.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This makes some changes which allow an Electron version of Grist to be build using grist-core as a submodule (see https://github.com/paulfitz/grist-electron). This should make it easy to keep the Electron version up to date, without bulking up grist-core. Broadly, the changes are cleanup, and more hooks.
ormconfig.jswith a newer mechanism of configuring TypeORM that can be included in the source code properly. The path toormconfig.jshas always been awkward to handle, and eliminating the file makes building different Grist setups a bit simpler.electronpackage. It is barely used, just for some old remnants of an older attempt at electron packaging. It was used for two types, which I left atanyfor now. More code pruning is no doubt possible here, but I'd rather do it when Electron packaging has solidified.