Skip to content

Commit

Permalink
fix: check for http in baseUrl (#993)
Browse files Browse the repository at this point in the history
* fix: check for http in baseUrl

`path.posix.join` can't be used with URLs.

* Update plugin.js

Co-authored-by: Fred K. Schott <fkschott@gmail.com>
  • Loading branch information
stefanfrede and FredKSchott authored Sep 7, 2020
1 parent 01c8dc8 commit 0d2d4cf
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion plugins/plugin-webpack/plugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const crypto = require("crypto");
const fs = require("fs");
const glob = require("glob");
const path = require("path");
const url = require("url");
const webpack = require("webpack");
const MiniCssExtractPlugin = require("mini-css-extract-plugin");
const TerserJSPlugin = require("terser-webpack-plugin");
Expand Down Expand Up @@ -67,7 +68,9 @@ function emitHTMLFiles({ doms, jsEntries, stats, baseUrl, buildDirectory }) {

for (const jsFile of jsFiles) {
const scriptEl = dom.window.document.createElement("script");
scriptEl.src = path.posix.join(baseUrl, jsFile);
scriptEl.src = url.parse(baseUrl).protocol
? url.resolve(baseUrl, jsFile)
: path.posix.join(baseUrl, jsFile);
// insert _before_ so the relative order of these scripts is maintained
insertBefore(scriptEl, originalScriptEl);
}
Expand Down

0 comments on commit 0d2d4cf

Please sign in to comment.