Merge branch 'main' into fix-monaco-exports

graphql · Aug 9, 2023 · 1c815c9 · 1c815c9
2 parents 47c0c89 + 7b00774
commit 1c815c9
Show file tree

Hide file tree

Showing 10 changed files with 472 additions and 160 deletions.
diff --git a/.changeset/few-hats-move.md b/.changeset/few-hats-move.md
@@ -0,0 +1,5 @@
+---
+'graphql-language-service': patch
+---
+
+Fix Variables JSON Schema for null values
diff --git a/.changeset/tame-lions-teach.md b/.changeset/tame-lions-teach.md
@@ -0,0 +1,6 @@
+---
+'graphql-language-service': minor
+'monaco-graphql': minor
+---
+
+Add support for custom scalars
diff --git a/examples/graphiql-cdn/index.html b/examples/graphiql-cdn/index.html
@@ -21,7 +21,6 @@
         height: 100vh;
       }
     </style>
-
     <!--
       This GraphiQL example depends on Promise and fetch, which are available in
       modern browsers, but can be "polyfilled" for older browsers.
@@ -37,20 +36,28 @@
       crossorigin
       src="https://unpkg.com/react-dom@18/umd/react-dom.development.js"
     ></script>
+    <!--
+      These two files can be found in the npm module, however you may wish to
+      copy them directly into your environment, or perhaps include them in your
+      favored resource bundler.
+     -->
     <script
       src="https://unpkg.com/graphiql/graphiql.min.js"
       type="application/javascript"
     ></script>
+    <link rel="stylesheet" href="https://unpkg.com/graphiql/graphiql.min.css" />
+    <!-- 
+      These are imports for the GraphIQL Explorer plugin.
+     -->
     <script
       src="https://unpkg.com/@graphiql/plugin-explorer/dist/index.umd.js"
       crossorigin
     ></script>
-    <!--
-      These two files can be found in the npm module, however you may wish to
-      copy them directly into your environment, or perhaps include them in your
-      favored resource bundler.
-     -->
-    <link rel="stylesheet" href="https://unpkg.com/graphiql/graphiql.min.css" />
+
+    <link
+      rel="stylesheet"
+      href="https://unpkg.com/@graphiql/plugin-explorer/dist/style.css"
+    />
   </head>
 
   <body>

diff --git a/packages/graphiql-plugin-code-exporter/README.md b/packages/graphiql-plugin-code-exporter/README.md
@@ -100,6 +100,6 @@ function GraphiQLWithExplorer() {
 
 ## CDN bundles
 
-You can also use this plugin when using the
-[CDN bundle](../../examples/graphiql-cdn) to render GraphiQL. Check out the
-[example HTML file](examples/index.html) that shows how you can do this.
+You can also use this plugin with `unpkg`, `jsdelivr`, and other CDNs.
+
+See the [example HTML file](examples/index.html) for this plugin
diff --git a/packages/graphiql-plugin-explorer/README.md b/packages/graphiql-plugin-explorer/README.md
@@ -49,6 +49,6 @@ return (
 
 ## CDN bundles
 
-You can also use add this plugin when using the
-[CDN bundle](../../examples/graphiql-cdn) to render GraphiQL. Check out the
-[example HTML file](examples/index.html) that shows how you can do this.
+You can also use this plugin with `unpkg`, `jsdelivr`, and other CDNs.
+
+See the [example HTML file](examples/index.html) for this plugin
diff --git a/packages/graphql-language-service/src/utils/__tests__/__schema__/StarWarsSchema.graphql b/packages/graphql-language-service/src/utils/__tests__/__schema__/StarWarsSchema.graphql
@@ -4,6 +4,28 @@ schema {
 
 directive @test(testArg: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
 
+scalar SomeCustomScalar
+scalar EmailAddress
+scalar Even
+scalar SpecialScalar
+scalar SpecialDate
+scalar FooBar
+scalar Foo
+
+"""
+An input type with custom scalars
+"""
+input CustomScalarsInput {
+  """
+  example email
+  """
+  email: EmailAddress
+  """
+  example even
+  """
+  even: Even
+}
+
 enum Episode {
   NEWHOPE
   EMPIRE