From 23dc063d26d966bfb9fea340487f4f4f7d22ca9d Mon Sep 17 00:00:00 2001
From: Raincal <cyj94228@gmail.com>
Date: Sat, 23 Dec 2017 08:42:23 +0800
Subject: [PATCH] fix(RawAsset): fix incorrect bundle path

---
 src/assets/RawAsset.js | 6 +++++-
 test/javascript.js     | 4 ++--
 test/typescript.js     | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/assets/RawAsset.js b/src/assets/RawAsset.js
index 39c1826cd17..a6713af8bb4 100644
--- a/src/assets/RawAsset.js
+++ b/src/assets/RawAsset.js
@@ -6,9 +6,13 @@ class RawAsset extends Asset {
   load() {}
 
   generate() {
+    let publicURL = this.options.publicURL;
+    publicURL = /\/$/.test(publicURL) ? publicURL : `${publicURL}/`;
+
     const pathToAsset = JSON.stringify(
-      url.resolve(this.options.publicURL, this.generateBundleName())
+      url.resolve(publicURL, this.generateBundleName())
     );
+
     return {
       js: `module.exports=${pathToAsset};`
     };
diff --git a/test/javascript.js b/test/javascript.js
index 86012eae54a..f69b5a4d4f0 100644
--- a/test/javascript.js
+++ b/test/javascript.js
@@ -158,8 +158,8 @@ describe('javascript', function() {
 
     let output = run(b);
     assert.equal(typeof output, 'function');
-    assert(/^\/[0-9a-f]+\.txt$/.test(output()));
-    assert(fs.existsSync(__dirname + '/dist/' + output()));
+    assert(/^\/dist\/[0-9a-f]+\.txt$/.test(output()));
+    assert(fs.existsSync(__dirname + output()));
   });
 
   it('should minify JS in production mode', async function() {
diff --git a/test/typescript.js b/test/typescript.js
index fdc00896e46..e75cba701a4 100644
--- a/test/typescript.js
+++ b/test/typescript.js
@@ -66,8 +66,8 @@ describe('typescript', function() {
 
     let output = run(b);
     assert.equal(typeof output.getRaw, 'function');
-    assert(/^\/[0-9a-f]+\.txt$/.test(output.getRaw()));
-    assert(fs.existsSync(__dirname + '/dist/' + output.getRaw()));
+    assert(/^\/dist\/[0-9a-f]+\.txt$/.test(output.getRaw()));
+    assert(fs.existsSync(__dirname + output.getRaw()));
   });
 
   it('should minify in production mode', async function() {