Merge branch 'dev' into next

michaeljherrmann · Jul 1, 2022 · 4cb7c4d · 4cb7c4d
2 parents acd50f4 + 8ea9132
commit 4cb7c4d
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 68 deletions.
diff --git 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/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';
     }

diff --git a/rollup.config.js b/rollup.config.js
@@ -48,9 +48,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
diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json