diff --git a/src/atlasViewer/atlasViewer.workerService.service.ts b/src/atlasViewer/atlasViewer.workerService.service.ts index 7e66dc31b5e5ab6b6935f3fcd7e9582bc906a4c8..304b291958d3cb37f952fa2d7c13eceaf18ca27f 100644 --- a/src/atlasViewer/atlasViewer.workerService.service.ts +++ b/src/atlasViewer/atlasViewer.workerService.service.ts @@ -7,4 +7,7 @@ import { Injectable } from "@angular/core"; export class AtlasWorkerService{ public worker = new Worker('worker.js') public safeMeshSet : Map<string, Set<number>> = new Map() -} \ No newline at end of file +} + +/* telling webpack to pack the worker file */ +require('../util/worker.js') \ No newline at end of file diff --git a/src/util/worker.ts b/src/util/worker.js similarity index 100% rename from src/util/worker.ts rename to src/util/worker.js diff --git a/tsconfig.json b/tsconfig.json index 13633294135515b7caea1c6550552b07cea72232..a15e5d0540dbc162397df6cfbdcf97b742da48a1 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,7 +3,6 @@ "experimentalDecorators": true, "emitDecoratorMetadata": true, "moduleResolution": "node", - "lib":["webworker","es2015", "dom"], "target": "es2015", "sourceMap": true, "baseUrl": ".", diff --git a/webpack.aot.js b/webpack.aot.js index aaeea3e40899e9c0c146363e89eb591b4af3470f..57d469ec9996950681deed85bae327fa541faba9 100644 --- a/webpack.aot.js +++ b/webpack.aot.js @@ -6,13 +6,11 @@ const AngularCompilerPlugin = ngtools.AngularCompilerPlugin const ClosureCompilerPlugin = require('webpack-closure-compiler') const merge = require('webpack-merge') const staticAssets = require('./webpack.staticassets') -const worker = require('./webpack.worker') -module.exports = merge(worker, staticAssets, { +module.exports = merge(staticAssets, { entry : { - main : './src/main-aot.ts', - worker : './src/util/worker.ts' + main : './src/main-aot.ts' }, output : { filename : '[name].js', @@ -21,7 +19,7 @@ module.exports = merge(worker, staticAssets, { module: { rules: [ { - test : /export_nehuba.*?worker.*?\.js$/, + test : /export_nehuba.*?worker.*?\.js$|worker\.js/, use : { loader : 'file-loader', options: { @@ -32,7 +30,7 @@ module.exports = merge(worker, staticAssets, { { test: /(?:\.ngfactory\.js|\.ngstyle\.js|\.ts)$/, loader: '@ngtools/webpack', - exclude : /worker|export_nehuba|plugin_example/ + exclude : /export_nehuba|plugin_example/ }, { test : /\.(html|css)$/, diff --git a/webpack.common.js b/webpack.common.js index f84ff7357eef32339f70f2d1221e3dfac9935852..64d93df42a3ecf189938a3c3022a3e5c009ed2cc 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -7,7 +7,7 @@ module.exports = { { test : /\.ts$/, loaders : ['ts-loader','angular2-template-loader?keepUrl=true'], - exclude : /worker|node_modules|[Ss]pec\.ts$/ + exclude : /node_modules|[Ss]pec\.ts$/ }, { test : /.*?worker.*?\.js$/, diff --git a/webpack.dev.js b/webpack.dev.js index 05babdb5cee93ccc91c2e54d859bc44813b831f4..3fe037c472f808ff4a811607d1992412c5e30d72 100644 --- a/webpack.dev.js +++ b/webpack.dev.js @@ -4,12 +4,10 @@ const path = require('path') const ngAssets = require('./webpack.ngassets') const staticAssets = require('./webpack.staticassets') const HtmlWebpackPlugin = require('html-webpack-plugin') -const worker = require('./webpack.worker') -module.exports = merge(common,worker,ngAssets,staticAssets,{ +module.exports = merge(common,ngAssets,staticAssets,{ entry : { - main : './src/main.ts', - worker: './src/util/worker.ts' + main : './src/main.ts' }, mode : 'development', output : { diff --git a/webpack.worker.js b/webpack.worker.js deleted file mode 100644 index 02f442e04c93d2b2b38b6f52af0c1e68307be122..0000000000000000000000000000000000000000 --- a/webpack.worker.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = { - module : { - rules : [{ - test : /worker.*?\.ts/, - loaders : ['ts-loader'], - exclude : /node_modules/ - }], - } -} \ No newline at end of file