netlify-cli 17.13.1 → 17.14.0

package/npm-shrinkwrap.json

@@ -1,19 +1,19 @@
 {
   "name": "netlify-cli",
-  "version": "17.13.1",
+  "version": "17.14.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "17.13.1",
+      "version": "17.14.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
         "@bugsnag/js": "7.20.2",
         "@fastify/static": "6.10.2",
-        "@netlify/blobs": "6.3.1",
-        "@netlify/build": "29.31.5",
+        "@netlify/blobs": "6.4.1",
+        "@netlify/build": "29.32.0",
         "@netlify/build-info": "7.11.4",
         "@netlify/config": "20.10.1",
         "@netlify/edge-bundler": "11.0.0",
@@ -759,17 +759,17 @@
       "integrity": "sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw=="
     },
     "node_modules/@netlify/blobs": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/@netlify/blobs/-/blobs-6.3.1.tgz",
-      "integrity": "sha512-JjLz3WW7Wp6NVwQtDxPpWio4L3u9pnnDXnQ7Q16zgAFE9IA1rSjZVSsyOQrtkiBQIxaJ1Zr5eky8vrXJ5mdRWg==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@netlify/blobs/-/blobs-6.4.1.tgz",
+      "integrity": "sha512-2n65VaF8llxBl8cfOFVgXff4soZbEXSXekuux0airJ2RFSufqP4rloIWl0mvs75JQ0xLsFAoLLgPMcRNuECQqw==",
       "engines": {
         "node": "^14.16.0 || >=16.0.0"
       }
     },
     "node_modules/@netlify/build": {
-      "version": "29.31.5",
-      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-29.31.5.tgz",
-      "integrity": "sha512-NycFWMdCjCd0mPvWLpJucWzEedrxQSzeeMftA7lP00j3lGVRxqy+5WGfMGjEhAq6GNHTBoYUKTxdEeFJv3wesA==",
+      "version": "29.32.0",
+      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-29.32.0.tgz",
+      "integrity": "sha512-J0Zx2MCrtFqN9Nmp1uE4exB/5Fqlf/5YuSgaRu6GsjLINzEbhCKVv2ZksMbbMxc0c/cuemcmK9IomFT3GWIeTA==",
       "dependencies": {
         "@bugsnag/js": "^7.0.0",
         "@netlify/blobs": "^6.3.1",
@@ -1289,14 +1289,6 @@
         "node": "^14.16.0 || >=16.0.0"
       }
     },
-    "node_modules/@netlify/build/node_modules/@opentelemetry/api": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.6.0.tgz",
-      "integrity": "sha512-OWlrQAnWn9577PhVgqjUvMr1pg57Bc4jv0iL4w0PRuOSRvq67rvHW9Ie/dZVMvCzhSCB+UxhcY/PmCmFj33Q+g==",
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
     "node_modules/@netlify/build/node_modules/@sindresorhus/is": {
       "version": "5.6.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz",
@@ -3095,14 +3087,6 @@
         "node": ">=18.0.0"
       }
     },
-    "node_modules/@netlify/opentelemetry-utils/node_modules/@opentelemetry/api": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.6.0.tgz",
-      "integrity": "sha512-OWlrQAnWn9577PhVgqjUvMr1pg57Bc4jv0iL4w0PRuOSRvq67rvHW9Ie/dZVMvCzhSCB+UxhcY/PmCmFj33Q+g==",
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
     "node_modules/@netlify/plugins-list": {
       "version": "6.74.0",
       "resolved": "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-6.74.0.tgz",
@@ -3645,21 +3629,6 @@
         "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/@netlify/zip-it-and-ship-it/node_modules/fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
     "node_modules/@netlify/zip-it-and-ship-it/node_modules/glob": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
@@ -3993,6 +3962,14 @@
         "@octokit/openapi-types": "^13.11.0"
       }
     },
+    "node_modules/@opentelemetry/api": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.6.0.tgz",
+      "integrity": "sha512-OWlrQAnWn9577PhVgqjUvMr1pg57Bc4jv0iL4w0PRuOSRvq67rvHW9Ie/dZVMvCzhSCB+UxhcY/PmCmFj33Q+g==",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
     "node_modules/@parcel/watcher": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.3.0.tgz",
@@ -8019,9 +7996,9 @@
       "integrity": "sha512-IgfweLvEpwyA4WgiQe9Nx6VV2QkML2NkvZnk1oKnIzXgXdWxuhF7zw4DvLTPZJn6PIUneiAXPF24QmoEqHTjyw=="
     },
     "node_modules/fast-glob": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
-      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
@@ -16115,14 +16092,14 @@
       "integrity": "sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw=="
     },
     "@netlify/blobs": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/@netlify/blobs/-/blobs-6.3.1.tgz",
-      "integrity": "sha512-JjLz3WW7Wp6NVwQtDxPpWio4L3u9pnnDXnQ7Q16zgAFE9IA1rSjZVSsyOQrtkiBQIxaJ1Zr5eky8vrXJ5mdRWg=="
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/@netlify/blobs/-/blobs-6.4.1.tgz",
+      "integrity": "sha512-2n65VaF8llxBl8cfOFVgXff4soZbEXSXekuux0airJ2RFSufqP4rloIWl0mvs75JQ0xLsFAoLLgPMcRNuECQqw=="
     },
     "@netlify/build": {
-      "version": "29.31.5",
-      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-29.31.5.tgz",
-      "integrity": "sha512-NycFWMdCjCd0mPvWLpJucWzEedrxQSzeeMftA7lP00j3lGVRxqy+5WGfMGjEhAq6GNHTBoYUKTxdEeFJv3wesA==",
+      "version": "29.32.0",
+      "resolved": "https://registry.npmjs.org/@netlify/build/-/build-29.32.0.tgz",
+      "integrity": "sha512-J0Zx2MCrtFqN9Nmp1uE4exB/5Fqlf/5YuSgaRu6GsjLINzEbhCKVv2ZksMbbMxc0c/cuemcmK9IomFT3GWIeTA==",
       "requires": {
         "@bugsnag/js": "^7.0.0",
         "@netlify/blobs": "^6.3.1",
@@ -16347,11 +16324,6 @@
             "uuid": "^9.0.0"
           }
         },
-        "@opentelemetry/api": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.6.0.tgz",
-          "integrity": "sha512-OWlrQAnWn9577PhVgqjUvMr1pg57Bc4jv0iL4w0PRuOSRvq67rvHW9Ie/dZVMvCzhSCB+UxhcY/PmCmFj33Q+g=="
-        },
         "@sindresorhus/is": {
           "version": "5.6.0",
           "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz",
@@ -17452,13 +17424,6 @@
       "integrity": "sha512-mL8vhn4tUpdkHg1+WuqEhguULNeN0kQWZtel6lFEEZ36G41Vxm1gv6n7RcOanNLHxQEnaLS4J8zRVUSuwj6iTQ==",
       "requires": {
         "@opentelemetry/api": "~1.6.0"
-      },
-      "dependencies": {
-        "@opentelemetry/api": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.6.0.tgz",
-          "integrity": "sha512-OWlrQAnWn9577PhVgqjUvMr1pg57Bc4jv0iL4w0PRuOSRvq67rvHW9Ie/dZVMvCzhSCB+UxhcY/PmCmFj33Q+g=="
-        }
       }
     },
     "@netlify/plugins-list": {
@@ -17752,18 +17717,6 @@
             "strip-final-newline": "^3.0.0"
           }
         },
-        "fast-glob": {
-          "version": "3.3.2",
-          "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-          "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
-          "requires": {
-            "@nodelib/fs.stat": "^2.0.2",
-            "@nodelib/fs.walk": "^1.2.3",
-            "glob-parent": "^5.1.2",
-            "merge2": "^1.3.0",
-            "micromatch": "^4.0.4"
-          }
-        },
         "glob": {
           "version": "8.1.0",
           "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
@@ -18018,6 +17971,11 @@
         "@octokit/openapi-types": "^13.11.0"
       }
     },
+    "@opentelemetry/api": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.6.0.tgz",
+      "integrity": "sha512-OWlrQAnWn9577PhVgqjUvMr1pg57Bc4jv0iL4w0PRuOSRvq67rvHW9Ie/dZVMvCzhSCB+UxhcY/PmCmFj33Q+g=="
+    },
     "@parcel/watcher": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.3.0.tgz",
@@ -20892,9 +20850,9 @@
       "integrity": "sha512-IgfweLvEpwyA4WgiQe9Nx6VV2QkML2NkvZnk1oKnIzXgXdWxuhF7zw4DvLTPZJn6PIUneiAXPF24QmoEqHTjyw=="
     },
     "fast-glob": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
-      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "17.13.1",
+  "version": "17.14.0",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -45,8 +45,8 @@
   "dependencies": {
     "@bugsnag/js": "7.20.2",
     "@fastify/static": "6.10.2",
-    "@netlify/blobs": "6.3.1",
-    "@netlify/build": "29.31.5",
+    "@netlify/blobs": "6.4.1",
+    "@netlify/build": "29.32.0",
     "@netlify/build-info": "7.11.4",
     "@netlify/config": "20.10.1",
     "@netlify/edge-bundler": "11.0.0",

package/src/commands/dev/dev.js

@@ -1,6 +1,6 @@
 import process from 'process';
 import { Option } from 'commander';
-import { getBlobsContext } from '../../lib/blobs/blobs.js';
+import { BLOBS_CONTEXT_VARIABLE, encodeBlobsContext, getBlobsContext } from '../../lib/blobs/blobs.js';
 import { promptEditorHelper } from '../../lib/edge-functions/editor-helper.js';
 import { startFunctionsServer } from '../../lib/functions/server.js';
 import { printBanner } from '../../utils/banner.js';
@@ -76,6 +76,12 @@ export const dev = async (options, command) => {
     };
     let { env } = cachedConfig;
     env.NETLIFY_DEV = { sources: ['internal'], value: 'true' };
+    const blobsContext = await getBlobsContext({
+        debug: options.debug,
+        projectRoot: command.workingDir,
+        siteID: site.id ?? 'unknown-site-id',
+    });
+    env[BLOBS_CONTEXT_VARIABLE] = { sources: ['internal'], value: encodeBlobsContext(blobsContext) };
     if (!options.offline && siteInfo.use_envelope) {
         env = await getEnvelopeEnv({ api, context: options.context, env, siteInfo });
         log(`${NETLIFYDEVLOG} Injecting environment variable values for ${chalk.yellow('all scopes')}`);
@@ -117,11 +123,6 @@ export const dev = async (options, command) => {
             DEPLOY_URL: url,
         },
     });
-    const blobsContext = await getBlobsContext({
-        debug: options.debug,
-        projectRoot: command.workingDir,
-        siteID: site.id ?? 'unknown-site-id',
-    });
     const functionsRegistry = await startFunctionsServer({
         api,
         blobsContext,

package/src/commands/functions/functions-create.js

@@ -23,7 +23,6 @@ import { readRepoURL, validateRepoURL } from '../../utils/read-repo-url.js';
 const copyTemplateDir = promisify(copyTemplateDirOriginal);
 const require = createRequire(import.meta.url);
 const templatesDir = path.resolve(dirname(fileURLToPath(import.meta.url)), '../../functions-templates');
-const showRustTemplates = process.env.NETLIFY_EXPERIMENTAL_BUILD_RUST_SOURCE === 'true';
 /**
  * Ensure that there's a sub-directory in `src/functions-templates` named after
  * each `value` property in this list.
@@ -32,7 +31,7 @@ const languages = [
     { name: 'JavaScript', value: 'javascript' },
     { name: 'TypeScript', value: 'typescript' },
     { name: 'Go', value: 'go' },
-    showRustTemplates && { name: 'Rust', value: 'rust' },
+    { name: 'Rust', value: 'rust' },
 ];
 /**
  * prompt for a name if name not supplied
@@ -153,11 +152,9 @@ const pickTemplate = async function ({ language: languageFromFlag }, funcType) {
     let language = languageFromFlag;
     if (language === undefined) {
         const langs = funcType === 'edge'
-            ? // @ts-expect-error TS(2339) FIXME: Property 'value' does not exist on type 'false | {... Remove this comment to see the full error message
-                languages.filter((lang) => lang.value === 'javascript' || lang.value === 'typescript')
+            ? languages.filter((lang) => lang.value === 'javascript' || lang.value === 'typescript')
             : languages.filter(Boolean);
         const { language: languageFromPrompt } = await inquirer.prompt({
-            // @ts-expect-error
             choices: langs,
             message: 'Select the language of your function',
             name: 'language',
@@ -202,7 +199,7 @@ const DEFAULT_PRIORITY = 999;
 const selectTypeOfFunc = async () => {
     const functionTypes = [
         { name: 'Edge function (Deno)', value: 'edge' },
-        { name: 'Serverless function (Node/Go)', value: 'serverless' },
+        { name: 'Serverless function (Node/Go/Rust)', value: 'serverless' },
     ];
     const { functionType } = await inquirer.prompt([
         {
@@ -468,6 +465,11 @@ const scaffoldFromTemplate = async function (command, options, argumentName, fun
         }
         await installAddons(command, addons, path.resolve(functionPath));
         await handleOnComplete({ command, onComplete });
+        log();
+        log(chalk.greenBright(`Function created!`));
+        if (lang == 'rust') {
+            log(chalk.green(`Please note that Rust functions require setting the NETLIFY_EXPERIMENTAL_BUILD_RUST_SOURCE environment variable to 'true' on your site.`));
+        }
     }
 };
 const TEMPLATE_PERMISSIONS = 0o777;

package/src/commands/serve/serve.js

@@ -1,5 +1,5 @@
 import process from 'process';
-import { getBlobsContext } from '../../lib/blobs/blobs.js';
+import { BLOBS_CONTEXT_VARIABLE, encodeBlobsContext, getBlobsContext } from '../../lib/blobs/blobs.js';
 import { promptEditorHelper } from '../../lib/edge-functions/editor-helper.js';
 import { startFunctionsServer } from '../../lib/functions/server.js';
 import { printBanner } from '../../utils/banner.js';
@@ -70,6 +70,7 @@ export const serve = async (options, command) => {
         projectRoot: command.workingDir,
         siteID: site.id ?? 'unknown-site-id',
     });
+    process.env[BLOBS_CONTEXT_VARIABLE] = encodeBlobsContext(blobsContext);
     const functionsRegistry = await startFunctionsServer({
         api,
         blobsContext,

package/src/functions-templates/rust/hello-world/src/main.rs

@@ -1,7 +1,7 @@
 use aws_lambda_events::event::apigw::{ApiGatewayProxyRequest, ApiGatewayProxyResponse};
 use aws_lambda_events::encodings::Body;
 use http::header::HeaderMap;
-use lambda_runtime::{handler_fn, Context, Error};
+use lambda_runtime::{service_fn, Error, LambdaEvent};
 use log::LevelFilter;
 use simple_logger::SimpleLogger;
 
@@ -9,13 +9,13 @@ use simple_logger::SimpleLogger;
 async fn main() -> Result<(), Error> {
     SimpleLogger::new().with_utc_timestamps().with_level(LevelFilter::Info).init().unwrap();
 
-    let func = handler_fn(my_handler);
+    let func = service_fn(my_handler);
     lambda_runtime::run(func).await?;
     Ok(())
 }
 
-pub(crate) async fn my_handler(event: ApiGatewayProxyRequest, _ctx: Context) -> Result<ApiGatewayProxyResponse, Error> {
-    let path = event.path.unwrap();
+pub(crate) async fn my_handler(event: LambdaEvent<ApiGatewayProxyRequest>) -> Result<ApiGatewayProxyResponse, Error> {
+    let path = event.payload.path.unwrap();
 
     let resp = ApiGatewayProxyResponse {
         status_code: 200,

package/src/lib/blobs/blobs.js

@@ -1,9 +1,11 @@
+import { Buffer } from 'buffer';
 import path from 'path';
 import { BlobsServer } from '@netlify/blobs';
 import { v4 as uuidv4 } from 'uuid';
 import { log, NETLIFYDEVLOG } from '../../utils/command-helpers.js';
 import { getPathInProject } from '../settings.js';
 let hasPrintedLocalBlobsNotice = false;
+export const BLOBS_CONTEXT_VARIABLE = 'NETLIFY_BLOBS_CONTEXT';
 const printLocalBlobsNotice = () => {
     if (hasPrintedLocalBlobsNotice) {
         return;
@@ -39,3 +41,8 @@ export const getBlobsContext = async ({ debug, projectRoot, siteID }) => {
     };
     return context;
 };
+/**
+ * Returns a Base-64, JSON-encoded representation of the Blobs context. This is
+ * the format that the `@netlify/blobs` package expects to find the context in.
+ */
+export const encodeBlobsContext = (context) => Buffer.from(JSON.stringify(context)).toString('base64');

package/src/lib/functions/runtimes/js/index.js

@@ -3,6 +3,7 @@ import { dirname } from 'path';
 import { pathToFileURL } from 'url';
 import { Worker } from 'worker_threads';
 import lambdaLocal from 'lambda-local';
+import { BLOBS_CONTEXT_VARIABLE } from '../../../blobs/blobs.js';
 import detectNetlifyLambdaBuilder from './builders/netlify-lambda.js';
 import detectZisiBuilder, { parseFunctionForMetadata } from './builders/zisi.js';
 import { SECONDS_TO_MILLISECONDS } from './constants.js';
@@ -83,6 +84,14 @@ export const invokeFunctionDirectly = async ({ context, event, func, timeout })
     const lambdaPath = func.buildData?.buildPath ?? func.mainFile;
     const result = await lambdaLocal.execute({
         clientContext: JSON.stringify(context),
+        environment: {
+            // We've set the Blobs context on the parent process, which means it will
+            // be available to the Lambda. This would be inconsistent with production
+            // where only V2 functions get the context injected. To fix it, unset the
+            // context variable before invoking the function.
+            // This has the side-effect of also removing the variable from `process.env`.
+            [BLOBS_CONTEXT_VARIABLE]: undefined,
+        },
         event,
         lambdaPath,
         timeoutMs: timeout * SECONDS_TO_MILLISECONDS,