@netlify/build 18.23.1 → 18.25.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "18.23.1",
+  "version": "18.25.2",
   "description": "Netlify build module",
   "main": "src/core/main.js",
   "types": "types/index.d.ts",
@@ -61,7 +61,7 @@
     "@netlify/plugin-edge-handlers": "^1.11.22",
     "@netlify/plugins-list": "^4.2.0",
     "@netlify/run-utils": "^2.0.0",
-    "@netlify/zip-it-and-ship-it": "^4.29.5",
+    "@netlify/zip-it-and-ship-it": "^4.30.0",
     "@sindresorhus/slugify": "^1.1.0",
     "@ungap/from-entries": "^0.2.1",
     "ansi-escapes": "^4.3.2",

package/src/error/monitor/print.js

@@ -10,7 +10,14 @@ const printEventForTest = function (
     groupingHash,
     severity,
     unhandled,
-    _metadata: { location, plugin: { packageName, homepage } = {}, pluginPackageJson, env: { BUILD_ID } = {}, other },
+    _metadata: {
+      location,
+      plugin: { packageName, homepage } = {},
+      pluginPackageJson,
+      tsConfig,
+      env: { BUILD_ID } = {},
+      other,
+    },
   },
   logs,
 ) {
@@ -26,6 +33,7 @@ const printEventForTest = function (
       packageName,
       pluginPackageJson: pluginPackageJson !== undefined,
       homepage,
+      tsConfig,
       BUILD_ID,
       other,
     },

package/src/error/monitor/report.js

@@ -60,11 +60,11 @@ const getGroupingHash = function (group, error, type) {
   return `${group}\n${messageA}`
 }
 
-const getMetadata = function ({ location, plugin }, childEnv, groupingHash) {
+const getMetadata = function ({ location, plugin, tsConfig }, childEnv, groupingHash) {
   const pluginMetadata = getPluginMetadata({ location, plugin })
   const envMetadata = getEnvMetadata(childEnv)
   const locationMetadata = getLocationMetadata(location, envMetadata)
-  return { location: locationMetadata, ...pluginMetadata, env: envMetadata, other: { groupingHash } }
+  return { location: locationMetadata, ...pluginMetadata, tsConfig, env: envMetadata, other: { groupingHash } }
 }
 
 const getPluginMetadata = function ({ location, plugin }) {

package/src/error/parse/parse.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const { serializeObject } = require('../../log/serialize')
 const { getErrorInfo } = require('../info')
 const { getTypeInfo } = require('../type')
 
@@ -17,7 +18,7 @@ const getFullErrorInfo = function ({ error, colors, debug }) {
     stack,
     errorProps,
     errorInfo,
-    errorInfo: { location = {}, plugin = {} },
+    errorInfo: { location = {}, plugin = {}, tsConfig },
     severity,
     title,
     stackType,
@@ -31,10 +32,28 @@ const getFullErrorInfo = function ({ error, colors, debug }) {
   const { message: messageA, stack: stackA } = getStackInfo({ message, stack, stackType, rawStack, severity, debug })
 
   const pluginInfo = getPluginInfo(plugin, location)
+  const tsConfigInfo = getTsConfigInfo(tsConfig)
   const locationInfo = getLocationInfo({ stack: stackA, location, locationType })
   const errorPropsA = getErrorProps({ errorProps, showErrorProps, colors })
 
-  return { ...basicErrorInfo, title: titleA, message: messageA, pluginInfo, locationInfo, errorProps: errorPropsA }
+  return {
+    ...basicErrorInfo,
+    title: titleA,
+    message: messageA,
+    tsConfigInfo,
+    pluginInfo,
+    locationInfo,
+    errorProps: errorPropsA,
+  }
+}
+
+// Serialize the `tsConfig` error information
+const getTsConfigInfo = function (tsConfig) {
+  if (tsConfig === undefined) {
+    return
+  }
+
+  return serializeObject(tsConfig)
 }
 
 // Parse error instance into all the basic properties containing information

package/src/error/parse/serialize_log.js

@@ -4,19 +4,20 @@ const { THEME } = require('../../log/theme')
 
 // Serialize an error object into a title|body string to print in logs
 const serializeLogError = function ({
-  fullErrorInfo: { title, severity, message, pluginInfo, locationInfo, errorProps },
+  fullErrorInfo: { title, severity, message, pluginInfo, locationInfo, tsConfigInfo, errorProps },
 }) {
-  const body = getBody({ message, pluginInfo, locationInfo, errorProps, severity })
+  const body = getBody({ message, pluginInfo, locationInfo, tsConfigInfo, errorProps, severity })
   return { title, body }
 }
 
-const getBody = function ({ message, pluginInfo, locationInfo, errorProps, severity }) {
+const getBody = function ({ message, pluginInfo, locationInfo, tsConfigInfo, errorProps, severity }) {
   if (severity === 'none') {
     return message
   }
 
   return Object.entries({
     message,
+    tsConfigInfo,
     pluginInfo,
     locationInfo,
     errorProps,
@@ -38,6 +39,7 @@ const LOG_BLOCK_NAMES = {
   message: 'Error message',
   pluginInfo: 'Plugin details',
   locationInfo: 'Error location',
+  tsConfigInfo: 'TypeScript configuration',
   errorProps: 'Error properties',
 }
 

package/src/plugins/child/load.js

@@ -10,8 +10,8 @@ const { validatePlugin } = require('./validate')
 // 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 = function ({ pluginPath, inputs, packageJson }) {
-  registerTypeScript(pluginPath)
-  const logic = getLogic({ pluginPath, inputs })
+  const tsNodeService = registerTypeScript(pluginPath)
+  const logic = getLogic({ pluginPath, inputs, tsNodeService })
 
   validatePlugin(logic)
 

package/src/plugins/child/logic.js

@@ -1,18 +1,21 @@
 'use strict'
 
+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 = function ({ pluginPath, inputs }) {
-  const logic = requireLogic(pluginPath)
+const getLogic = function ({ pluginPath, inputs, tsNodeService }) {
+  const logic = requireLogic(pluginPath, tsNodeService)
   const logicA = loadLogic({ logic, inputs })
   return logicA
 }
 
-const requireLogic = function (pluginPath) {
+const requireLogic = function (pluginPath, tsNodeService) {
   try {
     // eslint-disable-next-line node/global-require, import/no-dynamic-require
     return require(pluginPath)
   } catch (error) {
+    addTsErrorInfo(error, tsNodeService)
     error.message = `Could not import plugin:\n${error.message}`
     throw error
   }

package/src/plugins/child/typescript.js

@@ -4,6 +4,8 @@ const { extname } = require('path')
 
 const { register } = require('ts-node')
 
+const { addErrorInfo } = require('../../error/info')
+
 // Allow local plugins to be written with TypeScript.
 // Local plugins cannot be transpiled by the build command since they can be run
 // before it. Therefore, we type-check and transpile them automatically using
@@ -13,7 +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 = function (error, tsNodeService) {
+  if (tsNodeService === undefined) {
+    return
+  }
+
+  const {
+    config: {
+      raw: { compilerOptions },
+    },
+    options: tsNodeOptions,
+  } = tsNodeService
+  addErrorInfo(error, { tsConfig: { compilerOptions, tsNodeOptions } })
 }
 
 const isTypeScriptPlugin = function (pluginPath) {
@@ -22,4 +40,4 @@ const isTypeScriptPlugin = function (pluginPath) {
 
 const TYPESCRIPT_EXTENSIONS = new Set(['.ts', '.tsx', '.mts', '.cts'])
 
-module.exports = { registerTypeScript }
+module.exports = { registerTypeScript, addTsErrorInfo }

package/src/plugins_core/functions/feature_flags.js

@@ -3,7 +3,7 @@
 const getZisiFeatureFlags = (featureFlags) => ({
   buildGoSource: featureFlags.buildbot_build_go_functions,
   defaultEsModulesToEsbuild: featureFlags.buildbot_es_modules_esbuild,
-  nftTranspile: featureFlags.buildbot_zisi_trace_nft,
+  nftTranspile: featureFlags.buildbot_nft_transpile_esm || featureFlags.buildbot_zisi_trace_nft,
   parseWithEsbuild: featureFlags.buildbot_zisi_esbuild_parser,
   traceWithNft: featureFlags.buildbot_zisi_trace_nft,
 })