From 51b90d7458fca5b10dbaa0605c33223b8884b6e1 Mon Sep 17 00:00:00 2001
From: Rakan Nimer <RakanNimer@users.noreply.github.com>
Date: Mon, 11 Dec 2017 06:46:00 +0200
Subject: [PATCH] Fix RawAsset loading. (#160)

* Prepending raw asset generated bundle name with publicURL.

* Working code. Failing tests.

* Fix whoops.

* Back to working.

* Resolve Raw Asset URL instead of path.
---
 src/assets/RawAsset.js | 7 +++++--
 test/javascript.js     | 2 +-
 test/typescript.js     | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/assets/RawAsset.js b/src/assets/RawAsset.js
index 170d143608f..39c1826cd17 100644
--- a/src/assets/RawAsset.js
+++ b/src/assets/RawAsset.js
@@ -1,13 +1,16 @@
 const Asset = require('../Asset');
-const path = require('path');
+const url = require('url');
 
 class RawAsset extends Asset {
   // Don't load raw assets. They will be copied by the RawPackager directly.
   load() {}
 
   generate() {
+    const pathToAsset = JSON.stringify(
+      url.resolve(this.options.publicURL, this.generateBundleName())
+    );
     return {
-      js: `module.exports=${JSON.stringify(this.generateBundleName())};`
+      js: `module.exports=${pathToAsset};`
     };
   }
 }
diff --git a/test/javascript.js b/test/javascript.js
index ac5bc86b5ed..eeb39e6c36b 100644
--- a/test/javascript.js
+++ b/test/javascript.js
@@ -137,7 +137,7 @@ describe('javascript', function() {
 
     let output = run(b);
     assert.equal(typeof output, 'function');
-    assert(/^[0-9a-f]+\.txt$/.test(output()));
+    assert(/^\/[0-9a-f]+\.txt$/.test(output()));
     assert(fs.existsSync(__dirname + '/dist/' + output()));
   });
 
diff --git a/test/typescript.js b/test/typescript.js
index a9ad60e8140..fdc00896e46 100644
--- a/test/typescript.js
+++ b/test/typescript.js
@@ -66,7 +66,7 @@ describe('typescript', function() {
 
     let output = run(b);
     assert.equal(typeof output.getRaw, 'function');
-    assert(/^[0-9a-f]+\.txt$/.test(output.getRaw()));
+    assert(/^\/[0-9a-f]+\.txt$/.test(output.getRaw()));
     assert(fs.existsSync(__dirname + '/dist/' + output.getRaw()));
   });