Skip to content

Commit

Permalink
Merge branch 'dev' into video-frame-resource
Browse files Browse the repository at this point in the history
  • Loading branch information
bigtimebuddy committed Jan 3, 2024
2 parents 408335f + 132fcb9 commit 107e298
Show file tree
Hide file tree
Showing 47 changed files with 1,917 additions and 1,282 deletions.
35 changes: 4 additions & 31 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,37 +15,10 @@
}
},
"rules": {
"no-multi-spaces": [1, { "exceptions": {} }],
"object-curly-newline": [1, { "multiline": true, "consistent": true }],

// Imports and Exports
"import/first": 1,
"import/newline-after-import": 1,
"simple-import-sort/imports": [1, {
"groups": [
[
"^\\w", // External
"^\\u0000", // External side effect
"^@pixi/", // @pixi/*
"^\\u0000@pixi/", // @pixi/* side effect
"^\\.", // Relative
"^\\u0000\\.", // Relative side effect
"^" // Others
],
[
"^\\w.*\\u0000$", // External types
"^@pixi/.*\\u0000$", // @pixi/* types
"^\\..*\\u0000$", // Relative types
"\\u0000$" // Other types
]
]
}],
"simple-import-sort/exports": 1,

"spaced-comment": [1, "always", { "markers": ["/"] }],
"@typescript-eslint/triple-slash-reference": [1, { "path": "always" }],
"@typescript-eslint/consistent-type-imports": [1, { "disallowTypeAnnotations": false }],
"@typescript-eslint/no-parameter-properties": 1,
"@typescript-eslint/no-unsafe-declaration-merging": 0,
"@typescript-eslint/no-duplicate-enum-values": 0,
"@typescript-eslint/type-annotation-spacing": 1,
"jsdoc/multiline-blocks": [
1,
Expand All @@ -60,7 +33,6 @@
"jsdoc/check-values": 1,
"jsdoc/empty-tags": 1,
"jsdoc/implements-on-classes": 1,
"jsdoc/newline-after-description": [1, "never"],
"jsdoc/no-multi-asterisks": [1, { "allowWhitespace": true }],
"jsdoc/no-undefined-types": [
"warn",
Expand Down Expand Up @@ -101,7 +73,8 @@
"globals": {
"expect": false,
"assert": false,
"sinon": false
"sinon": false,
"GlobalMixins": false
},
"rules": {
"@typescript-eslint/no-unused-expressions": 0,
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PixiJS — The HTML5 Creation Engine
=============

![pixi.js logo](https://pixijs.download/pixijs-banner-no-version.png?v=1)
![PixiJS logo](https://files.pixijs.download/branding/pixijs-banner.png)

[![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/QrnxmQUPGV)
[![npm version](https://badge.fury.io/js/pixi.js.svg)](https://badge.fury.io/js/pixi.js)
Expand Down
2 changes: 1 addition & 1 deletion bundles/pixi.js-legacy/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PixiJS — The HTML5 Creation Engine
=============

![pixi.js logo](https://pixijs.download/pixijs-banner-no-version.png?v=1)
![PixiJS logo](https://files.pixijs.download/branding/pixijs-banner.png)

The aim of this project is to provide a fast lightweight 2D library that works
across all devices. The PixiJS renderer allows everyone to enjoy the power of
Expand Down
2 changes: 1 addition & 1 deletion bundles/pixi.js-webworker/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@pixi/webworker
=============

![pixi.js logo](https://pixijs.download/pixijs-banner-no-version.png?v=1)
![PixiJS logo](https://files.pixijs.download/branding/pixijs-banner.png)

The aim of this project is to provide a fast lightweight 2D library that works
across all devices. The PixiJS renderer allows everyone to enjoy the power of
Expand Down
2 changes: 1 addition & 1 deletion bundles/pixi.js/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PixiJS — The HTML5 Creation Engine
=============

![pixi.js logo](https://pixijs.download/pixijs-banner-no-version.png?v=1)
![PixiJS logo](https://files.pixijs.download/branding/pixijs-banner.png)

The aim of this project is to provide a fast lightweight 2D library that works
across all devices. The PixiJS renderer allows everyone to enjoy the power of
Expand Down
Loading

0 comments on commit 107e298

Please sign in to comment.