@netlify/build 28.1.5 → 28.1.7

package/lib/plugins/manifest/main.js

@@ -2,8 +2,10 @@ import { addPluginLoadErrorStatus } from '../../status/load_error.js';
 import { checkInputs } from './check.js';
 import { loadManifest } from './load.js';
 import { getManifestPath } from './path.js';
-// Load plugin's `manifest.yml`
-export const useManifest = async function ({ packageName, loadedFrom, origin, inputs }, { pluginDir, packageDir, pluginPackageJson, pluginPackageJson: { version }, debug }) {
+/**
+ * Load plugin's `manifest.yml`
+ */
+export const useManifest = async function ({ packageName, loadedFrom, origin, inputs, }, { pluginDir, packageDir, pluginPackageJson, pluginPackageJson: { version }, debug, }) {
     const manifestPath = await getManifestPath({ pluginDir, packageDir, packageName });
     try {
         const manifest = await loadManifest({ manifestPath, packageName, pluginPackageJson, loadedFrom, origin });

package/lib/plugins/node_version.js

@@ -1,7 +1,8 @@
-import { version as currentVersion, execPath } from 'process';
+import { execPath, version as currentVersion } from 'process';
 import semver from 'semver';
-import { addErrorInfo } from '../error/info.js';
-import { ROOT_PACKAGE_JSON } from '../utils/json.js';
+// This node version is minimum required to use ESModules so if the user's preferred Node.js version is below that
+// we have to fall back to the system node version
+const MINIMUM_REQUIRED_NODE_VERSION = '^12.20.0 || ^14.14.0 || >=16.0.0';
 // Local plugins and `package.json`-installed plugins use user's preferred Node.js version if higher than our minimum
 // supported version. Else default to the system Node version.
 // Local and programmatic builds use `@netlify/build` Node.js version, which is
@@ -13,18 +14,7 @@ export const addPluginsNodeVersion = function ({ pluginsOptions, nodePath, userN
 };
 const addPluginNodeVersion = function ({ pluginOptions, pluginOptions: { loadedFrom }, currentNodeVersion, userNodeVersion, nodePath, }) {
     return (loadedFrom === 'local' || loadedFrom === 'package.json') &&
-        semver.satisfies(userNodeVersion, ROOT_PACKAGE_JSON.engines.node)
+        semver.satisfies(userNodeVersion, MINIMUM_REQUIRED_NODE_VERSION)
         ? { ...pluginOptions, nodePath, nodeVersion: userNodeVersion }
         : { ...pluginOptions, nodePath: execPath, nodeVersion: currentNodeVersion };
 };
-// Ensure Node.js version is compatible with plugin's `engines.node`
-export const checkNodeVersion = function ({ nodeVersion, packageName, pluginPackageJson: { engines: { node: pluginNodeVersionRange } = {} } = {}, }) {
-    if (pluginNodeVersionRange && !semver.satisfies(nodeVersion, pluginNodeVersionRange)) {
-        throwUserError(`The Node.js version is ${nodeVersion} but the plugin "${packageName}" requires ${pluginNodeVersionRange}`);
-    }
-};
-const throwUserError = function (message) {
-    const error = new Error(message);
-    addErrorInfo(error, { type: 'resolveConfig' });
-    throw error;
-};

package/lib/plugins/options.js

@@ -1,10 +1,11 @@
 import { dirname } from 'path';
+import semver from 'semver';
+import { addErrorInfo } from '../error/info.js';
 import { installLocalPluginsDependencies } from '../install/local.js';
 import { measureDuration } from '../time/main.js';
 import { ROOT_PACKAGE_JSON } from '../utils/json.js';
 import { getPackageJson } from '../utils/package.js';
 import { useManifest } from './manifest/main.js';
-import { checkNodeVersion } from './node_version.js';
 import { resolvePluginsPath } from './resolve.js';
 // Load core plugins and user plugins
 const tGetPluginsOptions = async function ({ pluginsOptions, netlifyConfig: { plugins }, siteInfo, buildDir, nodePath, packageJson, userNodeVersion, mode, api, logs, debug, sendStatus, testOpts, featureFlags, }) {
@@ -34,7 +35,11 @@ export const getPluginsOptions = measureDuration(tGetPluginsOptions, 'get_plugin
 const loadPluginFiles = async function ({ pluginOptions, pluginOptions: { pluginPath, nodeVersion, packageName }, debug, }) {
     const pluginDir = dirname(pluginPath);
     const { packageDir, packageJson: pluginPackageJson } = await getPackageJson(pluginDir);
-    checkNodeVersion({ nodeVersion, packageName, pluginPackageJson });
+    // Ensure Node.js version is compatible with plugin's `engines.node`
+    const pluginNodeVersionRange = pluginPackageJson?.engines?.node;
+    if (pluginNodeVersionRange && !semver.satisfies(nodeVersion, pluginNodeVersionRange)) {
+        throwUserError(`The Node.js version is ${nodeVersion} but the plugin "${packageName}" requires ${pluginNodeVersionRange}`);
+    }
     const { manifest, inputs } = await useManifest(pluginOptions, { pluginDir, packageDir, pluginPackageJson, debug });
     return { ...pluginOptions, pluginDir, packageDir, pluginPackageJson, manifest, inputs };
 };
@@ -45,11 +50,16 @@ const isNotRedundantCorePlugin = function (pluginOptionsA, index, pluginsOptions
     return (pluginOptionsA.loadedFrom !== 'core' ||
         pluginsOptions.every((pluginOptionsB) => pluginOptionsA.manifest.name !== pluginOptionsB.manifest.name || pluginOptionsA === pluginOptionsB));
 };
-// Retrieve information about @netlify/build when an error happens there and not
-// in a plugin
-export const getSpawnInfo = function () {
-    return {
-        plugin: { packageName: ROOT_PACKAGE_JSON.name, pluginPackageJson: ROOT_PACKAGE_JSON },
-        location: { event: 'load', packageName: ROOT_PACKAGE_JSON.name, loadedFrom: 'core', origin: 'core' },
-    };
+/**
+ * Retrieve information about @netlify/build when an error happens there and not
+ * in a plugin
+ */
+export const getSpawnInfo = () => ({
+    plugin: { packageName: ROOT_PACKAGE_JSON.name, pluginPackageJson: ROOT_PACKAGE_JSON },
+    location: { event: 'load', packageName: ROOT_PACKAGE_JSON.name, loadedFrom: 'core', origin: 'core' },
+});
+const throwUserError = function (message) {
+    const error = new Error(message);
+    addErrorInfo(error, { type: 'resolveConfig' });
+    throw error;
 };

package/lib/utils/json.js

@@ -4,12 +4,12 @@ const ROOT_PACKAGE_JSON_PATH = fileURLToPath(new URL('../../package.json', impor
 // TODO: Replace with dynamic `import()` once it is supported without
 // experimental flags
 export const importJsonFile = async function (filePath) {
-    const fileContents = await fs.readFile(filePath);
+    const fileContents = await fs.readFile(filePath, 'utf-8');
     return JSON.parse(fileContents);
 };
 const importJsonFileSync = function (filePath) {
     // Use sync I/O so it is easier to migrate to `import()` later on
-    const fileContents = readFileSync(filePath, 'utf8');
+    const fileContents = readFileSync(filePath, 'utf-8');
     return JSON.parse(fileContents);
 };
 export const ROOT_PACKAGE_JSON = importJsonFileSync(ROOT_PACKAGE_JSON_PATH);

package/lib/utils/omit.js

@@ -1,5 +1,3 @@
 import filterObj from 'filter-obj';
 // lodash.omit is 1400 lines of codes. filter-obj is much smaller and simpler.
-export const omit = function (obj, keys) {
-    return filterObj(obj, (key) => !keys.includes(key));
-};
+export const omit = (obj, keys) => filterObj(obj, (key) => !keys.includes(key));

package/lib/utils/package.js

@@ -1,22 +1,22 @@
 import { dirname } from 'path';
 import { readPackageUp } from 'read-pkg-up';
-// Retrieve `package.json` from a specific directory
-export const getPackageJson = async function (cwd, { normalize } = {}) {
-    const packageObj = await getPackageObj({ cwd, normalize });
-    if (packageObj === undefined) {
-        return { packageJson: {} };
-    }
-    const { path, packageJson } = packageObj;
-    const packageDir = dirname(path);
-    return { packageDir, packageJson };
-};
-const getPackageObj = async function ({ cwd, normalize = true }) {
+/**
+ * Retrieve `package.json` from a specific directory
+ */
+export const getPackageJson = async function (cwd, options = {}) {
+    const result = {
+        packageJson: {},
+    };
     try {
-        return await readPackageUp({ cwd, normalize });
-        // If the `package.json` is invalid and `normalize` is `true`, an error is
-        // thrown. We return `undefined` then.
+        const { path, packageJson } = await readPackageUp({
+            cwd,
+            ...Object.assign({ normalize: true }, options),
+        });
+        result.packageJson = packageJson;
+        result.packageDir = dirname(path);
     }
     catch {
         // continue regardless error
     }
+    return result;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "28.1.5",
+  "version": "28.1.7",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/core/main.js",
@@ -65,7 +65,7 @@
   "dependencies": {
     "@bugsnag/js": "^7.0.0",
     "@netlify/cache-utils": "^5.0.1",
-    "@netlify/config": "^19.1.1",
+    "@netlify/config": "^19.1.2",
     "@netlify/edge-bundler": "^3.0.1",
     "@netlify/functions-utils": "^5.0.1",
     "@netlify/git-utils": "^5.0.1",
@@ -113,7 +113,7 @@
     "supports-color": "^9.0.0",
     "tmp-promise": "^3.0.2",
     "ts-node": "^10.6.0",
-    "typescript": "^4.5.4",
+    "typescript": "^4.8.4",
     "update-notifier": "^5.0.0",
     "uuid": "^8.0.0",
     "yargs": "^17.6.0"
@@ -140,7 +140,6 @@
     "process-exists": "^5.0.0",
     "sinon": "^13.0.0",
     "tsd": "^0.24.1",
-    "typescript": "^4.8.4",
     "yarn": "^1.22.4"
   },
   "engines": {
@@ -151,5 +150,5 @@
       "module": "commonjs"
     }
   },
-  "gitHead": "a17c26b151dd163548b4c8f9d6836ff290305a4a"
+  "gitHead": "452f62c69334ac40ef33156baea0d6bd64f20394"
 }