Skip to content

Commit 77efa4c

Browse files
committed
propagate basehref
1 parent b750327 commit 77efa4c

3 files changed

Lines changed: 64 additions & 849 deletions

File tree

gulpfile.js

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,25 @@ var path = require("path");
1313
var PluginError = require("plugin-error");
1414
var terriajsServerGulpTask = require("terriajs/buildprocess/terriajsServerGulpTask");
1515

16+
const getBaseHref = () => {
17+
const minimist = require("minimist");
18+
// Arguments written in skewer-case can cause problems (unsure why), so stick to camelCase
19+
const options = minimist(process.argv.slice(2), {
20+
string: ["baseHref"],
21+
default: { baseHref: "/" }
22+
});
23+
24+
return options.baseHref;
25+
};
26+
const viteBuildArgs = (mode) => {
27+
const args = ["vite", "build", "--mode", mode];
28+
const baseHref = getBaseHref();
29+
if (baseHref !== "/") {
30+
args.push("--base", baseHref);
31+
}
32+
return args;
33+
};
34+
1635
gulp.task("check-terriajs-dependencies", function (done) {
1736
var appPackageJson = require("./package.json");
1837
var terriaPackageJson = require("terriajs/package.json");
@@ -71,7 +90,7 @@ gulp.task(
7190
"write-version",
7291
function buildApp(done) {
7392
var spawn = require("child_process").spawn;
74-
var proc = spawn("npx", ["vite", "build", "--mode", "development"], {
93+
var proc = spawn("npx", viteBuildArgs("development"), {
7594
stdio: "inherit",
7695
shell: true
7796
});
@@ -93,7 +112,7 @@ gulp.task(
93112
"write-version",
94113
function releaseApp(done) {
95114
var spawn = require("child_process").spawn;
96-
var proc = spawn("npx", ["vite", "build", "--mode", "production"], {
115+
var proc = spawn("npx", viteBuildArgs("production"), {
97116
stdio: "inherit",
98117
shell: true
99118
});

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
"is-subdir": "^1.2.0",
5959
"json5": "^2.1.0",
6060
"lodash": "^4.17.21",
61+
"minimist": "^1.2.8",
6162
"plugin-error": "^2.0.1",
6263
"prettier": "2.8.8",
6364
"pretty-quick": "^4.0.0",

0 commit comments

Comments
 (0)