Skip to content

Commit 3cddc5f

Browse files
authored
Merge pull request paf31#61 from fsoikin/purescript-0.14
Migrate to PureScript 0.14
2 parents 46f0999 + c9ceaa4 commit 3cddc5f

File tree

9 files changed

+25
-18
lines changed

9 files changed

+25
-18
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.psci*
22
bower_components/
3+
node_modules/
34
output/
45
.psc-package
56
.psc-ide-port

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ First, define some data type and derive `Generic`:
1515
```purescript
1616
> import Prelude
1717
> import Data.Generic.Rep (class Generic)
18-
> import Data.Generic.Rep.Show (genericShow)
18+
> import Data.Show.Generic (genericShow)
1919
2020
> newtype MyRecord = MyRecord { a :: Int }
2121
> derive instance genericMyRecord :: Generic MyRecord _

bower.json

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,16 @@
1515
"url": "git://github.com/paf31/purescript-foreign-generic.git"
1616
},
1717
"dependencies": {
18-
"purescript-effect": "^2.0.0",
19-
"purescript-foreign": "^5.0.0",
20-
"purescript-foreign-object": "^2.0.0",
21-
"purescript-generics-rep": "^6.0.0",
22-
"purescript-ordered-collections": "^1.0.0",
23-
"purescript-proxy": "^3.0.0",
24-
"purescript-exceptions": "^4.0.0",
25-
"purescript-record": "^2.0.0",
26-
"purescript-identity": "^4.1.0"
18+
"purescript-effect": "^3.0.0",
19+
"purescript-foreign": "^6.0.0",
20+
"purescript-foreign-object": "^3.0.0",
21+
"purescript-ordered-collections": "^2.0.0",
22+
"purescript-exceptions": "^5.0.0",
23+
"purescript-record": "^3.0.0",
24+
"purescript-identity": "^5.0.0"
2725
},
2826
"devDependencies": {
29-
"purescript-assert": "^4.0.0",
30-
"purescript-psci-support": "^4.0.0"
27+
"purescript-assert": "^5.0.0",
28+
"purescript-psci-support": "^5.0.0"
3129
}
3230
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"test": "pulp test"
77
},
88
"devDependencies": {
9-
"pulp": "^12.0.0",
10-
"purescript": "^0.12.0",
9+
"pulp": "^15.0.0",
10+
"purescript": "^0.14.0",
1111
"purescript-psa": "^0.5.0",
1212
"rimraf": "^2.5.0"
1313
}

src/Foreign/Generic.purs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import Foreign (F, Foreign)
1515
import Foreign (F, Foreign, ForeignError(..)) as Reexports
1616
import Foreign.Generic.Class (class Decode, class Encode, class GenericDecode, class GenericEncode, Options, decode, decodeOpts, encode, encodeOpts)
1717
import Foreign.Generic.Class (class Decode, class Encode, class GenericDecode, class GenericEncode, Options, SumEncoding(..), defaultOptions, decode, encode) as Reexports
18+
import Foreign.Internal.Stringify (unsafeStringify)
1819
import Foreign.JSON (decodeJSONWith, parseJSON)
19-
import Global.Unsafe (unsafeStringify)
2020

2121
-- | Read a value which has a `Generic` type.
2222
genericDecode

src/Foreign/Internal/Stringify.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
exports.unsafeStringify = function (x) {
2+
return JSON.stringify(x);
3+
};
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module Foreign.Internal.Stringify (unsafeStringify) where
2+
3+
-- | Uses the global JSON object to turn anything into a string. Careful! Trying
4+
-- | to serialize functions returns undefined
5+
foreign import unsafeStringify :: forall a. a -> String

test/Main.purs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import Foreign (isNull, unsafeToForeign)
1515
import Foreign.Generic (class Decode, class Encode, class GenericDecode, class GenericEncode, Options, decode, encode, defaultOptions, decodeJSON, encodeJSON, genericDecodeJSON, genericEncodeJSON)
1616
import Foreign.Generic.EnumEncoding (class GenericDecodeEnum, class GenericEncodeEnum, GenericEnumOptions, genericDecodeEnum, genericEncodeEnum)
1717
import Foreign.Index (readProp)
18+
import Foreign.Internal.Stringify (unsafeStringify)
1819
import Foreign.JSON (parseJSON)
1920
import Foreign.Object as Object
20-
import Global.Unsafe (unsafeStringify)
2121
import Test.Assert (assert, assert')
2222
import Test.Types (Fruit(..), IntList(..), RecordTest(..), Tree(..), TupleArray(..), UndefinedTest(..))
2323

test/Types.purs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import Foreign (ForeignError(..), fail, readArray, unsafeToForeign)
77
import Foreign.Generic (class Encode, class Decode, Options, SumEncoding(..), encode, decode, defaultOptions, genericDecode, genericEncode)
88
import Foreign.Generic.EnumEncoding (defaultGenericEnumOptions, genericDecodeEnum, genericEncodeEnum)
99
import Data.Generic.Rep (class Generic)
10-
import Data.Generic.Rep.Eq (genericEq)
11-
import Data.Generic.Rep.Show (genericShow)
10+
import Data.Eq.Generic (genericEq)
11+
import Data.Show.Generic (genericShow)
1212
import Data.Maybe (Maybe)
1313
import Data.Tuple (Tuple(..))
1414

0 commit comments

Comments
 (0)