Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ package-lock.json
/.purs*
/.psa*
/.spago
/.vscode
yarn-error.log
yarn.lock
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: node_js
dist: trusty
dist: focal
sudo: required
node_js: stable
install:
Expand Down
30 changes: 23 additions & 7 deletions examples-icon-spago.dhall
Original file line number Diff line number Diff line change
@@ -1,10 +1,26 @@
{ name = "examples-icon"
, dependencies = (./spago.dhall).dependencies #
[ "react-map-gl"
, "web-html"
, "affjax"
, "argonaut"
]
, dependencies =
(./spago.dhall).dependencies
# [ "react-map-gl"
, "web-html"
, "affjax"
, "argonaut"
, "aff"
, "arrays"
, "either"
, "exceptions"
, "foldable-traversable"
, "integers"
, "math"
, "maybe"
, "newtype"
, "ordered-collections"
, "partial"
, "react-dom"
, "transformers"
, "tuples"
, "web-dom"
]
, packages = (./spago.dhall).packages
, sources = (./spago.dhall).sources # ["examples/icon/src/**/*.purs"]
, sources = (./spago.dhall).sources # [ "examples/icon/src/**/*.purs" ]
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"scripts": {
"build": "spago build",
"//": "",
"examples-icon": "yarn examples-icon:bundle-app && yarn examples-icon:browserify",
"examples-icon": "npm run examples-icon:bundle-app && npm run examples-icon:browserify",
"examples-icon:build": "spago --config examples-icon-spago.dhall build",
"examples-icon:bundle-app": "spago --config examples-icon-spago.dhall bundle-app --to examples/icon/dist/bundle.js",
"examples-icon:browserify": "browserify examples/icon/dist/bundle.js -o examples/icon/dist/bundle.js",
Expand Down
40 changes: 17 additions & 23 deletions packages.dhall
Original file line number Diff line number Diff line change
@@ -1,33 +1,27 @@
let upstream =
https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20200922/packages.dhall sha256:5edc9af74593eab8834d7e324e5868a3d258bbab75c5531d2eb770d4324a2900
https://github.com/purescript/package-sets/releases/download/psc-0.14.3-20210722/packages.dhall sha256:1ceb43aa59436bf5601bac45f6f3781c4e1f0e4c2b8458105b018e5ed8c30f8c

let overrides = {=}

let additions =
{ react-map-gl =
{ dependencies =
[ "prelude"
, "react"
, "web-mercator"
, "simple-json"
, "generics-rep"
]
, repo =
"https://github.com/f-o-a-m/purescript-react-map-gl.git"
, version =
"master"
}
, web-mercator =
{ dependencies =
[ "partial"
{ react-map-gl =
{ dependencies = [ "prelude", "react", "web-mercator", "simple-json" ]
, repo = "https://github.com/f-o-a-m/purescript-react-map-gl.git"
, version = "v0.14"
}
, web-mercator =
{ dependencies =
[ "assert"
, "console"
, "effect"
, "prelude"
, "psci-support"
, "partial"
, "functions"
]
, repo =
"https://github.com/f-o-a-m/purescript-web-mercator.git"
, version =
"master"
, repo = "https://github.com/f-o-a-m/purescript-web-mercator.git"
, version = "v0.14"
}
}
}

in upstream // overrides // additions
in upstream overrides additions
4 changes: 3 additions & 1 deletion spago.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
, "effect"
, "foreign"
, "foreign-object"
, "nullable"
, "prelude"
, "psci-support"
, "react"
, "unsafe-coerce"
, "web-mercator"
, "react-dom"
]
, packages = ./packages.dhall
, sources = [ "src/**/*.purs", "test/**/*.purs" ]
Expand Down