8000 Merge branch 'dev' into dev-v4 · j143/github-pages-deploy-action@709df6c · GitHub
[go: up one dir, main page]
Skip to content

Commit 709df6c

Browse files
JamesIvesJamesIves
committed
Merge branch 'dev' into dev-v4
2 parents cb95e7b + a283747 commit 709df6c

Some content is hidden

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

44 files changed

+2252
-1921
lines changed

‎.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
ARG VARIANT=12
1+
ARG VARIANT=14
22
FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:${VARIANT}

‎.devcontainer/base.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG VARIANT=12-buster
1+
ARG VARIANT=14-buster
22
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:dev-${VARIANT}
33

44
# Install tslint, typescript. eslint is installed by javascript image

‎.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"build": {
55
"dockerfile": "Dockerfile",
66
"args": {
7-
"VARIANT": "12"
7+
"VARIANT": "14"
88
}
99
},
1010
"settings": {
@@ -14,4 +14,4 @@
1414
"dbaeumer.vscode-eslint"
1515
],
1616
"remoteUser": "node"
17-
}
17+
}

‎.eslintrc.json

Lines changed: 56 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
2-
"plugins": ["jest", "@typescript-eslint", "github"],
3-
"extends": ["plugin:github/recommended"],
2+
"plugins": ["jest", "@typescript-eslint"],
3+
"extends": [
4+
"eslint:recommended",
5+
"plugin:@typescript-eslint/recommended",
6+
"plugin:prettier/recommended"
7+
],
48
"parser": "@typescript-eslint/parser",
59
"parserOptions": {
610
"ecmaVersion": 9,
@@ -10,57 +14,61 @@
1014
"globals": {
1115
"fetch": true
1216
},
17+
"env": {
18+
"node": true,
19+
"es6": true,
20+
"jest/globals": true
21+
},
1322
"rules": {
14-
"eslint-comments/no-use": "off",
15-
"import/no-namespace": "off",
16-
"no-unused-vars": "off",
17-
"@typescript-eslint/no-unused-vars": "error",
18-
"@typescript-eslint/explicit-member-accessibility": ["error", {"accessibility": "no-public"}],
19-
"@typescript-eslint/no-require-imports": "error",
20-
"@typescript-eslint/array-type": "error",
21-
"@typescript-eslint/await-thenable": "error",
22-
"@typescript-eslint/ban-ts-comment": "error",
23-
"camelcase": "off",
24-
"@typescript-eslint/naming-convention": [
23+
"@typescript-eslint/ban-types": [
2524
"error",
2625
{
27-
"selector": "default",
28-
"format": ["camelCase", "UPPER_CASE", "StrictPascalCase"]
26+
"types": {
27+
"Number": {
28+
"message": "Use number instead",
29+
"fixWith": "number"
30+
},
31+
"String": {
32+
"message": "Use string instead",
33+
"fixWith": "string"
34+
},
35+
"Boolean": {
36+
"message": "Use boolean instead",
37+
"fixWith": "boolean"
38+
},
39+
"Object": {
40+
"message": "Use object instead",
41+
"fixWith": "object"
42+
},
43+
"{}": {
44+
"message": "Use object instead",
45+
"fixWith": "object"
46+
},
47+
"Symbol": {
48+
"message": "Use symbol instead",
49+
"fixWith": "symbol"
50+
}
51+
}
2952
}
3053
],
31-
"@typescript-eslint/explicit-function-return-type": ["error", {"allowExpressions": true}],
32-
"@typescript-eslint/func-call-spacing": ["error", "never"],
33-
"@typescript-eslint/no-array-constructor": "error",
34-
"@typescript-eslint/no-empty-interface": "error",
35-
"@typescript-eslint/no-explicit-any": "off",
36-
"@typescript-eslint/no-extraneous-class": "error",
37-
"@typescript-eslint/no-for-in-array": "error",
38-
"@typescript-eslint/no-inferrable-types": "error",
39-
"@typescript-eslint/no-misused-new": "error",
40-
"@typescript-eslint/no-namespace": "error",
41-
"@typescript-eslint/no-non-null-assertion": "warn",
42-
"@typescript-eslint/no-unnecessary-qualifier": "error",
43-
"@typescript-eslint/no-unnecessary-type-assertion": "error",
44-
"@typescript-eslint/no-useless-constructor": "error",
45-
"@typescript-eslint/no-var-requires": "error",
46-
"@typescript-eslint/prefer-for-of": "warn",
47-
"@typescript-eslint/prefer-function-type": "warn",
48-
"@typescript-eslint/prefer-includes": "error",
49-
"@typescript-eslint/prefer-string-starts-ends-with": "error",
50-
"@typescript-eslint/promise-function-async": "error",
51-
"@typescript-eslint/require-array-sort-compare": "error",
52-
"@typescript-eslint/restrict-plus-operands": "error",
53-
"semi": "off",
54-
"@typescript-eslint/semi": ["error", "never"],
55-
"@typescript-eslint/type-annotation-spacing": "error",
56-
"@typescript-eslint/unbound-method": "error",
57-
"no-console": "off",
58-
"no-shadow": "off", // replaced by ts-eslint rule below
59-
"@typescript-eslint/no-shadow": "error"
54+
"@typescript-eslint/array-type": ["error", {"default": "array"}],
55+
"@typescript-eslint/explicit-module-boundary-types": "error",
56+
"@typescript-eslint/no-explicit-any": "error",
57+
"@typescript-eslint/no-unused-vars": "error",
58+
"@typescript-eslint/explicit-function-return-type": "error",
59+
"object-shorthand": ["error", "always"],
60+
"prefer-destructuring": [
61+
"error",
62+
{
63+
"array": false,
64+
"object": true
6065
},
61-
"env": {
62-
"node": true,
63-
"es6": true,
64-
"jest/globals": true
66+
{
67+
"enforceForRenamedProperties": false
68+
}
69+
],
70+
"no-console": ["error", {"allow": ["warn", "error"]}],
71+
"no-alert": "error",
72+
"no-debugger": "error"
6573
}
6674
}

‎.github/ISSUE_TEMPLATE/BUG_REPORT.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,27 @@
22
name: Bug Report
33
about: Create a bug report to help us improve the action.
44
labels:
5-
- bug
6-
5+
- triage ⚠️
76
---
87

98
<!-- Please check the Q&A before posting an issue: https://github.com/JamesIves/github-pages-deploy-action/discussions?discussions_q=category%3AQ%26A -->
109

11-
### Describe the bug
10+
## Describe the bug
11+
1212
<!-- Please provide a clear and concise description of what the bug is. -->
1313

14-
---
14+
## Reproduction Steps
1515

16-
### Reproduction Steps
1716
<!-- Steps to reproduce the behavior. -->
1817

19-
---
18+
## Logs
2019

21-
### Logs
22-
<!-- Please provide your deployment logs and a link or sample to/of your workflow. If the error message isn't revealing the problem please set ACTIONS_STEP_DEBUG to true in your repository's secrets menu and run the workflow again. -->
20+
<!-- Please provide your deployment logs. If the error message isn't revealing the problem please set ACTIONS_STEP_DEBUG to true in your repository's secrets menu and run the workflow again. -->
2321

24-
---
22+
## Workflow
23+
24+
<!-- Please provide a link or snippet of your workflow yml file. -->
25+
26+
## Additional Comments
2527

26-
### Additional Comments
2728
<!--Add any other context about the problem here. -->

‎.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ contact_links:
33
- name: Feature Request and Ideas
44
url: https://github.com/JamesIves/github-pages-deploy-action/discussions?discussions_q=category%3AIdeas
55
about: If you have an idea or would like to make a feature request please open a discussion thread.
6-
6+
77
- name: Support and Questions
88
url: https://github.com/JamesIves/github-pages-deploy-action/discussions?discussions_q=category%3AQ%26A
99
about: Need help or just have a general question? Please open a discussion thread.
10-

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
### Description
1+
## Description
2+
23
<!-- Provide a description of what your changes do. -->
34

4-
---
5+
## Testing Instructions
56

6-
### Testing Instructions
77
<!-- Give us step by step instructions on how to test your changes. -->
88

9-
---
9+
## Additional Notes
1010

11-
### Additional Notes
12-
<!-- Anything else that will help us test the pull request. -->
11+
<!-- Anything else that will help us test the pull request. -->

‎.github/assets/icon.png

97.2 KB
Loading

‎assets/screenshot.png renamed to ‎.github/assets/screenshot.png

File renamed without changes.

‎.github/dependabot.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
version: 2
22
updates:
3-
- package-ecosystem: npm
4-
directory: "/"
5-
schedule:
6-
interval: daily
7-
time: "10:00"
8-
open-pull-requests-limit: 10
3+
- package-ecosystem: npm
4+
directory: '/'
5+
schedule:
6+
interval: daily
7+
time: '10:00'
8+
open-pull-requests-limit: 10
9+
10+
- package-ecosystem: github-actions
11+
directory: '/'
12+
schedule:
13+
interval: daily
14+
time: '10:00'
15+
open-pull-requests-limit: 10

0 commit comments

Comments
 (0)
0