Skip to content

Commit bd321a2

Browse files
captbaritonefacebook-github-bot
authored andcommitted
Make generating ES modules the default
Reviewed By: lynnshaoyu Differential Revision: D73149004 fbshipit-source-id: 5656ae5bf1c38d4d695c594d79783309d25b80d2
1 parent 66550c3 commit bd321a2

File tree

75 files changed

+961
-561
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+961
-561
lines changed

compiler/crates/relay-compiler/relay-compiler-config-schema.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@
8080
}
8181
},
8282
"eagerEsModules": {
83-
"description": "This option enables emitting es modules artifacts.",
84-
"default": false,
83+
"description": "This option enables opting out of emitting es modules artifacts. When set to false, Relay will emit CommonJS modules.",
84+
"default": true,
8585
"type": "boolean"
8686
},
8787
"enumModuleSuffix": {
@@ -4915,8 +4915,8 @@
49154915
}
49164916
},
49174917
"eagerEsModules": {
4918-
"description": "This option enables emitting es modules artifacts.",
4919-
"default": false,
4918+
"description": "This option enables opting out of emitting es modules artifacts. When set to false, Relay will emit CommonJS modules.",
4919+
"default": true,
49204920
"type": "boolean"
49214921
},
49224922
"enumModuleSuffix": {

compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/client-3D-resolvers-enabled-client-3D-fragment.expected

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,9 @@ QUERY:
295295

296296
Query Text is Empty.
297297

298+
import clientUserRelayModelInstanceResolver from './../ClientUserResolver';
299+
import ClientUser__id_graphql from './ClientUser__id.graphql';
300+
import {resolverDataInjector} from 'relay-runtime/experimental';
298301
{
299302
"argumentDefinitions": [],
300303
"kind": "Fragment",
@@ -311,7 +314,7 @@ Query Text is Empty.
311314
},
312315
"kind": "RelayResolver",
313316
"name": "__relay_model_instance",
314-
"resolverModule": require('relay-runtime/experimental').resolverDataInjector(require('./ClientUser__id.graphql'), require('./../ClientUserResolver'), 'id', true),
317+
"resolverModule": resolverDataInjector(ClientUser__id_graphql, clientUserRelayModelInstanceResolver, 'id', true),
315318
"path": "__relay_model_instance"
316319
}
317320
],
@@ -342,6 +345,9 @@ Query Text is Empty.
342345
"abstractKey": null
343346
}
344347

348+
import specialUserRelayModelInstanceResolver from './../SpecialUserResolver';
349+
import SpecialUser__id_graphql from './SpecialUser__id.graphql';
350+
import {resolverDataInjector} from 'relay-runtime/experimental';
345351
{
346352
"argumentDefinitions": [],
347353
"kind": "Fragment",
@@ -358,7 +364,7 @@ Query Text is Empty.
358364
},
359365
"kind": "RelayResolver",
360366
"name": "__relay_model_instance",
361-
"resolverModule": require('relay-runtime/experimental').resolverDataInjector(require('./SpecialUser__id.graphql'), require('./../SpecialUserResolver'), 'id', true),
367+
"resolverModule": resolverDataInjector(SpecialUser__id_graphql, specialUserRelayModelInstanceResolver, 'id', true),
362368
"path": "__relay_model_instance"
363369
}
364370
],

compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-with-connection-es-modules.expected

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ fragment refetchableFragmentWithConnectionEsModules_PaginationFragment on Node
2121

2222
%project_config%
2323
{
24-
"eagerEsModules": true,
2524
"language": "flow"
2625
}
2726
==================================== OUTPUT ===================================

compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/refetchable-fragment-with-connection-es-modules.graphql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,5 @@ fragment refetchableFragmentWithConnectionEsModules_PaginationFragment on Node
2020

2121
%project_config%
2222
{
23-
"eagerEsModules": true,
2423
"language": "flow"
2524
}

compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-resolver-es-modules.expected

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ extend type User {
2020

2121
%project_config%
2222
{
23-
"eagerEsModules": true,
2423
"language": "flow",
2524
"jsModuleFormat": "haste"
2625
}

compiler/crates/relay-compiler/tests/compile_relay_artifacts/fixtures/relay-resolver-es-modules.graphql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ extend type User {
1919

2020
%project_config%
2121
{
22-
"eagerEsModules": true,
2322
"language": "flow",
2423
"jsModuleFormat": "haste"
2524
}

compiler/crates/relay-compiler/tests/relay_compiler_integration/fixtures/client_mutation_extension.expected

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ graphql`mutation barMutation {
88
{
99
"language": "flow",
1010
"schema": "./schema.graphql",
11-
"eagerEsModules": true,
1211
"schemaExtensions": [
1312
"./extensions.graphql"
1413
]

compiler/crates/relay-compiler/tests/relay_compiler_integration/fixtures/client_mutation_extension.input

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ graphql`mutation barMutation {
77
{
88
"language": "flow",
99
"schema": "./schema.graphql",
10-
"eagerEsModules": true,
1110
"schemaExtensions": [
1211
"./extensions.graphql"
1312
]

compiler/crates/relay-compiler/tests/relay_compiler_integration/fixtures/client_mutation_resolver.expected

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ graphql`mutation barMutation {
1313
{
1414
"language": "flow",
1515
"schema": "./schema.graphql",
16-
"eagerEsModules": true,
1716
"featureFlags": {
1817
"enable_relay_resolver_mutations": true
1918
}

compiler/crates/relay-compiler/tests/relay_compiler_integration/fixtures/client_mutation_resolver.input

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ graphql`mutation barMutation {
1212
{
1313
"language": "flow",
1414
"schema": "./schema.graphql",
15-
"eagerEsModules": true,
1615
"featureFlags": {
1716
"enable_relay_resolver_mutations": true
1817
}

0 commit comments

Comments
 (0)