Merge remote-tracking branch 'origin/main' into handle-content-type-w…

…ith-additional-data

.all-contributorsrc

@@ -3,9 +3,7 @@
   "projectOwner": "dkundel",
   "repoType": "github",
   "repoHost": "https://github.com",
-  "files": [
-    "README.md"
-  ],
+  "files": ["README.md"],
   "imageSize": 100,
   "commit": true,
   "contributors": [
@@ -14,79 +12,65 @@
       "name": "Dominik Kundel",
       "avatar_url": "https://avatars3.githubusercontent.com/u/1505101?v=4",
       "profile": "https://dkundel.com",
-      "contributions": [
-        "code"
-      ]
+      "contributions": ["code"]
     },
     {
       "login": "dbbidclips",
       "name": "dbbidclips",
       "avatar_url": "https://avatars1.githubusercontent.com/u/41997517?v=4",
       "profile": "https://github.com/dbbidclips",
-      "contributions": [
-        "code",
-        "bug"
-      ]
+      "contributions": ["code", "bug"]
     },
     {
       "login": "ShelbyZ",
       "name": "Shelby Hagman",
       "avatar_url": "https://avatars0.githubusercontent.com/u/1033099?v=4",
       "profile": "https://shagman.codes",
-      "contributions": [
-        "bug",
-        "code"
-      ]
+      "contributions": ["bug", "code"]
     },
     {
       "login": "jsjoeio",
       "name": "JavaScript Joe",
       "avatar_url": "https://avatars3.githubusercontent.com/u/3806031?v=4",
       "profile": "https://joeprevite.com/",
-      "contributions": [
-        "bug"
-      ]
+      "contributions": ["bug"]
     },
     {
       "login": "stefanjudis",
       "name": "Stefan Judis",
       "avatar_url": "https://avatars3.githubusercontent.com/u/962099?v=4",
       "profile": "https://www.stefanjudis.com/",
-      "contributions": [
-        "bug",
-        "code"
-      ]
+      "contributions": ["bug", "code"]
     },
     {
       "login": "philnash",
       "name": "Phil Nash",
       "avatar_url": "https://avatars3.githubusercontent.com/u/31462?v=4",
       "profile": "https://philna.sh",
-      "contributions": [
-        "bug",
-        "code",
-        "review"
-      ]
+      "contributions": ["bug", "code", "review"]
     },
     {
       "login": "childish-sambino",
       "name": "childish-sambino",
       "avatar_url": "https://avatars0.githubusercontent.com/u/47228322?v=4",
       "profile": "https://github.com/childish-sambino",
-      "contributions": [
-        "code",
-        "bug"
-      ]
+      "contributions": ["code", "bug"]
     },
     {
       "login": "thinkingserious",
       "name": "Elmer Thomas",
       "avatar_url": "https://avatars0.githubusercontent.com/u/146695?v=4",
       "profile": "http://www.ThinkingSerious.com",
-      "contributions": [
-        "bug",
-        "doc"
-      ]
+      "contributions": ["bug", "doc"]
+    },
+    {
+      "login": "makserik",
+      "name": "makserik",
+      "avatar_url": "https://avatars.githubusercontent.com/u/15821542?v=4",
+      "profile": "https://github.com/makserik",
+      "contributions": ["code", "doc"]
     }
-  ]
+  ],
+  "commitConvention": "angular"
 }
+

.changeset/README.md

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

.changeset/config.json

@@ -0,0 +1,16 @@
+{
+  "$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
+  "changelog": [
+    "@changesets/changelog-github",
+    {
+      "repo": "twilio-labs/serverless-toolkit"
+    }
+  ],
+  "commit": false,
+  "fixed": [],
+  "linked": [],
+  "access": "public",
+  "baseBranch": "main",
+  "updateInternalDependencies": "patch",
+  "ignore": []
+}

.changeset/forty-snails-rescue.md

@@ -0,0 +1,5 @@
+---
+'@twilio/runtime-handler': patch
+---
+
+Fix error messages in local development

.github/workflows/nodejs.yml

@@ -1,11 +1,8 @@
 name: Node CI
 
 on:
-  push:
-    branches:
-      - main
-      - master
-      - 'features/*'
+  workflow_call:
+  # This gets run by on-merge-main.yml automatically
   pull_request:
     branches:
       - main
@@ -19,19 +16,21 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        node-version: [12, 14]
+        node-version: [ lts/-1, lts/*]
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
+      - name: Update npm to 8.x
+        run: |
+          npm i -g npm@8
       - name: npm install, build, and test
         run: |
           npm install
-          npm run bootstrap
-          npm run build --if-present
+          npm run build
           npm run test
         env:
           CI: true

.github/workflows/on-merge-main.yml

@@ -0,0 +1,46 @@
+name: Merge to main
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  tests:
+    name: Run tests
+    uses: twilio-labs/serverless-toolkit/.github/workflows/nodejs.yml@main
+
+  release:
+    name: Run release work
+    needs: tests
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v3
+      - name: Setup Node.js 20
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+      - name: Update npm to 10.x
+        run: |
+          npm i -g npm@10
+      - name: Install Dependencies
+        run: npm install
+      - name: Setup CI Git User
+        run: |
+          git config user.name twilio-labs-ci
+          git config user.email [email protected]
+      - name: Create new build
+        run: |
+          npm run clean
+          npm run build
+      - name: "Create Pull Request or Publish to npm"
+        uses: changesets/action@v1
+        with:
+          version: npm run version-packages
+          publish: npm run npm:publish
+          commit: "chore: version packages"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.gitignore

@@ -72,3 +72,7 @@ dist/
 *.twiliodeployinfo
 
 packages/serverless-api/docs/
+
+.idea
+
+**/.DS_Store

.npmrc

@@ -1 +1,2 @@
-package-lock=false
+package-lock=false
+@twilio:registry=https://registry.npmjs.org/

.nvmrc

@@ -1 +1 @@
-12.22.1
+18

README.md

@@ -4,7 +4,7 @@
 
 ## What is the Serverless Toolkit?
 
-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).
+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).
 
 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.
 
@@ -34,13 +34,13 @@ To understand more about the structure and the design of the Toolkit check out t
 
 ## Setup & Development
 
-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/).
+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`).
 
 ```bash
 git clone [email protected]:twilio-labs/serverless-toolkit.git
 cd serverless-toolkit
 npm install
-npm run bootstrap
+npm run build
 ```
 
 ## License

commitlint.config.js

@@ -1 +1,7 @@
-module.exports = { extends: ['@commitlint/config-conventional'] };
+module.exports = {
+  extends: ['@commitlint/config-conventional'],
+  plugins: ['workspace-scopes'],
+  rules: {
+    'scope-enum': [2, 'always', []],
+  },
+};