Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: check for http in baseUrl #993

Merged
merged 2 commits into from
Sep 7, 2020
Merged

fix: check for http in baseUrl #993

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80eefc1
fix: check for http in baseUrl
stefanfrede Sep 4, 2020
fb90d10
Update plugin.js
FredKSchott Sep 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion plugins/plugin-webpack/plugin.js
View file
Open in desktop
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