Skip to content

Commit

Permalink
Merge branch 'master' into dev/4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
iMattPro committed Nov 10, 2024
2 parents 144e91f + 733b726 commit 187363f
Show file tree
Hide file tree
Showing 5 changed files with 213 additions and 272 deletions.
5 changes: 5 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
tests/ export-ignore
develop/ export-ignore
node_modules/ export-ignore
.github/ export-ignore
.gitignore export-ignore
.gitattributes export-ignore
phpunit.xml.* export-ignore
composer.lock export-ignore
README.md export-ignore
build.xml export-ignore
package.js export-ignore
package-lock.js export-ignore
eslint.config.mjs export-ignore
.codeclimate.yml export-ignore
7 changes: 4 additions & 3 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,16 @@
<delete dir="${dir}/.github" />

<delete file="${dir}/.codeclimate.yml" />
<delete file="${dir}/.gitignore" />
<delete file="${dir}/.gitattributes" />
<delete file="${dir}/.gitignore" />
<delete file="${dir}/build.xml" />
<delete file="${dir}/composer.lock" />
<delete file="${dir}/composer.phar" />
<delete file="${dir}/phpunit.xml.dist" />
<delete file="${dir}/README.md" />
<delete file="${dir}/eslint.config.mjs" />
<delete file="${dir}/package.json" />
<delete file="${dir}/package-lock.json" />
<delete file="${dir}/phpunit.xml.dist" />
<delete file="${dir}/README.md" />
</target>

<!--
Expand Down
26 changes: 26 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import globals from "globals";

export default [{
languageOptions: {
globals: {
...globals.browser,
...globals.node,
},
},

rules: {
quotes: ["error", "single"],
"comma-dangle": ["error", "always-multiline"],
"max-params": ["error", 6],
"block-spacing": "error",
"array-bracket-spacing": ["error", "always"],
"multiline-comment-style": "error",
"computed-property-spacing": "off",
"space-in-parens": "off",
"capitalized-comments": "off",
"object-curly-spacing": ["error", "always"],
"no-lonely-if": "off",
"unicorn/prefer-module": "off",
"space-before-function-paren": ["error", "never"],
},
}];
Loading

0 comments on commit 187363f

Please sign in to comment.