@netlify/build 27.15.8-rc → 27.16.2-pidgey

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "27.15.8-rc",
+  "version": "27.16.2-pidgey",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./src/core/main.js",
@@ -56,14 +56,14 @@
   "license": "MIT",
   "dependencies": {
     "@bugsnag/js": "^7.0.0",
-    "@netlify/edge-bundler": "^1.13.0",
+    "@netlify/edge-bundler": "^1.14.1",
     "@netlify/cache-utils": "^4.0.0",
-    "@netlify/config": "^18.2.2",
-    "@netlify/functions-utils": "^4.2.4",
+    "@netlify/config": "^18.2.3",
+    "@netlify/functions-utils": "^4.2.5",
     "@netlify/git-utils": "^4.0.0",
-    "@netlify/plugins-list": "^6.36.0",
+    "@netlify/plugins-list": "^6.41.0",
     "@netlify/run-utils": "^4.0.0",
-    "@netlify/zip-it-and-ship-it": "^5.13.5",
+    "@netlify/zip-it-and-ship-it": "^6.0.0",
     "@sindresorhus/slugify": "^2.0.0",
     "@types/node": "^16.0.0",
     "ajv": "^8.11.0",

package/src/log/messages/compatibility.js

@@ -1,5 +1,6 @@
 import semver from 'semver'
 
+import { isRuntime } from '../../utils/runtime.js'
 import { isPreviousMajor } from '../../utils/semver.js'
 import { getPluginOrigin } from '../description.js'
 import { logArray, logSubHeader, logWarningArray, logWarningSubHeader } from '../logger.js'
@@ -36,11 +37,6 @@ const isNotCorePlugin = function ({ origin }) {
   return origin !== 'core'
 }
 
-const isRuntime = function ({ packageName }) {
-  // Make this a bit more robust in the future
-  return ['@netlify/next-runtime', '@netlify/plugin-nextjs'].includes(packageName)
-}
-
 const getPluginDescription = function (
   {
     packageName,

package/src/log/messages/install.js

@@ -1,8 +1,20 @@
+import { isRuntime } from '../../utils/runtime.js'
 import { log, logArray, logSubHeader } from '../logger.js'
 
 export const logInstallMissingPlugins = function (logs, packages) {
-  logSubHeader(logs, 'Installing plugins')
-  logArray(logs, packages)
+  const runtimes = packages.filter((pkg) => isRuntime(pkg))
+  const plugins = packages.filter((pkg) => !isRuntime(pkg))
+
+  if (plugins.length !== 0) {
+    logSubHeader(logs, 'Installing plugins')
+    logArray(logs, packages)
+  }
+
+  if (runtimes.length !== 0) {
+    const [nextRuntime] = runtimes
+
+    logSubHeader(logs, `Using Next.js Runtime - v${nextRuntime.pluginPackageJson.version}`)
+  }
 }
 
 export const logInstallLocalPluginsDeps = function (logs, localPluginsOptions) {

package/src/plugins/compatibility.js

@@ -42,12 +42,11 @@ export const getExpectedVersion = async function ({ versions, nodeVersion, packa
 //  - Otherwise, use `latestVersion`
 const getCompatibleEntry = async function ({ versions, nodeVersion, packageJson, buildDir, pinnedVersion }) {
   if (pinnedVersion !== undefined) {
-    // invalid semver versions are coerced to valid ones (e.g 4.17.1-runtime.7 -> 4.17.1)
-    return (
-      versions.find(({ version }) => semver.satisfies(semver.coerce(version), pinnedVersion)) || {
-        version: pinnedVersion,
-      }
+    const matchingVersion = versions.find(({ version }) =>
+      semver.satisfies(version, pinnedVersion, { includePrerelease: true }),
     )
+
+    return matchingVersion || { version: pinnedVersion }
   }
 
   const versionsWithConditions = versions.filter(hasConditions)

package/src/plugins_core/functions/index.js

@@ -1,4 +1,6 @@
-import { resolve } from 'path'
+import { promises as fs } from 'fs'
+import path, { resolve } from 'path'
+import process from 'process'
 
 import { zipFunctions } from '@netlify/zip-it-and-ship-it'
 import { pathExists } from 'path-exists'
@@ -26,6 +28,7 @@ const zipFunctionsAndLogResults = async ({
   isRunningLocally,
   logs,
   repositoryRoot,
+  publishDir,
 }) => {
   const zisiParameters = getZisiParameters({
     buildDir,
@@ -44,6 +47,13 @@ const zipFunctionsAndLogResults = async ({
 
     const sourceDirectories = [internalFunctionsSrc, functionsSrc].filter(Boolean)
     const results = await zipItAndShipIt.zipFunctions(sourceDirectories, functionsDist, zisiParameters)
+    if (process.env.NF_BUNDLE_FOR_FLY === 'true') {
+      const destDir = path.join(publishDir, '.netlify/internal/fly-functions')
+      await fs.mkdir(destDir, { recursive: true })
+      await Promise.all(
+        results.map((result) => fs.copyFile(result.path, path.join(destDir, path.basename(result.path)))),
+      )
+    }
 
     logBundleResults({ logs, results })
 
@@ -62,6 +72,7 @@ const coreStep = async function ({
     IS_LOCAL: isRunningLocally,
     FUNCTIONS_SRC: relativeFunctionsSrc,
     FUNCTIONS_DIST: relativeFunctionsDist,
+    PUBLISH_DIR: publishDir,
   },
   buildDir,
   logs,
@@ -114,6 +125,7 @@ const coreStep = async function ({
     isRunningLocally,
     logs,
     repositoryRoot,
+    publishDir,
   })
 
   return {

package/src/utils/runtime.js

@@ -0,0 +1,4 @@
+export const isRuntime = function (packageName) {
+  // Make this a bit more robust in the future
+  return ['@netlify/next-runtime', '@netlify/plugin-nextjs'].includes(packageName)
+}