Add BlobWorker tests

Author: andywer

.gitignore

@@ -7,7 +7,7 @@ dist/*
 dist-*/*
 node_modules/
 test/rollup/dist/
-test/webpack/dist*
+test/webpack/dist/
 test/workers/*.js
 .DS_Store
 Thumbs.db

package-lock.json

@@ -20,7 +20,7 @@
     "test": "run-s test:ava test:puppeteer:basic test:puppeteer:webpack",
     "test:ava": "cross-env TS_NODE_FILES=true ava",
     "test:puppeteer:basic": "puppet-run --plugin=mocha --bundle=./test/workers/:/workers/ --serve=./bundle/worker.js:/worker.js ./test/*.chromium*.ts",
-    "test:puppeteer:webpack": "puppet-run --serve ./test/webpack/dist.web/0.worker.js --serve ./test/webpack/dist.web/1.worker.js --plugin=mocha ./test/webpack/webpack.chromium.mocha.ts",
+    "test:puppeteer:webpack": "puppet-run --serve ./test/webpack/dist/app.web/0.worker.js --serve ./test/webpack/dist/app.web/1.worker.js --plugin=mocha ./test/webpack/webpack.chromium.mocha.ts",
     "posttest": "tslint --project .",
     "prepare": "run-s build"
   },
@@ -71,17 +71,18 @@
     "npm-run-all": "^4.1.5",
     "puppet-run": "^0.11.1",
     "puppet-run-plugin-mocha": "^0.10.0-alpha",
+    "raw-loader": "^4.0.1",
     "rimraf": "^2.6.3",
     "rollup": "^1.16.2",
     "rollup-plugin-commonjs": "^10.0.1",
     "rollup-plugin-node-resolve": "^5.1.0",
     "threads-plugin": "^1.2.0",
     "tiny-worker": "^2.2.0",
     "ts-loader": "^6.0.1",
-    "ts-node": "^8.1.0",
+    "ts-node": "^8.10.2",
     "tslint": "^5.16.0",
     "tslint-config-prettier": "^1.18.0",
-    "typescript": "^3.9.3",
+    "typescript": "^3.9.5",
     "wavy": "^1.0.4",
     "webpack": "^4.32.2",
     "worker-plugin": "^3.1.0"

package.json

@@ -0,0 +1,24 @@
+/// <reference types="./raw-loader" />
+
+import { spawn, BlobWorker } from "../../src/index"
+import AdditionWorkerNodeBundle from "raw-loader!./dist/addition-worker.node/worker.js"
+import AdditionWorkerWebBundle from "raw-loader!./dist/addition-worker.web/worker.js"
+
+const AdditionWorkerBundle = (process as any).browser ? AdditionWorkerWebBundle : AdditionWorkerNodeBundle
+type AdditionWorker = (a: number, b: number) => number
+
+async function test() {
+  // We also want to test if referencing multiple different workers in a module
+  // built using webpack works
+
+  const add = await spawn<AdditionWorker>(BlobWorker.fromText(AdditionWorkerBundle))
+  const result = await add(2, 3)
+
+  if (result !== 5) {
+    throw Error("Unexpected result returned by addition worker: " + result)
+  }
+
+  return "test succeeded"
+}
+
+export default test

test/webpack/app-with-inlined-worker.ts

@@ -0,0 +1,4 @@
+declare module "raw-loader!*" {
+  const content: string
+  export = content
+}

test/webpack/raw-loader.d.ts

@@ -1,11 +1,20 @@
 // NOTE:
-// We are gonna test the bundle that previously been built by the AVA tests (see webpack.test.ts)
+// We are gonna test the bundles previously built by the AVA tests (see webpack.test.ts)
 
 describe("threads webpack browser bundle", function() {
   this.timeout(8000)
 
   it("works fine", async function() {
-    const bundle = require("./dist.web/main")
+    const bundle = require("./dist/app.web/main")
+    await bundle.test()
+  })
+})
+
+describe("threads webpack browser bundle with inlined worker", function() {
+  this.timeout(8000)
+
+  it("works fine", async function() {
+    const bundle = require("./dist/app-inlined.web/main")
     await bundle.test()
   })
 })

test/webpack/webpack.chromium.mocha.ts

@@ -13,7 +13,7 @@ module.exports = {
     library: "test",
     libraryExport: "default",
     libraryTarget: "commonjs",
-    path: path.resolve(__dirname, "./dist.node")
+    path: path.resolve(__dirname, "./dist/app.node")
   },
   module: {
     rules: [

test/webpack/webpack.node.config.js

@@ -1,4 +1,5 @@
 import test from "ava"
+import * as path from "path"
 import Webpack from "webpack"
 
 const browserConfig = require("./webpack.web.config")
@@ -30,6 +31,58 @@ test("can create a working server bundle with webpack", async t => {
   const stats = await runWebpack(serverConfig)
   t.deepEqual(stats.compilation.errors, [], stringifyWebpackError(stats.compilation.errors[0]))
 
-  const bundle = require("./dist.node/main")
+  const bundle = require("./dist/app.node/main")
   await bundle.test()
 })
+
+test("can inline a worker into an app bundle", async t => {
+  // Bundle browser worker
+  let stats = await runWebpack({
+    ...browserConfig,
+    entry: require.resolve("./addition-worker"),
+    output: {
+      filename: "worker.js",
+      path: path.resolve(__dirname, "dist/addition-worker.web")
+    },
+    target: "webworker"
+  })
+  t.deepEqual(stats.compilation.errors, [], stringifyWebpackError(stats.compilation.errors[0]))
+
+  // Bundle server worker
+  stats = await runWebpack({
+    ...serverConfig,
+    entry: require.resolve("./addition-worker"),
+    output: {
+      filename: "worker.js",
+      path: path.resolve(__dirname, "dist/addition-worker.node")
+    }
+  })
+  t.deepEqual(stats.compilation.errors, [], stringifyWebpackError(stats.compilation.errors[0]))
+
+  // Bundle browser app
+  stats = await runWebpack({
+    ...browserConfig,
+    entry: require.resolve("./app-with-inlined-worker"),
+    output: {
+      ...serverConfig.output,
+      path: path.resolve(__dirname, "dist/app-inlined.web")
+    }
+  })
+  t.deepEqual(stats.compilation.errors, [], stringifyWebpackError(stats.compilation.errors[0]))
+
+  // Bundle server app
+  stats = await runWebpack({
+    ...serverConfig,
+    entry: require.resolve("./app-with-inlined-worker"),
+    output: {
+      ...serverConfig.output,
+      path: path.resolve(__dirname, "dist/app-inlined.node")
+    }
+  })
+  t.deepEqual(stats.compilation.errors, [], stringifyWebpackError(stats.compilation.errors[0]))
+
+  const bundle = require("./dist/app-inlined.node/main")
+  const result = await bundle.test()
+
+  t.is(result, "test succeeded")
+})

test/webpack/webpack.test.ts

@@ -10,7 +10,7 @@ module.exports = {
     library: "test",
     libraryExport: "default",
     libraryTarget: "commonjs",
-    path: path.resolve(__dirname, "./dist.web")
+    path: path.resolve(__dirname, "./dist/app.web")
   },
   module: {
     rules: [