BUG: Fix imports of utilities in build output

KitwareMedical · Jul 27, 2023 · fc0ff9a · fc0ff9a
1 parent d1d98b8
commit fc0ff9a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/app/index.html b/app/index.html
@@ -1,5 +1,3 @@
-<!-- Generated file. To retain edits, remove this comment. -->
-
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -40,8 +38,6 @@
 </head>
 <body>
 
-<script src="./src/utilities.js"></script>
-
 <!-- https://tholman.com/github-corners/ -->
 <a href="https://github.com/InsightSoftwareConsortium/itk-wasm" class="github-corner" aria-label="View source on GitHub"><svg width="80" height="80" viewBox="0 0 250 250" style="fill:#151513; color:#fff; position: absolute; top: 0; border: 0; right: 0;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a>
 
@@ -123,7 +119,7 @@ <h2>ITK IO Scanco</h2>
   </sl-tab-group>
 </div>
 
-<script type="module" src="./src/index.ts"></script>
+<script type="module" src="/src/index.ts"></script>
 
 </body>
 </html>
diff --git a/app/src/conversion-controller.ts b/app/src/conversion-controller.ts
@@ -1,6 +1,7 @@
 import { readImageArrayBuffer, writeImageArrayBuffer } from "itk-wasm"
 
 import conversionLoadSampleInputs from "./conversion-load-sample-inputs.js"
+import { notify, downloadFile } from "./utilities.js"
 
 class ConversionModel {
 
@@ -72,7 +73,7 @@ class ConversionController  {
         event.preventDefault()
         event.stopPropagation()
         if (model.outputVolume) {
-            globalThis.downloadFile(model.outputVolume, `${model.inputFileName}.${model.outputFormat}`)
+            downloadFile(model.outputVolume, `${model.inputFileName}.${model.outputFormat}`)
         }
     })
 
@@ -82,7 +83,7 @@ class ConversionController  {
       event.stopPropagation()
 
       if(!model.inputVolume) {
-        globalThis.notify("Required input volume not provided", "Please provide an AIM or ISQ file", "danger", "exclamation-octagon")
+        notify("Required input volume not provided", "Please provide an AIM or ISQ file", "danger", "exclamation-octagon")
         return
       }
 
@@ -96,13 +97,12 @@ class ConversionController  {
           'volume.aim'
         )
         this.webWorker = webWorker
-        console.log(image)
         // Avoid later use of detached buffer
         const direction = image.direction.slice()
         const { arrayBuffer } = await writeImageArrayBuffer(webWorker, image, `${model.inputFileName}.${model.outputFormat}`)
 
         const t1 = performance.now()
-        globalThis.notify("conversion successfully completed", `in ${t1 - t0} milliseconds.`, "success", "rocket-fill")
+        notify("conversion successfully completed", `in ${t1 - t0} milliseconds.`, "success", "rocket-fill")
 
         model.outputVolume = new Uint8Array(arrayBuffer)
 
@@ -119,7 +119,7 @@ class ConversionController  {
         image.data = "[...]"
         outputOutput.value = JSON.stringify(image, replacer, 2)
       } catch (error) {
-        globalThis.notify("Error while running pipeline", error.toString(), "danger", "exclamation-octagon")
+        notify("Error while running pipeline", error.toString(), "danger", "exclamation-octagon")
         throw error
       } finally {
         runButton.loading = false

diff --git a/app/src/utilities.js → app/src/utilities.ts b/app/src/utilities.js → app/src/utilities.ts
@@ -1,4 +1,4 @@
-function downloadFile(content, filename) {
+export function downloadFile(content, filename) {
   const url = URL.createObjectURL(new Blob([content]))
   const a = document.createElement('a')
   a.href = url
@@ -23,7 +23,7 @@ function escapeHtml(html) {
   return escaped
 }
 
-function notify(title, message, variant = 'primary', icon = 'info-circle', duration = 3000) {
+export function notify(title, message, variant = 'primary', icon = 'info-circle', duration = 3000) {
   const slAlert = Object.assign(document.createElement('sl-alert'), {
     variant,
     closable: true,
@@ -39,7 +39,7 @@ function notify(title, message, variant = 'primary', icon = 'info-circle', durat
   setTimeout(() => slAlert.toast(), 300)
 }
 
-function disableInputs(inputId) {
+export function disableInputs(inputId) {
   document.querySelectorAll(`#${inputId} sl-button`).forEach(button => {
     button.disabled = true
   })
@@ -52,7 +52,7 @@ function disableInputs(inputId) {
   })
 }
 
-function enableInputs(inputId) {
+export function enableInputs(inputId) {
   document.querySelectorAll(`#${inputId} sl-button`).forEach(button => {
     button.disabled = false
   })

diff --git a/app/vite.config.js b/app/vite.config.js
@@ -13,10 +13,10 @@ export default defineConfig({
     // put lazy loaded JavaScript and Wasm bundles in dist directory
     viteStaticCopy({
       targets: [
-        { src: 'node_modules/itk-wasm/dist/web-workers/*', dest: 'dist/itk/web-workers' },
+        { src: 'node_modules/itk-wasm/dist/web-workers/*', dest: 'itk/web-workers' },
         {
           src: 'node_modules/itk-image-io/*',
-          dest: 'dist/itk/image-io',
+          dest: 'itk/image-io',
         },
       ],
     })