From 4dc12dcc4fad5568b52e003fe3ec763cc24f0d20 Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Fri, 3 Feb 2023 23:07:29 -0700 Subject: [PATCH 1/2] Let's get the contributors on the same page with format and style. --- ,dockerignore | 3 ++ .browserslistrc | 5 +++ .editorconfig | 51 +++++++++++++++++++++++++++ .npmrc | 6 ++++ .prettierignore | 18 ++++++++++ .prettierrc.json | 14 ++++++++ docs/.gitignore | 1 - includes/.gitignore | 1 - includes/classes/phpmailer/.gitignore | 1 - tests/.gitignore | 2 -- wc-icons/.gitignore | 4 --- 11 files changed, 97 insertions(+), 9 deletions(-) create mode 100644 ,dockerignore create mode 100644 .browserslistrc create mode 100644 .editorconfig create mode 100644 .npmrc create mode 100644 .prettierignore create mode 100644 .prettierrc.json delete mode 100644 docs/.gitignore delete mode 100644 includes/.gitignore delete mode 100644 includes/classes/phpmailer/.gitignore delete mode 100644 tests/.gitignore delete mode 100644 wc-icons/.gitignore diff --git a/,dockerignore b/,dockerignore new file mode 100644 index 000000000..2bbc36f8a --- /dev/null +++ b/,dockerignore @@ -0,0 +1,3 @@ +.git +includes/settings.php +node_modules diff --git a/.browserslistrc b/.browserslistrc new file mode 100644 index 000000000..0e3e3ae41 --- /dev/null +++ b/.browserslistrc @@ -0,0 +1,5 @@ +# Browsers that we support. + +defaults, +not IE 11, +maintained node versions diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..0689ead91 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,51 @@ +# EditorConfig is awesome: https://EditorConfig.org + +# Stop the editor from looking for ".editorconfig" files in the parent directories. +root = true + +[*] +# Non-configurable Prettier behavior. +# Set default charset +charset = utf-8 + +insert_final_newline = true +# Caveat: Prettier won’t trim trailing whitespace inside template strings, +# but your editor might. +trim_trailing_whitespace = true + +# Configurable Prettier behaviors +# (change these if your Prettier config differs) +end_of_line = lf +indent_size = 2 +indent_style = space +max_line_length = 80 + +# examples: +# Unix-style newlines with a newline ending every file. +# [*] +# end_of_line = lf +# insert_final_newline = true +# +# Matches multiple files with brace expansion notation. +# Set default charset +# [*.{js,py}] +# charset = utf-8 +# +# 4 space indentation. +# [*.py] +# indent_style = space +# indent_size = 4 +# +# Tab indentation (no size specified). +# [Makefile] +# indent_style = tab +# +# Indentation override for all JS under "lib" directory. +# [lib/**.js] +# indent_style = space +# indent_size = 2 +# +# Matches the exact files either "package.json" or ".travis.yml". +# [{package.json,.travis.yml}] +# indent_style = space +# indent_size = 2 diff --git a/.npmrc b/.npmrc new file mode 100644 index 000000000..0fb761617 --- /dev/null +++ b/.npmrc @@ -0,0 +1,6 @@ +global-style = true +init-author-email = "cknudsen@cknudsen.com" +init-author-name = "Craig Knudsen" +init-author-url = "http://www.k5n.us/cknudsen" +init-license = GPL-2.0 +init-version = 1.9.1 diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 000000000..d123a5079 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,18 @@ +.DS_Store +.htaccess +*.min.* +*.orig +*.save +*.sha +includes/classes/captcha/ +includes/classes/hKit/ +includes/classes/phpmailer/ +includes/htmlare* +includes/settings.php +java/ +mysql-data +node_modules/ +pub/ +tests/ +vendor/ +wc-icons/ diff --git a/.prettierrc.json b/.prettierrc.json new file mode 100644 index 000000000..cfebf8405 --- /dev/null +++ b/.prettierrc.json @@ -0,0 +1,14 @@ +{ + "overrides": [ + { + "files": ".prettierrc.json", + "options": { + "parser": "json" + } + } + ], + "editorconfig": true, + "semi": true, + "singleQuote": true, + "trailingComma": "es5" +} diff --git a/docs/.gitignore b/docs/.gitignore deleted file mode 100644 index 7a7a8b107..000000000 --- a/docs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -faqs.html diff --git a/includes/.gitignore b/includes/.gitignore deleted file mode 100644 index acb6b6e26..000000000 --- a/includes/.gitignore +++ /dev/null @@ -1 +0,0 @@ -settings.php htmlarea- htmlarea diff --git a/includes/classes/phpmailer/.gitignore b/includes/classes/phpmailer/.gitignore deleted file mode 100644 index 264b736d3..000000000 --- a/includes/classes/phpmailer/.gitignore +++ /dev/null @@ -1 +0,0 @@ -test.php diff --git a/tests/.gitignore b/tests/.gitignore deleted file mode 100644 index 1fb3e8592..000000000 --- a/tests/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.phar -.phpunit.result.cache diff --git a/wc-icons/.gitignore b/wc-icons/.gitignore deleted file mode 100644 index 31f4f059b..000000000 --- a/wc-icons/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -cat-*.png -cat-*.jpg -cat-*.jpeg -cat-*.gif From 29488b16a3efb265fcfdea75f6bf954625552542 Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Fri, 3 Feb 2023 23:10:27 -0700 Subject: [PATCH 2/2] The last file. --- .gitignore | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 90c8eaa66..0049388b5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,15 @@ -.htaccess -includes/htmlarea -includes/settings.php .DS_Store -mysql-data -*.sha -vendor +.htaccess +*.min.* *.orig *.save +*.sha +includes/htmlare* +includes/settings.php +java/ +mysql-data +node_modules/ +pub/ +tests/.phpunit.result.cache +vendor/ +wc-icons/