Skip to content

Commit 09612e7

Browse files
victorayvictoray
committed
Merge remote-tracking branch 'origin/main' into should-not-print-in-function-runner
2 parents 16a6ea2 + 3868a78 commit 09612e7

File tree

125 files changed

+2429
-2062
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+2429
-2062
lines changed

Diff for: ‎.all-contributorsrc

+19-35
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
"projectOwner": "dkundel",
44
"repoType": "github",
55
"repoHost": "https://github.com",
6-
"files": [
7-
"README.md"
8-
],
6+
"files": ["README.md"],
97
"imageSize": 100,
108
"commit": true,
119
"contributors": [
@@ -14,79 +12,65 @@
1412
"name": "Dominik Kundel",
1513
"avatar_url": "https://avatars3.githubusercontent.com/u/1505101?v=4",
1614
"profile": "https://dkundel.com",
17-
"contributions": [
18-
"code"
19-
]
15+
"contributions": ["code"]
2016
},
2117
{
2218
"login": "dbbidclips",
2319
"name": "dbbidclips",
2420
"avatar_url": "https://avatars1.githubusercontent.com/u/41997517?v=4",
2521
"profile": "https://github.com/dbbidclips",
26-
"contributions": [
27-
"code",
28-
"bug"
29-
]
22+
"contributions": ["code", "bug"]
3023
},
3124
{
3225
"login": "ShelbyZ",
3326
"name": "Shelby Hagman",
3427
"avatar_url": "https://avatars0.githubusercontent.com/u/1033099?v=4",
3528
"profile": "https://shagman.codes",
36-
"contributions": [
37-
"bug",
38-
"code"
39-
]
29+
"contributions": ["bug", "code"]
4030
},
4131
{
4232
"login": "jsjoeio",
4333
"name": "JavaScript Joe",
4434
"avatar_url": "https://avatars3.githubusercontent.com/u/3806031?v=4",
4535
"profile": "https://joeprevite.com/",
46-
"contributions": [
47-
"bug"
48-
]
36+
"contributions": ["bug"]
4937
},
5038
{
5139
"login": "stefanjudis",
5240
"name": "Stefan Judis",
5341
"avatar_url": "https://avatars3.githubusercontent.com/u/962099?v=4",
5442
"profile": "https://www.stefanjudis.com/",
55-
"contributions": [
56-
"bug",
57-
"code"
58-
]
43+
"contributions": ["bug", "code"]
5944
},
6045
{
6146
"login": "philnash",
6247
"name": "Phil Nash",
6348
"avatar_url": "https://avatars3.githubusercontent.com/u/31462?v=4",
6449
"profile": "https://philna.sh",
65-
"contributions": [
66-
"bug",
67-
"code",
68-
"review"
69-
]
50+
"contributions": ["bug", "code", "review"]
7051
},
7152
{
7253
"login": "childish-sambino",
7354
"name": "childish-sambino",
7455
"avatar_url": "https://avatars0.githubusercontent.com/u/47228322?v=4",
7556
"profile": "https://github.com/childish-sambino",
76-
"contributions": [
77-
"code",
78-
"bug"
79-
]
57+
"contributions": ["code", "bug"]
8058
},
8159
{
8260
"login": "thinkingserious",
8361
"name": "Elmer Thomas",
8462
"avatar_url": "https://avatars0.githubusercontent.com/u/146695?v=4",
8563
"profile": "http://www.ThinkingSerious.com",
86-
"contributions": [
87-
"bug",
88-
"doc"
89-
]
64+
"contributions": ["bug", "doc"]
65+
},
66+
{
67+
"login": "makserik",
68+
"name": "makserik",
69+
"avatar_url": "https://avatars.githubusercontent.com/u/15821542?v=4",
70+
"profile": "https://github.com/makserik",
71+
"contributions": ["code", "doc"]
9072
}
91-
]
73+
],
74+
"commitConvention": "angular"
9275
}
76+

Diff for: ‎.changeset/README.md

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Changesets
2+
3+
Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
4+
with multi-package repos, or single-package repos to help you version and publish your code. You can
5+
find the full documentation for it [in our repository](https://github.com/changesets/changesets)
6+
7+
We have a quick list of common questions to get you started engaging with this project in
8+
[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)

Diff for: ‎.changeset/config.json

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
3+
"changelog": [
4+
"@changesets/changelog-github",
5+
{
6+
"repo": "twilio-labs/serverless-toolkit"
7+
}
8+
],
9+
"commit": false,
10+
"fixed": [],
11+
"linked": [],
12+
"access": "public",
13+
"baseBranch": "main",
14+
"updateInternalDependencies": "patch",
15+
"ignore": []
16+
}

Diff for: ‎.changeset/forty-snails-rescue.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@twilio/runtime-handler': patch
3+
---
4+
5+
Fix error messages in local development

Diff for: ‎.changeset/friendly-turtles-pretend.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@twilio/runtime-handler': patch
3+
---
4+
5+
Don't check for exact Content-Type matches

Diff for: ‎.changeset/warm-moles-learn.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'twilio-run': patch
3+
'@twilio-labs/plugin-serverless': patch
4+
---
5+
6+
Fix of debug/inspect mode by disabling fork process

Diff for: ‎.github/workflows/nodejs.yml

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
name: Node CI
22

33
on:
4-
push:
5-
branches:
6-
- main
7-
- master
8-
- 'features/*'
4+
workflow_call:
5+
# This gets run by on-merge-main.yml automatically
96
pull_request:
107
branches:
118
- main
@@ -19,19 +16,21 @@ jobs:
1916
fail-fast: false
2017
matrix:
2118
os: [macos-latest, windows-latest, ubuntu-latest]
22-
node-version: [12, 14]
19+
node-version: [ lts/-1, lts/*]
2320

2421
steps:
25-
- uses: actions/checkout@v1
22+
- uses: actions/checkout@v4
2623
- name: Use Node.js ${{ matrix.node-version }}
27-
uses: actions/setup-node@v1
24+
uses: actions/setup-node@v3
2825
with:
2926
node-version: ${{ matrix.node-version }}
27+
- name: Update npm to 8.x
28+
run: |
29+
npm i -g npm@8
3030
- name: npm install, build, and test
3131
run: |
3232
npm install
33-
npm run bootstrap
34-
npm run build --if-present
33+
npm run build
3534
npm run test
3635
env:
3736
CI: true

Diff for: ‎.github/workflows/on-merge-main.yml

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: Merge to main
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
jobs:
9+
tests:
10+
name: Run tests
11+
uses: twilio-labs/serverless-toolkit/.github/workflows/nodejs.yml@main
12+
13+
release:
14+
name: Run release work
15+
needs: tests
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- name: Checkout Repo
20+
uses: actions/checkout@v3
21+
- name: Setup Node.js 20
22+
uses: actions/setup-node@v3
23+
with:
24+
node-version: 20
25+
- name: Update npm to 10.x
26+
run: |
27+
npm i -g npm@10
28+
- name: Install Dependencies
29+
run: npm install
30+
- name: Setup CI Git User
31+
run: |
32+
git config user.name twilio-labs-ci
33+
git config user.email [email protected]
34+
- name: Create new build
35+
run: |
36+
npm run clean
37+
npm run build
38+
- name: "Create Pull Request or Publish to npm"
39+
uses: changesets/action@v1
40+
with:
41+
version: npm run version-packages
42+
publish: npm run npm:publish
43+
commit: "chore: version packages"
44+
env:
45+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
46+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

Diff for: ‎.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,7 @@ dist/
7272
*.twiliodeployinfo
7373

7474
packages/serverless-api/docs/
75+
76+
.idea
77+
78+
**/.DS_Store

Diff for: ‎.npmrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
package-lock=false
1+
package-lock=false
2+
@twilio:registry=https://registry.npmjs.org/

Diff for: ‎.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12.22.1
1+
18

Diff for: ‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
## What is the Serverless Toolkit?
66

7-
The [Serverless Toolkit](https://www.twilio.com/docs/labs/serverless-toolkit) is CLI tooling to help you develop locally and deploy to the [Twilio Runtime](https://www.twilio.com/runtime).
7+
The [Serverless Toolkit](https://www.twilio.com/docs/labs/serverless-toolkit) is CLI tooling to help you develop locally and deploy to the [Twilio Functions & Assets](https://www.twilio.com/serverless/functions).
88

99
There are two ways you can use the toolkit. If you are already using the [Twilio CLI](https://www.twilio.com/docs/twilio-cli), you can install it via a plugin. Alternatively, you can use the toolkit as a standalone using [twilio-run](https://npm.im/twilio-run) via npm or another Node.js package manager.
1010

@@ -34,13 +34,13 @@ To understand more about the structure and the design of the Toolkit check out t
3434

3535
## Setup & Development
3636

37-
This project uses [`lerna`](https://npm.im/lerna) as a tool to manage the monorepo. If you are unfamiliar with the tool, start by checking out the the [lerna docs](https://lerna.js.org/).
37+
This project uses [`npm` workspaces](https://docs.npmjs.com/cli/v8/using-npm/workspaces) as a tool to manage the monorepo. If you are unfamiliar with the tool, start by checking out the the [`npm` docs](https://docs.npmjs.com/cli/v7/using-npm/workspaces) and make sure you use at least npm version 8 or newer (`npm install -g npm@8`).
3838

3939
```bash
4040
git clone [email protected]:twilio-labs/serverless-toolkit.git
4141
cd serverless-toolkit
4242
npm install
43-
npm run bootstrap
43+
npm run build
4444
```
4545

4646
## License

Diff for: ‎commitlint.config.js

+7-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1-
module.exports = { extends: ['@commitlint/config-conventional'] };
1+
module.exports = {
2+
extends: ['@commitlint/config-conventional'],
3+
plugins: ['workspace-scopes'],
4+
rules: {
5+
'scope-enum': [2, 'always', []],
6+
},
7+
};

0 commit comments

Comments
 (0)