fix(generate-schema): load typescript files properly (Akryum#322)

start using same load module everywhere

Co-authored-by: Jakub Freisler <[email protected]>

Author: FRSgit

graphql-server/index.js

@@ -11,6 +11,8 @@ const { defaultValue, autoCall } = require('../utils')
 require = require('esm')(module)
 
 module.exports = (options, cb = null) => {
+  const { load } = require('../utils/load')(options)
+
   // Default options
   options = merge({
     integratedEngine: false,
@@ -19,8 +21,6 @@ module.exports = (options, cb = null) => {
   // Express app
   const app = express()
 
-  if (options.typescript) require('ts-node/register/transpile-only')
-
   // Customize those files
   let typeDefs = load(options.paths.typeDefs)
   const resolvers = load(options.paths.resolvers)
@@ -174,14 +174,6 @@ module.exports = (options, cb = null) => {
   })
 }
 
-function load (file) {
-  const module = require(file)
-  if (module.default) {
-    return module.default
-  }
-  return module
-}
-
 function processSchema (typeDefs) {
   if (Array.isArray(typeDefs)) {
     return typeDefs.map(processSchema)

utils/generate-schema.js

@@ -4,9 +4,7 @@ module.exports = async (options) => {
   const { logWithSpinner, stopSpinner, done } = require('@vue/cli-shared-utils')
   const { graphql, getIntrospectionQuery, printSchema } = require('graphql')
   const { makeExecutableSchema } = require('graphql-tools')
-  const { load } = require('./load')
-
-  if (options.typescript) require('ts-node/register/transpile-only')
+  const { load } = require('./load')(options)
 
   // JS Schema
   const typeDefs = load(options.paths.typeDefs)

utils/load.js

@@ -1,7 +1,15 @@
 // eslint-disable-next-line no-global-assign
 require = require('esm')(module)
 
-exports.load = function (file) {
+module.exports = function (options) {
+  if (options.typescript) require('ts-node/register/transpile-only')
+
+  return {
+    load: load,
+  }
+}
+
+function load (file) {
   const module = require(file)
   if (module.default) {
     return module.default