From b1011da0f159a20cca54c9b6ac8177aaf06b78da Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Fri, 6 Mar 2020 17:48:21 +0800
Subject: [PATCH 1/4] fix(target-lib): fix dynamic public path in a dynmaic
 chunk in Firefox

---
 .../lib/commands/build/getCurrentScript.js    | 62 +++++++++++++++++++
 .../lib/commands/build/setPublicPath.js       |  7 ++-
 2 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 packages/@vue/cli-service/lib/commands/build/getCurrentScript.js

diff --git a/packages/@vue/cli-service/lib/commands/build/getCurrentScript.js b/packages/@vue/cli-service/lib/commands/build/getCurrentScript.js
new file mode 100644
index 0000000000..185870cf33
--- /dev/null
+++ b/packages/@vue/cli-service/lib/commands/build/getCurrentScript.js
@@ -0,0 +1,62 @@
+/* eslint-disable */
+// adapted from https://github.com/amiller-gh/currentScript-polyfill/blob/master/currentScript.js
+// added support for Firefox https://bugzilla.mozilla.org/show_bug.cgi?id=1620505
+function getCurrentScript () {
+  // IE 8-10 support script readyState
+  // IE 11+ support stack trace
+  // Firefox supports err.fileName
+  try {
+    throw new Error();
+  }
+  catch (err) {
+    // Find the second match for the "at" string to get file src url from stack.
+    // Specifically works with the format of stack traces in IE.
+    var i = 0,
+      stackDetails = (/.*at [^(]*\((.*):(.+):(.+)\)$/ig).exec(err.stack),
+      scriptLocation = err.fileName || (stackDetails && stackDetails[1]) || false,
+      line = (stackDetails && stackDetails[2]) || false,
+      currentLocation = document.location.href.replace(document.location.hash, ''),
+      pageSource,
+      inlineScriptSourceRegExp,
+      inlineScriptSource,
+      scripts = document.getElementsByTagName('script'); // Live NodeList collection
+
+    if (scriptLocation === currentLocation) {
+      pageSource = document.documentElement.outerHTML;
+      inlineScriptSourceRegExp = new RegExp('(?:[^\\n]+?\\n){0,' + (line - 2) + '}[^<]*<script>([\\d\\D]*?)<\\/script>[\\d\\D]*', 'i');
+      inlineScriptSource = pageSource.replace(inlineScriptSourceRegExp, '$1').trim();
+    }
+
+    for (; i < scripts.length; i++) {
+      // If ready state is interactive, return the script tag
+      if (scripts[i].readyState === 'interactive') {
+        return scripts[i];
+      }
+
+      // If src matches, return the script tag
+      if (scripts[i].src === scriptLocation) {
+        return scripts[i];
+      }
+
+      // If inline source matches, return the script tag
+      if (
+        scriptLocation === currentLocation &&
+        scripts[i].innerHTML &&
+        scripts[i].innerHTML.trim() === inlineScriptSource
+      ) {
+        return scripts[i];
+      }
+    }
+
+    // If no match, return null
+    return null;
+  }
+}
+
+var currentScript = 'currentScript';
+// for backward compatibility, because previously we directly included the polyfill
+if (!(currentScript in document)) {
+  Object.defineProperty(document, currentScript, { get: getCurrentScript })
+}
+
+module.exports = getCurrentScript
diff --git a/packages/@vue/cli-service/lib/commands/build/setPublicPath.js b/packages/@vue/cli-service/lib/commands/build/setPublicPath.js
index 8968ca36be..862480223a 100644
--- a/packages/@vue/cli-service/lib/commands/build/setPublicPath.js
+++ b/packages/@vue/cli-service/lib/commands/build/setPublicPath.js
@@ -1,12 +1,13 @@
 // This file is imported into lib/wc client bundles.
 
 if (typeof window !== 'undefined') {
+  var currentScript = window.document.currentScript
   if (process.env.NEED_CURRENTSCRIPT_POLYFILL) {
-    require('current-script-polyfill')
+    currentScript = currentScript || require('./getCurrentScript')()
   }
 
-  var i
-  if ((i = window.document.currentScript) && (i = i.src.match(/(.+\/)[^/]+\.js(\?.*)?$/))) {
+  var src = currentScript && currentScript.src.match(/(.+\/)[^/]+\.js(\?.*)?$/)
+  if (src) {
     __webpack_public_path__ = i[1] // eslint-disable-line
   }
 }

From b41a14af3156f4604ab482c4aa5ab7f4433f8505 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Fri, 6 Mar 2020 17:55:32 +0800
Subject: [PATCH 2/4] fix: fix typo

---
 packages/@vue/cli-service/lib/commands/build/setPublicPath.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@vue/cli-service/lib/commands/build/setPublicPath.js b/packages/@vue/cli-service/lib/commands/build/setPublicPath.js
index 862480223a..9bdbdc9583 100644
--- a/packages/@vue/cli-service/lib/commands/build/setPublicPath.js
+++ b/packages/@vue/cli-service/lib/commands/build/setPublicPath.js
@@ -8,7 +8,7 @@ if (typeof window !== 'undefined') {
 
   var src = currentScript && currentScript.src.match(/(.+\/)[^/]+\.js(\?.*)?$/)
   if (src) {
-    __webpack_public_path__ = i[1] // eslint-disable-line
+    __webpack_public_path__ = src[1] // eslint-disable-line
   }
 }
 

From d63167108bdfe20a52dc50e846fd7f813cad974d Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Mon, 9 Mar 2020 18:31:56 +0800
Subject: [PATCH 3/4] feat: use external dependency `@soda/get-current-script`

---
 .../lib/commands/build/getCurrentScript.js    | 62 -------------------
 .../lib/commands/build/setPublicPath.js       |  8 ++-
 packages/@vue/cli-service/package.json        |  2 +-
 yarn.lock                                     | 10 +--
 4 files changed, 13 insertions(+), 69 deletions(-)
 delete mode 100644 packages/@vue/cli-service/lib/commands/build/getCurrentScript.js

diff --git a/packages/@vue/cli-service/lib/commands/build/getCurrentScript.js b/packages/@vue/cli-service/lib/commands/build/getCurrentScript.js
deleted file mode 100644
index 185870cf33..0000000000
--- a/packages/@vue/cli-service/lib/commands/build/getCurrentScript.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/* eslint-disable */
-// adapted from https://github.com/amiller-gh/currentScript-polyfill/blob/master/currentScript.js
-// added support for Firefox https://bugzilla.mozilla.org/show_bug.cgi?id=1620505
-function getCurrentScript () {
-  // IE 8-10 support script readyState
-  // IE 11+ support stack trace
-  // Firefox supports err.fileName
-  try {
-    throw new Error();
-  }
-  catch (err) {
-    // Find the second match for the "at" string to get file src url from stack.
-    // Specifically works with the format of stack traces in IE.
-    var i = 0,
-      stackDetails = (/.*at [^(]*\((.*):(.+):(.+)\)$/ig).exec(err.stack),
-      scriptLocation = err.fileName || (stackDetails && stackDetails[1]) || false,
-      line = (stackDetails && stackDetails[2]) || false,
-      currentLocation = document.location.href.replace(document.location.hash, ''),
-      pageSource,
-      inlineScriptSourceRegExp,
-      inlineScriptSource,
-      scripts = document.getElementsByTagName('script'); // Live NodeList collection
-
-    if (scriptLocation === currentLocation) {
-      pageSource = document.documentElement.outerHTML;
-      inlineScriptSourceRegExp = new RegExp('(?:[^\\n]+?\\n){0,' + (line - 2) + '}[^<]*<script>([\\d\\D]*?)<\\/script>[\\d\\D]*', 'i');
-      inlineScriptSource = pageSource.replace(inlineScriptSourceRegExp, '$1').trim();
-    }
-
-    for (; i < scripts.length; i++) {
-      // If ready state is interactive, return the script tag
-      if (scripts[i].readyState === 'interactive') {
-        return scripts[i];
-      }
-
-      // If src matches, return the script tag
-      if (scripts[i].src === scriptLocation) {
-        return scripts[i];
-      }
-
-      // If inline source matches, return the script tag
-      if (
-        scriptLocation === currentLocation &&
-        scripts[i].innerHTML &&
-        scripts[i].innerHTML.trim() === inlineScriptSource
-      ) {
-        return scripts[i];
-      }
-    }
-
-    // If no match, return null
-    return null;
-  }
-}
-
-var currentScript = 'currentScript';
-// for backward compatibility, because previously we directly included the polyfill
-if (!(currentScript in document)) {
-  Object.defineProperty(document, currentScript, { get: getCurrentScript })
-}
-
-module.exports = getCurrentScript
diff --git a/packages/@vue/cli-service/lib/commands/build/setPublicPath.js b/packages/@vue/cli-service/lib/commands/build/setPublicPath.js
index 9bdbdc9583..602696515e 100644
--- a/packages/@vue/cli-service/lib/commands/build/setPublicPath.js
+++ b/packages/@vue/cli-service/lib/commands/build/setPublicPath.js
@@ -3,7 +3,13 @@
 if (typeof window !== 'undefined') {
   var currentScript = window.document.currentScript
   if (process.env.NEED_CURRENTSCRIPT_POLYFILL) {
-    currentScript = currentScript || require('./getCurrentScript')()
+    const getCurrentScript = require('@soda/get-current-script')
+    currentScript = getCurrentScript()
+
+    // for backward compatibility, because previously we directly included the polyfill
+    if (!('currentScript' in document)) {
+      Object.defineProperty(document, 'currentScript', { get: getCurrentScript })
+    }
   }
 
   var src = currentScript && currentScript.src.match(/(.+\/)[^/]+\.js(\?.*)?$/)
diff --git a/packages/@vue/cli-service/package.json b/packages/@vue/cli-service/package.json
index 4c656313ec..6706e174bb 100644
--- a/packages/@vue/cli-service/package.json
+++ b/packages/@vue/cli-service/package.json
@@ -25,6 +25,7 @@
   "dependencies": {
     "@intervolga/optimize-cssnano-plugin": "^1.0.5",
     "@soda/friendly-errors-webpack-plugin": "^1.7.1",
+    "@soda/get-current-script": "^1.0.0",
     "@vue/cli-overlay": "^4.2.3",
     "@vue/cli-plugin-router": "^4.2.3",
     "@vue/cli-plugin-vuex": "^4.2.3",
@@ -45,7 +46,6 @@
     "copy-webpack-plugin": "^5.1.1",
     "css-loader": "^3.4.2",
     "cssnano": "^4.1.10",
-    "current-script-polyfill": "^1.0.0",
     "debug": "^4.1.1",
     "default-gateway": "^5.0.5",
     "dotenv": "^8.2.0",
diff --git a/yarn.lock b/yarn.lock
index 0886cbe102..0d738bde3e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2306,6 +2306,11 @@
     error-stack-parser "^2.0.0"
     string-width "^2.0.0"
 
+"@soda/get-current-script@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@soda/get-current-script/-/get-current-script-1.0.0.tgz#623aa40623550e3b94767cffeb096a6fb597ed09"
+  integrity sha512-9GvTek+7cVw7r+L7TNGOG1astZJWXz2h5q4BqMXl28KN+24iSCm1xo+RhZOZvwdT3bzNe9hD7riJc/lBoO7mgg==
+
 "@szmarczak/http-timer@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
@@ -6317,11 +6322,6 @@ csv-parser@^1.6.0:
     minimist "^1.2.0"
     ndjson "^1.4.0"
 
-current-script-polyfill@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/current-script-polyfill/-/current-script-polyfill-1.0.0.tgz#f31cf7e4f3e218b0726e738ca92a02d3488ef615"
-  integrity sha1-8xz35PPiGLBybnOMqSoC00iO9hU=
-
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"

From 54808fd7365d68a53bca72af3de05b45a4339250 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Mon, 23 Mar 2020 14:55:43 +0800
Subject: [PATCH 4/4] fix: const -> var, as the `setPublicPath` file is not
 transpiled

---
 packages/@vue/cli-service/lib/commands/build/setPublicPath.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@vue/cli-service/lib/commands/build/setPublicPath.js b/packages/@vue/cli-service/lib/commands/build/setPublicPath.js
index 602696515e..e298abdc47 100644
--- a/packages/@vue/cli-service/lib/commands/build/setPublicPath.js
+++ b/packages/@vue/cli-service/lib/commands/build/setPublicPath.js
@@ -3,7 +3,7 @@
 if (typeof window !== 'undefined') {
   var currentScript = window.document.currentScript
   if (process.env.NEED_CURRENTSCRIPT_POLYFILL) {
-    const getCurrentScript = require('@soda/get-current-script')
+    var getCurrentScript = require('@soda/get-current-script')
     currentScript = getCurrentScript()
 
     // for backward compatibility, because previously we directly included the polyfill