Skip to content

Commit 4fe16a0

Browse files
authored
Merge branch 'area17:3.x' into 3.x
2 parents 816709a + 90da826 commit 4fe16a0

File tree

1,338 files changed

+65367
-57686
lines changed

Some content is hidden

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

1,338 files changed

+65367
-57686
lines changed

.browserslistrc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
> 1%
2-
last 2 versions
3-
not IE 11
1+
defaults

.eslintrc.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@ module.exports = {
55
},
66
extends: ['plugin:vue/essential', '@vue/standard', 'prettier'],
77
rules: {
8+
'no-unmodified-loop-condition': process.env.NODE_ENV === 'production' ? 'error' : 'warn',
9+
'no-unused-vars': process.env.NODE_ENV === 'production' ? 'error' : 'warn',
10+
'no-unreachable': process.env.NODE_ENV === 'production' ? 'error' : 'warn',
811
// indent
912
indent: ['error', 2, { SwitchCase: 1 }],
1013
'vue/script-indent': [
11-
'error',
14+
process.env.NODE_ENV === 'production' ? 'error' : 'warn',
1215
2,
1316
{
1417
baseIndent: 1,
@@ -27,15 +30,15 @@ module.exports = {
2730
'no-console':
2831
process.env.NODE_ENV === 'production'
2932
? ['error', { allow: ['error'] }]
30-
: 'off'
33+
: 'warn'
3134
},
3235
overrides: [
3336
{
3437
files: ['*.vue'],
3538
rules: {
3639
indent: 'off',
3740
'vue/script-indent': [
38-
'error',
41+
process.env.NODE_ENV === 'production' ? 'error' : 'warn',
3942
2,
4043
{
4144
baseIndent: 1,
@@ -46,6 +49,6 @@ module.exports = {
4649
}
4750
],
4851
parserOptions: {
49-
parser: 'babel-eslint'
52+
parser: '@babel/eslint-parser'
5053
}
5154
}

.gitattributes

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/tests export-ignore
2+
/phpunit.xml export-ignore
3+
/.github export-ignore
4+
/phpstan.neon export-ignore
5+
/phpstan-baseline.neon export-ignore
6+
/phpcs.xml export-ignore
7+
/docs export-ignore
8+
/docs-api export-ignore
9+
/examples/tests-* export-ignore

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ contact_links:
44
url: https://github.com/area17/twill/discussions
55
about: Ask questions and discuss with other community members
66
- name: Read the docs
7-
url: https://twill.io/docs/
7+
url: https://twillcms.com/docs/
88
about: Check out the Twill documentation for answers to common questions
99
- name: Chat with the community
10-
url: https://discord.link/twill
10+
url: https://discord.gg/cnWk7EFv8R
1111
about: Ask questions, get help and discuss new things you're building with the Twill community

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<!--
22
Thanks for opening a PR! Your contribution is much appreciated.
3-
Do you have any questions? Check out the contributing docs at https://github.com/area17/twill/blob/2.x/CONTRIBUTING.md,
4-
or ask in this Pull Request and a Twill maintainer will be happy to help :)
3+
Do you have any questions? Check out the contributing docs at https://github.com/area17/twill/blob/3.x/CONTRIBUTING.md, or ask in this Pull Request and a Twill maintainer will be happy to help :)
54
-->
65

76
## Description

.github/clover.xml

Lines changed: 7964 additions & 0 deletions
Large diffs are not rendered by default.

.github/workflows/build.yml

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

.github/workflows/dispatch.yml

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

.github/workflows/docs.yml

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

.github/workflows/format.yml

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

0 commit comments

Comments
 (0)