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.

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

Implement the project install step #1602

Merged
merged 20 commits into from
Jan 29, 2024

Conversation

sodic
Copy link
Contributor

@sodic sodic commented Dec 18, 2023

Important

I messed up the base branch when merging this. The entire discussion is here, but the commit that ended up in main is in this PR: #1690.

Fixes #1597.

Tasks:

How to run and test stuff:

  • Go to waspc/examples/todo-typescript and work inside that project.
  • Running ./cleanstart will clean everything, fix known issues (e.g., duplicate react) and start the app with all the necessary migrations applied.
  • The rest of the commands (e.g,. cabal run wasp-cli start, cabal run wasp-cli clean) will do what you expect.
  • After each change, either let the application pick it up, rerun cabal run wasp-cli start, or run ./cleanstart (depending on what you're changing).
  • You can run ./fix to fix the double react installation issue (but often won't need to, as ./cleanstart takes care of it).
  • Please don't commit the migrations or package-lock.json.

Important

PR 1603 (filip-wasp-reset) branches out of PR 1604 (filip-restructuring-prisma), which branches out of PR 1602 (filip-project-install-step).
The PR numbers are unfortunately out of order.
Make sure you keep the branches up to date with their bases as you change stuff.

@sodic sodic changed the title Filip project install step Implement the project install step Dec 18, 2023
waspc/data/Cli/templates/basic/package.json Show resolved Hide resolved
waspc/src/Wasp/AppSpec.hs Show resolved Hide resolved
waspc/src/Wasp/AppSpec/PackageJson.hs Outdated Show resolved Hide resolved
waspc/src/Wasp/AppSpec/PackageJson.hs Outdated Show resolved Hide resolved
waspc/src/Wasp/AppSpec/PackageJson.hs Outdated Show resolved Hide resolved
waspc/src/Wasp/Generator/NpmInstall.hs Outdated Show resolved Hide resolved
waspc/src/Wasp/Generator/SdkGenerator.hs Outdated Show resolved Hide resolved
waspc/src/Wasp/Project/Analyze.hs Show resolved Hide resolved
waspc/src/Wasp/Project/Analyze.hs Outdated Show resolved Hide resolved
waspc/src/Wasp/Project/Analyze.hs Outdated Show resolved Hide resolved
waspc/src/Wasp/AppSpec.hs Show resolved Hide resolved
waspc/src/Wasp/Util/IO.hs Show resolved Hide resolved
waspc/data/Cli/templates/basic/package.json Show resolved Hide resolved
waspc/src/Wasp/AppSpec/PackageJson.hs Outdated Show resolved Hide resolved
waspc/src/Wasp/AppSpec/PackageJson.hs Outdated Show resolved Hide resolved
waspc/src/Wasp/Generator/NpmInstall.hs Outdated Show resolved Hide resolved
waspc/src/Wasp/Generator/NpmInstall.hs Outdated Show resolved Hide resolved
waspc/src/Wasp/Generator/NpmDependencies.hs Outdated Show resolved Hide resolved
waspc/src/Wasp/Generator/SdkGenerator.hs Outdated Show resolved Hide resolved
waspc/src/Wasp/Project/Analyze.hs Show resolved Hide resolved
Copy link
Member

@Martinsos Martinsos left a comment

Choose a reason for hiding this comment

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

Did another round!

@Martinsos
Copy link
Member

Done!

@Martinsos
Copy link
Member

TODO: Update the docs.

@Martinsos
Copy link
Member

I fixed all the comments except for that one you said @sodic not to touch.
I also ran the new code, all seems fine.

@Martinsos
Copy link
Member

Ok I actually revived you change to how output in terminal is prefixed, I saw after running it more that it just doesn't look good.

@Martinsos
Copy link
Member

Martinsos commented Jan 19, 2024

I also did the docs. I hunted down mentions of dependencies and either removed them if redundant or updated them to talk about package.json / npm install .

@Martinsos
Copy link
Member

Martinsos commented Jan 20, 2024

I tried running npm install -S <some_dep> and Wasp picked it up and reacted to it: that worked well! Interesting thing though: this dep was never added to .wasp/out/installedFullStackNpmDependencies.json . Not sure if this is a problem or not at this point -> probably is?

I also tried adding a dep directly into package.json to see if Wasp will pick that up and install it on its own, but that didn't happen. I tried starting wasp start again, and that also didn't pick it up. But might that be ok at this point, due to the shape in which restructuring is and the fact that we are using ./cleanstart thing? Or should this be working?

@sodic
Copy link
Contributor Author

sodic commented Jan 21, 2024

Or should this be working?

Everything you mentioned here should be working.

Base automatically changed from filip-restructuring-prototype to filip-restructuring January 29, 2024 13:00
@sodic sodic changed the base branch from filip-restructuring to filip-restructuring-prototype January 29, 2024 13:31
@sodic sodic marked this pull request as ready for review January 29, 2024 13:42
@sodic sodic merged commit b285131 into filip-restructuring-prototype Jan 29, 2024
1 of 4 checks passed
@sodic sodic deleted the filip-project-install-step branch January 29, 2024 13:43
@sodic sodic restored the filip-project-install-step branch January 29, 2024 13:50
@sodic sodic deleted the filip-project-install-step branch January 29, 2024 13:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants