diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index c5e3808..ed1b11c 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -1,11 +1,9 @@ name: Node.js CI on: push: - branches: [ '*' ] - release: - types: [ 'created' ] + branches: [ '**' ] pull_request: - branches: [ '*' ] + branches: [ '**' ] jobs: build: runs-on: ubuntu-latest diff --git a/index.d.ts b/index.d.ts index ff8d34c..ba4b21d 100644 --- a/index.d.ts +++ b/index.d.ts @@ -1,19 +1,12 @@ -/// +import { Sprite } from '@pixi/sprite'; +import { TextStyle } from '@pixi/text'; -declare namespace PIXI { - export class HTMLText extends PIXI.Sprite { - constructor(text?:string, style?:PIXI.TextStyle, canvas?:HTMLCanvasElement); - readonly canvas:HTMLCanvasElement; - readonly context:CanvasRenderingContext2D; - text:string; - style:PIXI.TextStyle; - resolution: number; - width: number; - height: number; - updateText(respectDirty?:boolean): void; - } -} - -declare module "@pixi/text-html" { - export import HTMLText = PIXI.HTMLText; +export class HTMLText extends Sprite { + constructor(text?:string, style?:TextStyle, canvas?:HTMLCanvasElement); + readonly canvas:HTMLCanvasElement; + readonly context:CanvasRenderingContext2D; + text:string; + style:TextStyle; + resolution: number; + updateText(respectDirty?:boolean): void; } diff --git a/package-lock.json b/package-lock.json index 4a54f58..744d391 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,6 +36,37 @@ "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==", "dev": true }, + "@pixi/constants": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/@pixi/constants/-/constants-6.0.4.tgz", + "integrity": "sha512-khwRMfuHVdFk93L+bf0mmCwtSloYlfBfjdseIAbJL+VSpeMG1S2DzCYlMCPdp4mvDLU9LvkH2U2leZGEIx5j7g==", + "dev": true + }, + "@pixi/core": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/@pixi/core/-/core-6.0.4.tgz", + "integrity": "sha512-r1ceyAz0z3usUs0uj4u2986vVT2tQixGNin2o9FNhPFDXbN5EaoKHLtrjGBt1iylK/EUH/nfL5zq0SGa/loW0A==", + "dev": true, + "requires": { + "@pixi/constants": "6.0.4", + "@pixi/math": "6.0.4", + "@pixi/runner": "6.0.4", + "@pixi/settings": "6.0.4", + "@pixi/ticker": "6.0.4", + "@pixi/utils": "6.0.4" + } + }, + "@pixi/display": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/@pixi/display/-/display-6.0.4.tgz", + "integrity": "sha512-v6hjx5Gm5aIlLQ7xrsZ2lstI1cv/MtbWXJOhU8LXckkrHHUvAuJgml3+0pcHw8YLuOlepZngUuiqy/XjceVk8A==", + "dev": true, + "requires": { + "@pixi/math": "6.0.4", + "@pixi/settings": "6.0.4", + "@pixi/utils": "6.0.4" + } + }, "@pixi/eslint-config": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@pixi/eslint-config/-/eslint-config-1.0.1.tgz", @@ -64,12 +95,97 @@ } } }, + "@pixi/math": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/@pixi/math/-/math-6.0.4.tgz", + "integrity": "sha512-UwZ72CeZ2KsS4IlcEXgNiuD88omPk42Dct74+1G+R2+yPI+XRZq+hGQRTle/BbFYjxh9ccdQVyX9ToGv1XTd6Q==", + "dev": true + }, + "@pixi/runner": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/@pixi/runner/-/runner-6.0.4.tgz", + "integrity": "sha512-ta6r36r2vC+fPB27URpSacPGQDtbJbdUoeGCJWAEwX+QI4vx4C9NYAcB0bIg8TLXiigCfA6by/RMnJ0dBiemFA==", + "dev": true + }, + "@pixi/settings": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/@pixi/settings/-/settings-6.0.4.tgz", + "integrity": "sha512-djiIsmULDwcHWNmEiZKm4zyVopu1NL+fClnbBmtDkGZw7nm37y6dOcdpYawJcxvE4/KLm6pspBiRTnrzdlqW7Q==", + "dev": true, + "requires": { + "ismobilejs": "^1.1.0" + } + }, + "@pixi/sprite": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/@pixi/sprite/-/sprite-6.0.4.tgz", + "integrity": "sha512-6yMoHmfFhSRERLM1PUXceq9e6e1UH0YJkLoPVLv6gxMunfk6jPXeO8p9dDS2FQ8ZMSkO/16BKq27HIMKvF6Cvg==", + "dev": true, + "requires": { + "@pixi/constants": "6.0.4", + "@pixi/core": "6.0.4", + "@pixi/display": "6.0.4", + "@pixi/math": "6.0.4", + "@pixi/settings": "6.0.4", + "@pixi/utils": "6.0.4" + } + }, + "@pixi/text": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/@pixi/text/-/text-6.0.4.tgz", + "integrity": "sha512-r9UJg8ivWvvS7nNyBaZBKX5zg5UCU37dIYbKXcHyiXnOvXO22tiQBfkPBrZCueeLXRouC9sHmDFya8rb5TE9HA==", + "dev": true, + "requires": { + "@pixi/core": "6.0.4", + "@pixi/math": "6.0.4", + "@pixi/settings": "6.0.4", + "@pixi/sprite": "6.0.4", + "@pixi/utils": "6.0.4" + } + }, + "@pixi/ticker": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/@pixi/ticker/-/ticker-6.0.4.tgz", + "integrity": "sha512-PkFfPP5vHlgnApLks0Ia0okmFu6KPqBdIyquDqHJAcBdgljedm32KS6K2EH37xelBOzYHScjZ2SQGiiebVfClw==", + "dev": true, + "requires": { + "@pixi/settings": "6.0.4" + } + }, + "@pixi/utils": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/@pixi/utils/-/utils-6.0.4.tgz", + "integrity": "sha512-35JTWsAJ8Va0vvtUSQvyOr3kGedGKVuJnHDO89B8C8tSFtMpJYrR44vp1b1p1vOjNak+ulGehZc8LzlCqymViQ==", + "dev": true, + "requires": { + "@pixi/constants": "6.0.4", + "@pixi/settings": "6.0.4", + "@types/earcut": "^2.1.0", + "earcut": "^2.2.2", + "eventemitter3": "^3.1.0", + "url": "^0.11.0" + }, + "dependencies": { + "eventemitter3": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz", + "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==", + "dev": true + } + } + }, "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", "dev": true }, + "@types/earcut": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@types/earcut/-/earcut-2.1.1.tgz", + "integrity": "sha512-w8oigUCDjElRHRRrMvn/spybSMyX8MTkKA5Dv+tS1IE/TgmNZPqUYtvYBXGY8cieSE66gm+szeK+bnbxC2xHTQ==", + "dev": true + }, "@types/eslint-visitor-keys": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", @@ -493,6 +609,12 @@ "esutils": "^2.0.2" } }, + "earcut": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/earcut/-/earcut-2.2.3.tgz", + "integrity": "sha512-iRDI1QeCQIhMCZk48DRDMVgQSSBDmbzzNhnxIo+pwx3swkfjMh6vh0nWLq1NdvGHLKH6wIrAM3vQWeTj6qeoug==", + "dev": true + }, "ecstatic": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/ecstatic/-/ecstatic-3.3.2.tgz", @@ -1233,6 +1355,12 @@ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, + "ismobilejs": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ismobilejs/-/ismobilejs-1.1.1.tgz", + "integrity": "sha512-VaFW53yt8QO61k2WJui0dHf4SlL8lxBofUuUmwBo0ljPk0Drz2TiuDW4jo3wDcv41qy/SxrJ+VAzJ/qYqsmzRw==", + "dev": true + }, "jest-worker": { "version": "24.9.0", "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz", @@ -1763,6 +1891,12 @@ "strict-uri-encode": "^1.0.0" } }, + "querystring": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", + "dev": true + }, "read-pkg": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", @@ -2388,6 +2522,24 @@ "punycode": "^2.1.0" } }, + "url": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", + "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", + "dev": true, + "requires": { + "punycode": "1.3.2", + "querystring": "0.2.0" + }, + "dependencies": { + "punycode": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", + "dev": true + } + } + }, "url-join": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/url-join/-/url-join-2.0.5.tgz", diff --git a/package.json b/package.json index 3bda8f7..12bbd91 100644 --- a/package.json +++ b/package.json @@ -38,12 +38,12 @@ "author": "Matt Karl ", "license": "MIT", "peerDependencies": { - "@pixi/core": "^5.0.0", - "@pixi/math": "^5.0.0", - "@pixi/settings": "^5.0.0", - "@pixi/sprite": "^5.0.0", - "@pixi/text": "^5.0.0", - "@pixi/utils": "^5.0.0" + "@pixi/core": "^6.0.0", + "@pixi/math": "^6.0.0", + "@pixi/settings": "^6.0.0", + "@pixi/sprite": "^6.0.0", + "@pixi/text": "^6.0.0", + "@pixi/utils": "^6.0.0" }, "devDependencies": { "@pixi/eslint-config": "^1.0.1", @@ -59,7 +59,13 @@ "rollup": "^2.3.3", "rollup-plugin-buble": "^0.19.8", "rollup-plugin-terser": "^5.3.0", - "typescript": "^3.8.3" + "typescript": "^3.8.3", + "@pixi/core": "^6.0.0", + "@pixi/math": "^6.0.0", + "@pixi/settings": "^6.0.0", + "@pixi/sprite": "^6.0.0", + "@pixi/text": "^6.0.0", + "@pixi/utils": "^6.0.0" }, "dependencies": {} }