From a13d800081a12a1699e6703a09886ebc0cfd8ccb Mon Sep 17 00:00:00 2001 From: Julien Marcou Date: Thu, 30 Jun 2022 20:00:07 +0200 Subject: [PATCH 1/2] Fix incorrect `saturate` blend mode mapping (#8458) --- .../canvas-renderer/src/utils/mapCanvasBlendModesToPixi.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.ts b/packages/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.ts index 696a5b850d..01c02c056b 100644 --- a/packages/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.ts +++ b/packages/canvas-renderer/src/utils/mapCanvasBlendModesToPixi.ts @@ -9,6 +9,7 @@ import { canUseNewCanvasBlendModes } from './canUseNewCanvasBlendModes'; * @param {string[]} [array=[]] - The array to output into. * @returns {string[]} Mapped modes. */ +// TODO after upgrading to typeScript 4.6, replace `string[]` with `GlobalCompositeOperation[]` export function mapCanvasBlendModesToPixi(array: string[] = []): string[] { if (canUseNewCanvasBlendModes()) @@ -27,7 +28,7 @@ export function mapCanvasBlendModesToPixi(array: string[] = []): string[] array[BLEND_MODES.DIFFERENCE] = 'difference'; array[BLEND_MODES.EXCLUSION] = 'exclusion'; array[BLEND_MODES.HUE] = 'hue'; - array[BLEND_MODES.SATURATION] = 'saturate'; + array[BLEND_MODES.SATURATION] = 'saturation'; array[BLEND_MODES.COLOR] = 'color'; array[BLEND_MODES.LUMINOSITY] = 'luminosity'; } From 8ea91328a1bf137e71569b5eae369215bc965fd6 Mon Sep 17 00:00:00 2001 From: Matt Karl Date: Fri, 1 Jul 2022 10:23:37 -0400 Subject: [PATCH 2/2] Chore: Simplify extra TSConfig files (#8460) --- .eslintrc.json | 3 --- rollup.config.js | 4 +--- tsconfig.build.json | 41 ----------------------------------------- tsconfig.eslint.json | 20 -------------------- 4 files changed, 1 insertion(+), 67 deletions(-) delete mode 100644 tsconfig.build.json delete mode 100644 tsconfig.eslint.json diff --git a/.eslintrc.json b/.eslintrc.json index 0e42f00a28..a06a7eb4be 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,9 +1,6 @@ { "extends": ["@pixi/eslint-config"], "plugins": ["jsdoc"], - "parserOptions": { - "project": ["./tsconfig.eslint.json"] - }, "ignorePatterns": ["**/*.index.d.ts"], "settings": { "jsdoc": { diff --git a/rollup.config.js b/rollup.config.js index 43797e47ea..2a8a484b5b 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -49,9 +49,7 @@ async function main() }), commonjs(), json(), - typescript({ - tsconfig: path.resolve(__dirname, 'tsconfig.build.json'), - }), + typescript({ downlevelIteration: false }), string({ include: [ '**/*.frag', diff --git a/tsconfig.build.json b/tsconfig.build.json deleted file mode 100644 index d95c0ca931..0000000000 --- a/tsconfig.build.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "compilerOptions": { - "target": "es5", - "allowJs": false, - "sourceMap": true, - "removeComments": false, - "strict": true, - "noImplicitAny": true, - "noUnusedLocals": true, - "noUnusedParameters": true, - "noImplicitReturns": true, - "strictNullChecks": false, - "allowSyntheticDefaultImports": true, - "moduleResolution": "node", - "resolveJsonModule": true, - "baseUrl": "./", - "paths": { - "@pixi/*": [ - "packages/*/src" - ], - "pixi.js": [ - "bundles/pixi.js/src" - ], - "pixi.js-legacy": [ - "bundles/pixi.js-legacy/src" - ] - }, - "outDir": "./out", - "declaration": true - }, - "exclude": [ - "node_modules", - "**/dist/**", - "**/lib/**", - "**/scripts/**", - "**/test/**", - "**/types/**", - "bundles/**/*.d.ts", - "rollup.config.js" - ] -} diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json deleted file mode 100644 index 1f2c04ea4e..0000000000 --- a/tsconfig.eslint.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "target": "es6", - "allowSyntheticDefaultImports": true, - "esModuleInterop": true, - "module": "commonjs", - "baseUrl": "./", - "paths": { - "@pixi/*": [ - "packages/*/src" - ] - }, - }, - "exclude": [ - "node_modules", - "**/dist/**", - "**/lib/**" - ] -}