Skip to content

Commit cc3fec9

Browse files
committed
Merge branch 'master' into rc
2 parents 0b6cec2 + ab8ea15 commit cc3fec9

File tree

52 files changed

+26520
-15967
lines changed

Some content is hidden

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

52 files changed

+26520
-15967
lines changed

.eslintrc.json

Lines changed: 15 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,16 @@
11
{
2-
"parser": "@typescript-eslint/parser",
3-
"extends": [
4-
"eslint:recommended",
5-
"plugin:@typescript-eslint/eslint-recommended",
6-
"plugin:@typescript-eslint/recommended"
7-
],
8-
"env": {
9-
"node": true,
10-
"es6": true,
11-
"mocha": true
12-
},
13-
"parserOptions": {
14-
"ecmaVersion": 2018,
15-
"sourceType": "module"
16-
},
17-
"rules": {
18-
"no-var": "error",
19-
"no-console": "off",
20-
"@typescript-eslint/camelcase": "off",
21-
"@typescript-eslint/interface-name-prefix": "off",
22-
"@typescript-eslint/member-delimiter-style": [
23-
"error",
24-
{
25-
"multiline": {
26-
"delimiter": "semi",
27-
"requireLast": true
28-
},
29-
"singleline": {
30-
"delimiter": "semi",
31-
"requireLast": true
32-
}
33-
}
34-
],
35-
"@typescript-eslint/explicit-function-return-type": "off"
36-
}
37-
}
2+
"parser": "@typescript-eslint/parser",
3+
"extends": [
4+
"eslint:recommended",
5+
"plugin:@typescript-eslint/eslint-recommended",
6+
"plugin:@typescript-eslint/recommended"
7+
],
8+
"env": {
9+
"node": true,
10+
"es6": true
11+
},
12+
"parserOptions": {
13+
"ecmaVersion": 2018,
14+
"sourceType": "module"
15+
}
16+
}

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
blank_issues_enabled: false
1+
blank_issues_enabled: false
Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
11
---
22
name: peer template
33
about: Create a report to help us improve
4-
title: ''
5-
labels: ''
6-
assignees: ''
7-
4+
title: ""
5+
labels: ""
6+
assignees: ""
87
---
98

109
### I'm having an issue:
11-
- Give an expressive description of what is went wrong
12-
- Version of `peer` you're experiencing this issue
13-
- Nodejs version?
14-
- Platform name and its version (Win, Mac, Linux)?
15-
- Nice to have: a repository with code to reproduce the issue
16-
- If you're getting an error or exception, please provide its full stack-trace as plain-text or screenshot
10+
11+
- Give an expressive description of what is went wrong
12+
- Version of `peer` you're experiencing this issue
13+
- Nodejs version?
14+
- Platform name and its version (Win, Mac, Linux)?
15+
- Nice to have: a repository with code to reproduce the issue
16+
- If you're getting an error or exception, please provide its full stack-trace as plain-text or screenshot
1717

1818
### I have a suggestion:
19-
- Describe your feature / request
20-
- How you're going to use it? Give a usage example(s)
19+
20+
- Describe your feature / request
21+
- How you're going to use it? Give a usage example(s)
2122

2223
### Documentation is missing something or incorrect (have typos, etc.):
23-
- Give an expressive description what you have changed/added and why
24-
- Make sure you're using correct markdown markup
25-
- Make sure all code blocks starts with triple ``` (*backtick*) and have a syntax tag, for more read [this docs](https://help.github.com/articles/creating-and-highlighting-code-blocks/#syntax-highlighting)
26-
- Post addition/changes in issue, we will manage it
24+
25+
- Give an expressive description what you have changed/added and why
26+
- Make sure you're using correct markdown markup
27+
- Make sure all code blocks starts with triple ``` (_backtick_) and have a syntax tag, for more read [this docs](https://help.github.com/articles/creating-and-highlighting-code-blocks/#syntax-highlighting)
28+
- Post addition/changes in issue, we will manage it
2729

2830
## Thank you, and do not forget to get rid of this default message

.github/workflows/docker.yml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
name: Docker build & publish
22

33
on:
4-
push:
5-
branches: [ "master" ]
6-
pull_request:
7-
branches: [ "master" ]
4+
push:
5+
branches: ["master"]
6+
pull_request:
7+
branches: ["master"]
88

99
jobs:
10-
docker:
11-
runs-on: ubuntu-latest
12-
steps:
13-
- name: Set up Docker Buildx
14-
uses: docker/setup-buildx-action@v2
15-
- name: Login to Docker Hub
16-
uses: docker/login-action@v2
17-
with:
18-
username: ${{ secrets.DOCKERHUB_USERNAME }}
19-
password: ${{ secrets.DOCKERHUB_TOKEN }}
20-
- name: Build
21-
if: ${{ github.event_name == 'pull_request' }}
22-
uses: docker/build-push-action@v3
23-
- name: Build & publish
24-
if: ${{ github.event_name == 'push' }}
25-
uses: docker/build-push-action@v3
26-
with:
27-
push: true
28-
tags: peerjs/peerjs-server-test:nightly
10+
docker:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Set up Docker Buildx
14+
uses: docker/setup-buildx-action@v2
15+
- name: Login to Docker Hub
16+
uses: docker/login-action@v2
17+
with:
18+
username: ${{ secrets.DOCKERHUB_USERNAME }}
19+
password: ${{ secrets.DOCKERHUB_TOKEN }}
20+
- name: Build
21+
if: ${{ github.event_name == 'pull_request' }}
22+
uses: docker/build-push-action@v3
23+
- name: Build & publish
24+
if: ${{ github.event_name == 'push' }}
25+
uses: docker/build-push-action@v3
26+
with:
27+
push: true
28+
tags: peerjs/peerjs-server-test:nightly

.github/workflows/fly.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: Fly Deploy
22

33
on:
44
push:
5-
branches:
6-
- master
5+
branches:
6+
- master
77

88
env:
99
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
@@ -13,6 +13,6 @@ jobs:
1313
name: Deploy app
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v3
17-
- uses: superfly/flyctl-actions/setup-flyctl@master
18-
- run: flyctl deploy --remote-only
16+
- uses: actions/checkout@v3
17+
- uses: superfly/flyctl-actions/setup-flyctl@master
18+
- run: flyctl deploy --remote-only

.github/workflows/node.js.yml

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ name: Node.js CI
55

66
on:
77
push:
8-
branches: [ "master" ]
8+
branches: ["master"]
99
pull_request:
10-
branches: [ "master" ]
10+
branches: ["master"]
1111

1212
jobs:
1313
build:
14-
1514
runs-on: ubuntu-latest
1615

1716
strategy:
@@ -20,17 +19,17 @@ jobs:
2019
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
2120

2221
steps:
23-
- uses: actions/checkout@v3
24-
- name: Use Node.js ${{ matrix.node-version }}
25-
uses: actions/setup-node@v3
26-
with:
27-
node-version: ${{ matrix.node-version }}
28-
cache: 'npm'
29-
- run: npm ci
30-
- run: npm run build
31-
- run: npm run lint
32-
- run: npm run coverage
33-
- name: Publish code coverage to CodeClimate
34-
uses: paambaati/[email protected]
35-
env:
36-
CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}}
22+
- uses: actions/checkout@v3
23+
- name: Use Node.js ${{ matrix.node-version }}
24+
uses: actions/setup-node@v3
25+
with:
26+
node-version: ${{ matrix.node-version }}
27+
cache: "npm"
28+
- run: npm ci
29+
- run: npm run build
30+
- run: npm run lint
31+
- run: npm run coverage
32+
- name: Publish code coverage to CodeClimate
33+
uses: paambaati/[email protected]
34+
env:
35+
CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}}

.github/workflows/prettier.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# From https://til.simonwillison.net/github-actions/prettier-github-actions
2+
name: Check JavaScript for conformance with Prettier
3+
4+
on:
5+
push:
6+
pull_request:
7+
8+
jobs:
9+
prettier:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Check out repo
13+
uses: actions/checkout@v3
14+
- uses: actions/cache@v3
15+
name: Configure npm caching
16+
with:
17+
path: ~/.npm
18+
key: ${{ runner.os }}-npm-${{ hashFiles('**/workflows/prettier.yml') }}
19+
restore-keys: |
20+
${{ runner.os }}-npm-
21+
- name: Run prettier
22+
run: |-
23+
npx prettier --check .

.nycrc

Lines changed: 0 additions & 6 deletions
This file was deleted.

.prettierignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
dist
2+
coverage
3+
4+
# semantic-release
5+
CHANGELOG.md

.prettierrc.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
trailingComma = "all"
2+
semi = true
3+
useTabs = true

0 commit comments

Comments
 (0)