Merge pull request #74 from developit/add-import-option

add import option to enable preload

Author: developit

.gitignore

@@ -1,9 +1,7 @@
 node_modules
-.DS_Store
-.cache
-.mocha-puppeteer
-*.log
-build
-dist
 package-lock.json
 yarn.lock
+dist
+coverage
+.DS_Store
+*.log

package.json

@@ -33,14 +33,14 @@
   "author": "Jason Miller <[email protected]> (http://jasonformat.com)",
   "license": "MIT",
   "devDependencies": {
-    "eslint": "^5.0.0",
+    "eslint": "^5.16.0",
     "eslint-config-developit": "^1.1.1",
-    "karmatic": "^1.2.0",
-    "microbundle": "^0.6.0",
-    "webpack": "^4.17.1"
+    "karmatic": "^1.3.1",
+    "microbundle": "^0.11.0",
+    "webpack": "^4.39.2"
   },
   "dependencies": {
-    "loader-utils": "^1.1.0"
+    "loader-utils": "^1.2.3"
   },
   "peerDependencies": {
     "webpack": "*"

src/index.js

@@ -122,11 +122,16 @@ loader.pitch = function(request) {
 				delete this._compilation.assets[worker.file];
 			}
 
+			let workerUrl = worker.url;
+			if (options.import) {
+				workerUrl = `"data:,importScripts('"+location.origin+${workerUrl}+"')"`;
+			}
+
 			return cb(null, `
 				var addMethods = require(${loaderUtils.stringifyRequest(this, path.resolve(__dirname, 'rpc-wrapper.js'))})
 				var methods = ${JSON.stringify(exports)}
 				module.exports = function() {
-					var w = new Worker(${worker.url}, { name: ${JSON.stringify(filename)} })
+					var w = new Worker(${workerUrl}, { name: ${JSON.stringify(filename)} })
 					addMethods(w, methods)
 					${ options.ready ? 'w.ready = new Promise(function(r) { w.addEventListener("ready", function(){ r(w) }) })' : '' }
 					return w

test/src/index.test.js

@@ -1,6 +1,7 @@
 import './other';
 import Worker from 'workerize-loader?ready&name=test!./worker';
 import InlineWorker from 'workerize-loader?ready&inline&name=test!./worker';
+import ImportWorker from 'workerize-loader?import!./worker';
 
 describe('worker', () => {
 	let worker;
@@ -95,3 +96,21 @@ describe('async/await demo', () => {
 		expect(elapsed).toBeLessThan(20);
 	});
 });
+
+describe('?import option', () => {
+	let worker;
+
+	it('should be an instance of Worker', () => {
+		worker = new ImportWorker();
+		expect(worker).toEqual(jasmine.any(window.Worker));
+	});
+
+	it('worker.foo()', async () => {
+		expect(await worker.foo()).toBe(1);
+	});
+
+	it('worker.bar()', async () => {
+		let out = await worker.bar('a', 'b');
+		expect(out).toEqual('a [bar:3] b');
+	});
+});