Merge branch 'main' into fix/twilio-dependency-conflict

Author: mikefaille

.changeset/gorgeous-gorillas-divide.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## 3.6.0
+
+### Minor Changes
+
+- [#540](https://github.com/twilio-labs/serverless-toolkit/pull/540) [`3c1149ce220900fb37c8bbbd56ef47fc6cd02838`](https://github.com/twilio-labs/serverless-toolkit/commit/3c1149ce220900fb37c8bbbd56ef47fc6cd02838) Thanks [@jannoteelem](https://github.com/jannoteelem)! - chore: update toolkit to default to node22
+
+### Patch Changes
+
+- Updated dependencies [[`3c1149ce220900fb37c8bbbd56ef47fc6cd02838`](https://github.com/twilio-labs/serverless-toolkit/commit/3c1149ce220900fb37c8bbbd56ef47fc6cd02838), [`50eae0acaa3561c65c61326667a216650f3200c4`](https://github.com/twilio-labs/serverless-toolkit/commit/50eae0acaa3561c65c61326667a216650f3200c4)]:
+ - twilio-run@4.2.0
+
 ## 3.5.0
 
 ### Minor Changes

packages/create-twilio-function/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
  "name": "create-twilio-function",
- "version": "3.5.0",
+ "version": "3.6.0",
  "description": "A CLI tool to generate a new Twilio Function using that can be run locally with twilio-run.",
  "bin": "./bin/create-twilio-function",
  "main": "./src/create-twilio-function.js",
@@ -36,7 +36,7 @@
  "pkg-install": "^1.0.0",
  "rimraf": "^2.6.3",
  "terminal-link": "^2.0.0",
- "twilio-run": "^4.0.3",
+ "twilio-run": "^4.2.0",
  "window-size": "^1.1.1",
  "wrap-ansi": "^7.0.0",
  "yargs": "^17.2.1"

packages/create-twilio-function/package.json

@@ -6,7 +6,7 @@ module.exports = {
  '@twilio/runtime-handler'
  ].replace(/[\^~]/, ''),
  twilioRun: pkgJson.dependencies['twilio-run'],
- node: '18',
+ node: '22',
  typescript: '^5.8.0',
  serverlessRuntimeTypes: '^4.0.1',
  copyfiles: '^2.4.1',

packages/create-twilio-function/src/create-twilio-function/versions.js

@@ -1,5 +1,17 @@
 # Change Log
 
+## 3.3.0
+
+### Minor Changes
+
+- [#540](https://github.com/twilio-labs/serverless-toolkit/pull/540) [`3c1149ce220900fb37c8bbbd56ef47fc6cd02838`](https://github.com/twilio-labs/serverless-toolkit/commit/3c1149ce220900fb37c8bbbd56ef47fc6cd02838) Thanks [@jannoteelem](https://github.com/jannoteelem)! - chore: update toolkit to default to node22
+
+### Patch Changes
+
+- Updated dependencies [[`3c1149ce220900fb37c8bbbd56ef47fc6cd02838`](https://github.com/twilio-labs/serverless-toolkit/commit/3c1149ce220900fb37c8bbbd56ef47fc6cd02838), [`50eae0acaa3561c65c61326667a216650f3200c4`](https://github.com/twilio-labs/serverless-toolkit/commit/50eae0acaa3561c65c61326667a216650f3200c4)]:
+ - twilio-run@4.2.0
+ - create-twilio-function@3.6.0
+
 ## 3.2.0
 
 ### Minor Changes

packages/plugin-serverless/CHANGELOG.md

@@ -158,7 +158,7 @@ FLAGS
  --password=<value> A specific API secret or auth token for deployment. Uses fields from .env otherwise
  --production Please prefer the "activate" command! Deploys to the production environment (no
  domain suffix). Overrides the value passed via the environment flag.
- --runtime=<value> The version of Node.js to deploy the build to. (node18)
+ --runtime=<value> The version of Node.js to deploy the build to. (node22)
  --service-sid=<value> SID of the Twilio Serverless Service to deploy to
  --silent Suppress output and logs. This is a shorthand for "-l none -o none".
  --to=<value> [Alias for "environment"]
@@ -167,7 +167,7 @@ DESCRIPTION
  Deploys existing functions and assets to Twilio
 ```
 
-_See code: [src/commands/serverless/deploy.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.2.0/src/commands/serverless/deploy.js)_
+_See code: [src/commands/serverless/deploy.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.3.0/src/commands/serverless/deploy.js)_
 
 ## `twilio serverless:dev [DIR]`
 
@@ -248,7 +248,7 @@ DESCRIPTION
  Retrieves the value of a specific environment variable
 ```
 
-_See code: [src/commands/serverless/env/get.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.2.0/src/commands/serverless/env/get.js)_
+_See code: [src/commands/serverless/env/get.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.3.0/src/commands/serverless/env/get.js)_
 
 ## `twilio serverless:env:import`
 
@@ -286,7 +286,7 @@ DESCRIPTION
  Takes a .env file and uploads all environment variables to a given environment
 ```
 
-_See code: [src/commands/serverless/env/import.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.2.0/src/commands/serverless/env/import.js)_
+_See code: [src/commands/serverless/env/import.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.3.0/src/commands/serverless/env/import.js)_
 
 ## `twilio serverless:env:list`
 
@@ -326,7 +326,7 @@ DESCRIPTION
  Lists all environment variables for a given environment
 ```
 
-_See code: [src/commands/serverless/env/list.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.2.0/src/commands/serverless/env/list.js)_
+_See code: [src/commands/serverless/env/list.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.3.0/src/commands/serverless/env/list.js)_
 
 ## `twilio serverless:env:set`
 
@@ -366,7 +366,7 @@ DESCRIPTION
  Sets an environment variable with a given key and value
 ```
 
-_See code: [src/commands/serverless/env/set.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.2.0/src/commands/serverless/env/set.js)_
+_See code: [src/commands/serverless/env/set.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.3.0/src/commands/serverless/env/set.js)_
 
 ## `twilio serverless:env:unset`
 
@@ -405,7 +405,7 @@ DESCRIPTION
  Removes an environment variable for a given key
 ```
 
-_See code: [src/commands/serverless/env/unset.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.2.0/src/commands/serverless/env/unset.js)_
+_See code: [src/commands/serverless/env/unset.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.3.0/src/commands/serverless/env/unset.js)_
 
 ## `twilio serverless:init NAME`
 
@@ -439,7 +439,7 @@ DESCRIPTION
  Creates a new Twilio Function project
 ```
 
-_See code: [src/commands/serverless/init.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.2.0/src/commands/serverless/init.js)_
+_See code: [src/commands/serverless/init.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.3.0/src/commands/serverless/init.js)_
 
 ## `twilio serverless:list [TYPES]`
 
@@ -482,7 +482,7 @@ DESCRIPTION
  List existing services, environments, variables, deployments for your Twilio Serverless Account
 ```
 
-_See code: [src/commands/serverless/list.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.2.0/src/commands/serverless/list.js)_
+_See code: [src/commands/serverless/list.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.3.0/src/commands/serverless/list.js)_
 
 ## `twilio serverless:list-templates`
 
@@ -499,7 +499,7 @@ DESCRIPTION
  Lists the available Twilio Function templates
 ```
 
-_See code: [src/commands/serverless/list-templates.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.2.0/src/commands/serverless/list-templates.js)_
+_See code: [src/commands/serverless/list-templates.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.3.0/src/commands/serverless/list-templates.js)_
 
 ## `twilio serverless:logs`
 
@@ -539,7 +539,7 @@ DESCRIPTION
  Print logs from your Twilio Serverless project
 ```
 
-_See code: [src/commands/serverless/logs.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.2.0/src/commands/serverless/logs.js)_
+_See code: [src/commands/serverless/logs.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.3.0/src/commands/serverless/logs.js)_
 
 ## `twilio serverless:new [NAMESPACE]`
 
@@ -563,7 +563,7 @@ DESCRIPTION
  Creates a new Twilio Function based on an existing template
 ```
 
-_See code: [src/commands/serverless/new.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.2.0/src/commands/serverless/new.js)_
+_See code: [src/commands/serverless/new.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.3.0/src/commands/serverless/new.js)_
 
 ## `twilio serverless:promote`
 
@@ -613,7 +613,7 @@ ALIASES
  $ twilio serverless:activate
 ```
 
-_See code: [src/commands/serverless/promote.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.2.0/src/commands/serverless/promote.js)_
+_See code: [src/commands/serverless/promote.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.3.0/src/commands/serverless/promote.js)_
 
 ## `twilio serverless:run [DIR]`
 
@@ -699,7 +699,7 @@ ALIASES
  $ twilio serverless:run
 ```
 
-_See code: [src/commands/serverless/start.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.2.0/src/commands/serverless/start.js)_
+_See code: [src/commands/serverless/start.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.3.0/src/commands/serverless/start.js)_
 <!-- commandsstop -->
 
 ## Contributing

packages/plugin-serverless/README.md

@@ -1,7 +1,7 @@
 {
  "name": "@twilio-labs/plugin-serverless",
  "description": "Develop and deploy Twilio Serverless Functions",
- "version": "3.2.0",
+ "version": "3.3.0",
  "author": "Twilio Inc. <open-source@twilio.com> (https://www.twilio.com/labs)",
  "contributors": [
  "Dominik Kundel <dkundel@twilio.com>"
@@ -10,10 +10,10 @@
  "dependencies": {
  "@oclif/core": "^1.14.2",
  "@twilio/cli-core": "^7.0.0",
- "create-twilio-function": "^3.5.0",
+ "create-twilio-function": "^3.6.0",
  "lodash.camelcase": "^4.3.0",
  "lodash.kebabcase": "^4.1.1",
- "twilio-run": "^4.1.0"
+ "twilio-run": "^4.2.0"
  },
  "devDependencies": {
  "@oclif/plugin-help": "^5.1.12",

packages/plugin-serverless/package.json

@@ -1,5 +1,11 @@
 # Change Log
 
+## 5.7.0
+
+### Minor Changes
+
+- [#540](https://github.com/twilio-labs/serverless-toolkit/pull/540) [`3c1149ce220900fb37c8bbbd56ef47fc6cd02838`](https://github.com/twilio-labs/serverless-toolkit/commit/3c1149ce220900fb37c8bbbd56ef47fc6cd02838) Thanks [@jannoteelem](https://github.com/jannoteelem)! - chore: update toolkit to default to node22
+
 ## 5.6.0
 
 ### Minor Changes

packages/serverless-api/CHANGELOG.md

@@ -10,7 +10,7 @@ async function run() {
  const result = await client.deployProject({
  ...config,
  overrideExistingService: true,
- runtime: 'node18',
+ runtime: 'node22',
  env: {
  HELLO: 'ahoy',
  WORLD: 'welt',

packages/serverless-api/examples/deploy.js

@@ -1,6 +1,6 @@
 {
  "name": "@twilio-labs/serverless-api",
- "version": "5.6.0",
+ "version": "5.7.0",
  "description": "API-wrapper for the Twilio Serverless API",
  "main": "dist/index.js",
  "types": "dist/index.d.ts",