Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
brianr authored Dec 17, 2024
2 parents 99e3669 + 02b77f5 commit 4e0640b
Show file tree
Hide file tree
Showing 222 changed files with 56,414 additions and 41,028 deletions.
21 changes: 15 additions & 6 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
## Description of the change

> Description here
> Please include a summary of the change and which issues are fixed.
> Please also include relevant motivation and context.
## Type of change

- [ ] Bug fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] Maintenance
- [ ] New release

## Related issues

> Fix [#1]()
> Shortcut stories and GitHub issues (delete irrelevant)
- Fix [SC-]
- Fix #1

## Checklists

### Development
Expand All @@ -17,9 +26,9 @@
- [ ] The code changed/added as part of this pull request has been covered with tests
- [ ] All tests related to the changed code pass in development

### Code review
### Code review

- [ ] This pull request has a descriptive title and information useful to a reviewer. There may be a screenshot or screencast attached
- [ ] "Ready for review" label attached to the PR and reviewers mentioned in a comment
- [ ] This pull request has a descriptive title and information useful to a reviewer. There may be a screenshot or screencast attached
- [ ] "Ready for review" label attached to the PR and reviewers assigned
- [ ] Issue from task tracker has a link to this pull request
- [ ] Changes have been reviewed by at least one other engineer
- [ ] Issue from task tracker has a link to this pull request
44 changes: 33 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,52 @@ name: Rollbar.js CI

on:
push:
branches: [ master ]
tags: [ v* ]
branches: [master]
tags: [v*]
pull_request:
branches: [ master ]
branches: [master]

jobs:
build:
runs-on: ubuntu-16.04
runs-on: ubuntu-20.04

strategy:
matrix:
node-version: [8, 10, 12, 14, 16]
include:
- node: 14
npm: ^8
- node: 16
npm: ^8
- node: 18
npm: ^9
- node: 20
npm: ^10
- node: latest
npm: latest

steps:
- uses: actions/checkout@v2
with:
submodules: recursive
- name: Checkout
uses: actions/checkout@v4

- name: Install node.js
uses: actions/setup-node@v2-beta
- name: Set up node ${{ matrix.node }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
node-version: ${{ matrix.node }}

- name: Update npm
run: npm install -g npm@${{ matrix.npm }}

- name: npm install
run: npm install

- name: Lint
uses: wearerequired/lint-action@v2
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
prettier: true
eslint: true
eslint_args: '--max-warnings 0'
eslint_extensions: js

- name: Run tests
run: npm run test_ci
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

14 changes: 7 additions & 7 deletions .lgtm.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
path_classifiers:
generated:
- release
- dist
docs:
- examples
test:
- test
generated:
- release
- dist
docs:
- examples
test:
- test
1 change: 0 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ node_modules
bower_components
.idea
vendor/*.min.js
vendor/JSON-js/.git
test/*.bundle.js*
sauce_connect.log
release
Expand Down
18 changes: 18 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
.github
.next
.yalc
build
bundles
coverage
dist
lib
node_modules
out
public
release
vendor

# ignore prettifying examples for now due to
# 1. there being minified snippets all over the place and
# 2. some tests fail cause they depend on some sources being exactly as they are
examples
39 changes: 39 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"[github-actions-workflow]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[javascriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[json5]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[jsonc]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"[typescriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"editor.formatOnSaveMode": "file",
"editor.tabSize": 2,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"files.trimTrailingWhitespace": true,
"prettier.useEditorConfig": false
}
Loading

0 comments on commit 4e0640b

Please sign in to comment.