diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index b4cdda3bc68..e5edffce282 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -29,6 +29,7 @@ jobs: env: NEXT_BASE_PATH: ${{ github.ref == 'refs/heads/master' && '/graphql/codegen' || '' }} SITE_URL: ${{ github.ref == 'refs/heads/master' && 'https://the-guild.dev/graphql/codegen' || '' }} + NEXT_PUBLIC_MENDABLE_ANON_KEY: ${{ secrets.NEXT_PUBLIC_MENDABLE_ANON_KEY }} with: cloudflareApiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} cloudflareAccountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} diff --git a/examples/react/apollo-client-swc-plugin/package.json b/examples/react/apollo-client-swc-plugin/package.json index df47cb768d9..54e6abff209 100644 --- a/examples/react/apollo-client-swc-plugin/package.json +++ b/examples/react/apollo-client-swc-plugin/package.json @@ -8,14 +8,14 @@ "react-dom": "18.2.0" }, "devDependencies": { - "@graphql-codegen/client-preset-swc-plugin": "0.2.0", + "@graphql-codegen/client-preset-swc-plugin": "0.3.0", "@graphql-codegen/client-preset": "^4.0.0", "@graphql-codegen/cli": "^4.0.0", "@vitejs/plugin-react-swc": "^3.3.0", "@types/react": "18.2.7", "@types/react-dom": "18.2.4", "typescript": "5.0.4", - "vite": "^4.1.0" + "vite": "^4.3.9" }, "scripts": { "dev": "vite", diff --git a/packages/presets/swc-plugin/Cargo.lock b/packages/presets/swc-plugin/Cargo.lock index 6758966a028..34e083e68ba 100644 --- a/packages/presets/swc-plugin/Cargo.lock +++ b/packages/presets/swc-plugin/Cargo.lock @@ -70,9 +70,9 @@ checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" [[package]] name = "ast_node" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f7fd7740c5752c16281a1c1f9442b1e69ba41738acde85dc604aaf3ce41890" +checksum = "c704e2f6ee1a98223f5a7629a6ef0f3decb3b552ed282889dc957edff98ce1e6" dependencies = [ "pmutil", "proc-macro2", @@ -136,9 +136,21 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.2.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24a6904aef64d73cf10ab17ebace7befb918b82164785cb89907993be7f83813" +checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84" + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] [[package]] name = "block-buffer" @@ -151,9 +163,9 @@ dependencies = [ [[package]] name = "bytecheck" -version = "0.6.10" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13fe11640a23eb24562225322cd3e452b93a3d4091d62fab69c70542fcd17d1f" +checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" dependencies = [ "bytecheck_derive", "ptr_meta", @@ -162,9 +174,9 @@ dependencies = [ [[package]] name = "bytecheck_derive" -version = "0.6.10" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e31225543cb46f81a7e224762764f4a6a0f097b1db0b175f69e8065efaa42de5" +checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" dependencies = [ "proc-macro2", "quote", @@ -330,6 +342,12 @@ dependencies = [ "syn", ] +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + [[package]] name = "generic-array" version = "0.14.6" @@ -950,6 +968,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + [[package]] name = "rand" version = "0.8.5" @@ -1041,23 +1065,26 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.41" +version = "0.7.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21499ed91807f07ae081880aabb2ccc0235e9d88011867d984525e9a4c3cfa3e" +checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" dependencies = [ + "bitvec", "bytecheck", "hashbrown", "ptr_meta", "rend", "rkyv_derive", "seahash", + "tinyvec", + "uuid", ] [[package]] name = "rkyv_derive" -version = "0.7.41" +version = "0.7.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1c672430eb41556291981f45ca900a0239ad007242d1cb4b4167af842db666" +checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" dependencies = [ "proc-macro2", "quote", @@ -1339,7 +1366,7 @@ dependencies = [ [[package]] name = "swc-plugin" -version = "0.1.3" +version = "0.2.0" dependencies = [ "graphql-parser", "pathdiff", @@ -1350,10 +1377,11 @@ dependencies = [ [[package]] name = "swc_atoms" -version = "0.5.3" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "593c2f3e4cea60ddc4179ed731cabebe7eacec209d9e76a3bbcff4b2b020e3f5" +checksum = "93d0307dc4bfd107d49c7528350c372758cfca94fb503629b9a056e6a1572860" dependencies = [ + "bytecheck", "once_cell", "rkyv", "rustc-hash", @@ -1365,15 +1393,16 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.31.4" +version = "0.31.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b557014d62318e08070c2a3d5eb0278ff73749dd69db53c39a4de4bcd301d6a" +checksum = "19c774005489d2907fb67909cf42af926e72edee1366512777c605ba2ef19c94" dependencies = [ "ahash", "anyhow", "ast_node", "atty", "better_scoped_tls", + "bytecheck", "cfg-if", "either", "from_variant", @@ -1398,9 +1427,9 @@ dependencies = [ [[package]] name = "swc_core" -version = "0.75.33" +version = "0.76.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b511e42ad4379856771ce7f2a8f6f342e507845502c07f4da4c7a134951fc91" +checksum = "e8cd48cee857b467c1a7f3ff14ec26bfcdbe6a08f3218577e15d8157701da958" dependencies = [ "once_cell", "swc_atoms", @@ -1420,11 +1449,12 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.103.4" +version = "0.104.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5206233430a6763e2759da76cfc596a64250793f70cd94cace1f82fdcc4d702c" +checksum = "b5cf9dd351d0c285dcd36535267953a18995d4dda0cbe34ac9d1df61aa415b26" dependencies = [ - "bitflags 2.2.1", + "bitflags 2.3.1", + "bytecheck", "is-macro", "num-bigint", "rkyv", @@ -1437,9 +1467,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.138.12" +version = "0.139.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3aae7dcc767099c0baedb37ef47208f134e5767a8e39482f56ed6a2956b5f0cb" +checksum = "11c6af8e6d6714ecd7ef5cfba322aa1b436f78d9a82b0c3ff16aeaf97b65cd6d" dependencies = [ "memchr", "num-bigint", @@ -1469,9 +1499,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.133.10" +version = "0.134.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce724a8fdc90548d882dec3b0288c0698059ce12a59bbfdeea0384f3d52f009" +checksum = "f0a3fcfe3d83dd445cbd9321882e47b467594433d9a21c4d6c37a27f534bb89e" dependencies = [ "either", "lexical", @@ -1501,12 +1531,12 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.126.15" +version = "0.127.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d1a3ca8c92886d014a8e359195ddc6bcdeb2c3671d93ec45cd3ea1fe50085a3" +checksum = "6232e641bef05c462bc7da34a3771f9b3f1f3352349ae0cd72b8eee8b0f5d5e0" dependencies = [ "better_scoped_tls", - "bitflags 2.2.1", + "bitflags 2.3.1", "indexmap", "once_cell", "phf", @@ -1524,9 +1554,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_testing" -version = "0.129.15" +version = "0.130.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb9d6c7f0b304b46b4cb86fa86c1aa2b26205a178b5f1b6176cf4151a07d40c" +checksum = "71e2f974e4f1d78309ea24cce2631a664eb367347c9d2e6677f96c7b8b6b176d" dependencies = [ "ansi_term", "anyhow", @@ -1550,9 +1580,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.116.10" +version = "0.117.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b462a1b6fc788ee956479adcbb05c282cb142a66a3b016b571fff0538a381196" +checksum = "ad791bbfdafcebd878584021e050964c8ab68aba7eeac9d0ee4afba4c284a629" dependencies = [ "indexmap", "num_cpus", @@ -1568,9 +1598,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.89.4" +version = "0.90.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecb23a4a1d77997f54e9b3a4e68d1441e5e8a25ad1a476bbb3b5a620d6562a86" +checksum = "6ce3ac941ae1d6c7e683aa375fc71fbf58df58b441f614d757fbb10554936ca2" dependencies = [ "num-bigint", "swc_atoms", @@ -1594,9 +1624,9 @@ dependencies = [ [[package]] name = "swc_error_reporters" -version = "0.15.4" +version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf37dae113d98ec257727dce3d746254a2731abc56e609a6f2efa7cf57806705" +checksum = "4e4ce9ba211e75848f6aff1c64ee16c71006bd93e45a37f4e149c22625f26d8c" dependencies = [ "anyhow", "miette", @@ -1628,9 +1658,9 @@ dependencies = [ [[package]] name = "swc_plugin_macro" -version = "0.9.11" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae095f51123037ae9a8d29ef06b221a273fe11b489a3caa9eeba6a965a8b4cc1" +checksum = "5251f7087dad18a80067d6701a552a90dc39b8bcd10acff328b351e19c6819a8" dependencies = [ "proc-macro2", "quote", @@ -1639,9 +1669,9 @@ dependencies = [ [[package]] name = "swc_plugin_proxy" -version = "0.32.4" +version = "0.33.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01e5a04649cde6c40bd2b746ad7ac8195b9e3316048bf7263380e315907a6fd9" +checksum = "6fd90309939333beb2cc4fc338b5f7f1aa588173e6452161d5edecfa8210e649" dependencies = [ "better_scoped_tls", "rkyv", @@ -1664,9 +1694,9 @@ dependencies = [ [[package]] name = "swc_visit" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1d5999f23421c8e21a0f2bc53a0b9e8244f3b421de89471561af2fbe40b9cca" +checksum = "5f412dd4fbc58f509a04e64f5c8038333142fc139e8232f01b883db0094b3b51" dependencies = [ "either", "swc_visit_macros", @@ -1674,9 +1704,9 @@ dependencies = [ [[package]] name = "swc_visit_macros" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebeed7eb0f545f48ad30f5aab314e5208b735bcea1d1464f26e20f06db904989" +checksum = "4cfc226380ba54a5feed2c12f3ccd33f1ae8e959160290e5d2d9b4e918b6472a" dependencies = [ "Inflector", "pmutil", @@ -1697,6 +1727,12 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + [[package]] name = "tempfile" version = "3.5.0" @@ -1731,9 +1767,9 @@ dependencies = [ [[package]] name = "testing" -version = "0.33.5" +version = "0.33.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45fc786aa2152d8b4a8b302f2273062d9370ff616441e3ef22a5b4303e150848" +checksum = "0901b02da634d6e420bc20716d86c2ee679ee852e126b23b6a478d6c83361956" dependencies = [ "ansi_term", "difference", @@ -1995,6 +2031,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "uuid" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" + [[package]] name = "valuable" version = "0.1.0" @@ -2197,6 +2239,15 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + [[package]] name = "yansi" version = "0.5.1" diff --git a/packages/presets/swc-plugin/Cargo.toml b/packages/presets/swc-plugin/Cargo.toml index b1c2d43105c..710556d54b3 100644 --- a/packages/presets/swc-plugin/Cargo.toml +++ b/packages/presets/swc-plugin/Cargo.toml @@ -27,7 +27,7 @@ graphql-parser = "0.4.0" pathdiff = "0.2.1" serde = "1" serde_json = "1.0.95" -swc_core = { version = "0.75.*", features = ["ecma_plugin_transform", "ecma_visit", "ecma_utils", "ecma_parser", "common", "testing" ] } +swc_core = { version = "0.76.*", features = ["ecma_plugin_transform", "ecma_visit", "ecma_utils", "ecma_parser", "common", "testing" ] } # .cargo/config defines few alias to build plugin. # cargo build-wasi generates wasm-wasi32 binary diff --git a/packages/presets/swc-plugin/package.json b/packages/presets/swc-plugin/package.json index 9653252cb86..a595a0ede0c 100644 --- a/packages/presets/swc-plugin/package.json +++ b/packages/presets/swc-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@graphql-codegen/client-preset-swc-plugin", - "version": "0.2.0", + "version": "0.3.0", "description": "A SWC plugin for https://the-guild.dev/graphql/codegen/plugins/presets/preset-client", "license": "MIT", "bob": false, @@ -11,8 +11,8 @@ ], "main": "swc_plugin.wasm", "scripts": { - "build-wasm": "cargo build --target wasm32-wasi --release && cp target/wasm32-wasi/release/swc_plugin.wasm ./", - "debug": "cargo build --target wasm32-wasi && cp target/wasm32-wasi/debug/swc_plugin.wasm ./" + "build-wasm": "cargo build --target wasm32-unknown-unknown --release && cp target/wasm32-unknown-unknown/release/swc_plugin.wasm ./", + "debug": "cargo build --target wasm32-unknown-unknown && cp target/wasm32-unknown-unknown/debug/swc_plugin.wasm ./" }, "homepage": "https://the-guild.dev/graphql/codegen/plugins/presets/preset-client", "repository": { diff --git a/website/package.json b/website/package.json index 85700e0644b..5e6c6d5580e 100644 --- a/website/package.json +++ b/website/package.json @@ -52,6 +52,7 @@ "@graphql-codegen/typescript-graphql-request": "4.5.8", "@graphql-codegen/typescript-mongodb": "2.4.6", "@graphql-codegen/typescript-msw": "1.1.6", + "@graphql-codegen/typescript-nhost": "0.0.1", "@graphql-codegen/typescript-operations": "4.0.0", "@graphql-codegen/typescript-react-apollo": "3.3.7", "@graphql-codegen/typescript-react-query": "4.1.0", @@ -59,13 +60,13 @@ "@graphql-codegen/typescript-rtk-query": "2.4.1", "@graphql-codegen/typescript-stencil-apollo": "2.3.6", "@graphql-codegen/typescript-type-graphql": "2.3.6", - "@graphql-codegen/typescript-nhost": "0.0.1", "@graphql-codegen/typescript-urql": "3.7.3", "@graphql-codegen/typescript-vue-apollo": "3.3.7", "@graphql-codegen/typescript-vue-apollo-smart-ops": "2.3.6", "@graphql-codegen/typescript-vue-urql": "2.3.6", "@graphql-codegen/urql-introspection": "2.2.1", "@graphql-codegen/client-preset": "4.0.0", + "@mendable/search": "0.0.108", "@monaco-editor/react": "4.5.1", "@theguild/components": "4.6.0", "classnames": "2.3.2", diff --git a/website/theme.config.tsx b/website/theme.config.tsx index c1e049975ba..95a0f2427f6 100644 --- a/website/theme.config.tsx +++ b/website/theme.config.tsx @@ -2,9 +2,33 @@ /* eslint sort-keys: error */ import { useRouter } from 'next/router'; import { defineConfig, Giscus, useTheme } from '@theguild/components'; +import { MendableSearchBar } from '@mendable/search'; export default defineConfig({ docsRepositoryBase: 'https://github.com/dotansimha/graphql-code-generator/tree/master/website', + search: { + component: () => { + return ( +