Skip to content

Commit 05c0547

Browse files
authored
Merge pull request #348 from wasabee-project/dev
Release 0.21
2 parents b97b1d5 + 9e621d5 commit 05c0547

File tree

253 files changed

+21147
-24775
lines changed

Some content is hidden

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

253 files changed

+21147
-24775
lines changed

.eslintrc.json

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"sourceType": "module"
55
},
66
"extends": ["eslint:recommended", "plugin:prettier/recommended"],
7+
"plugins": ["eslint-plugin-local-rules"],
78
"env": {
89
"browser": true,
910
"jest": false,
@@ -14,6 +15,7 @@
1415
"commonjs": true,
1516
"es2020": true
1617
},
18+
"ignorePatterns": ["*.d.ts"],
1719
"rules": {
1820
"prettier/prettier": ["error", { "endOfLine": "auto" }],
1921
"no-console": "off",
@@ -42,14 +44,36 @@
4244
"no-self-compare": 1,
4345
"no-throw-literal": 1,
4446
"no-unused-expressions": 1,
45-
"no-useless-concat": 1,
4647
"no-void": 1,
4748
"no-sequences": 1,
48-
"radix": 1
49+
"radix": 1,
50+
"local-rules/wx-keys": 2
4951
},
5052
"globals": {
5153
"L": "readonly",
5254
"PLAYER": "readonly",
5355
"android": "readonly"
54-
}
56+
},
57+
"overrides": [
58+
{
59+
"files": ["src/**/*.ts"],
60+
"parser": "@typescript-eslint/parser",
61+
"parserOptions": {
62+
"project": "./tsconfig.json"
63+
},
64+
"extends": [
65+
"eslint:recommended",
66+
"plugin:@typescript-eslint/eslint-recommended",
67+
"plugin:@typescript-eslint/recommended",
68+
"prettier"
69+
],
70+
"rules": {
71+
"prettier/prettier": 0,
72+
"lines-between-class-members": 0,
73+
"@typescript-eslint/no-array-constructor": 1,
74+
"@typescript-eslint/no-empty-function": 1,
75+
"@typescript-eslint/no-inferrable-types": 1
76+
}
77+
}
78+
]
5579
}

.github/FUNDING.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Build 🔧
1414
run: |
1515
npm install
16-
npx gulp build-dev
16+
npm run build-dev
1717
1818
- name: Deploy 🚀
1919
uses: JamesIves/github-pages-deploy-action@4.1.1

.github/workflows/master.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Build 🔧
1616
run: |
1717
npm install
18-
npx gulp build-prod
18+
npm run build
1919
2020
- name: Deploy 🚀
2121
if: ${{ github.ref_type == 'tag' }}

.github/workflows/pr-build.yaml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Pull request build
2+
on:
3+
pull_request:
4+
branches: [dev]
5+
6+
jobs:
7+
build:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Checkout 🛎️
11+
uses: actions/checkout@v2.3.1
12+
13+
- name: Build
14+
env:
15+
PR_NUMBER: ${{ github.event.number }}
16+
run: |
17+
npm install
18+
npm run build-pr
19+
20+
- uses: actions/upload-artifact@v2
21+
with:
22+
name: pr
23+
path: releases/dev/wasabee.user.js

.github/workflows/pr-comment.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Pull request Comment
2+
on:
3+
workflow_run:
4+
workflows: ["Pull request build"]
5+
types:
6+
- completed
7+
jobs:
8+
comment:
9+
runs-on: ubuntu-latest
10+
if: >
11+
${{ github.event.workflow_run.event == 'pull_request' &&
12+
github.event.workflow_run.conclusion == 'success' }}
13+
steps:
14+
- uses: actions/download-artifact@v2
15+
with:
16+
name: pr
17+
18+
- name: Pull request artifacts
19+
uses: gavv/pull-request-artifacts@v1.0.0
20+
with:
21+
commit: ${{ github.event.pull_request.head.sha }}
22+
repo-token: ${{ secrets.GITHUB_TOKEN }}
23+
artifacts-branch: artifacts
24+
artifacts: |
25+
wasabee.user.js

.github/workflows/testing.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Build and Deploy Testing
2+
on:
3+
push:
4+
branches:
5+
- testing
6+
jobs:
7+
build-and-deploy-testing:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Checkout 🛎️
11+
uses: actions/checkout@v2.3.1
12+
13+
- name: Build 🔧
14+
run: |
15+
npm install
16+
npm run build-testing
17+
18+
- name: Deploy 🚀
19+
uses: JamesIves/github-pages-deploy-action@4.1.1
20+
with:
21+
branch: dist # The branch the action should deploy to.
22+
folder: releases # The folder the action should deploy.
23+
clean: false # build is already clean (keep prod/dev)

.vscode/settings.json

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

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
![GitHub issues](https://img.shields.io/github/issues/wasabee-project/Wasabee-IITC.svg)
33
[![Build Status](https://travis-ci.org/wasabee-project/Wasabee-IITC.svg?branch=master)](https://travis-ci.org/wasabee-project/Wasabee-IITC)
44
[![Releases](https://img.shields.io/github/v/release/wasabee-project/Wasabee-IITC)](https://github.com/wasabee-project/Wasabee-IITC/releases)
5+
[![Crowdin](https://badges.crowdin.net/wasabee-iitc/localized.svg)](https://crowdin.com/project/wasabee-iitc)
56

67
# Wasabee
78

crowdin.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
files:
2+
- source: /src/code/translations/English.json
3+
translation: /src/code/translations/%language%.json
4+
skip_untranslated_strings: true
5+
update_option: "update_as_unapproved"

0 commit comments

Comments
 (0)