patch(): node build follow up

fabric.ts

@@ -143,7 +143,6 @@ import { isTouchEvent, getPointer } from './src/util/dom_event';
 import {
   // getScrollLeftTop,
   getElementOffset,
-  cleanUpJsdomNode,
   makeElementUnselectable,
   makeElementSelectable,
 } from './src/util/dom_misc';
@@ -236,7 +235,6 @@ const util = {
   isTouchEvent,
   getPointer,
   // getScrollLeftTop,
-  cleanUpJsdomNode,
   makeElementUnselectable,
   makeElementSelectable,
   isTransparent,
@@ -355,7 +353,7 @@ import { Textbox } from './src/shapes/Textbox';
 import { Group } from './src/shapes/Group';
 import { ActiveSelection } from './src/shapes/ActiveSelection';
 import { Image } from './src/shapes/Image';
-import { getEnv, getDocument, getWindow, setEnvForTests } from './src/env';
+import { getEnv, getDocument, getWindow, setEnv } from './src/env';
 import { createCollectionMixin } from './src/Collection';
 import { parseAttributes } from './src/parser/parseAttributes';
 import { parseElements } from './src/parser/parseElements';
@@ -418,7 +416,7 @@ export {
   getEnv,
   getDocument,
   getWindow,
-  setEnvForTests,
+  setEnv,
   parseStyleAttribute,
   parsePointsAttribute,
   parseFontDeclaration,

index.node.ts

@@ -1,9 +1,9 @@
-import './src/env/node';
+// first we set the env variable by importing the node env file
+import { getNodeCanvas } from './src/env/node';
 
-import type { Canvas as NodeCanvas, JpegConfig, PngConfig } from 'canvas';
+import type { JpegConfig, PngConfig } from 'canvas';
 import {
   Canvas as CanvasBase,
-  getEnv,
   StaticCanvas as StaticCanvasBase,
 } from './fabric';
 import { FabricObject } from './src/shapes/Object/Object';
@@ -13,11 +13,6 @@ FabricObject.prototype.objectCaching = false;
 
 export * from './fabric';
 
-function getNodeCanvas(canvasEl: HTMLCanvasElement) {
-  const impl = getEnv().jsdomImplForWrapper(canvasEl);
-  return (impl._canvas || impl._image) as NodeCanvas;
-}
-
 export class StaticCanvas extends StaticCanvasBase {
   getNodeCanvas() {
     return getNodeCanvas(this.lowerCanvasEl);

rollup.config.mjs

@@ -69,11 +69,6 @@ export default [
       },
     ],
     plugins,
-    external: [
-      'jsdom',
-      'jsdom/lib/jsdom/living/generated/utils.js',
-      'jsdom/lib/jsdom/utils.js',
-      'canvas',
-    ],
+    external: ['jsdom', 'jsdom/lib/jsdom/living/generated/utils.js', 'canvas'],
   },
 ];

src/canvas/Canvas.ts

@@ -1,5 +1,5 @@
 import { LEFT_CLICK, MIDDLE_CLICK, RIGHT_CLICK } from '../constants';
-import { getEnv } from '../env';
+import { getDocument, getWindow } from '../env';
 import {
   CanvasEvents,
   DragEventData,
@@ -15,7 +15,6 @@ import { Group } from '../shapes/Group';
 import type { FabricObject } from '../shapes/Object/FabricObject';
 import { AssertKeys } from '../typedefs';
 import { isTouchEvent, stopEvent } from '../util/dom_event';
-import { createCanvasElement } from '../util/misc/dom';
 import { sendPointToPlane } from '../util/misc/planeChange';
 import {
   isActiveSelection,
@@ -175,7 +174,7 @@ export class Canvas extends SelectableCanvas {
   addOrRemove(functor: any, eventjsFunctor: 'add' | 'remove') {
     const canvasElement = this.upperCanvasEl,
       eventTypePrefix = this._getEventPrefix();
-    functor(getEnv().window, 'resize', this._onResize);
+    functor(getWindow(), 'resize', this._onResize);
     functor(canvasElement, eventTypePrefix + 'down', this._onMouseDown);
     functor(
       canvasElement,
@@ -218,24 +217,24 @@ export class Canvas extends SelectableCanvas {
     // if you dispose on a mouseDown, before mouse up, you need to clean document to...
     const eventTypePrefix = this._getEventPrefix();
     removeListener(
-      getEnv().document,
+      getDocument(),
       `${eventTypePrefix}up`,
       this._onMouseUp as EventListener
     );
     removeListener(
-      getEnv().document,
+      getDocument(),
       'touchend',
       this._onTouchEnd as EventListener,
       addEventOptions
     );
     removeListener(
-      getEnv().document,
+      getDocument(),
       `${eventTypePrefix}move`,
       this._onMouseMove as EventListener,
       addEventOptions
     );
     removeListener(
-      getEnv().document,
+      getDocument(),
       'touchmove',
       this._onMouseMove as EventListener,
       addEventOptions
@@ -625,13 +624,13 @@ export class Canvas extends SelectableCanvas {
     const canvasElement = this.upperCanvasEl,
       eventTypePrefix = this._getEventPrefix();
     addListener(
-      getEnv().document,
+      getDocument(),
       'touchend',
       this._onTouchEnd as EventListener,
       addEventOptions
     );
     addListener(
-      getEnv().document,
+      getDocument(),
       'touchmove',
       this._onMouseMove as EventListener,
       addEventOptions
@@ -660,12 +659,12 @@ export class Canvas extends SelectableCanvas {
       addEventOptions
     );
     addListener(
-      getEnv().document,
+      getDocument(),
       `${eventTypePrefix}up`,
       this._onMouseUp as EventListener
     );
     addListener(
-      getEnv().document,
+      getDocument(),
       `${eventTypePrefix}move`,
       this._onMouseMove as EventListener,
       addEventOptions
@@ -686,13 +685,13 @@ export class Canvas extends SelectableCanvas {
     this.mainTouchId = null;
     const eventTypePrefix = this._getEventPrefix();
     removeListener(
-      getEnv().document,
+      getDocument(),
       'touchend',
       this._onTouchEnd as EventListener,
       addEventOptions
     );
     removeListener(
-      getEnv().document,
+      getDocument(),
       'touchmove',
       this._onMouseMove as EventListener,
       addEventOptions
@@ -723,12 +722,12 @@ export class Canvas extends SelectableCanvas {
       eventTypePrefix = this._getEventPrefix();
     if (this._isMainEvent(e)) {
       removeListener(
-        getEnv().document,
+        getDocument(),
         `${eventTypePrefix}up`,
         this._onMouseUp as EventListener
       );
       removeListener(
-        getEnv().document,
+        getDocument(),
         `${eventTypePrefix}move`,
         this._onMouseMove as EventListener,
         addEventOptions

src/canvas/SelectableCanvas.ts

@@ -1,4 +1,4 @@
-import { getEnv } from '../env';
+import { getDocument, getEnv } from '../env';
 import { dragHandler } from '../controls/drag';
 import { getActionFromCorner } from '../controls/util';
 import { Point } from '../Point';
@@ -26,11 +26,7 @@ import { TMat2D, TOriginX, TOriginY, TSize } from '../typedefs';
 import { degreesToRadians } from '../util/misc/radiansDegreesConversion';
 import { getPointer, isTouchEvent } from '../util/dom_event';
 import type { IText } from '../shapes/IText/IText';
-import {
-  cleanUpJsdomNode,
-  makeElementUnselectable,
-  wrapElement,
-} from '../util/dom_misc';
+import { makeElementUnselectable, wrapElement } from '../util/dom_misc';
 import { setStyle } from '../util/dom_style';
 import type { BaseBrush } from '../brushes/BaseBrush';
 import { pick } from '../util/misc/pick';
@@ -1241,7 +1237,7 @@ export class SelectableCanvas<
   }
 
   protected _initWrapperElement() {
-    const container = getEnv().document.createElement('div');
+    const container = getDocument().createElement('div');
     container.classList.add(this.containerClass);
     this.wrapperEl = wrapElement(this.lowerCanvasEl, container);
     this.wrapperEl.setAttribute('data-fabric', 'wrapper');
@@ -1504,9 +1500,9 @@ export class SelectableCanvas<
     this.contextCache = null;
     this.contextTop = null;
     // TODO: interactive canvas should NOT be used in node, therefore there is no reason to cleanup node canvas
-    cleanUpJsdomNode(upperCanvasEl);
+    getEnv().dispose(upperCanvasEl);
     this.upperCanvasEl = undefined;
-    cleanUpJsdomNode(cacheCanvasEl);
+    getEnv().dispose(cacheCanvasEl);
     this.cacheCanvasEl = undefined;
     if (wrapperEl.parentNode) {
       wrapperEl.parentNode.replaceChild(lowerCanvasEl, wrapperEl);

src/canvas/StaticCanvas.ts

@@ -1,4 +1,4 @@
-import { getEnv } from '../env';
+import { getDocument, getEnv } from '../env';
 import { config } from '../config';
 import { iMatrix, VERSION } from '../constants';
 import type { CanvasEvents, StaticCanvasEvents } from '../EventTypeDefs';
@@ -26,7 +26,7 @@ import {
   cancelAnimFrame,
   requestAnimFrame,
 } from '../util/animation/AnimationFrameProvider';
-import { cleanUpJsdomNode, getElementOffset } from '../util/dom_misc';
+import { getElementOffset } from '../util/dom_misc';
 import { uid } from '../util/internals/uid';
 import { createCanvasElement, isHTMLCanvas, toDataURL } from '../util/misc/dom';
 import { invertTransform, transformPoint } from '../util/misc/matrix';
@@ -397,7 +397,7 @@ export class StaticCanvas<
       this.lowerCanvasEl = canvasEl;
     } else {
       this.lowerCanvasEl =
-        (getEnv().document.getElementById(canvasEl) as HTMLCanvasElement) ||
+        (getDocument().getElementById(canvasEl) as HTMLCanvasElement) ||
         this._createCanvasElement();
     }
     if (this.lowerCanvasEl.hasAttribute('data-fabric')) {
@@ -1675,7 +1675,7 @@ export class StaticCanvas<
     canvasElement.setAttribute('height', `${this.height}`);
     canvasElement.style.cssText = this._originalCanvasStyle || '';
     this._originalCanvasStyle = undefined;
-    cleanUpJsdomNode(canvasElement);
+    getEnv().dispose(canvasElement);
   }
 
   /**

src/env/browser.ts

@@ -1,5 +1,6 @@
 /* eslint-disable no-restricted-globals */
 import { config } from '../config';
+import { WebGLProbe } from '../filters/GLProbes/WebGLProbe';
 import { TCopyPasteData, TFabricEnv } from './types';
 
 const copyPasteData: TCopyPasteData = {};
@@ -22,7 +23,10 @@ export const getEnv = (): TFabricEnv => {
     document,
     window,
     isTouchSupported,
-    isLikelyNode: false,
+    GLProbe: new WebGLProbe(),
+    dispose() {
+      // noop
+    },
     copyPasteData,
   };
 };

src/env/index.ts

@@ -1,3 +1,12 @@
+/**
+ * This file is consumed by fabric.
+ * The `./node` and `./browser` files define the env variable that is used by this module.
+ * The `./node` module sets the env at import time.
+ * The `./browser` module is defined to be the default env and doesn't set the env at all.
+ * This is done in order to support SSR.
+ * Since window and document aren't defined at time of import in SSR, we can't set env so we avoid it by deferring to the default env.
+ */
+
 import { TFabricEnv } from './types';
 import { getEnv as getBrowserEnv } from './browser';
 
@@ -12,8 +21,3 @@ export const getEnv = () => env || getBrowserEnv();
 export const getDocument = (): Document => getEnv().document;
 
 export const getWindow = (): Window => getEnv().window;
-
-export const setEnvForTests = (window: Window) => {
-  env.document = window.document;
-  env.window = window;
-};

src/env/node.ts

@@ -1,17 +1,17 @@
 /* eslint-disable no-restricted-globals */
+import type { Canvas as NodeCanvas } from 'canvas';
 import { JSDOM } from 'jsdom';
-import utils1 from 'jsdom/lib/jsdom/living/generated/utils.js';
-import utils2 from 'jsdom/lib/jsdom/utils.js';
+import utils from 'jsdom/lib/jsdom/living/generated/utils.js';
 import { config } from '../config';
+import { NodeGLProbe } from '../filters/GLProbes/NodeGLProbe';
 import { setEnv } from './index';
 import { TCopyPasteData, TFabricEnv } from './types';
 
-const { implForWrapper: jsdomImplForWrapper } = utils1;
-const { Canvas: nodeCanvas } = utils2;
+const { implForWrapper: jsdomImplForWrapper } = utils;
 
 const copyPasteData: TCopyPasteData = {};
 
-const { window: virtualWindow } = new JSDOM(
+const { window: fabricWindow } = new JSDOM(
   decodeURIComponent(
     '%3C!DOCTYPE%20html%3E%3Chtml%3E%3Chead%3E%3C%2Fhead%3E%3Cbody%3E%3C%2Fbody%3E%3C%2Fhtml%3E'
   ),
@@ -20,31 +20,37 @@ const { window: virtualWindow } = new JSDOM(
       FetchExternalResources: ['img'],
     },
     resources: 'usable',
+    // needed for `requestAnimationFrame`
+    pretendToBeVisual: true,
   }
 );
 
-const fabricDocument = virtualWindow.document;
-const fabricWindow = virtualWindow;
-
-const isTouchSupported =
-  'ontouchstart' in fabricWindow ||
-  'ontouchstart' in fabricDocument ||
-  (fabricWindow &&
-    fabricWindow.navigator &&
-    fabricWindow.navigator.maxTouchPoints > 0);
-
 config.configure({
   devicePixelRatio: fabricWindow.devicePixelRatio || 1,
 });
 
+export const getNodeCanvas = (canvasEl: HTMLCanvasElement) => {
+  const impl = jsdomImplForWrapper(canvasEl);
+  return (impl._canvas || impl._image) as NodeCanvas;
+};
+
 export const getEnv = (): TFabricEnv => {
   return {
-    document: fabricDocument,
+    document: fabricWindow.document,
     window: fabricWindow,
-    isTouchSupported,
-    isLikelyNode: true,
-    nodeCanvas,
-    jsdomImplForWrapper,
+    isTouchSupported: false,
+    GLProbe: new NodeGLProbe(),
+    dispose(element) {
+      const impl = jsdomImplForWrapper(element);
+      if (impl) {
+        impl._image = null;
+        impl._canvas = null;
+        // unsure if necessary
+        impl._currentSrc = null;
+        impl._attributes = null;
+        impl._classList = null;
+      }
+    },
     copyPasteData,
   };
 };

src/env/types.ts

@@ -1,4 +1,4 @@
-import type { Canvas } from 'canvas';
+import { GLProbe } from '../filters/GLProbes/GLProbe';
 
 export type TCopyPasteData = {
   copiedText?: string;
@@ -8,8 +8,7 @@ export type TFabricEnv = {
   document: Document;
   window: Window;
   isTouchSupported: boolean;
-  isLikelyNode: boolean;
-  nodeCanvas?: Canvas;
-  jsdomImplForWrapper?: any;
+  GLProbe: GLProbe;
+  dispose(element: Element): void;
   copyPasteData: TCopyPasteData;
 };