Support XML fonts in Webworker (#8904)

pixijs · Nov 30, 2022 · 14a5ce9 · 14a5ce9
1 parent eacfa54
commit 14a5ce9
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 265 deletions.
diff --git a/bundles/pixi.js-node/package.json b/bundles/pixi.js-node/package.json
@@ -67,11 +67,10 @@
     "@pixi/text": "7.1.0-alpha",
     "@pixi/text-bitmap": "7.1.0-alpha",
     "@types/gl": "^6.0.2",
-    "@types/xml2js": "^0.4.11",
+    "@xmldom/xmldom": "^0.8.6",
     "canvas": "^2.9.1",
     "cross-fetch": "^3.1.5",
-    "gl": "^6.0.1",
-    "xml2js": "^0.4.23"
+    "gl": "^6.0.1"
   },
   "nodeDependencies": [
     "fs",

diff --git a/bundles/pixi.js-node/src/adapter/adapter.ts b/bundles/pixi.js-node/src/adapter/adapter.ts
@@ -3,6 +3,7 @@ import fs from 'fs';
 import { WebGLRenderingContext } from 'gl';
 import { settings, utils } from '@pixi/core';
 import { NodeCanvasElement } from './NodeCanvasElement';
+import { DOMParser } from '@xmldom/xmldom';
 
 import type { IAdapter } from '@pixi/core';
 
@@ -53,6 +54,12 @@ export const NodeAdapter = {
             });
         });
     },
+    parseXML: (xml: string) =>
+    {
+        const parser = new DOMParser();
+
+        return parser.parseFromString(xml, 'text/xml');
+    },
 } as IAdapter;
 
 settings.ADAPTER = NodeAdapter;

diff --git a/bundles/pixi.js-node/src/adapter/index.ts b/bundles/pixi.js-node/src/adapter/index.ts
@@ -2,7 +2,6 @@ import './polyfills';
 
 export * from './NodeCanvasElement';
 export * from './NodeCanvasResource';
-export * from './loadNodeBitmapFont';
 export * from './loadNodeFont';
 export * from './loadNodeTexture';
 export * from './loadNodeBase64';

diff --git a/bundles/pixi.js-node/src/adapter/loadNodeBitmapFont.ts b/bundles/pixi.js-node/src/adapter/loadNodeBitmapFont.ts
diff --git a/bundles/pixi.js-node/src/index.ts b/bundles/pixi.js-node/src/index.ts
@@ -14,13 +14,11 @@ import '@pixi/mixin-get-global-position';
 import { NodeCanvasResource } from './adapter';
 import { loadTextures, loadWebFont } from '@pixi/assets';
 import { ResizePlugin } from '@pixi/app';
-import { loadBitmapFont } from '@pixi/text-bitmap';
 
 // Remove the default loader plugins
 extensions.remove(
     loadTextures,
     loadWebFont,
-    loadBitmapFont,
     ResizePlugin
 );
 

diff --git a/bundles/pixi.js-webworker/package.json b/bundles/pixi.js-webworker/package.json
@@ -62,7 +62,8 @@
     "@pixi/sprite-tiling": "7.1.0-alpha",
     "@pixi/spritesheet": "7.1.0-alpha",
     "@pixi/text": "7.1.0-alpha",
-    "@pixi/text-bitmap": "7.1.0-alpha"
+    "@pixi/text-bitmap": "7.1.0-alpha",
+    "@xmldom/xmldom": "^0.8.6"
   },
   "publishConfig": {
     "access": "public"

diff --git a/bundles/pixi.js-webworker/src/adapter.ts b/bundles/pixi.js-webworker/src/adapter.ts
@@ -1,4 +1,5 @@
 import { settings } from '@pixi/core';
+import { DOMParser } from '@xmldom/xmldom';
 
 import type { IAdapter } from '@pixi/core';
 
@@ -15,6 +16,13 @@ export const WebWorkerAdapter = {
     getBaseUrl: () => globalThis.location.href,
     getFontFaceSet: () => (globalThis as unknown as WorkerGlobalScope).fonts,
     fetch: (url: RequestInfo, options?: RequestInit) => fetch(url, options),
+    parseXML: (xml: string) =>
+    {
+        const parser = new DOMParser();
+
+        return parser.parseFromString(xml, 'text/xml');
+    },
+
 } as IAdapter;
 
 settings.ADAPTER = WebWorkerAdapter;