From f0740bc1bdd2a3f3da40e2a56394096742186e2a Mon Sep 17 00:00:00 2001
From: dangreen <danon0404@gmail.com>
Date: Wed, 9 Feb 2022 01:51:38 +0700
Subject: [PATCH] refactor: default exports were replaced with named

Default export was replaced with "Canvg" named export.

BREAKING CHANGE:  Default export was replaced with "Canvg" named export.
---
 README.md                               | 15 ++--
 src/BoundingBox.ts                      |  2 +-
 src/Canvg.ts                            | 12 ++--
 src/Document/AElement.ts                | 14 ++--
 src/Document/AnimateColorElement.ts     |  4 +-
 src/Document/AnimateElement.ts          |  8 +--
 src/Document/AnimateTransformElement.ts |  4 +-
 src/Document/CircleElement.ts           |  6 +-
 src/Document/ClipPathElement.ts         |  8 +--
 src/Document/DefsElement.ts             |  4 +-
 src/Document/DescElement.ts             |  4 +-
 src/Document/Document.ts                | 25 ++++---
 src/Document/Element.ts                 | 18 ++---
 src/Document/EllipseElement.ts          |  6 +-
 src/Document/FeColorMatrixElement.ts    |  6 +-
 src/Document/FeCompositeElement.ts      |  4 +-
 src/Document/FeDropShadowElement.ts     |  6 +-
 src/Document/FeGaussianBlurElement.ts   |  6 +-
 src/Document/FeMorphologyElement.ts     |  4 +-
 src/Document/FilterElement.ts           |  8 +--
 src/Document/FontElement.ts             | 12 ++--
 src/Document/FontFaceElement.ts         |  6 +-
 src/Document/GElement.ts                |  8 +--
 src/Document/GlyphElement.ts            |  6 +-
 src/Document/GradientElement.ts         | 20 +++---
 src/Document/ImageElement.ts            |  8 +--
 src/Document/LineElement.ts             |  8 +--
 src/Document/LinearGradientElement.ts   |  8 +--
 src/Document/MarkerElement.ts           | 10 +--
 src/Document/MaskElement.ts             | 10 +--
 src/Document/MissingGlyphElement.ts     |  4 +-
 src/Document/PathElement.ts             | 14 ++--
 src/Document/PatternElement.ts          |  8 +--
 src/Document/PolygonElement.ts          |  4 +-
 src/Document/PolylineElement.ts         | 10 +--
 src/Document/RadialGradientElement.ts   |  8 +--
 src/Document/RectElement.ts             |  6 +-
 src/Document/RenderedElement.ts         |  8 +--
 src/Document/SVGElement.ts              |  8 +--
 src/Document/StopElement.ts             |  6 +-
 src/Document/StyleElement.ts            | 10 +--
 src/Document/SymbolElement.ts           |  4 +-
 src/Document/TRefElement.ts             |  4 +-
 src/Document/TSpanElement.ts            |  6 +-
 src/Document/TextElement.ts             | 20 +++---
 src/Document/TextNode.ts                |  4 +-
 src/Document/TextPathElement.ts         | 10 +--
 src/Document/TitleElement.ts            |  4 +-
 src/Document/UnknownElement.ts          |  6 +-
 src/Document/UseElement.ts              | 12 ++--
 src/Document/elements.ts                | 94 ++++++++++++-------------
 src/Document/index.ts                   |  1 -
 src/Font.ts                             |  2 +-
 src/Mouse.ts                            |  8 +--
 src/Parser.ts                           |  4 +-
 src/PathParser.ts                       |  4 +-
 src/Point.ts                            |  2 +-
 src/Property.ts                         |  5 +-
 src/SVGFontLoader.ts                    |  4 +-
 src/Screen.ts                           | 11 +--
 src/Transform/Matrix.ts                 |  8 +--
 src/Transform/Rotate.ts                 |  8 +--
 src/Transform/Scale.ts                  |  8 +--
 src/Transform/Skew.ts                   |  8 +--
 src/Transform/SkewX.ts                  |  8 +--
 src/Transform/SkewY.ts                  |  8 +--
 src/Transform/Transform.ts              | 31 +++-----
 src/Transform/Translate.ts              |  6 +-
 src/Transform/index.ts                  |  8 ++-
 src/Transform/types.ts                  |  2 +-
 src/ViewPort.ts                         |  2 +-
 src/index.ts                            | 14 ----
 test/node.canvg.spec.ts                 |  2 +-
 test/node/index.ts                      |  4 +-
 74 files changed, 328 insertions(+), 340 deletions(-)

diff --git a/README.md b/README.md
index ce2bcca19..a87acec83 100644
--- a/README.md
+++ b/README.md
@@ -46,8 +46,8 @@ npm i canvg
 Basic module exports:
 
 ```js
-export default Canvg;
 export {
+  Canvg,
   presets
 };
 ```
@@ -57,7 +57,7 @@ export {
 ### Example
 
 ```js
-import Canvg from 'canvg';
+import { Canvg } from 'canvg';
 
 let v = null;
 
@@ -82,7 +82,8 @@ window.onbeforeunload = () => {
   </summary>
 
 ```js
-import Canvg, {
+import {
+  Canvg,
   presets
 } from 'canvg';
 
@@ -126,7 +127,8 @@ import {
 } from 'xmldom';
 import * as canvas from 'canvas';
 import fetch from 'node-fetch';
-import Canvg, {
+import {
+  Canvg,
   presets
 } from 'canvg';
 
@@ -163,7 +165,8 @@ const preset = presets.node({
   </summary>
 
 ```js
-import Canvg, {
+import {
+  Canvg,
   presets
 } from 'canvg';
 
@@ -206,7 +209,7 @@ self.onmessage = async (event) => {
 
 ```html
 <script type="module">
-import Canvg from 'https://cdn.skypack.dev/canvg';
+import { Canvg } from 'https://cdn.skypack.dev/canvg';
 
 window.onload = () => {
   const canvas = document.querySelector('canvas');
diff --git a/src/BoundingBox.ts b/src/BoundingBox.ts
index 98617f39d..84686b60b 100644
--- a/src/BoundingBox.ts
+++ b/src/BoundingBox.ts
@@ -1,5 +1,5 @@
 
-export default class BoundingBox {
+export class BoundingBox {
   constructor(
     public x1 = Number.NaN,
     public y1 = Number.NaN,
diff --git a/src/Canvg.ts b/src/Canvg.ts
index 56bc363d0..7e01f7750 100644
--- a/src/Canvg.ts
+++ b/src/Canvg.ts
@@ -1,11 +1,13 @@
 import { RenderingContext2D } from './types'
-import Parser, { IParserOptions } from './Parser'
-import Screen, {
+import { IParserOptions, Parser } from './Parser'
+import {
   IScreenOptions,
-  IScreenStartOptions
+  IScreenStartOptions,
+  Screen
 } from './Screen'
-import Document, {
+import {
   IDocumentOptions,
+  Document,
   SVGElement
 } from './Document'
 
@@ -19,7 +21,7 @@ export interface IOptions extends IParserOptions,
 /**
  * SVG renderer on canvas.
  */
-export default class Canvg {
+export class Canvg {
   /**
    * Create Canvg instance from SVG source string or URL.
    * @param ctx - Rendering context.
diff --git a/src/Document/AElement.ts b/src/Document/AElement.ts
index 2573d341c..9e1a054d6 100644
--- a/src/Document/AElement.ts
+++ b/src/Document/AElement.ts
@@ -1,12 +1,12 @@
 import { RenderingContext2D } from '../types'
-import Property from '../Property'
-import Font from '../Font'
-import BoundingBox from '../BoundingBox'
-import Document from './Document'
-import TextElement from './TextElement'
-import GElement from './GElement'
+import { Property } from '../Property'
+import { Font } from '../Font'
+import { BoundingBox } from '../BoundingBox'
+import { Document } from './Document'
+import { TextElement } from './TextElement'
+import { GElement } from './GElement'
 
-export default class AElement extends TextElement {
+export class AElement extends TextElement {
   type = 'a'
   protected readonly hasText: boolean
   protected readonly text: string
diff --git a/src/Document/AnimateColorElement.ts b/src/Document/AnimateColorElement.ts
index d22d87042..ab9eaa82b 100644
--- a/src/Document/AnimateColorElement.ts
+++ b/src/Document/AnimateColorElement.ts
@@ -1,7 +1,7 @@
 import RGBColor from 'rgbcolor'
-import AnimateElement from './AnimateElement'
+import { AnimateElement } from './AnimateElement'
 
-export default class AnimateColorElement extends AnimateElement {
+export class AnimateColorElement extends AnimateElement {
   type = 'animateColor'
 
   calcValue() {
diff --git a/src/Document/AnimateElement.ts b/src/Document/AnimateElement.ts
index 95475c141..a7a95998e 100644
--- a/src/Document/AnimateElement.ts
+++ b/src/Document/AnimateElement.ts
@@ -1,6 +1,6 @@
-import Property from '../Property'
-import Document from './Document'
-import Element from './Element'
+import { Property } from '../Property'
+import { Document } from './Document'
+import { Element } from './Element'
 
 export interface IProgress {
   from?: Property
@@ -8,7 +8,7 @@ export interface IProgress {
   progress: number
 }
 
-export default class AnimateElement extends Element {
+export class AnimateElement extends Element {
   type = 'animate'
   protected readonly begin: number
   protected readonly maxDuration: number
diff --git a/src/Document/AnimateTransformElement.ts b/src/Document/AnimateTransformElement.ts
index 0ae3bbc80..fba30f159 100644
--- a/src/Document/AnimateTransformElement.ts
+++ b/src/Document/AnimateTransformElement.ts
@@ -1,7 +1,7 @@
 import { toNumbers } from '../util'
-import AnimateElement from './AnimateElement'
+import { AnimateElement } from './AnimateElement'
 
-export default class AnimateTransformElement extends AnimateElement {
+export class AnimateTransformElement extends AnimateElement {
   type = 'animateTransform'
 
   calcValue() {
diff --git a/src/Document/CircleElement.ts b/src/Document/CircleElement.ts
index 0c6373fce..3f57ed0f3 100644
--- a/src/Document/CircleElement.ts
+++ b/src/Document/CircleElement.ts
@@ -1,8 +1,8 @@
 import { RenderingContext2D } from '../types'
-import BoundingBox from '../BoundingBox'
-import PathElement from './PathElement'
+import { BoundingBox } from '../BoundingBox'
+import { PathElement } from './PathElement'
 
-export default class CircleElement extends PathElement {
+export class CircleElement extends PathElement {
   type = 'circle'
 
   path(ctx: RenderingContext2D) {
diff --git a/src/Document/ClipPathElement.ts b/src/Document/ClipPathElement.ts
index 4dc6b9480..a1f6e2509 100644
--- a/src/Document/ClipPathElement.ts
+++ b/src/Document/ClipPathElement.ts
@@ -1,13 +1,13 @@
 import { RenderingContext2D } from '../types'
-import Transform from '../Transform'
-import Element from './Element'
-import UseElement from './UseElement'
+import { Transform } from '../Transform'
+import { Element } from './Element'
+import { UseElement } from './UseElement'
 
 const noop = () => {
   // NOOP
 }
 
-export default class ClipPathElement extends Element {
+export class ClipPathElement extends Element {
   type = 'clipPath'
 
   apply(ctx: RenderingContext2D) {
diff --git a/src/Document/DefsElement.ts b/src/Document/DefsElement.ts
index 7708dca88..4f3e5ef81 100644
--- a/src/Document/DefsElement.ts
+++ b/src/Document/DefsElement.ts
@@ -1,6 +1,6 @@
-import Element from './Element'
+import { Element } from './Element'
 
-export default class DefsElement extends Element {
+export class DefsElement extends Element {
   type = 'defs'
 
   render() {
diff --git a/src/Document/DescElement.ts b/src/Document/DescElement.ts
index 8ef8d243c..a129eeb96 100644
--- a/src/Document/DescElement.ts
+++ b/src/Document/DescElement.ts
@@ -1,5 +1,5 @@
-import Element from './Element'
+import { Element } from './Element'
 
-export default class DescElement extends Element {
+export class DescElement extends Element {
   type = 'desc'
 }
diff --git a/src/Document/Document.ts b/src/Document/Document.ts
index 65bfe7de6..6aad13722 100644
--- a/src/Document/Document.ts
+++ b/src/Document/Document.ts
@@ -1,14 +1,17 @@
 /* eslint-disable @typescript-eslint/no-use-before-define */
-import Canvg from '../Canvg'
-import Screen, { IScreenViewBoxConfig } from '../Screen'
-import Property from '../Property'
-import SVGFontLoader from '../SVGFontLoader'
-import Element from './Element'
-import UnknownElement from './UnknownElement'
-import TextNode from './TextNode'
-import ImageElement from './ImageElement'
-import SVGElement from './SVGElement'
-import elementTypes, { AnyElement } from './elements'
+import { Canvg } from '../Canvg'
+import { IScreenViewBoxConfig, Screen } from '../Screen'
+import { Property } from '../Property'
+import { SVGFontLoader } from '../SVGFontLoader'
+import { Element } from './Element'
+import { UnknownElement } from './UnknownElement'
+import { TextNode } from './TextNode'
+import { ImageElement } from './ImageElement'
+import { SVGElement } from './SVGElement'
+import {
+  AnyElement,
+  elements as elementTypes
+} from './elements'
 
 /**
  * Function to create new canvas.
@@ -76,7 +79,7 @@ async function createImage(src: string, anonymousCrossOrigin = false) {
   })
 }
 
-export default class Document {
+export class Document {
   static readonly createCanvas = createCanvas
   static readonly createImage = createImage
   static readonly elementTypes = elementTypes
diff --git a/src/Document/Element.ts b/src/Document/Element.ts
index 162842f22..f8c5772cf 100644
--- a/src/Document/Element.ts
+++ b/src/Document/Element.ts
@@ -1,14 +1,14 @@
 import { RenderingContext2D } from '../types'
 import { normalizeAttributeName } from '../util'
-import Property from '../Property'
-import Transform from '../Transform'
-import Document from './Document'
-import ClipPathElement from './ClipPathElement'
-import MaskElement from './MaskElement'
-import FilterElement from './FilterElement'
-import PathElement from './PathElement'
-
-export default abstract class Element {
+import { Property } from '../Property'
+import { Transform } from '../Transform'
+import { Document } from './Document'
+import { ClipPathElement } from './ClipPathElement'
+import { MaskElement } from './MaskElement'
+import { FilterElement } from './FilterElement'
+import { PathElement } from './PathElement'
+
+export abstract class Element {
   static readonly ignoreChildTypes = ['title']
 
   readonly type: string
diff --git a/src/Document/EllipseElement.ts b/src/Document/EllipseElement.ts
index a3a5fe557..e15fe7066 100644
--- a/src/Document/EllipseElement.ts
+++ b/src/Document/EllipseElement.ts
@@ -1,8 +1,8 @@
 import { RenderingContext2D } from '../types'
-import BoundingBox from '../BoundingBox'
-import PathElement from './PathElement'
+import { BoundingBox } from '../BoundingBox'
+import { PathElement } from './PathElement'
 
-export default class EllipseElement extends PathElement {
+export class EllipseElement extends PathElement {
   type = 'ellipse'
 
   path(ctx: RenderingContext2D) {
diff --git a/src/Document/FeColorMatrixElement.ts b/src/Document/FeColorMatrixElement.ts
index f130bf912..7325cfd5b 100644
--- a/src/Document/FeColorMatrixElement.ts
+++ b/src/Document/FeColorMatrixElement.ts
@@ -1,7 +1,7 @@
 import { RenderingContext2D } from '../types'
 import { toNumbers } from '../util'
-import Document from './Document'
-import Element from './Element'
+import { Document } from './Document'
+import { Element } from './Element'
 
 function imGet(
   img: Uint8ClampedArray,
@@ -45,7 +45,7 @@ function c(
   return m1 + Math.cos(a) * m2 + Math.sin(a) * m3
 }
 
-export default class FeColorMatrixElement extends Element {
+export class FeColorMatrixElement extends Element {
   type = 'feColorMatrix'
   protected readonly matrix: number[]
   protected readonly includeOpacity: boolean
diff --git a/src/Document/FeCompositeElement.ts b/src/Document/FeCompositeElement.ts
index 8730d327f..73f0a0fab 100644
--- a/src/Document/FeCompositeElement.ts
+++ b/src/Document/FeCompositeElement.ts
@@ -1,7 +1,7 @@
 import { RenderingContext2D } from '../types'
-import Element from './Element'
+import { Element } from './Element'
 
-export default class FeCompositeElement extends Element {
+export class FeCompositeElement extends Element {
   type = 'feComposite'
 
   apply(
diff --git a/src/Document/FeDropShadowElement.ts b/src/Document/FeDropShadowElement.ts
index 11371f05d..a528ed3c8 100644
--- a/src/Document/FeDropShadowElement.ts
+++ b/src/Document/FeDropShadowElement.ts
@@ -1,8 +1,8 @@
 import { RenderingContext2D } from '../types'
-import Document from './Document'
-import Element from './Element'
+import { Document } from './Document'
+import { Element } from './Element'
 
-export default class FeDropShadowElement extends Element {
+export class FeDropShadowElement extends Element {
   type = 'feDropShadow'
 
   constructor(
diff --git a/src/Document/FeGaussianBlurElement.ts b/src/Document/FeGaussianBlurElement.ts
index db89e52e7..d4d879b98 100644
--- a/src/Document/FeGaussianBlurElement.ts
+++ b/src/Document/FeGaussianBlurElement.ts
@@ -1,9 +1,9 @@
 import { canvasRGBA } from 'stackblur-canvas'
 import { RenderingContext2D } from '../types'
-import Document from './Document'
-import Element from './Element'
+import { Document } from './Document'
+import { Element } from './Element'
 
-export default class FeGaussianBlurElement extends Element {
+export class FeGaussianBlurElement extends Element {
   type = 'feGaussianBlur'
   readonly extraFilterDistance: number
   protected readonly blurRadius: number
diff --git a/src/Document/FeMorphologyElement.ts b/src/Document/FeMorphologyElement.ts
index d0f3c1981..4ca9d363f 100644
--- a/src/Document/FeMorphologyElement.ts
+++ b/src/Document/FeMorphologyElement.ts
@@ -1,7 +1,7 @@
 import { RenderingContext2D } from '../types'
-import Element from './Element'
+import { Element } from './Element'
 
-export default class FeMorphologyElement extends Element {
+export class FeMorphologyElement extends Element {
   type = 'feMorphology'
 
   apply(
diff --git a/src/Document/FilterElement.ts b/src/Document/FilterElement.ts
index 97c285658..4f5a443ce 100644
--- a/src/Document/FilterElement.ts
+++ b/src/Document/FilterElement.ts
@@ -1,9 +1,9 @@
 import { RenderingContext2D } from '../types'
-import Element from './Element'
-import PathElement from './PathElement'
-import FeGaussianBlurElement from './FeGaussianBlurElement'
+import { Element } from './Element'
+import { PathElement } from './PathElement'
+import { FeGaussianBlurElement } from './FeGaussianBlurElement'
 
-export default class FilterElement extends Element {
+export class FilterElement extends Element {
   static ignoreStyles = [
     'filter',
     'transform',
diff --git a/src/Document/FontElement.ts b/src/Document/FontElement.ts
index b0b95d831..4ed263ead 100644
--- a/src/Document/FontElement.ts
+++ b/src/Document/FontElement.ts
@@ -1,10 +1,10 @@
-import Document from './Document'
-import Element from './Element'
-import FontFaceElement from './FontFaceElement'
-import MissingGlyphElement from './MissingGlyphElement'
-import GlyphElement from './GlyphElement'
+import { Document } from './Document'
+import { Element } from './Element'
+import { FontFaceElement } from './FontFaceElement'
+import { MissingGlyphElement } from './MissingGlyphElement'
+import { GlyphElement } from './GlyphElement'
 
-export default class FontElement extends Element {
+export class FontElement extends Element {
   type = 'font'
   readonly isArabic: boolean
   readonly missingGlyph: MissingGlyphElement
diff --git a/src/Document/FontFaceElement.ts b/src/Document/FontFaceElement.ts
index 5b4ed1cb3..4179f79da 100644
--- a/src/Document/FontFaceElement.ts
+++ b/src/Document/FontFaceElement.ts
@@ -1,7 +1,7 @@
-import Document from './Document'
-import Element from './Element'
+import { Document } from './Document'
+import { Element } from './Element'
 
-export default class FontFaceElement extends Element {
+export class FontFaceElement extends Element {
   type = 'font-face'
   readonly ascent: number
   readonly descent: number
diff --git a/src/Document/GElement.ts b/src/Document/GElement.ts
index ddcd361a8..d7cc99922 100644
--- a/src/Document/GElement.ts
+++ b/src/Document/GElement.ts
@@ -1,9 +1,9 @@
 import { RenderingContext2D } from '../types'
-import BoundingBox from '../BoundingBox'
-import PathElement from './PathElement'
-import RenderedElement from './RenderedElement'
+import { BoundingBox } from '../BoundingBox'
+import { PathElement } from './PathElement'
+import { RenderedElement } from './RenderedElement'
 
-export default class GElement extends RenderedElement {
+export class GElement extends RenderedElement {
   type = 'g'
 
   getBoundingBox(ctx: RenderingContext2D) {
diff --git a/src/Document/GlyphElement.ts b/src/Document/GlyphElement.ts
index 2419fa549..1055bc0e7 100644
--- a/src/Document/GlyphElement.ts
+++ b/src/Document/GlyphElement.ts
@@ -1,7 +1,7 @@
-import Document from './Document'
-import PathElement from './PathElement'
+import { Document } from './Document'
+import { PathElement } from './PathElement'
 
-export default class GlyphElement extends PathElement {
+export class GlyphElement extends PathElement {
   type = 'glyph'
   readonly horizAdvX: number
   readonly unicode: string
diff --git a/src/Document/GradientElement.ts b/src/Document/GradientElement.ts
index 628f41dae..51354f364 100644
--- a/src/Document/GradientElement.ts
+++ b/src/Document/GradientElement.ts
@@ -1,14 +1,14 @@
 import { RenderingContext2D } from '../types'
-import Property from '../Property'
-import Document from './Document'
-import Element from './Element'
-import PathElement from './PathElement'
-import SVGElement from './SVGElement'
-import RectElement from './RectElement'
-import StopElement from './StopElement'
-import GElement from './GElement'
-
-export default abstract class GradientElement extends Element {
+import { Property } from '../Property'
+import { Document } from './Document'
+import { Element } from './Element'
+import { PathElement } from './PathElement'
+import { SVGElement } from './SVGElement'
+import { RectElement } from './RectElement'
+import { StopElement } from './StopElement'
+import { GElement } from './GElement'
+
+export abstract class GradientElement extends Element {
   readonly attributesToInherit = ['gradientUnits']
 
   protected readonly stops: StopElement[] = []
diff --git a/src/Document/ImageElement.ts b/src/Document/ImageElement.ts
index 4e6eb7886..b5b0aa733 100644
--- a/src/Document/ImageElement.ts
+++ b/src/Document/ImageElement.ts
@@ -1,12 +1,12 @@
 import { RenderingContext2D } from '../types'
-import BoundingBox from '../BoundingBox'
-import Document from './Document'
-import RenderedElement from './RenderedElement'
+import { BoundingBox } from '../BoundingBox'
+import { Document } from './Document'
+import { RenderedElement } from './RenderedElement'
 
 // groups: 1: mime-type (+ charset), 2: mime-type (w/o charset), 3: charset, 4: base64?, 5: body
 const dataUriRegex = /^\s*data:(([^/,;]+\/[^/,;]+)(?:;([^,;=]+=[^,;=]+))?)?(?:;(base64))?,(.*)$/i
 
-export default class ImageElement extends RenderedElement {
+export class ImageElement extends RenderedElement {
   type = 'image'
   loaded = false
   protected readonly isSvg: boolean
diff --git a/src/Document/LineElement.ts b/src/Document/LineElement.ts
index a440693c7..f3416eecb 100644
--- a/src/Document/LineElement.ts
+++ b/src/Document/LineElement.ts
@@ -1,9 +1,9 @@
 import { RenderingContext2D } from '../types'
-import Point from '../Point'
-import BoundingBox from '../BoundingBox'
-import PathElement, { Marker } from './PathElement'
+import { Point } from '../Point'
+import { BoundingBox } from '../BoundingBox'
+import { PathElement, Marker } from './PathElement'
 
-export default class LineElement extends PathElement {
+export class LineElement extends PathElement {
   type = 'line'
 
   getPoints() {
diff --git a/src/Document/LinearGradientElement.ts b/src/Document/LinearGradientElement.ts
index 01842550d..a3b07289d 100644
--- a/src/Document/LinearGradientElement.ts
+++ b/src/Document/LinearGradientElement.ts
@@ -1,9 +1,9 @@
 import { RenderingContext2D } from '../types'
-import Document from './Document'
-import PathElement from './PathElement'
-import GradientElement from './GradientElement'
+import { Document } from './Document'
+import { PathElement } from './PathElement'
+import { GradientElement } from './GradientElement'
 
-export default class LinearGradientElement extends GradientElement {
+export class LinearGradientElement extends GradientElement {
   type = 'linearGradient'
 
   constructor(
diff --git a/src/Document/MarkerElement.ts b/src/Document/MarkerElement.ts
index d654e03e4..c34a87d5f 100644
--- a/src/Document/MarkerElement.ts
+++ b/src/Document/MarkerElement.ts
@@ -1,10 +1,10 @@
 import { RenderingContext2D } from '../types'
-import Point from '../Point'
-import Property from '../Property'
-import Element from './Element'
-import SVGElement from './SVGElement'
+import { Point } from '../Point'
+import { Property } from '../Property'
+import { Element } from './Element'
+import { SVGElement } from './SVGElement'
 
-export default class MarkerElement extends Element {
+export class MarkerElement extends Element {
   type = 'marker'
 
   render(ctx: RenderingContext2D, point?: Point, angle?: number) {
diff --git a/src/Document/MaskElement.ts b/src/Document/MaskElement.ts
index 9aab5ef6e..78200f61b 100644
--- a/src/Document/MaskElement.ts
+++ b/src/Document/MaskElement.ts
@@ -1,10 +1,10 @@
 import { RenderingContext2D } from '../types'
-import BoundingBox from '../BoundingBox'
-import Element from './Element'
-import PathElement from './PathElement'
-import FeColorMatrixElement from './FeColorMatrixElement'
+import { BoundingBox } from '../BoundingBox'
+import { Element } from './Element'
+import { PathElement } from './PathElement'
+import { FeColorMatrixElement } from './FeColorMatrixElement'
 
-export default class MaskElement extends Element {
+export class MaskElement extends Element {
   static ignoreStyles = [
     'mask',
     'transform',
diff --git a/src/Document/MissingGlyphElement.ts b/src/Document/MissingGlyphElement.ts
index 8aefd94fe..90af20f1f 100644
--- a/src/Document/MissingGlyphElement.ts
+++ b/src/Document/MissingGlyphElement.ts
@@ -1,6 +1,6 @@
-import PathElement from './PathElement'
+import { PathElement } from './PathElement'
 
-export default class MissingGlyphElement extends PathElement {
+export class MissingGlyphElement extends PathElement {
   type = 'missing-glyph'
   readonly horizAdvX = 0
 }
diff --git a/src/Document/PathElement.ts b/src/Document/PathElement.ts
index 2ac67b452..07db58645 100644
--- a/src/Document/PathElement.ts
+++ b/src/Document/PathElement.ts
@@ -4,16 +4,16 @@ import {
   vectorsRatio,
   vectorsAngle
 } from '../util'
-import Point from '../Point'
-import BoundingBox from '../BoundingBox'
-import PathParser from '../PathParser'
-import Document from './Document'
-import RenderedElement from './RenderedElement'
-import MarkerElement from './MarkerElement'
+import { Point } from '../Point'
+import { BoundingBox } from '../BoundingBox'
+import { PathParser } from '../PathParser'
+import { Document } from './Document'
+import { RenderedElement } from './RenderedElement'
+import { MarkerElement } from './MarkerElement'
 
 export type Marker = [Point, number]
 
-export default class PathElement extends RenderedElement {
+export class PathElement extends RenderedElement {
   type = 'path'
   readonly pathParser: PathParser = null
 
diff --git a/src/Document/PatternElement.ts b/src/Document/PatternElement.ts
index b04644b2a..f0dfb9ab6 100644
--- a/src/Document/PatternElement.ts
+++ b/src/Document/PatternElement.ts
@@ -1,9 +1,9 @@
 import { RenderingContext2D } from '../types'
-import Property from '../Property'
-import Element from './Element'
-import SVGElement from './SVGElement'
+import { Property } from '../Property'
+import { Element } from './Element'
+import { SVGElement } from './SVGElement'
 
-export default class PatternElement extends Element {
+export class PatternElement extends Element {
   type = 'pattern'
 
   createPattern(
diff --git a/src/Document/PolygonElement.ts b/src/Document/PolygonElement.ts
index f7af11fe1..db8ec9132 100644
--- a/src/Document/PolygonElement.ts
+++ b/src/Document/PolygonElement.ts
@@ -1,7 +1,7 @@
 import { RenderingContext2D } from '../types'
-import PolylineElement from './PolylineElement'
+import { PolylineElement } from './PolylineElement'
 
-export default class PolygonElement extends PolylineElement {
+export class PolygonElement extends PolylineElement {
   type = 'polygon'
 
   path(ctx: RenderingContext2D) {
diff --git a/src/Document/PolylineElement.ts b/src/Document/PolylineElement.ts
index 7892faad6..47cfa96be 100644
--- a/src/Document/PolylineElement.ts
+++ b/src/Document/PolylineElement.ts
@@ -1,10 +1,10 @@
 import { RenderingContext2D } from '../types'
-import Point from '../Point'
-import BoundingBox from '../BoundingBox'
-import Document from './Document'
-import PathElement, { Marker } from './PathElement'
+import { Point } from '../Point'
+import { BoundingBox } from '../BoundingBox'
+import { Document } from './Document'
+import { PathElement, Marker } from './PathElement'
 
-export default class PolylineElement extends PathElement {
+export class PolylineElement extends PathElement {
   type = 'polyline'
   protected readonly points: Point[] = []
 
diff --git a/src/Document/RadialGradientElement.ts b/src/Document/RadialGradientElement.ts
index e7aa7a8c2..5bd781230 100644
--- a/src/Document/RadialGradientElement.ts
+++ b/src/Document/RadialGradientElement.ts
@@ -1,9 +1,9 @@
 import { RenderingContext2D } from '../types'
-import Document from './Document'
-import PathElement from './PathElement'
-import GradientElement from './GradientElement'
+import { Document } from './Document'
+import { PathElement } from './PathElement'
+import { GradientElement } from './GradientElement'
 
-export default class RadialGradientElement extends GradientElement {
+export class RadialGradientElement extends GradientElement {
   type = 'radialGradient'
 
   constructor(
diff --git a/src/Document/RectElement.ts b/src/Document/RectElement.ts
index 432804bc4..56eba5110 100644
--- a/src/Document/RectElement.ts
+++ b/src/Document/RectElement.ts
@@ -1,8 +1,8 @@
 import { RenderingContext2D } from '../types'
-import BoundingBox from '../BoundingBox'
-import PathElement from './PathElement'
+import { BoundingBox } from '../BoundingBox'
+import { PathElement } from './PathElement'
 
-export default class RectElement extends PathElement {
+export class RectElement extends PathElement {
   type = 'rect'
 
   path(ctx: RenderingContext2D) {
diff --git a/src/Document/RenderedElement.ts b/src/Document/RenderedElement.ts
index 033365ae4..6b6a08f42 100644
--- a/src/Document/RenderedElement.ts
+++ b/src/Document/RenderedElement.ts
@@ -3,11 +3,11 @@ import {
   PSEUDO_ZERO,
   toNumbers
 } from '../util'
-import Font from '../Font'
-import Property from '../Property'
-import Element from './Element'
+import { Font } from '../Font'
+import { Property } from '../Property'
+import { Element } from './Element'
 
-export default abstract class RenderedElement extends Element {
+export abstract class RenderedElement extends Element {
   private modifiedEmSizeStack = false
 
   protected calculateOpacity() {
diff --git a/src/Document/SVGElement.ts b/src/Document/SVGElement.ts
index fc536ac06..3dc2ac7de 100644
--- a/src/Document/SVGElement.ts
+++ b/src/Document/SVGElement.ts
@@ -1,10 +1,10 @@
 import { RenderingContext2D } from '../types'
 import { toNumbers } from '../util'
-import Property from '../Property'
-import Font from '../Font'
-import RenderedElement from './RenderedElement'
+import { Property } from '../Property'
+import { Font } from '../Font'
+import { RenderedElement } from './RenderedElement'
 
-export default class SVGElement extends RenderedElement {
+export class SVGElement extends RenderedElement {
   type = 'svg'
   root = false
 
diff --git a/src/Document/StopElement.ts b/src/Document/StopElement.ts
index 88412f9dd..fa6ba6092 100644
--- a/src/Document/StopElement.ts
+++ b/src/Document/StopElement.ts
@@ -1,7 +1,7 @@
-import Document from './Document'
-import Element from './Element'
+import { Document } from './Document'
+import { Element } from './Element'
 
-export default class StopElement extends Element {
+export class StopElement extends Element {
   type = 'stop'
   readonly offset: number
   readonly color: string
diff --git a/src/Document/StyleElement.ts b/src/Document/StyleElement.ts
index cfd481c09..d442dd031 100644
--- a/src/Document/StyleElement.ts
+++ b/src/Document/StyleElement.ts
@@ -3,12 +3,12 @@ import {
   getSelectorSpecificity,
   parseExternalUrl
 } from '../util'
-import Property from '../Property'
-import SVGFontLoader from '../SVGFontLoader'
-import Document from './Document'
-import Element from './Element'
+import { Property } from '../Property'
+import { SVGFontLoader } from '../SVGFontLoader'
+import { Document } from './Document'
+import { Element } from './Element'
 
-export default class StyleElement extends Element {
+export class StyleElement extends Element {
   static readonly parseExternalUrl = parseExternalUrl
 
   type = 'style'
diff --git a/src/Document/SymbolElement.ts b/src/Document/SymbolElement.ts
index 0ac8c2546..fc000a573 100644
--- a/src/Document/SymbolElement.ts
+++ b/src/Document/SymbolElement.ts
@@ -1,7 +1,7 @@
 import { RenderingContext2D } from '../types'
-import RenderedElement from './RenderedElement'
+import { RenderedElement } from './RenderedElement'
 
-export default class SymbolElement extends RenderedElement {
+export class SymbolElement extends RenderedElement {
   type = 'symbol'
 
   render(_: RenderingContext2D) {
diff --git a/src/Document/TRefElement.ts b/src/Document/TRefElement.ts
index 0d25dd413..8bebefc41 100644
--- a/src/Document/TRefElement.ts
+++ b/src/Document/TRefElement.ts
@@ -1,6 +1,6 @@
-import TextElement from './TextElement'
+import { TextElement } from './TextElement'
 
-export default class TRefElement extends TextElement {
+export class TRefElement extends TextElement {
   type = 'tref'
 
   getText() {
diff --git a/src/Document/TSpanElement.ts b/src/Document/TSpanElement.ts
index 825caeb7e..d3da9eb3e 100644
--- a/src/Document/TSpanElement.ts
+++ b/src/Document/TSpanElement.ts
@@ -1,7 +1,7 @@
-import Document from './Document'
-import TextElement from './TextElement'
+import { Document } from './Document'
+import { TextElement } from './TextElement'
 
-export default class TSpanElement extends TextElement {
+export class TSpanElement extends TextElement {
   type = 'tspan'
   protected readonly text: string
 
diff --git a/src/Document/TextElement.ts b/src/Document/TextElement.ts
index d393f5f1c..3132dfbfd 100644
--- a/src/Document/TextElement.ts
+++ b/src/Document/TextElement.ts
@@ -5,16 +5,16 @@ import {
   trimLeft,
   trimRight
 } from '../util'
-import Font from '../Font'
-import BoundingBox from '../BoundingBox'
-import Property from '../Property'
-import Document from './Document'
-import Element from './Element'
-import FontElement from './FontElement'
-import GlyphElement from './GlyphElement'
-import RenderedElement from './RenderedElement'
-
-export default class TextElement extends RenderedElement {
+import { Font } from '../Font'
+import { BoundingBox } from '../BoundingBox'
+import { Property } from '../Property'
+import { Document } from './Document'
+import { Element } from './Element'
+import { FontElement } from './FontElement'
+import { GlyphElement } from './GlyphElement'
+import { RenderedElement } from './RenderedElement'
+
+export class TextElement extends RenderedElement {
   type = 'text'
   protected x = 0
   protected y = 0
diff --git a/src/Document/TextNode.ts b/src/Document/TextNode.ts
index 1bf2673e6..0651ff51c 100644
--- a/src/Document/TextNode.ts
+++ b/src/Document/TextNode.ts
@@ -1,5 +1,5 @@
-import TSpanElement from './TSpanElement'
+import { TSpanElement } from './TSpanElement'
 
-export default class TextNode extends TSpanElement {
+export class TextNode extends TSpanElement {
   type = 'textNode'
 }
diff --git a/src/Document/TextPathElement.ts b/src/Document/TextPathElement.ts
index 4e69c52bd..a48dc3cec 100644
--- a/src/Document/TextPathElement.ts
+++ b/src/Document/TextPathElement.ts
@@ -9,10 +9,10 @@ import {
   QB2,
   QB3
 } from '../util'
-import PathParser, { CommandType } from '../PathParser'
-import Document from './Document'
-import TextElement from './TextElement'
-import PathElement from './PathElement'
+import { PathParser, CommandType } from '../PathParser'
+import { Document } from './Document'
+import { TextElement } from './TextElement'
+import { PathElement } from './PathElement'
 
 export interface IPoint {
   x: number
@@ -45,7 +45,7 @@ interface IGlyphInfo {
   p1: ICachedPoint
 }
 
-export default class TextPathElement extends TextElement {
+export class TextPathElement extends TextElement {
   type = 'textPath'
   protected textWidth = 0
   protected textHeight = 0
diff --git a/src/Document/TitleElement.ts b/src/Document/TitleElement.ts
index 87b7af6cb..b5dc71e4c 100644
--- a/src/Document/TitleElement.ts
+++ b/src/Document/TitleElement.ts
@@ -1,5 +1,5 @@
-import Element from './Element'
+import { Element } from './Element'
 
-export default class TitleElement extends Element {
+export class TitleElement extends Element {
   type = 'title'
 }
diff --git a/src/Document/UnknownElement.ts b/src/Document/UnknownElement.ts
index 0446a0339..d9cdac7a7 100644
--- a/src/Document/UnknownElement.ts
+++ b/src/Document/UnknownElement.ts
@@ -1,7 +1,7 @@
-import Document from './Document'
-import Element from './Element'
+import { Document } from './Document'
+import { Element } from './Element'
 
-export default class UnknownElement extends Element {
+export class UnknownElement extends Element {
   constructor(
     document: Document,
     node: HTMLElement,
diff --git a/src/Document/UseElement.ts b/src/Document/UseElement.ts
index b9de62fe0..c480f1795 100644
--- a/src/Document/UseElement.ts
+++ b/src/Document/UseElement.ts
@@ -1,11 +1,11 @@
 import { RenderingContext2D } from '../types'
-import Property from '../Property'
-import Transform from '../Transform'
-import RenderedElement from './RenderedElement'
-import PathElement from './PathElement'
-import SVGElement from './SVGElement'
+import { Property } from '../Property'
+import { Transform } from '../Transform'
+import { RenderedElement } from './RenderedElement'
+import { PathElement } from './PathElement'
+import { SVGElement } from './SVGElement'
 
-export default class UseElement extends RenderedElement {
+export class UseElement extends RenderedElement {
   type = 'use'
   private cachedElement: PathElement
 
diff --git a/src/Document/elements.ts b/src/Document/elements.ts
index 3cafb7910..ade0e30d2 100644
--- a/src/Document/elements.ts
+++ b/src/Document/elements.ts
@@ -1,50 +1,50 @@
-import Element from './Element'
-import UnknownElement from './UnknownElement'
-import RenderedElement from './RenderedElement'
-import PathElement from './PathElement'
-import SVGElement from './SVGElement'
-import RectElement from './RectElement'
-import CircleElement from './CircleElement'
-import EllipseElement from './EllipseElement'
-import LineElement from './LineElement'
-import PolylineElement from './PolylineElement'
-import PolygonElement from './PolygonElement'
-import PatternElement from './PatternElement'
-import MarkerElement from './MarkerElement'
-import DefsElement from './DefsElement'
-import GradientElement from './GradientElement'
-import LinearGradientElement from './LinearGradientElement'
-import RadialGradientElement from './RadialGradientElement'
-import StopElement from './StopElement'
-import AnimateElement from './AnimateElement'
-import AnimateColorElement from './AnimateColorElement'
-import AnimateTransformElement from './AnimateTransformElement'
-import FontElement from './FontElement'
-import FontFaceElement from './FontFaceElement'
-import MissingGlyphElement from './MissingGlyphElement'
-import GlyphElement from './GlyphElement'
-import TextElement from './TextElement'
-import TSpanElement from './TSpanElement'
-import TRefElement from './TRefElement'
-import AElement from './AElement'
-import TextPathElement from './TextPathElement'
-import ImageElement from './ImageElement'
-import GElement from './GElement'
-import SymbolElement from './SymbolElement'
-import StyleElement from './StyleElement'
-import UseElement from './UseElement'
-import MaskElement from './MaskElement'
-import ClipPathElement from './ClipPathElement'
-import FilterElement from './FilterElement'
-import FeDropShadowElement from './FeDropShadowElement'
-import FeMorphologyElement from './FeMorphologyElement'
-import FeCompositeElement from './FeCompositeElement'
-import FeColorMatrixElement from './FeColorMatrixElement'
-import FeGaussianBlurElement from './FeGaussianBlurElement'
-import TitleElement from './TitleElement'
-import DescElement from './DescElement'
+import { Element } from './Element'
+import { UnknownElement } from './UnknownElement'
+import { RenderedElement } from './RenderedElement'
+import { PathElement } from './PathElement'
+import { SVGElement } from './SVGElement'
+import { RectElement } from './RectElement'
+import { CircleElement } from './CircleElement'
+import { EllipseElement } from './EllipseElement'
+import { LineElement } from './LineElement'
+import { PolylineElement } from './PolylineElement'
+import { PolygonElement } from './PolygonElement'
+import { PatternElement } from './PatternElement'
+import { MarkerElement } from './MarkerElement'
+import { DefsElement } from './DefsElement'
+import { GradientElement } from './GradientElement'
+import { LinearGradientElement } from './LinearGradientElement'
+import { RadialGradientElement } from './RadialGradientElement'
+import { StopElement } from './StopElement'
+import { AnimateElement } from './AnimateElement'
+import { AnimateColorElement } from './AnimateColorElement'
+import { AnimateTransformElement } from './AnimateTransformElement'
+import { FontElement } from './FontElement'
+import { FontFaceElement } from './FontFaceElement'
+import { MissingGlyphElement } from './MissingGlyphElement'
+import { GlyphElement } from './GlyphElement'
+import { TextElement } from './TextElement'
+import { TSpanElement } from './TSpanElement'
+import { TRefElement } from './TRefElement'
+import { AElement } from './AElement'
+import { TextPathElement } from './TextPathElement'
+import { ImageElement } from './ImageElement'
+import { GElement } from './GElement'
+import { SymbolElement } from './SymbolElement'
+import { StyleElement } from './StyleElement'
+import { UseElement } from './UseElement'
+import { MaskElement } from './MaskElement'
+import { ClipPathElement } from './ClipPathElement'
+import { FilterElement } from './FilterElement'
+import { FeDropShadowElement } from './FeDropShadowElement'
+import { FeMorphologyElement } from './FeMorphologyElement'
+import { FeCompositeElement } from './FeCompositeElement'
+import { FeColorMatrixElement } from './FeColorMatrixElement'
+import { FeGaussianBlurElement } from './FeGaussianBlurElement'
+import { TitleElement } from './TitleElement'
+import { DescElement } from './DescElement'
 
-const elements = {
+export const elements = {
   'svg': SVGElement,
   'rect': RectElement,
   'circle': CircleElement,
@@ -88,8 +88,6 @@ const elements = {
   'desc': DescElement
 }
 
-export default elements
-
 type Elements = typeof elements
 
 export type AnyElement = Elements[keyof Elements]
diff --git a/src/Document/index.ts b/src/Document/index.ts
index bd9d54714..0a6fdd000 100644
--- a/src/Document/index.ts
+++ b/src/Document/index.ts
@@ -1,3 +1,2 @@
-export { default } from './Document'
 export * from './Document'
 export * from './elements'
diff --git a/src/Font.ts b/src/Font.ts
index 1793f4e2d..0e703f5c9 100644
--- a/src/Font.ts
+++ b/src/Font.ts
@@ -81,7 +81,7 @@ function prepareFontWeight(fontWeight: string) {
   }
 }
 
-export default class Font {
+export class Font {
   static parse(
     font = '',
     inherit?: string | Font
diff --git a/src/Mouse.ts b/src/Mouse.ts
index a58ec2b1b..a9582709a 100644
--- a/src/Mouse.ts
+++ b/src/Mouse.ts
@@ -1,7 +1,7 @@
 import { RenderingContext2D } from './types'
-import BoundingBox from './BoundingBox'
-import Point from './Point'
-import Screen from './Screen'
+import { BoundingBox } from './BoundingBox'
+import { Point } from './Point'
+import { Screen } from './Screen'
 import { Element } from './Document'
 
 interface IEventTarget {
@@ -16,7 +16,7 @@ export interface IEvent {
   run(eventTarget: IEventTarget): void
 }
 
-export default class Mouse {
+export class Mouse {
   private working = false
   private events: IEvent[] = []
   private eventElements: Element[] = []
diff --git a/src/Parser.ts b/src/Parser.ts
index ec0e0173c..22fbf6944 100644
--- a/src/Parser.ts
+++ b/src/Parser.ts
@@ -1,4 +1,4 @@
-import Screen from './Screen'
+import { Screen } from './Screen'
 
 export interface IParserOptions {
   /**
@@ -16,7 +16,7 @@ const DefaultDOMParser = typeof DOMParser !== 'undefined'
   ? DOMParser
   : null
 
-export default class Parser {
+export class Parser {
   private readonly fetch: typeof defaultFetch
   private readonly DOMParser: typeof DefaultDOMParser
 
diff --git a/src/PathParser.ts b/src/PathParser.ts
index e9421345e..cec487eb6 100644
--- a/src/PathParser.ts
+++ b/src/PathParser.ts
@@ -12,7 +12,7 @@ import {
   CommandA
 } from 'svg-pathdata/lib/types'
 import { SVGPathData } from 'svg-pathdata'
-import Point from './Point'
+import { Point } from './Point'
 
 export type CommandType = SVGCommand['type']
 export type Command = { type: CommandType }
@@ -27,7 +27,7 @@ export type Command = { type: CommandType }
   & Omit<CommandS, 'type'>
   & Omit<CommandA, 'type'>
 
-export default class PathParser extends SVGPathData {
+export class PathParser extends SVGPathData {
   control: Point = null
   start: Point = null
   current: Point = null
diff --git a/src/Point.ts b/src/Point.ts
index 94b509027..a2729059a 100644
--- a/src/Point.ts
+++ b/src/Point.ts
@@ -1,6 +1,6 @@
 import { toNumbers } from './util'
 
-export default class Point {
+export class Point {
   static parse(point: string, defaultValue = 0) {
     const [x = defaultValue, y = defaultValue] = toNumbers(point)
 
diff --git a/src/Property.ts b/src/Property.ts
index 91194bb7f..bdfa573b8 100644
--- a/src/Property.ts
+++ b/src/Property.ts
@@ -6,13 +6,14 @@ import {
   normalizeColor
 } from './util'
 import { Axis } from './ViewPort'
-import Document, {
+import {
+  Document,
   Element,
   PatternElement,
   GradientElement
 } from './Document'
 
-export default class Property<T = any> {
+export class Property<T = any> {
   static empty(document: Document) {
     return new Property(document, 'EMPTY', '')
   }
diff --git a/src/SVGFontLoader.ts b/src/SVGFontLoader.ts
index ae7934785..9359842c7 100644
--- a/src/SVGFontLoader.ts
+++ b/src/SVGFontLoader.ts
@@ -1,6 +1,6 @@
-import Document from './Document'
+import { Document } from './Document'
 
-export default class SVGFontLoader {
+export class SVGFontLoader {
   loaded = false
 
   constructor(
diff --git a/src/Screen.ts b/src/Screen.ts
index 6c2f2c282..817551fa1 100644
--- a/src/Screen.ts
+++ b/src/Screen.ts
@@ -4,10 +4,11 @@ import {
   compressSpaces,
   toNumbers
 } from './util'
-import Property from './Property'
-import ViewPort from './ViewPort'
-import Mouse from './Mouse'
-import Document, {
+import { Property } from './Property'
+import { ViewPort } from './ViewPort'
+import { Mouse } from './Mouse'
+import {
+  Document,
   Element,
   AnimateElement
 } from './Document'
@@ -90,7 +91,7 @@ const defaultFetch = typeof fetch !== 'undefined'
   ? fetch.bind(undefined) as typeof fetch // `fetch` depends on context: `someObject.fetch(...)` will throw error.
   : null
 
-export default class Screen {
+export class Screen {
   static readonly defaultWindow = defaultWindow
   static readonly defaultFetch = defaultFetch
 
diff --git a/src/Transform/Matrix.ts b/src/Transform/Matrix.ts
index c3497353d..7470758bc 100644
--- a/src/Transform/Matrix.ts
+++ b/src/Transform/Matrix.ts
@@ -1,11 +1,11 @@
 import { RenderingContext2D } from '../types'
 import { toNumbers } from '../util'
-import Document from '../Document'
-import Point from '../Point'
-import Property from '../Property'
+import { Document } from '../Document'
+import { Point } from '../Point'
+import { Property } from '../Property'
 import { ITransform } from './types'
 
-export default class Matrix implements ITransform {
+export class Matrix implements ITransform {
   type = 'matrix'
   protected matrix: number[] = []
   private readonly originX: Property = null
diff --git a/src/Transform/Rotate.ts b/src/Transform/Rotate.ts
index 91b85222f..a3f009c13 100644
--- a/src/Transform/Rotate.ts
+++ b/src/Transform/Rotate.ts
@@ -1,10 +1,10 @@
 import { RenderingContext2D } from '../types'
 import { toNumbers } from '../util'
-import Document from '../Document'
-import Property from '../Property'
-import Point from '../Point'
+import { Document } from '../Document'
+import { Property } from '../Property'
+import { Point } from '../Point'
 
-export default class Rotate {
+export class Rotate {
   type = 'rotate'
   private readonly angle: Property = null
   private readonly originX: Property = null
diff --git a/src/Transform/Scale.ts b/src/Transform/Scale.ts
index c44101511..b738068f4 100644
--- a/src/Transform/Scale.ts
+++ b/src/Transform/Scale.ts
@@ -1,10 +1,10 @@
 import { RenderingContext2D } from '../types'
 import { PSEUDO_ZERO } from '../util'
-import Document from '../Document'
-import Point from '../Point'
-import Property from '../Property'
+import { Document } from '../Document'
+import { Point } from '../Point'
+import { Property } from '../Property'
 
-export default class Scale {
+export class Scale {
   type = 'scale'
   private readonly scale: Point = null
   private readonly originX: Property = null
diff --git a/src/Transform/Skew.ts b/src/Transform/Skew.ts
index b0a65f350..a703e471c 100644
--- a/src/Transform/Skew.ts
+++ b/src/Transform/Skew.ts
@@ -1,8 +1,8 @@
-import Document from '../Document'
-import Property from '../Property'
-import Matrix from './Matrix'
+import { Document } from '../Document'
+import { Property } from '../Property'
+import { Matrix } from './Matrix'
 
-export default class Skew extends Matrix {
+export class Skew extends Matrix {
   type = 'skew'
   protected readonly angle: Property = null
 
diff --git a/src/Transform/SkewX.ts b/src/Transform/SkewX.ts
index 34c01e851..5a63f2d03 100644
--- a/src/Transform/SkewX.ts
+++ b/src/Transform/SkewX.ts
@@ -1,8 +1,8 @@
-import Document from '../Document'
-import Property from '../Property'
-import Skew from './Skew'
+import { Document } from '../Document'
+import { Property } from '../Property'
+import { Skew } from './Skew'
 
-export default class SkewX extends Skew {
+export class SkewX extends Skew {
   type = 'skewX'
 
   constructor(
diff --git a/src/Transform/SkewY.ts b/src/Transform/SkewY.ts
index 4fb19f0fb..fdb6add66 100644
--- a/src/Transform/SkewY.ts
+++ b/src/Transform/SkewY.ts
@@ -1,8 +1,8 @@
-import Document from '../Document'
-import Property from '../Property'
-import Skew from './Skew'
+import { Document } from '../Document'
+import { Property } from '../Property'
+import { Skew } from './Skew'
 
-export default class SkewY extends Skew {
+export class SkewY extends Skew {
   type = 'skewY'
 
   constructor(
diff --git a/src/Transform/Transform.ts b/src/Transform/Transform.ts
index 63679d897..c693b8701 100644
--- a/src/Transform/Transform.ts
+++ b/src/Transform/Transform.ts
@@ -1,26 +1,15 @@
 import { RenderingContext2D } from '../types'
 import { compressSpaces } from '../util'
-import Property from '../Property'
-import Point from '../Point'
-import Document, { Element } from '../Document'
+import { Property } from '../Property'
+import { Point } from '../Point'
+import { Document, Element } from '../Document'
 import { ITransform } from './types'
-import Translate from './Translate'
-import Rotate from './Rotate'
-import Scale from './Scale'
-import Matrix from './Matrix'
-import Skew from './Skew'
-import SkewX from './SkewX'
-import SkewY from './SkewY'
-
-export {
-  Translate,
-  Rotate,
-  Scale,
-  Matrix,
-  Skew,
-  SkewX,
-  SkewY
-}
+import { Translate } from './Translate'
+import { Rotate } from './Rotate'
+import { Scale } from './Scale'
+import { Matrix } from './Matrix'
+import { SkewX } from './SkewX'
+import { SkewY } from './SkewY'
 
 function parseTransforms(transform: string) {
   return compressSpaces(transform)
@@ -45,7 +34,7 @@ interface ITransformConstructor {
   ): ITransform
 }
 
-export default class Transform {
+export class Transform {
   static fromElement(document: Document, element: Element) {
     const transformStyle = element.getStyle('transform', false, true)
     const [transformOriginXProperty, transformOriginYProperty = transformOriginXProperty] = element.getStyle('transform-origin', false, true).split()
diff --git a/src/Transform/Translate.ts b/src/Transform/Translate.ts
index ad6af271e..7a7f4b6e4 100644
--- a/src/Transform/Translate.ts
+++ b/src/Transform/Translate.ts
@@ -1,8 +1,8 @@
 import { RenderingContext2D } from '../types'
-import Document from '../Document'
-import Point from '../Point'
+import { Document } from '../Document'
+import { Point } from '../Point'
 
-export default class Translate {
+export class Translate {
   type = 'translate'
   private readonly point: Point = null
 
diff --git a/src/Transform/index.ts b/src/Transform/index.ts
index 215234ee7..1584e0c08 100644
--- a/src/Transform/index.ts
+++ b/src/Transform/index.ts
@@ -1,2 +1,8 @@
-export { default } from './Transform'
 export * from './Transform'
+export * from './Translate'
+export * from './Rotate'
+export * from './Scale'
+export * from './Matrix'
+export * from './Skew'
+export * from './SkewX'
+export * from './SkewY'
diff --git a/src/Transform/types.ts b/src/Transform/types.ts
index 315b4b41b..e752aded1 100644
--- a/src/Transform/types.ts
+++ b/src/Transform/types.ts
@@ -1,5 +1,5 @@
 import { RenderingContext2D } from '../types'
-import Point from '../Point'
+import { Point } from '../Point'
 
 export interface ITransform {
   type: string
diff --git a/src/ViewPort.ts b/src/ViewPort.ts
index b801440eb..ad893710e 100644
--- a/src/ViewPort.ts
+++ b/src/ViewPort.ts
@@ -6,7 +6,7 @@ export interface IViewPortSize {
 
 export type Axis = 'x' | 'y'
 
-export default class ViewPort {
+export class ViewPort {
   viewPorts: IViewPortSize[] = []
 
   clear() {
diff --git a/src/index.ts b/src/index.ts
index 01d4e14cf..144047de6 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -2,32 +2,18 @@ import * as presets from './presets'
 
 export * from './types'
 export * from './util'
-export { default } from './Canvg'
-export { default as Canvg } from './Canvg'
 export * from './Canvg'
-export { default as Parser } from './Parser'
 export * from './Parser'
-export { default as Screen } from './Screen'
 export * from './Screen'
-export { default as Document } from './Document'
 export * from './Document'
-export { default as Transform } from './Transform'
 export * from './Transform'
-export { default as BoundingBox } from './BoundingBox'
 export * from './BoundingBox'
-export { default as Point } from './Point'
 export * from './Point'
-export { default as Property } from './Property'
 export * from './Property'
-export { default as Font } from './Font'
 export * from './Font'
-export { default as Mouse } from './Mouse'
 export * from './Mouse'
-export { default as ViewPort } from './ViewPort'
 export * from './ViewPort'
-export { default as SVGFontLoader } from './SVGFontLoader'
 export * from './SVGFontLoader'
-export { default as PathParser } from './PathParser'
 export * from './PathParser'
 
 export { presets }
diff --git a/test/node.canvg.spec.ts b/test/node.canvg.spec.ts
index 0b4d4a5d4..f46a975c2 100644
--- a/test/node.canvg.spec.ts
+++ b/test/node.canvg.spec.ts
@@ -3,7 +3,7 @@ import {
   filterConsoleWarn,
   filterConsoleError
 } from './common'
-import render from './node'
+import { render } from './node'
 import svgs from './svgs.json'
 
 describe('canvg', () => {
diff --git a/test/node/index.ts b/test/node/index.ts
index 5af399f26..ce366fbdc 100644
--- a/test/node/index.ts
+++ b/test/node/index.ts
@@ -10,7 +10,7 @@ import {
 import { DOMParser } from 'xmldom'
 import * as canvas from 'canvas'
 import fetch, { Response } from 'node-fetch'
-import Canvg, { presets } from '../../src'
+import { Canvg, presets } from '../../src'
 
 const preset = presets.node({
   DOMParser,
@@ -29,7 +29,7 @@ const preset = presets.node({
   }
 })
 
-export default async function render(
+export async function render(
   file: string,
   width?: number,
   height?: number,