Skip to content

Commit

Permalink
Merge pull request #33 from lumihq/purs-15
Browse files Browse the repository at this point in the history
Purescript 15 support
  • Loading branch information
mjrussell authored Jun 5, 2022
2 parents 89f254c + e38699c commit 545ff01
Show file tree
Hide file tree
Showing 13 changed files with 12,795 additions and 3,812 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Set up PureScript toolchain
uses: purescript-contrib/setup-purescript@main
with:
purescript: "0.14.0"
purescript: "0.15.0"

- name: Cache PureScript dependencies
uses: actions/cache@v2
Expand Down Expand Up @@ -51,3 +51,6 @@ jobs:

- name: Build the project
run: npm run build

- name: Make the examples
run: make examples
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ all: build examples
build: bower_components node_modules
npx pulp build

examples: bower_components node_modules
examples: node_modules
find examples -maxdepth 2 -type f -iname makefile -execdir make \;

bower_components: node_modules
Expand Down
27 changes: 15 additions & 12 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,20 @@
"output"
],
"dependencies": {
"purescript-colors": "^v6.0.0",
"purescript-console": "^v5.0.0",
"purescript-effect": "^v3.0.0",
"purescript-foreign": "^v6.0.0",
"purescript-foreign-object": "^v3.0.0",
"purescript-numbers": "^v8.0.0",
"purescript-prelude": "^v5.0.0",
"purescript-psci-support": "^v5.0.0",
"purescript-react-basic": "^v16.0.0",
"purescript-react-basic-hooks": "^v7.0.0",
"purescript-typelevel-prelude": "^v6.0.0",
"purescript-unsafe-reference": "^v4.0.0"
"purescript-arrays": "^v7.0.0",
"purescript-colors": "^v7.0.1",
"purescript-either": "^v6.0.0",
"purescript-foreign": "^v7.0.0",
"purescript-foreign-object": "^v4.0.0",
"purescript-functions": "^v6.0.0",
"purescript-integers": "^v6.0.0",
"purescript-numbers": "^v9.0.0",
"purescript-prelude": "^v6.0.0",
"purescript-react-basic": "^v17.0.0",
"purescript-strings": "^v6.0.0",
"purescript-transformers": "^v6.0.0",
"purescript-typelevel-prelude": "^v7.0.0",
"purescript-unsafe-coerce": "^v6.0.0",
"purescript-web-html": "^v4.0.0"
}
}
1 change: 1 addition & 0 deletions examples/basic/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ output
html/index.js
package-lock.json
node_modules
.spago
9 changes: 5 additions & 4 deletions examples/basic/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
all: node_modules
purs compile src/*.purs '../../src/**/*.purs' '../../bower_components/purescript-*/src/**/*.purs'
purs bundle -m Main --main Main output/*/*.js > output/bundle.js
node_modules/.bin/browserify output/bundle.js -o html/index.js
all: node_modules deps
npx spago bundle-app --main Main --to output/bundle.js
npx browserify output/bundle.js -o html/index.js

node_modules:
npm install

deps:
npx spago install
3 changes: 2 additions & 1 deletion examples/basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"react-dom": "17.0.2"
},
"devDependencies": {
"browserify": "17.0.0"
"browserify": "17.0.0",
"esbuild": "^0.14.42"
}
}
17 changes: 17 additions & 0 deletions examples/basic/spago.dhall
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{-
Welcome to a Spago project!
You can edit this file as you like.
-}
let conf = ../../spago.dhall

in conf // {
sources = conf.sources # [ "src/**/*.purs", "../../src/**/*.purs" ],
dependencies = conf.dependencies #
[ "effect"
, "exceptions"
, "maybe"
, "react-basic-dom"
, "react-basic-hooks"
, "web-dom"
]
}
Loading

0 comments on commit 545ff01

Please sign in to comment.