Skip to content

Commit afd3a71

Browse files
authored
Merge branch 'main' into fix/twilio-dependency-conflict
2 parents 6a96529 + 4c1b5e2 commit afd3a71

File tree

23 files changed

+887
-66
lines changed

23 files changed

+887
-66
lines changed

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18
1+
20

docs/CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ If you are planning to contribute something that does not have an open issue yet
1414

1515
## Requirements
1616

17-
Make sure you have Node.js 18 or newer installed. Due to compatibility with Twilio
18-
Functions this project has to support at least Node.js 18.0.0.
17+
Make sure you have Node.js 20 or newer installed. Due to compatibility with Twilio
18+
Functions this project has to support at least Node.js 20.0.0.
1919

2020
We are using the npm CLI to manage our project. You'll need at least `npm` version 8 or newer.
2121

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"prettier": "^2.2.1",
4343
"rimraf": "^3.0.2",
4444
"ts-jest": "^29.1.2",
45-
"typedoc": "^0.27.4",
45+
"typedoc": "^0.28.14",
4646
"typescript": "^5.3.3"
4747
},
4848
"peerDependencies": {

packages/create-twilio-function/CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# Change Log
22

3+
## 4.0.0
4+
5+
### Major Changes
6+
7+
- [#544](https://github.com/twilio-labs/serverless-toolkit/pull/544) [`9f945cd79e89aaa00474c56a5ab3d6b41415b874`](https://github.com/twilio-labs/serverless-toolkit/commit/9f945cd79e89aaa00474c56a5ab3d6b41415b874) Thanks [@alfrol](https://github.com/alfrol)! - **WHAT**: Remove Node.js 18 from supported versions.
8+
9+
**WHY**: Node.js 18 is EOL and will not receive bug fixes or security upgrades. Users should migrate to Node.js 20 or 22.
10+
11+
**BREAKING CHANGE**: Projects using `create-twilio-function`, `@twilio-labs/plugin-asset`, `@twilio-labs/plugin-serverless`, `@twilio-labs/serverless-twilio-runtime` or `twilio-run` will have to migrate to Node.js 20 or 22.
12+
13+
### Patch Changes
14+
15+
- Updated dependencies [[`9f945cd79e89aaa00474c56a5ab3d6b41415b874`](https://github.com/twilio-labs/serverless-toolkit/commit/9f945cd79e89aaa00474c56a5ab3d6b41415b874)]:
16+
- twilio-run@5.0.0
17+
318
## 3.6.0
419

520
### Minor Changes

packages/create-twilio-function/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "create-twilio-function",
3-
"version": "3.6.0",
3+
"version": "4.0.0",
44
"description": "A CLI tool to generate a new Twilio Function using that can be run locally with twilio-run.",
55
"bin": "./bin/create-twilio-function",
66
"main": "./src/create-twilio-function.js",
@@ -36,13 +36,13 @@
3636
"pkg-install": "^1.0.0",
3737
"rimraf": "^2.6.3",
3838
"terminal-link": "^2.0.0",
39-
"twilio-run": "^4.2.0",
39+
"twilio-run": "^5.0.0",
4040
"window-size": "^1.1.1",
4141
"wrap-ansi": "^7.0.0",
4242
"yargs": "^17.2.1"
4343
},
4444
"engines": {
45-
"node": ">=12.22.1"
45+
"node": "^20.x || ^22.x"
4646
},
4747
"files": [
4848
"bin/",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = {
66
'@twilio/runtime-handler'
77
].replace(/[\^~]/, ''),
88
twilioRun: pkgJson.dependencies['twilio-run'],
9-
node: '22',
9+
node: '^20.x || ^22.x',
1010
typescript: '^5.8.0',
1111
serverlessRuntimeTypes: '^4.0.1',
1212
copyfiles: '^2.4.1',

packages/plugin-assets/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Change Log
22

3+
## 3.0.0
4+
5+
### Major Changes
6+
7+
- [#544](https://github.com/twilio-labs/serverless-toolkit/pull/544) [`9f945cd79e89aaa00474c56a5ab3d6b41415b874`](https://github.com/twilio-labs/serverless-toolkit/commit/9f945cd79e89aaa00474c56a5ab3d6b41415b874) Thanks [@alfrol](https://github.com/alfrol)! - **WHAT**: Remove Node.js 18 from supported versions.
8+
9+
**WHY**: Node.js 18 is EOL and will not receive bug fixes or security upgrades. Users should migrate to Node.js 20 or 22.
10+
11+
**BREAKING CHANGE**: Projects using `create-twilio-function`, `@twilio-labs/plugin-asset`, `@twilio-labs/plugin-serverless`, `@twilio-labs/serverless-twilio-runtime` or `twilio-run` will have to migrate to Node.js 20 or 22.
12+
313
## 2.0.6
414

515
### Patch Changes

packages/plugin-assets/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ DESCRIPTION
7373
Create a new assets service to use as a bucket
7474
```
7575

76-
_See code: [src/commands/assets/init.js](https://github.com/twilio-labs/serverless-toolkit/blob/v2.0.6/src/commands/assets/init.js)_
76+
_See code: [src/commands/assets/init.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.0.0/src/commands/assets/init.js)_
7777

7878
## `twilio assets:list`
7979

@@ -96,7 +96,7 @@ DESCRIPTION
9696
List all the assets in the service
9797
```
9898

99-
_See code: [src/commands/assets/list.js](https://github.com/twilio-labs/serverless-toolkit/blob/v2.0.6/src/commands/assets/list.js)_
99+
_See code: [src/commands/assets/list.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.0.0/src/commands/assets/list.js)_
100100

101101
## `twilio assets:upload FILE`
102102

@@ -123,7 +123,7 @@ DESCRIPTION
123123
Upload a new asset to the Assets service
124124
```
125125

126-
_See code: [src/commands/assets/upload.js](https://github.com/twilio-labs/serverless-toolkit/blob/v2.0.6/src/commands/assets/upload.js)_
126+
_See code: [src/commands/assets/upload.js](https://github.com/twilio-labs/serverless-toolkit/blob/v3.0.0/src/commands/assets/upload.js)_
127127
<!-- commandsstop -->
128128

129129
## Contributing

packages/plugin-assets/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@twilio-labs/plugin-assets",
33
"description": "Easily upload assets to a Twilio Assets service",
4-
"version": "2.0.6",
4+
"version": "3.0.0",
55
"author": "Twilio Inc. <open-source@twilio.com> (https://www.twilio.com/labs)",
66
"contributors": [
77
"Phil Nash <philnash@twilio.com>"
@@ -23,7 +23,7 @@
2323
"rimraf": "^5.0.5"
2424
},
2525
"engines": {
26-
"node": ">=18"
26+
"node": "^20.x || ^22.x"
2727
},
2828
"files": [
2929
"/oclif.manifest.json",

packages/plugin-serverless/CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# Change Log
22

3+
## 4.0.0
4+
5+
### Major Changes
6+
7+
- [#544](https://github.com/twilio-labs/serverless-toolkit/pull/544) [`9f945cd79e89aaa00474c56a5ab3d6b41415b874`](https://github.com/twilio-labs/serverless-toolkit/commit/9f945cd79e89aaa00474c56a5ab3d6b41415b874) Thanks [@alfrol](https://github.com/alfrol)! - **WHAT**: Remove Node.js 18 from supported versions.
8+
9+
**WHY**: Node.js 18 is EOL and will not receive bug fixes or security upgrades. Users should migrate to Node.js 20 or 22.
10+
11+
**BREAKING CHANGE**: Projects using `create-twilio-function`, `@twilio-labs/plugin-asset`, `@twilio-labs/plugin-serverless`, `@twilio-labs/serverless-twilio-runtime` or `twilio-run` will have to migrate to Node.js 20 or 22.
12+
13+
### Patch Changes
14+
15+
- Updated dependencies [[`9f945cd79e89aaa00474c56a5ab3d6b41415b874`](https://github.com/twilio-labs/serverless-toolkit/commit/9f945cd79e89aaa00474c56a5ab3d6b41415b874)]:
16+
- create-twilio-function@4.0.0
17+
- twilio-run@5.0.0
18+
319
## 3.3.0
420

521
### Minor Changes

0 commit comments

Comments
 (0)