Skip to content
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

Get vercel to work again #150

Merged
merged 4 commits into from
Jun 26, 2023
Merged
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
6 changes: 3 additions & 3 deletions bsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
],
"ppx-flags": [
"bs-let/ppx",
"decco/ppx",
"rescript-logger/ppx",
"@reasonml-community/graphql-ppx/ppx"
"@reasonml-community/graphql-ppx/ppx",
"@greenlabs/ppx-spice/ppx"
],
"jsx": {
"version": 4,
Expand All @@ -46,9 +46,9 @@
"bs-css-emotion",
"@glennsl/rescript-fetch",
"bs-moment",
"decco",
"reason-promise",
"rescript-classnames",
"@greenlabs/ppx-spice",
"rescript-logger",
"@glennsl/bs-jest",
"@reasonml-community/graphql-ppx",
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@
"next-start": "next start",
"start": "npm run res:build && REACT_APP_NETWORK=\"TEST\" react-scripts start",
"build-js-only": "EXTEND_ESLINT=true REACT_APP_MAINNET_BE=https://api.wildcards.world/v1/graphql REACT_APP_GOERLI_BE=https://goerli.api.wildcards.world/v1/graphql react-scripts build --verbose",
"build": "npm run res:build && npm run build-js-only",
"build": "npm run res:build && npm run react-scripts build --verbose",
"test": "react-scripts test",
"lint": "eslint src",
"res:clean": "rescript clean -with-deps",
"res:build": "res:clean; rescript build",
"res:build": "npm run res:clean; rescript build",
"res:start": "RES_LOG=* rescript build -w",
"generate-ppx-schema": "get-graphql-schema https://api.wildcards.world/v1/graphql -j >| graphql_schema.json",
"generate-ppx-schema-goerli": "get-graphql-schema https://api.wildcards.world/v1/graphql -j >| graphql_schema.json",
Expand Down Expand Up @@ -107,6 +107,7 @@
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@babel/plugin-transform-modules-commonjs": "^7.12.1",
"@glennsl/bs-jest": "^0.6.0",
"@greenlabs/ppx-spice": "^0.1.14",
"@reasonml-community/graphql-ppx": "^1.2.3",
"babel-plugin-styled-components": "^1.12.0",
"babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
Expand Down
25 changes: 0 additions & 25 deletions src/components/Dapp.bs.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/components/OrgProfile.bs.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/components/OrgProfile.res
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@decco.decode
@spice.decode
type orgDescriptionArray = array<string>

module YoutubeVid = {
Expand Down
6 changes: 3 additions & 3 deletions src/harberger-lib/QlHooks.bs.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/harberger-lib/QlHooks.res
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ let useDetailsPageNextPrevious = (currentToken: TokenId.t) => {
)
}

@decco.decode
@spice.decode
type animalDescription = array<string>
let useWildcardDescription = tokenId =>
switch useWildcardDataQuery(tokenId) {
Expand Down
47 changes: 25 additions & 22 deletions src/harberger-lib/components/UsdPriceProvider.bs.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/harberger-lib/components/UsdPriceProvider.res
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ module PriceProvider = {
}
}

@decco @deriving(accessors)
@spice @deriving(accessors)
type price = {c: array<string>}
@decco @deriving(accessors)
@spice @deriving(accessors)
type ethUsdPrice = {
@decco.key("XETHZUSD")
@spice.key("XETHZUSD")
ethUsd: option<price>,
}
@decco @deriving(accessors)
@spice @deriving(accessors)
type krakenPriceResponse = {result: option<ethUsdPrice>}

let getPrice = () => {
Expand Down
5 changes: 5 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3218,6 +3218,11 @@
resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.2.0.tgz#5f3d96ec6b2354ad6d8a28bf216a1d97b5426861"
integrity sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==

"@greenlabs/ppx-spice@^0.1.14":
version "0.1.14"
resolved "https://registry.yarnpkg.com/@greenlabs/ppx-spice/-/ppx-spice-0.1.14.tgz#0c531452233c5f55e5c631d13d22f86660cd1c32"
integrity sha512-2zP5E3+yWCRwYkvOl1A/VoRC1ixHdIa4CujsGD3uwbAzfJkrGc7KH83Zbc+Yw858+RNw2GKrNC35f0CNVMusHw==

"@hapi/accept@^3.2.4":
version "3.2.4"
resolved "https://registry.yarnpkg.com/@hapi/accept/-/accept-3.2.4.tgz#687510529493fe1d7d47954c31aff360d9364bd1"
Expand Down