netlify-cli 17.13.2 → 17.14.1

package/{src/functions-templates → 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/functions-templates/typescript/abtest/{{name}}.ts

@@ -0,0 +1,31 @@
+import type { Context } from 'https://edge.netlify.com'
+
+export default async (request: Request, context: Context) => {
+  // look for existing "test_bucket" cookie
+  const bucketName = 'test_bucket'
+  const bucket = context.cookies.get(bucketName)
+
+  // return here if we find a cookie
+  if (bucket) {
+    return new Response(`Welcome back! You were assigned ${bucketName} **${bucket}** when you last visited the site!`)
+  }
+
+  // if no "test_bucket" cookie is found, assign the user to a bucket
+  // in this example we're using two buckets (a, b) with an equal weighting of 50/50
+  const weighting = 0.5
+
+  // get a random number between (0-1)
+  // this is a basic example and you may want to experiment
+  const random = Math.random()
+  const newBucketValue = random <= weighting ? 'a' : 'b'
+
+  // set the new "test_bucket" cookie
+  context.cookies.set({
+    name: bucketName,
+    value: newBucketValue,
+  })
+
+  return new Response(
+    `Congratulations! You have been assigned ${bucketName} **${newBucketValue}**. View your browser cookies to check it out!`,
+  )
+}

package/functions-templates/typescript/geolocation/{{name}}.ts

@@ -0,0 +1,23 @@
+import { Context } from 'https://edge.netlify.com'
+
+export default async (request: Request, context: Context) =>
+  // Here's what's available on context.geo
+
+  // context: {
+  //   geo: {
+  //     city?: string;
+  //     country?: {
+  //       code?: string;
+  //       name?: string;
+  //     },
+  //     subdivision?: {
+  //       code?: string;
+  //       name?: string;
+  //     },
+  //   }
+  // }
+
+  Response.json({
+    geo: context.geo,
+    header: request.headers.get('x-nf-geo'),
+  })

package/functions-templates/typescript/hello-world/{{name}}.ts

@@ -0,0 +1,12 @@
+import { Handler } from '@netlify/functions'
+
+export const handler: Handler = async (event, context) => {
+  const { name = 'stranger' } = event.queryStringParameters
+
+  return {
+    statusCode: 200,
+    body: JSON.stringify({
+      message: `Hello, ${name}!`,
+    }),
+  }
+}

package/functions-templates/typescript/json/{{name}}.ts

@@ -0,0 +1,4 @@
+import type { Context } from 'https://edge.netlify.com'
+
+export default async (request: Request, context: Context) =>
+  Response.json({ hello: 'world', location: context.geo.city })

package/functions-templates/typescript/log/{{name}}.ts

@@ -0,0 +1,9 @@
+import type { Context } from 'https://edge.netlify.com'
+
+export default async (request: Request, context: Context) => {
+  console.log(`There was a request from ${context.geo.city} to ${request.url}`)
+
+  return new Response('The request to this URL was logged', {
+    headers: { 'content-type': 'text/html' },
+  })
+}

package/functions-templates/typescript/scheduled-function/{{name}}.ts

@@ -0,0 +1,12 @@
+import { schedule } from '@netlify/functions'
+
+// To learn about scheduled functions and supported cron extensions,
+// see: https://ntl.fyi/sched-func
+export const handler = schedule('@hourly', async (event) => {
+  const eventBody = JSON.parse(event.body)
+  console.log(`Next function run at ${eventBody.next_run}.`)
+
+  return {
+    statusCode: 200,
+  }
+})

package/functions-templates/typescript/set-cookies/{{name}}.ts

@@ -0,0 +1,29 @@
+import type { Context } from 'https://edge.netlify.com'
+
+export default async (request: Request, context: Context) => {
+  const url = new URL(request.url)
+
+  switch (url.searchParams.get('action')) {
+    case 'set':
+      context.cookies.set({
+        name: 'action',
+        value: 'hello',
+      })
+
+      return new Response('Cookie value has been set. Reload this page without the "action" parameter to see it.')
+
+    case 'clear':
+      context.cookies.delete('action')
+
+      return new Response(
+        'Cookie value has been cleared. Reload this page without the "action" parameter to see the new state.',
+      )
+  }
+
+  const value = context.cookies.get('action')
+  const message = value
+    ? `Cookie value is "${value}". You can clear it by using "?action=clear".`
+    : 'Cookie has not been set. You can do so by adding "?action=set" to the URL.'
+
+  return new Response(message)
+}

package/functions-templates/typescript/set-req-header/{{name}}.ts

@@ -0,0 +1,5 @@
+import type { Context } from 'https://edge.netlify.com'
+
+export default async (request: Request, context: Context) => {
+  request.headers.set('X-Your-Custom-Header', 'Your custom header value')
+}

package/functions-templates/typescript/set-res-header/{{name}}.ts

@@ -0,0 +1,7 @@
+import type { Context } from 'https://edge.netlify.com'
+
+export default async (request: Request, context: Context) => {
+  const response = await context.next()
+  response.headers.set('X-Your-Custom-Header', 'A custom value')
+  return response
+}

package/functions-templates/typescript/transform-response/{{name}}.ts

@@ -0,0 +1,13 @@
+import { Context } from 'https://edge.netlify.com'
+
+export default async (request: Request, context: Context) => {
+  const url = new URL(request.url)
+
+  // Look for the query parameter, and return if we don't find it
+  if (url.searchParams.get('method') !== 'transform') {
+    return
+  }
+  const response = await context.next()
+  const text = await response.text()
+  return new Response(text.toUpperCase(), response)
+}

package/npm-shrinkwrap.json

@@ -1,20 +1,20 @@
 {
   "name": "netlify-cli",
-  "version": "17.13.2",
+  "version": "17.14.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "17.13.2",
+      "version": "17.14.1",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
         "@bugsnag/js": "7.20.2",
         "@fastify/static": "6.10.2",
-        "@netlify/blobs": "6.4.1",
+        "@netlify/blobs": "6.4.2",
         "@netlify/build": "29.32.0",
-        "@netlify/build-info": "7.11.4",
+        "@netlify/build-info": "7.11.5",
         "@netlify/config": "20.10.1",
         "@netlify/edge-bundler": "11.0.0",
         "@netlify/local-functions-proxy": "1.1.1",
@@ -759,9 +759,9 @@
       "integrity": "sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw=="
     },
     "node_modules/@netlify/blobs": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@netlify/blobs/-/blobs-6.4.1.tgz",
-      "integrity": "sha512-2n65VaF8llxBl8cfOFVgXff4soZbEXSXekuux0airJ2RFSufqP4rloIWl0mvs75JQ0xLsFAoLLgPMcRNuECQqw==",
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/@netlify/blobs/-/blobs-6.4.2.tgz",
+      "integrity": "sha512-MccXfC/b8vRr5FWJTvMN7L3aBgtrbhNLWQsSu802C/R2Gmlb5C9/OC0IY4i0+BEZ8rS+F4TU/8NQsVlqHHVESQ==",
       "engines": {
         "node": "^14.16.0 || >=16.0.0"
       }
@@ -846,9 +846,9 @@
       }
     },
     "node_modules/@netlify/build-info": {
-      "version": "7.11.4",
-      "resolved": "https://registry.npmjs.org/@netlify/build-info/-/build-info-7.11.4.tgz",
-      "integrity": "sha512-4TvH/oIzow6wlpw+6wGsEyoApws1lzXNxwpArgSS5roCCWZ2NvoF1m7dsTEy+bN1bl1XkwOlK3L6YBJzs4khtg==",
+      "version": "7.11.5",
+      "resolved": "https://registry.npmjs.org/@netlify/build-info/-/build-info-7.11.5.tgz",
+      "integrity": "sha512-uZIlBVUHgJuW46iSAEgI2WOAFFhzufhvTrLzuNsXFSo2/v79rEfjYI2lnuknkihgjVSyrmxAjMfWFzpaQjNGyQ==",
       "dependencies": {
         "@bugsnag/js": "^7.20.0",
         "dot-prop": "^7.2.0",
@@ -16092,9 +16092,9 @@
       "integrity": "sha512-4wMPu9iN3/HL97QblBsBay3E1etIciR84izI3U+4iALY+JHCrI+a2jO0qbAZ/nxKoegypYEaiiqWXylm+/zfrw=="
     },
     "@netlify/blobs": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/@netlify/blobs/-/blobs-6.4.1.tgz",
-      "integrity": "sha512-2n65VaF8llxBl8cfOFVgXff4soZbEXSXekuux0airJ2RFSufqP4rloIWl0mvs75JQ0xLsFAoLLgPMcRNuECQqw=="
+      "version": "6.4.2",
+      "resolved": "https://registry.npmjs.org/@netlify/blobs/-/blobs-6.4.2.tgz",
+      "integrity": "sha512-MccXfC/b8vRr5FWJTvMN7L3aBgtrbhNLWQsSu802C/R2Gmlb5C9/OC0IY4i0+BEZ8rS+F4TU/8NQsVlqHHVESQ=="
     },
     "@netlify/build": {
       "version": "29.32.0",
@@ -16641,9 +16641,9 @@
       }
     },
     "@netlify/build-info": {
-      "version": "7.11.4",
-      "resolved": "https://registry.npmjs.org/@netlify/build-info/-/build-info-7.11.4.tgz",
-      "integrity": "sha512-4TvH/oIzow6wlpw+6wGsEyoApws1lzXNxwpArgSS5roCCWZ2NvoF1m7dsTEy+bN1bl1XkwOlK3L6YBJzs4khtg==",
+      "version": "7.11.5",
+      "resolved": "https://registry.npmjs.org/@netlify/build-info/-/build-info-7.11.5.tgz",
+      "integrity": "sha512-uZIlBVUHgJuW46iSAEgI2WOAFFhzufhvTrLzuNsXFSo2/v79rEfjYI2lnuknkihgjVSyrmxAjMfWFzpaQjNGyQ==",
       "requires": {
         "@bugsnag/js": "^7.20.0",
         "dot-prop": "^7.2.0",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "17.13.2",
+  "version": "17.14.1",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -10,17 +10,9 @@
   "files": [
     "/bin",
     "/npm-shrinkwrap.json",
-    "/scripts/postinstall.js",
-    "/src/**/*.js",
-    "/src/**/types.d.ts",
-    "/src/**/*.sh",
-    "/src/**/*.ps1",
-    "/src/functions-templates/**",
-    "/src/lib/templates/**",
-    "!/src/**/node_modules/**",
-    "!/src/**/*.test.js",
-    "!/src/**/*.ts",
-    "!/src/**/*.d.ts.map"
+    "/scripts",
+    "/functions-templates",
+    "/dist"
   ],
   "homepage": "https://github.com/netlify/cli",
   "keywords": [
@@ -45,9 +37,9 @@
   "dependencies": {
     "@bugsnag/js": "7.20.2",
     "@fastify/static": "6.10.2",
-    "@netlify/blobs": "6.4.1",
+    "@netlify/blobs": "6.4.2",
     "@netlify/build": "29.32.0",
-    "@netlify/build-info": "7.11.4",
+    "@netlify/build-info": "7.11.5",
     "@netlify/config": "20.10.1",
     "@netlify/edge-bundler": "11.0.0",
     "@netlify/local-functions-proxy": "1.1.1",

package/scripts/postinstall.js

@@ -2,8 +2,8 @@ import process from 'process'
 
 import chalk from 'chalk'
 
-import { createMainCommand } from '../src/commands/index.js'
-import { generateAutocompletion } from '../src/lib/completion/index.js'
+import { createMainCommand } from '../dist/commands/index.js'
+import { generateAutocompletion } from '../dist/lib/completion/index.js'
 
 const id = (message) => message
 

package/scripts/prepare-for-publish.js

@@ -0,0 +1,56 @@
+import { readFile, writeFile } from 'fs/promises'
+import { dirname, join } from 'path'
+import { fileURLToPath } from 'url'
+
+import execa from 'execa'
+import ora from 'ora'
+
+// These scripts from package.json need to be preserved on publish
+const preserveScripts = new Set([
+  'postinstall-pack',
+  'postpack',
+  'preinstall',
+  'prepack',
+  'prepublish',
+  'prepublishOnly',
+])
+
+let spinner = ora({
+  spinner: 'star',
+  text: 'Patching package.json (removing devDependencies, scripts, etc)',
+}).start()
+
+const dir = dirname(fileURLToPath(import.meta.url))
+const packageJsonPath = join(dir, '../package.json')
+
+const pkgJson = JSON.parse(await readFile(packageJsonPath))
+
+delete pkgJson.devDependencies
+delete pkgJson.ava
+delete pkgJson.config
+
+for (const scriptName in pkgJson.scripts) {
+  if (preserveScripts.has(scriptName)) continue
+
+  delete pkgJson.scripts[scriptName]
+}
+
+pkgJson.scripts.postinstall = pkgJson.scripts['postinstall-pack']
+delete pkgJson.scripts['postinstall-pack']
+
+await writeFile(packageJsonPath, JSON.stringify(pkgJson, null, 2))
+spinner.succeed()
+
+spinner = ora({
+  spinner: 'star',
+  text: 'Running `npm install --no-audit`',
+}).start()
+await execa('npm', ['install', '--no-audit'])
+spinner.succeed()
+
+spinner = ora({
+  spinner: 'star',
+  text: 'Running `npm shrinkwrap`',
+}).start()
+await execa('npm', ['shrinkwrap'])
+spinner.succeed()