@netlify/build 18.25.1 → 18.25.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "18.25.1",
+  "version": "18.25.2",
   "description": "Netlify build module",
   "main": "src/core/main.js",
   "types": "types/index.d.ts",

package/src/plugins/child/load.js

@@ -9,9 +9,9 @@ const { validatePlugin } = require('./validate')
 // This also validates the plugin.
 // Do it when parent requests it using the `load` event.
 // Also figure out the list of plugin steps. This is also passed to the parent.
-const load = async function ({ pluginPath, inputs, packageJson }) {
-  registerTypeScript(pluginPath)
-  const logic = await getLogic({ pluginPath, inputs })
+const load = function ({ pluginPath, inputs, packageJson }) {
+  const tsNodeService = registerTypeScript(pluginPath)
+  const logic = getLogic({ pluginPath, inputs, tsNodeService })
 
   validatePlugin(logic)
 

package/src/plugins/child/logic.js

@@ -4,18 +4,18 @@ const { addTsErrorInfo } = require('./typescript')
 
 // Require the plugin file and fire its top-level function.
 // The returned object is the `logic` which includes all event handlers.
-const getLogic = async function ({ pluginPath, inputs }) {
-  const logic = await requireLogic(pluginPath)
+const getLogic = function ({ pluginPath, inputs, tsNodeService }) {
+  const logic = requireLogic(pluginPath, tsNodeService)
   const logicA = loadLogic({ logic, inputs })
   return logicA
 }
 
-const requireLogic = async function (pluginPath) {
+const requireLogic = function (pluginPath, tsNodeService) {
   try {
     // eslint-disable-next-line node/global-require, import/no-dynamic-require
     return require(pluginPath)
   } catch (error) {
-    await addTsErrorInfo(error, pluginPath)
+    addTsErrorInfo(error, tsNodeService)
     error.message = `Could not import plugin:\n${error.message}`
     throw error
   }

package/src/plugins/child/typescript.js

@@ -2,7 +2,6 @@
 
 const { extname } = require('path')
 
-const execa = require('execa')
 const { register } = require('ts-node')
 
 const { addErrorInfo } = require('../../error/info')
@@ -16,39 +15,23 @@ const registerTypeScript = function (pluginPath) {
     return
   }
 
-  register()
+  return register()
 }
 
 // On TypeScript errors, adds information about the `ts-node` configuration,
 // which includes the resolved `tsconfig.json`.
-const addTsErrorInfo = async function (error, pluginPath) {
-  if (!isTypeScriptPlugin(pluginPath)) {
+const addTsErrorInfo = function (error, tsNodeService) {
+  if (tsNodeService === undefined) {
     return
   }
 
-  const { stdout } = await execa.command('ts-node --show-config', {
-    // `ts-node` is located inside `@netlify/build` `node_modules` directory.
-    // `preferLocal: true` ensures any parent `node_modules/.bin/` directory
-    // is searched.
-    // It does so starting from `localDir`, which defaults to `process.cwd()`.
-    // The current directory is the plugin's main file's directory.
-    // Therefore it needs to be changed to `__dirname` to be able to find
-    // `ts-node` binary.
-    localDir: __dirname,
-    preferLocal: true,
-  })
-  const tsConfig = safeJsonParse(stdout)
-  addErrorInfo(error, { tsConfig })
-}
-
-// The output of `ts-node --show-config` should be JSON.
-// This is just a failsafe.
-const safeJsonParse = function (stdout) {
-  try {
-    return JSON.parse(stdout)
-  } catch (error) {
-    return { stdout, parsingError: error.message }
-  }
+  const {
+    config: {
+      raw: { compilerOptions },
+    },
+    options: tsNodeOptions,
+  } = tsNodeService
+  addErrorInfo(error, { tsConfig: { compilerOptions, tsNodeOptions } })
 }
 
 const isTypeScriptPlugin = function (pluginPath) {