fix: remove dynamic imports (#169)

Removes dynamic imports because they dont work well when imports cjs also removes unused file
ipfs · Aug 27, 2021 · 4842293 · 4842293
1 parent eaeae88
commit 4842293
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 41 deletions.
diff --git a/packages/ipfs-unixfs-importer/src/chunker/index.js b/packages/ipfs-unixfs-importer/src/chunker/index.js
diff --git a/packages/ipfs-unixfs-importer/src/dag-builder/file/index.js b/packages/ipfs-unixfs-importer/src/dag-builder/file/index.js
@@ -9,6 +9,7 @@ import * as dagPb from '@ipld/dag-pb'
 import dagFlat from './flat.js'
 import dagBalanced from './balanced.js'
 import dagTrickle from './trickle.js'
+import bufferImporterFn from './buffer-importer.js'
 
 /**
  * @typedef {import('interface-blockstore').Blockstore} Blockstore
@@ -41,7 +42,7 @@ async function * buildFileBatch (file, blockstore, options) {
   if (typeof options.bufferImporter === 'function') {
     bufferImporter = options.bufferImporter
   } else {
-    bufferImporter = (await (import('./buffer-importer.js'))).default
+    bufferImporter = bufferImporterFn
   }
 
   for await (const entry of parallelBatch(bufferImporter(file, blockstore, options), options.blockWriteConcurrency)) {

diff --git a/packages/ipfs-unixfs-importer/src/dag-builder/index.js b/packages/ipfs-unixfs-importer/src/dag-builder/index.js
@@ -1,6 +1,9 @@
 import dirBuilder from './dir.js'
 import fileBuilder from './file/index.js'
 import errCode from 'err-code'
+import rabin from '../chunker/rabin.js'
+import fixedSize from '../chunker/fixed-size.js'
+import validateChunks from './validate-chunks.js'
 
 /**
  * @typedef {import('../types').File} File
@@ -75,9 +78,9 @@ async function * dagBuilder (source, blockstore, options) {
       if (typeof options.chunker === 'function') {
         chunker = options.chunker
       } else if (options.chunker === 'rabin') {
-        chunker = (await (import('../chunker/rabin.js'))).default
+        chunker = rabin
       } else {
-        chunker = (await (import('../chunker/fixed-size.js'))).default
+        chunker = fixedSize
       }
 
       /**
@@ -88,7 +91,7 @@ async function * dagBuilder (source, blockstore, options) {
       if (typeof options.chunkValidator === 'function') {
         chunkValidator = options.chunkValidator
       } else {
-        chunkValidator = (await (import('./validate-chunks.js'))).default
+        chunkValidator = validateChunks
       }
 
       /** @type {File} */

diff --git a/packages/ipfs-unixfs-importer/src/index.js b/packages/ipfs-unixfs-importer/src/index.js
@@ -1,5 +1,7 @@
 import parallelBatch from 'it-parallel-batch'
 import defaultOptions from './options.js'
+import dagBuilderFn from './dag-builder/index.js'
+import treeBuilderFn from './tree-builder.js'
 
 /**
  * @typedef {import('interface-blockstore').Blockstore} Blockstore
@@ -32,15 +34,15 @@ export async function * importer (source, blockstore, options = {}) {
   if (typeof options.dagBuilder === 'function') {
     dagBuilder = options.dagBuilder
   } else {
-    dagBuilder = (await (import('./dag-builder/index.js'))).default
+    dagBuilder = dagBuilderFn
   }
 
   let treeBuilder
 
   if (typeof options.treeBuilder === 'function') {
     treeBuilder = options.treeBuilder
   } else {
-    treeBuilder = (await (import('./tree-builder.js'))).default
+    treeBuilder = treeBuilderFn
   }
 
   /** @type {AsyncIterable<ImportCandidate> | Iterable<ImportCandidate>} */