Skip to content

Commit 90bc2a5

Browse files
committed
Merge branch 'development'
# Conflicts: # .travis.yml # src/GitServerClient.js # src/components/save/CreateRepoModal.js # src/components/save/FileModal.js
2 parents e9988fd + fe19339 commit 90bc2a5

37 files changed

+21639
-9460
lines changed

.babelrc

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,37 @@
11
{
2-
"presets": [
3-
["@babel/preset-env", {
4-
"corejs": 3,
5-
"useBuiltIns": "entry"
6-
}],
7-
"@babel/preset-react"
2+
"presets": [
3+
[
4+
"@babel/preset-env",
5+
{
6+
"corejs": 3,
7+
"useBuiltIns": "entry"
8+
}
89
],
9-
"plugins": [
10-
["@babel/plugin-transform-runtime", {
11-
"regenerator": true
12-
}]
10+
"@babel/preset-react"
11+
],
12+
"plugins": [
13+
[
14+
"@babel/plugin-transform-runtime",
15+
{
16+
"corejs": { "version": 3, "proposals": true },
17+
"helpers": true,
18+
"regenerator": true,
19+
"useESModules": true,
20+
"version": "^7.12.15"
21+
}
1322
]
14-
}
23+
],
24+
"env": {
25+
"test": {
26+
"presets": ["@babel/preset-env", "@babel/preset-react"],
27+
"plugins": [
28+
[
29+
"@babel/plugin-transform-runtime",
30+
{
31+
"regenerator": true
32+
}
33+
]
34+
]
35+
}
36+
}
37+
}

.czrc.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"path": "git-cz"
3+
}

.eslintrc

Lines changed: 21 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,22 @@
11
{
2-
"env": {
3-
"browser": true,
4-
"es6": true,
5-
"jquery": true,
6-
"jest": true,
7-
"node": true
8-
},
9-
"extends": ["eslint:recommended", "plugin:react/recommended"],
10-
"globals": {
11-
"Atomics": "readonly",
12-
"SharedArrayBuffer": "readonly"
13-
},
14-
"parser": "babel-eslint",
15-
"parserOptions": {
16-
"ecmaVersion": 2020,
17-
"sourceType": "module"
18-
},
19-
"rules": {
20-
"indent": ["warn", "tab"],
21-
"no-multi-spaces": 1,
22-
"no-trailing-spaces": 1,
23-
"no-unused-vars": 2,
24-
"quotes": [2, "single"],
25-
"require-atomic-updates": "off",
26-
"require-await": ["error"],
27-
"semi": ["error", "always"]
28-
}
29-
}
2+
"env": {
3+
"browser": true,
4+
"es6": true,
5+
"jquery": true,
6+
"jest": true,
7+
"node": true
8+
},
9+
"extends": ["eslint:recommended", "plugin:react/recommended", "prettier"],
10+
"globals": {
11+
"Atomics": "readonly",
12+
"SharedArrayBuffer": "readonly"
13+
},
14+
"parser": "@babel/eslint-parser",
15+
"parserOptions": {
16+
"ecmaVersion": 2020,
17+
"sourceType": "module"
18+
},
19+
"rules": {
20+
"no-unused-vars": 2
21+
}
22+
}

.github/workflows/action-CI.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: CI (test and release)
2+
3+
## Controls when the workflow will run
4+
on:
5+
push:
6+
branches: [master, development, next]
7+
pull_request:
8+
branches: [master]
9+
10+
# Allows you to run this workflow manually from the Actions tab
11+
workflow_dispatch:
12+
13+
jobs:
14+
tests:
15+
name: run tests on nodejs
16+
runs-on: ubuntu-latest
17+
18+
strategy:
19+
matrix:
20+
node-version: [12.x, 14.x, 16.x]
21+
22+
steps:
23+
- uses: actions/checkout@v2
24+
- name: Use Node.js ${{ matrix.node-version }}
25+
uses: actions/setup-node@v2
26+
with:
27+
node-version: ${{ matrix.node-version }}
28+
cache: "npm"
29+
- run: npm ci
30+
- run: npm test
31+
- name: report coverage
32+
if: ${{ success() }}
33+
run: npm run report-coverage
34+
35+
release:
36+
if: github.ref == 'refs/heads/master'
37+
needs: tests
38+
name: Release on NPM
39+
runs-on: ubuntu-latest
40+
steps:
41+
- name: Checkout
42+
uses: actions/checkout@v2
43+
with:
44+
fetch-depth: 0
45+
- name: Setup Node.js
46+
uses: actions/setup-node@v2
47+
with:
48+
node-version: 16
49+
- name: Install dependencies
50+
run: npm ci
51+
- name: Release
52+
env:
53+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
54+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
55+
run: npx semantic-release

.husky/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
_

.husky/pre-commit

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
npm test

.prettierrc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"printWidth": 100,
3+
"react/jsx-max-props-per-line": [1, {
4+
"when": "always"
5+
}],
6+
"singleQuote": true
7+
}

.releaserc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"branches": ["master"]
2+
"branches": ["master"]
33
}

.travis.yml

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

changelog.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module.exports = {
2-
maxMessageLength: 110,
2+
maxMessageLength: 110,
33
};

0 commit comments

Comments
 (0)