Merge pull request #12 from wellcaffeinated/master

Update for comlink 4.x

.gitignore

@@ -8,3 +8,4 @@ dist
 coverage
 package-lock.json
 yarn.lock
+coverage/*

README.md

@@ -33,6 +33,10 @@ In the example below, the sole difference between running `MyClass` on a Worker
 import rnd from 'random-int';
 
 // Export as you would in a normal module:
+export function meaningOfLife(){
+  return 42;
+}
+
 export class MyClass {
   constructor(value = rnd()) {
     this.value = value;
@@ -50,13 +54,16 @@ export class MyClass {
 **main.js**: _(our demo, on the main thread)_
 
 ```js
-import { MyClass } from 'comlink-loader!./my-class';
+import worker from 'comlink-loader!./my-class';
+const inst = worker();
+
+await inst.meaningOfLife(); // 42
 
-const inst = await new MyClass(42); // notice the await
+const obj = await new inst.MyClass(42); // notice the await
 
-await inst.increment();
+await obj.increment();
 
-await inst.getValue();  // 43
+await obj.getValue();  // 43
 ```
 
 ## License

package.json

@@ -46,6 +46,10 @@
     {
       "name": "Jason Miller",
       "email": "developit@google.com"
+    },
+    {
+      "name": "Jasper Palfree",
+      "email": "jasper@wellcaffeinated.net"
     }
   ],
   "license": "Apache-2.0",

src/comlink-worker-loader.js

@@ -15,7 +15,13 @@
  */
 
 export default function rpcWorkerLoader (content) {
-  return `import {expose} from 'comlink';
-${content}
-for(var $$ in __webpack_exports__)if ($$!='__esModule')expose(__webpack_exports__[$$],self)`;
+  return `import { expose } from 'comlink';
+  ${content};
+  expose(
+    Object.keys(__webpack_exports__).reduce(function(r,k){
+      if (k=='__esModule') return r;
+      r[k] = __webpack_exports__[k];
+      return r
+    },{})
+  )`;
 }

src/index.js

@@ -33,11 +33,12 @@ loader.pitch = function (request) {
   }
 
   return `
-    import {wrap} from 'comlink';
-    ${multi ? '' : 'var inst;'}
+    import { wrap } from 'comlink';
+    var inst;
+    var worker = wrap(require('!worker-loader?${JSON.stringify(workerLoaderOptions)}!${slash(path.resolve(__dirname, 'comlink-worker-loader.js'))}!${request}');
     export default function f() {
-      ${multi ? 'var inst =' : 'inst = inst ||'} wrap(require('!worker-loader?${JSON.stringify(workerLoaderOptions)}!${slash(path.resolve(__dirname, 'comlink-worker-loader.js'))}!${request}')());
-      return this instanceof f ? new inst : inst;
+      if (this instanceof f) return wrap(worker());
+      return inst = inst || wrap(worker());
     }
   `.replace(/\n\s*/g, '');
 };

test/index.test.js

@@ -17,7 +17,7 @@
 import sinon from 'sinon';
 import 'jasmine-sinon';
 import './other';
-import MyClass from 'comlink-loader!./worker';
+import worker from 'comlink-loader!./worker';
 
 const OriginalWorker = self.Worker;
 self.Worker = sinon.spy((url, opts) => new OriginalWorker(url, opts));
@@ -26,7 +26,7 @@ describe('worker', () => {
   let inst;
 
   it('should be instantiable', async () => {
-    inst = await new MyClass();
+    inst = await new (worker().MyClass)();
     expect(self.Worker).toHaveBeenCalledOnce();
   });
 
@@ -52,7 +52,7 @@ describe('worker', () => {
   it('should re-use Worker instances after the first instance', async () => {
     sinon.reset(self.Worker);
 
-    const secondInst = await new MyClass();
+    const secondInst = await new (worker().MyClass)();
     expect(secondInst).not.toBe(inst);
     expect(await secondInst.foo()).toBe(1);