Removed circular dependency

Author: jonobr1

src/effects/texture.js

@@ -7,8 +7,6 @@ import { CanvasPolyfill } from '../utils/canvas-polyfill.js';
 import { Vector } from '../vector.js';
 import { Registry } from '../registry.js';
 
-import { Renderer as CanvasRenderer } from '../renderers/canvas.js';
-
 let anchor;
 const regex = {
   video: /\.(mp4|webm|ogg)$/i,
@@ -283,7 +281,7 @@ export class Texture extends Element {
     if (CanvasPolyfill.Image) {
       // TODO: Fix for headless environments
       image = new CanvasPolyfill.Image();
-      CanvasRenderer.Utils.shim(image, 'img');
+      CanvasPolyfill.shim(image, 'img');
     } else if (root.document) {
       if (regex.video.test(absoluteSrc)) {
         image = document.createElement('video');

src/renderers/canvas.js

@@ -4,7 +4,6 @@ import { Curve } from '../utils/curves.js';
 import { Events } from '../events.js';
 import { getRatio } from '../utils/device-pixel-ratio.js';
 import { _ } from '../utils/underscore.js';
-import { CanvasPolyfill } from '../utils/canvas-polyfill.js';
 
 import { Group } from '../group.js';
 import { Vector } from '../vector.js';
@@ -36,8 +35,6 @@ const canvas = {
     baseline: 'alphabetic',
   },
 
-  shim: CanvasPolyfill.shim,
-
   getRendererType: function (type) {
     return type in canvas ? type : 'path';
   },

types.d.ts

@@ -1617,7 +1617,6 @@ declare module 'two.js/src/renderers/canvas' {
         middle: string;
         right: string;
       };
-      shim: (elem: any, name: any) => any;
       group: {
         renderChild: (child: any) => void;
         render: (ctx: any) => any;

utils/build.js

@@ -4,33 +4,32 @@ const path = require('path');
 const _ = require('underscore');
 const gzip = require('gzip-size');
 
-const publishDateString = (new Date()).toISOString();
+const publishDateString = new Date().toISOString();
 const config = getJSON(path.resolve(__dirname, '../package.json'));
 const paths = {
   entry: path.resolve(__dirname, '../src/two.js'),
   umd: path.resolve(__dirname, '../build/two.js'),
   esm: path.resolve(__dirname, '../build/two.module.js'),
   min: path.resolve(__dirname, '../build/two.min.js'),
-  license: path.resolve(__dirname, '../LICENSE')
+  license: path.resolve(__dirname, '../LICENSE'),
 };
 
 async function buildModules() {
-
   esbuild.buildSync({
     entryPoints: [paths.entry],
     outfile: paths.umd,
     bundle: true,
     minify: false,
     format: 'iife',
-    globalName: 'Two'
+    globalName: 'Two',
   });
 
   esbuild.buildSync({
     entryPoints: [paths.entry],
     outfile: paths.esm,
     bundle: true,
     target: 'es6',
-    format: 'esm'
+    format: 'esm',
   });
 
   esbuild.buildSync({
@@ -39,10 +38,12 @@ async function buildModules() {
     bundle: true,
     minify: true,
     format: 'iife',
-    globalName: 'Two'
+    globalName: 'Two',
   });
 
-  const license = await fs.promises.readFile(paths.license, { encoding: 'utf-8' });
+  const license = await fs.promises.readFile(paths.license, {
+    encoding: 'utf-8',
+  });
   const licenseComment = ['/*', license.trim(), '*/'].join('\n');
 
   const umdOutput = await fs.promises.readFile(paths.umd);
@@ -52,19 +53,27 @@ async function buildModules() {
   const moduleExports = `(function(){if(typeof exports==='object'&&typeof module!=='undefined'){module.exports=Two}})()`;
 
   return Promise.all([
-    fs.promises.writeFile(paths.umd, [licenseComment, template(umdOutput, true), moduleExports].join('\n')),
-    fs.promises.writeFile(paths.esm, [licenseComment, template(esmOutput, false)].join('\n')),
-    fs.promises.writeFile(paths.min, [licenseComment, template(minOutput, true), moduleExports].join('\n'))
+    fs.promises.writeFile(
+      paths.umd,
+      [licenseComment, template(umdOutput, true), moduleExports].join('\n')
+    ),
+    fs.promises.writeFile(
+      paths.esm,
+      [licenseComment, template(esmOutput, false)].join('\n')
+    ),
+    fs.promises.writeFile(
+      paths.min,
+      [licenseComment, template(minOutput, true), moduleExports].join('\n')
+    ),
   ]);
-
 }
 
 function template(buffer, isExposed) {
   const code = buffer.toString();
   const generate = _.template(code);
   let result = generate({
     version: config.version,
-    publishDate: publishDateString
+    publishDate: publishDateString,
   });
   if (isExposed) {
     result = result.replace(/\}\)\(\);/, '})().default;');
@@ -73,7 +82,6 @@ function template(buffer, isExposed) {
 }
 
 function publishModule() {
-
   let size;
   const result = {};
 
@@ -87,7 +95,6 @@ function publishModule() {
   const outputPath = path.resolve(__dirname, './file-sizes.json');
 
   return fs.promises.writeFile(outputPath, contents);
-
 }
 
 function getFileSize(filepath) {
@@ -106,7 +113,6 @@ function formatFileSize(v) {
 }
 
 async function build() {
-
   let startTime, elapsed;
 
   startTime = Date.now();
@@ -124,8 +130,11 @@ async function build() {
   } catch (error) {
     console.log(error);
   }
-  console.log('Published additional statistics to wiki:', elapsed / 1000, 'seconds');
-
+  console.log(
+    'Published additional statistics to wiki:',
+    elapsed / 1000,
+    'seconds'
+  );
 }
 
 function getJSON(filepath) {

utils/file-sizes.json

@@ -1 +1 @@
-{"development":"60KB","production":"45KB"}
+{"development":"59KB","production":"45KB"}