Skip to content

Merge changes from #128 #136

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

Merged
merged 13 commits into from
Mar 14, 2020
Merged

Merge changes from #128 #136

merged 13 commits into from
Mar 14, 2020

Conversation

gabejohnson
Copy link
Contributor

I merged the changes from #128 into master and updated Try.Config.mainGist to point to my updated fork.

In order to load the modules, it's necessary to copy the contents of staging/core/.psci_modules/node_modules/ into client/js/output/.

@hdgarrood Again this is the bare minimum. The other backends haven't been removed, no READMEs have been updated, and none of the comments from #135 (review) have been implemented.

@natefaubion your changes are great! This will likely allow a lot of flexibility for people wanting to run TryPS locally.

Comment on lines +12 to +26
shims :: Object Shim
shims = Object.fromFoldable
[ Tuple "react"
{ url: "https://unpkg.com/[email protected]/umd/react.development.js"
, deps: []
}
, Tuple "react-dom"
{ url: "https://unpkg.com/[email protected]/umd/react-dom.development.js"
, deps: [ "react" ]
}
, Tuple "react-dom/server"
{ url: "https://unpkg.com/[email protected]/umd/react-dom-server.browser.development.js"
, deps: [ "react" ]
}
]
Copy link
Contributor

Choose a reason for hiding this comment

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

These versions probably need to be updated.

@hdgarrood
Copy link
Collaborator

In what sense have the other backends not been removed? To me, it looks like they have been. The only remnants of the other backends I can find are the files in client/js like react.js and mathbox-bundle.js.

@hdgarrood
Copy link
Collaborator

This looks great! I'm going to just go ahead and merge it (and update the shim versions).

@hdgarrood hdgarrood merged commit 91276af into purescript:master Mar 14, 2020
@hdgarrood
Copy link
Collaborator

I've just noticed that link clicks no longer work, presumably because of the new iframe. Perhaps we can handle this by listening for the iframe load event and navigating to the new location manually?

@hdgarrood hdgarrood mentioned this pull request Mar 14, 2020
33 tasks
@hdgarrood
Copy link
Collaborator

Oh I see, there's also the contents of staging/*

hdgarrood added a commit that referenced this pull request Apr 11, 2020
Runtime JS dependencies are obtained as follows:

- dependencies for the main client window (eg jquery, ace) are obtained
  via cdnjs.cloudflare.com, and so we don't need anything beyond than
  the script tags in index.html.
- dependencies needed inside the iframe (eg react, for gists which use
  react-based libraries like purescript-react or purescript-thermite)
  are obtained via the new 'shims' mechanism introduced by #128 / #136.

The files I am removing in this commit do not appear to be in use. I've
also removed non-purescript dependencies from bower.json, as they also
do not appear to be in use.
hdgarrood added a commit that referenced this pull request Apr 11, 2020
Runtime JS dependencies are obtained as follows:

- dependencies for the main client window (eg jquery, ace) are obtained
  via cdnjs.cloudflare.com, and so we don't need anything beyond than
  the script tags in index.html.
- dependencies needed inside the iframe (eg react, for gists which use
  react-based libraries like purescript-react or purescript-thermite)
  are obtained via the new 'shims' mechanism introduced by #128 / #136.

The files I am removing in this commit do not appear to be in use. I've
also removed non-purescript dependencies from bower.json, as they also
do not appear to be in use.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants