Skip to content

Commit 4d94b3a

Browse files
committed
fix(itkConfig.js): use consistent path for itkConfig.js
Or else webpack module resolution is not dynamic for tests.
1 parent efe15f6 commit 4d94b3a

File tree

7 files changed

+36
-5
lines changed

7 files changed

+36
-5
lines changed

karma.conf.js

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/* eslint-disable global-require */
22
const path = require('path')
3+
const os = require('os')
34

45
const vtkRules = require('vtk.js/Utilities/config/dependency.js').webpack.core
56
.rules
@@ -43,6 +44,13 @@ const moduleConfigRules = [
4344

4445
const entry = path.join(__dirname, './src/index.js')
4546

47+
// fixes 404 errors getting worker bundles https://github.com/ryanclark/karma-webpack/issues/498#issuecomment-790040818
48+
const output = {
49+
path:
50+
path.join(os.tmpdir(), '_karma_webpack_') +
51+
Math.floor(Math.random() * 1000000),
52+
}
53+
4654
module.exports = function init(config) {
4755
config.set({
4856
plugins: [
@@ -56,6 +64,10 @@ module.exports = function init(config) {
5664

5765
basePath: '',
5866
frameworks: ['tap', 'webpack'],
67+
proxies: {
68+
'/itk/web-workers/itk-wasm-pipeline.min.worker.js':
69+
'/base/dist/itk/web-workers/itk-wasm-pipeline.min.worker.js',
70+
},
5971
files: [
6072
'./test/tests.js',
6173
{
@@ -100,6 +112,12 @@ module.exports = function init(config) {
100112
served: true,
101113
included: false,
102114
},
115+
{
116+
pattern: './dist/**',
117+
watched: true,
118+
served: true,
119+
included: false,
120+
},
103121
{
104122
pattern: './src/UI/reference-ui/dist/referenceUIMachineOptions.js',
105123
watched: true,
@@ -118,13 +136,19 @@ module.exports = function init(config) {
118136
served: true,
119137
included: false,
120138
},
139+
{
140+
pattern: `${output.path}/**/*`,
141+
watched: false,
142+
included: false,
143+
},
121144
],
122145

123146
preprocessors: {
124147
'./test/tests.js': ['webpack'],
125148
},
126149

127150
webpack: {
151+
output,
128152
mode: 'development',
129153
devtool: 'eval-source-map',
130154
module: {

src/Compression/bloscZarrDecompress.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { runPipeline, InterfaceTypes, WorkerPool } from 'itk-wasm'
2-
import itkConfig from '../itkConfig'
2+
import itkConfig from '../itkConfig.js'
33
import { getSize } from '../IO/dtypeUtils'
44

55
const cores = navigator.hardwareConcurrency ? navigator.hardwareConcurrency : 4

src/IO/Compare/createCompareImage.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { runWasm } from '../itkWasmUtils.js'
2+
import itkConfig from '../itkConfig.js'
23

34
export async function createCompareImage(
45
movingImage,
@@ -17,11 +18,17 @@ export async function createCompareImage(
1718
clampedPattern.join(','),
1819
]
1920

21+
const itkWasmOptions = {
22+
pipelineWorkerUrl: itkConfig.pipelineWorkerUrl,
23+
pipelineBaseUrl: itkConfig.pipelinesUrl,
24+
}
25+
console.log('createCompare', itkWasmOptions)
2026
const image = await runWasm({
2127
pipeline: 'Compare',
2228
args,
2329
images: [movingImage, fixedImage],
2430
maxSplits: 1,
31+
itkWasmOptions,
2532
})
2633
image.ranges = [minMax, minMax]
2734

src/IO/InMemoryMultiscaleSpatialImage.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
imageSharedBufferOrCopy,
1212
stackImages,
1313
} from 'itk-wasm'
14-
import itkConfig from '../itkConfig'
14+
import itkConfig from '../itkConfig.js'
1515
import { chunkArray, CXYZT, orderBy, toDimensionMap } from './dimensionUtils'
1616
import { computeRanges } from './Analyze/computeRanges'
1717

src/IO/itkWasmUtils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
WorkerPool,
66
stackImages,
77
} from 'itk-wasm'
8-
import itkConfig from '../itkConfig'
8+
import itkConfig from '../itkConfig.js'
99

1010
export async function runWasm({
1111
pipeline,

src/Rendering/VTKJS/Images/fuseImages.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import WebworkerPromise from 'webworker-promise'
22
import ComposeImageWorker from './ComposeImage.worker.js'
33

4-
import itkConfig from '../../../itkConfig.js'
4+
import itkConfig from '../itkConfig.js'
55

66
export const fuseImages = async ({
77
imageAtScale, //could be array if Conglomerate

src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import vtkURLExtract from 'vtk.js/Sources/Common/Core/URLExtract'
44
import { readImage } from '@itk-wasm/image-io'
55
import { setPipelineWorkerUrl, setPipelinesBaseUrl } from 'itk-wasm'
66

7-
import itkConfig from './itkConfig.js'
7+
import itkConfig from '../itkConfig.js'
88
import fetchBinaryContent from './IO/fetchBinaryContent'
99
import fetchJsonContent from './IO/fetchJsonContent'
1010
import { processFiles } from './IO/processFiles'

0 commit comments

Comments
 (0)