dojo · kitsonk · Apr 6, 2017 · Mar 9, 2017 · Mar 9, 2017 · Mar 9, 2017
diff --git a/package.json b/package.json
@@ -25,6 +25,7 @@
     "@types/chai": "~3.4.0",
     "@types/glob": "~5.0.0",
     "@types/grunt": "~0.4.0",
+    "@types/node": "~6.0.0",
     "dts-generator": "~2.0.0",
     "grunt": "^1.0.1",
     "grunt-contrib-uglify": "^2.0.0",

diff --git a/src/loader.ts b/src/loader.ts
@@ -186,6 +186,7 @@ declare const Packages: {} | undefined;
 	has.add('host-browser', typeof document !== 'undefined' && typeof location !== 'undefined');
 	has.add('host-node', typeof process === 'object' && process.versions && process.versions.node);
 	has.add('host-nashorn', typeof load === 'function' && typeof Packages !== 'undefined');
+	has.add('host-web-worker', !has('host-browser') && typeof importScripts !== 'undefined');
 	has.add('debug', true);
 
 	has.add('loader-configurable', true);
@@ -1064,6 +1065,21 @@ declare const Packages: {} | undefined;
 
 		setGlobals = globalObjectGlobals;
 	}
+	else if (has('host-web-worker')) {
+		injectUrl = function (url: string, callback: (node?: HTMLScriptElement) => void, module: DojoLoader.Module,
+			parent?: DojoLoader.Module): void {
+
+			try {
+				importScripts(url);
+			}
+			catch (e) {
+				reportModuleLoadError(parent, module, url);
+			}
+			callback();
+		};
+
+		setGlobals = globalObjectGlobals;
+	}
 	else {
 		throw new Error('Unsupported platform');
 	}

diff --git a/tests/functional/all.ts b/tests/functional/all.ts
@@ -4,4 +4,5 @@ import './crossOrigin';
 import './csp';
 import './scriptConfigReading';
 import './shimAmdLoading';
+import './webworkerAmd';
 import './require/require';
diff --git a/tests/functional/webworkerAmd.ts b/tests/functional/webworkerAmd.ts
@@ -0,0 +1,15 @@
+import * as assert from 'intern/chai!assert';
+import * as registerSuite from 'intern!object';
+import executeTest from './executeTest';
+
+const AMD_APP_MESSAGE = 'Message from AMD app.';
+
+registerSuite({
+	name: 'AMD loading in web worker',
+
+	'basic loading'(this: any) {
+		return executeTest(this, './webworkerBasic.html', function (results: any) {
+			assert.strictEqual(results.message, AMD_APP_MESSAGE);
+		});
+	}
+});
diff --git a/tests/functional/webworkerBasic.html b/tests/functional/webworkerBasic.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+	<script>
+		if (window.Worker) {
+			const worker = new Worker('worker.js');
+
+			worker.onmessage = function (e) {
+				window.loaderTestResults = e.data;
+			}
+
+			worker.postMessage('start');
+		}
+		else {
+			console.error('does not support web workers');
+		}
+	</script>
+</body>
+</html>
diff --git a/tests/functional/worker.ts b/tests/functional/worker.ts
@@ -0,0 +1,28 @@
+onmessage = function (e) {
+	try {
+		/* load the loader */
+		importScripts('../../src/loader.js');
+
+		require.config({
+			packages: [
+				{ name: 'amdApp', location: './amdApp' }
+			]
+		});
+
+		require([
+			'amdApp/app'
+		], function (app) {
+			/* post message back with the results */
+			(<any> postMessage)({
+				message: app.getMessage()
+			});
+		});
+	}
+	catch (e) {
+		(<any> postMessage)({
+			message: e.message,
+			status: 'fail'
+		});
+		throw e;
+	}
+};