diff --git a/.all-contributorsrc b/.all-contributorsrc index 844f7ee1..57a17dae 100644 --- a/.all-contributorsrc +++ b/.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" } + diff --git a/.changeset/six-paws-speak.md b/.changeset/six-paws-speak.md new file mode 100644 index 00000000..3af9805f --- /dev/null +++ b/.changeset/six-paws-speak.md @@ -0,0 +1,5 @@ +--- +"create-twilio-function": patch +--- + +FRIDGE-734 make serverless-toolkit work with node v18 diff --git a/.gitignore b/.gitignore index 52f45c29..afa6e160 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,5 @@ dist/ *.twiliodeployinfo packages/serverless-api/docs/ + +.idea diff --git a/.nvmrc b/.nvmrc index da2d3988..3c032078 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -14 \ No newline at end of file +18 diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 421d5018..e82da97e 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -33,6 +33,7 @@ npm run bootstrap ## Contributing 1. Perform changes. Check out [Working with Workspaces](#working-with-workspaces) for more info +2. If you changed packages/plugins, run `twilio plugins:link ` and then test the plugin locally by running `twilio ` 2. Make sure tests pass by running `npm test` 3. Stage the files you changed by running `git add` with the files you changed. 4. If you have a customer facing change make sure to run `npm run changeset` at the root of the project, select what type of version change it is and which packages are impacted and describe the change. Check out ["How we version"](#how-we-version) for more details. diff --git a/package.json b/package.json index d58d8975..20059b85 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "@changesets/cli": "^2.26.0", "@commitlint/cli": "^9.1.2", "@commitlint/config-conventional": "^10.0.0", + "@twilio/test-dep": "npm:twilio@3.84.0", "@types/jest": "^29.2.4", "all-contributors-cli": "^6.1.2", "commitizen": "^4.2.4", @@ -40,8 +41,7 @@ "prettier": "^2.2.1", "rimraf": "^3.0.2", "ts-jest": "^28.0.8", - "typescript": "^4.9.4", - "@twilio/test-dep": "npm:twilio@3.84.0" + "typescript": "^5.3.3" }, "lint-staged": { "*.{js,jsx,ts,tsx}": [ diff --git a/packages/create-twilio-function/src/create-twilio-function/create-files.js b/packages/create-twilio-function/src/create-twilio-function/create-files.js index b97111ee..05ae54f8 100644 --- a/packages/create-twilio-function/src/create-twilio-function/create-files.js +++ b/packages/create-twilio-function/src/create-twilio-function/create-files.js @@ -126,7 +126,7 @@ function createTsconfigFile(pathName) { JSON.stringify( { compilerOptions: { - target: 'es5', + target: 'es2018', module: 'commonjs', strict: true, esModuleInterop: true, @@ -134,7 +134,9 @@ function createTsconfigFile(pathName) { outDir: 'dist', skipLibCheck: true, sourceMap: true, + types: ['node'], }, + exclude: ['node_modules'], }, null, 2 diff --git a/packages/create-twilio-function/src/create-twilio-function/versions.js b/packages/create-twilio-function/src/create-twilio-function/versions.js index e772cf51..7c5c4fce 100644 --- a/packages/create-twilio-function/src/create-twilio-function/versions.js +++ b/packages/create-twilio-function/src/create-twilio-function/versions.js @@ -7,7 +7,7 @@ module.exports = { ].replace(/[\^~]/, ''), twilioRun: pkgJson.dependencies['twilio-run'], node: '18', - typescript: '^3.8', + typescript: '^5.3.3', serverlessRuntimeTypes: '^1.1', copyfiles: '^2.2.0', };