From 140c5a46485676d31469094c28acf0e63d6c3da4 Mon Sep 17 00:00:00 2001 From: Simon Woolf Date: Thu, 21 Jan 2016 16:22:16 +0000 Subject: [PATCH] Stop shimming async for requirejs It does support it, support was just slightly broken. Have forked async to fix, now using that fork. Using the global meant that it was actually using the global async that was defined most recently. Which, for browser tests, happened to be the (rather) old one that karma-nodeunit defines inline (!) (https://github.com/karma-runner/karma-nodeunit/blob/master/lib/nodeunit.js#L500) --- package.json | 2 +- spec/support/browser_setup.js | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/package.json b/package.json index 9390710b29..e6d567ca9a 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "version": "0.8.13", "main": "./nodejs/index.js", "dependencies": { - "async": "~0.9", + "async": "git://github.com/ably-forks/async#requirejs", "buffertools": "^2.1.3", "crypto-js": "git://github.com/ably-forks/crypto-js#typedarray-webkit", "hexy": "~0.2", diff --git a/spec/support/browser_setup.js b/spec/support/browser_setup.js index 50048821f0..94b74f58b0 100644 --- a/spec/support/browser_setup.js +++ b/spec/support/browser_setup.js @@ -53,9 +53,6 @@ require([(baseUrl + '/spec/common/globals/named_dependencies.js').replace('//',' }, 'browser-base64': { exports: 'Base64' - }, - 'async': { - exports: 'async' } },