Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
jazmon committed Jan 24, 2023
2 parents a81db57 + 16e95cb commit 2708585
Show file tree
Hide file tree
Showing 69 changed files with 29,726 additions and 11,732 deletions.
275 changes: 275 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,275 @@
{
"projectName": "serverless-esbuild",
"projectOwner": "floydspace",
"repoType": "github",
"repoHost": "https://github.com",
"files": [
"README.md"
],
"imageSize": 70,
"commit": true,
"commitConvention": "angular",
"contributors": [
{
"login": "floydspace",
"name": "Victor Korzunin",
"avatar_url": "https://avatars.githubusercontent.com/u/5180700?v=4",
"profile": "https://github.com/floydspace",
"contributions": [
"question",
"code",
"doc",
"example",
"ideas",
"infra",
"maintenance",
"plugin",
"projectManagement",
"review",
"test",
"tool"
]
},
{
"login": "olup",
"name": "Loup Topalian",
"avatar_url": "https://avatars.githubusercontent.com/u/13785588?v=4",
"profile": "https://github.com/olup",
"contributions": [
"question",
"code",
"doc",
"infra",
"maintenance",
"plugin"
]
},
{
"login": "samchungy",
"name": "Sam Chung",
"avatar_url": "https://avatars.githubusercontent.com/u/18017094?v=4",
"profile": "https://github.com/samchungy",
"contributions": [
"question",
"code",
"doc",
"example",
"infra",
"maintenance",
"plugin",
"review",
"tool"
]
},
{
"login": "vamche",
"name": "Vamsi Dharmavarapu",
"avatar_url": "https://avatars.githubusercontent.com/u/9653338?v=4",
"profile": "https://github.com/vamche",
"contributions": [
"code",
"doc",
"example",
"infra",
"maintenance"
]
},
{
"login": "webdeveric",
"name": "Eric",
"avatar_url": "https://avatars.githubusercontent.com/u/1823514?v=4",
"profile": "https://github.com/webdeveric",
"contributions": [
"code",
"ideas",
"maintenance",
"infra",
"review"
]
},
{
"login": "codingnuclei",
"name": "Chris",
"avatar_url": "https://avatars.githubusercontent.com/u/37954566?v=4",
"profile": "https://github.com/codingnuclei",
"contributions": [
"code",
"ideas"
]
},
{
"login": "tinchoz49",
"name": "Martín Acosta",
"avatar_url": "https://avatars.githubusercontent.com/u/819446?v=4",
"profile": "https://geutstudio.com/",
"contributions": [
"code"
]
},
{
"login": "tonyt-adept",
"name": "Tony Tyrrell",
"avatar_url": "https://avatars.githubusercontent.com/u/82844324?v=4",
"profile": "https://github.com/tonyt-adept",
"contributions": [
"code"
]
},
{
"login": "mattjennings",
"name": "Matt Jennings",
"avatar_url": "https://avatars.githubusercontent.com/u/8703090?v=4",
"profile": "https://mattjennings.io/",
"contributions": [
"code"
]
},
{
"login": "mishabruml",
"name": "Misha Bruml",
"avatar_url": "https://avatars.githubusercontent.com/u/25983780?v=4",
"profile": "https://github.com/mishabruml",
"contributions": [
"code"
]
},
{
"login": "fargito",
"name": "François Farge",
"avatar_url": "https://avatars.githubusercontent.com/u/29537204?v=4",
"profile": "https://www.swarmion.dev/",
"contributions": [
"code"
]
},
{
"login": "ffxsam",
"name": "Sam Hulick",
"avatar_url": "https://avatars.githubusercontent.com/u/12532733?v=4",
"profile": "https://reelcrafter.com/",
"contributions": [
"doc"
]
},
{
"login": "troyready",
"name": "Troy Ready",
"avatar_url": "https://avatars.githubusercontent.com/u/1806418?v=4",
"profile": "https://github.com/troyready",
"contributions": [
"code"
]
},
{
"login": "adikari",
"name": "subash adhikari",
"avatar_url": "https://avatars.githubusercontent.com/u/1757714?v=4",
"profile": "http://www.subash.com.au/",
"contributions": [
"code"
]
},
{
"login": "danionescu",
"name": "Dan Ionescu",
"avatar_url": "https://avatars.githubusercontent.com/u/3269359?v=4",
"profile": "https://github.com/danionescu",
"contributions": [
"code"
]
},
{
"login": "gurushida",
"name": "gurushida",
"avatar_url": "https://avatars.githubusercontent.com/u/49831684?v=4",
"profile": "https://github.com/gurushida",
"contributions": [
"code"
]
},
{
"login": "nickygb",
"name": "nickygb",
"avatar_url": "https://avatars.githubusercontent.com/u/23530107?v=4",
"profile": "https://github.com/nickygb",
"contributions": [
"code"
]
},
{
"login": "capaj",
"name": "Jiri Spac",
"avatar_url": "https://avatars.githubusercontent.com/u/1305378?v=4",
"profile": "https://twitter.com/capajj",
"contributions": [
"code"
]
},
{
"login": "gavynriebau",
"name": "gavynriebau",
"avatar_url": "https://avatars.githubusercontent.com/u/11895736?v=4",
"profile": "https://github.com/gavynriebau",
"contributions": [
"doc"
]
},
{
"login": "adriencaccia",
"name": "Adrien Cacciaguerra",
"avatar_url": "https://avatars.githubusercontent.com/u/19605940?v=4",
"profile": "https://github.com/adriencaccia",
"contributions": [
"doc"
]
},
{
"login": "lulzneko",
"name": "lulzneko",
"avatar_url": "https://avatars.githubusercontent.com/u/31102213?v=4",
"profile": "https://riotz.works/",
"contributions": [
"code"
]
},
{
"login": "uneco",
"name": "AOKI Yuuto",
"avatar_url": "https://avatars.githubusercontent.com/u/603523?v=4",
"profile": "https://u-ne.co/",
"contributions": [
"code"
]
},
{
"login": "ThomasAribart",
"name": "Thomas Aribart",
"avatar_url": "https://avatars.githubusercontent.com/u/38014240?v=4",
"profile": "https://github.com/ThomasAribart",
"contributions": [
"ideas"
]
},
{
"login": "koryhutchison",
"name": "Kory Hutchison",
"avatar_url": "https://avatars.githubusercontent.com/u/22381273?v=4",
"profile": "https://github.com/koryhutchison",
"contributions": [
"code",
"ideas"
]
},
{
"login": "chrishutchinson",
"name": "Chris Hutchinson",
"avatar_url": "https://avatars.githubusercontent.com/u/1573022?v=4",
"profile": "https://www.chrishutchinson.me",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,
"linkToUsage": false
}
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ insert_final_newline = true

[*.md]
trim_trailing_whitespace = false

[Makefile]
indent_style = tab
1 change: 1 addition & 0 deletions .eslintignore
32 changes: 12 additions & 20 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,14 @@
env:
node: true
ignorePatterns:
- dist
root: true
extends:
- eslint:recommended
- plugin:@typescript-eslint/recommended
- '@floydspace/eslint-config/lib'
- '@floydspace/eslint-config/jest'
rules:
semi: 'off'
quotes: 'off'
no-use-before-define: 'off'
'@typescript-eslint/no-var-requires': 'off'
'@typescript-eslint/explicit-function-return-type': 'off'
'@typescript-eslint/explicit-module-boundary-types': 'off'
'@typescript-eslint/semi': error
'@typescript-eslint/quotes':
- error
- single
'@typescript-eslint/no-use-before-define':
- error
- functions: false
classes: false
'@typescript-eslint/naming-convention': off
jest/no-conditional-expect: off
overrides:
- files:
- 'examples/**/*.[tj]s'
rules:
import/no-unresolved: off
no-promise-executor-return: off
no-console: off
9 changes: 5 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ about: Create a report to help us improve
title: ''
labels: bug
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior. If you have an example repository that would be even better:

1. Set X to `true`
2. Run `sls package`

Expand All @@ -22,9 +22,10 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots or logs to help explain your problem.

**Versions (please complete the following information):**
- OS: [e.g. Linux, Mac, Windows]
- Serverless Framework Version: [e.g. 3.0.0]
- Plugin Version: [e.g. 1.25.0]

- OS: [e.g. Linux, Mac, Windows]
- Serverless Framework Version: [e.g. 3.0.0]
- Plugin Version: [e.g. 1.25.0]

**Additional context**
Add any other context about the problem here.
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ about: Suggest an idea for this project
title: ''
labels: enhancement
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
Expand Down
21 changes: 17 additions & 4 deletions .github/workflows/pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,27 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x, 14.x]
node-version: [14, 16, 18]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: npm
- run: npm install
- uses: pnpm/action-setup@v2
with:
version: 7
- run: npm ci
- run: npm test
- run: npm run test:e2e
- name: Upload e2e test artifacts
uses: actions/upload-artifact@v3
if: failure()
with:
name: e2e-test-artifact
path: |
.test-artifacts/**/.serverless/*.json
.test-artifacts/**/.serverless/*.zip
retention-days: 7
- run: npm run build --if-present
Loading

0 comments on commit 2708585

Please sign in to comment.