All source files in one branch #135
Conversation
* setQueryStrings should replace existing parameters * Update JS
In preparation for merging `gh-pages` into `master`, we move everything into a `client` directory to avoid merge conflicts and preserve git history. See purescript#132
See purescript#132. We would like to keep all source files in a single branch and use `gh-pages` purely for hosting build artifacts. Going forward we would build the PS source and push it (along with the html, css, other js dependencies, README.md, etc.) to `gh-pages`. No edits would happen directly in `gh-pages`.
I've updated dependencies by major version only for those that require it to compile against the v0.13.x version of the compiler (I bumped the compiler to the latest at the time of writing - v0.13.6). When running `bower install`, I had to do some interactive module resolutions. I think it makes sense to move to psc-package (whether in this PR or a follow-up) and potentially `spago` in the future.
There was a missing step to install npm dependencies and the instructions for `psc-package` were out-of-date.
Phil's gist was targeted < v0.12.x so I forked it and made the required updates at https://gist.github.com/gabejohnson/e1d317102aad40207309d8873e301273
client/js/index.js
Outdated
| @@ -0,0 +1,6231 @@ | |||
| // Generated by purs bundle 0.12.0 | |||
There was a problem hiding this comment.
Should this file be ignored?
There was a problem hiding this comment.
I had just added a it to .gitignore right before opening the PR, but forgot to remove it. Fixed.
|
I'm very much in favour of keeping this PR minimal, by the way. 👍 |
We no longer want to track build artifacts in the mainline branch.
gabejohnson
force-pushed
the
all-source-files-in-one-branch
branch
2 times, most recently
from
1df65d9 to
9a2530e
Compare
There was a problem hiding this comment.
This is great! Some things that occur to me that I think would be nice to do next:
- Have the client use spago rather than bower for its PureScript dependencies
- Have the client use npm for its JS dependencies, and avoid having react and mathbox checked in
- Merge README.md and client/README.md into a single file, and make some minor updates
- Move client configuration out of the source files
But I think all of these can happen separately. As far as I'm concerned I'm happy to go ahead and merge this now.
|
Those all sound like reasonable changes. I think replacing the Since I incorporated the changes from #127, that can probably be closed as well. |
|
I don't think it's worth updating backends. I would much rather merge up #128 and obviate the need for backends. |
That makes sense. I guess just updating some gists then. |
See #132
We would like to keep all source files in a single branch and use
gh-pagespurely for hostingbuild artifacts.
Going forward we would build the PS source and push it (along with the html, css, other js dependencies, README.md, etc.) to
gh-pages. No edits would happen directly ingh-pages.So far I've done the minimum to move the frontend files into the mainline branch and get the Core backend working with
v0.13.6. Much of the work was already done by @natefaubionin #127 which I've merged into this branch. The other backends still need updating and there are none of the scripts mentioned in #132 (comment).
I've forked the Core gist and the example gists to which it points to get them working with
Effectand pointedTry.APIto that fork. Going forward it may make sense to have those gists live under thepurescriptorg.I'm open to adding more to this PR (backend updates, build scripts) but wanted to keep it minimal and spur discussion concerning what needs to be done to get https://try.purescript.org up-to-date.