s.actionType === ActionType.Chapter) ? "" : "hidden"}>
+
{
setTab(SegmentListTab.Segments);
}}>
@@ -125,7 +135,7 @@ export const SegmentListComponent = (props: SegmentListComponentProps) => {
isVip={isVip}
loopedChapter={props.loopedChapter} // UUID instead of boolean so it can be passed down to nested chapters
- tabFilter={tabFilter}
+ tabFilter={tab === SegmentListTab.Chapter ? isChapter : isSegment}
sendMessage={props.sendMessage}
/>
))
diff --git a/tsconfig-production.json b/tsconfig-production.json
index c79b6f61..6f9122e0 100644
--- a/tsconfig-production.json
+++ b/tsconfig-production.json
@@ -5,7 +5,7 @@
"noImplicitAny": false,
"noImplicitReturns": true,
"noFallthroughCasesInSwitch": true,
- "sourceMap": false,
+ "sourceMap": true,
"outDir": "dist/js",
"noEmitOnError": false,
"typeRoots": [ "node_modules/@types" ],
@@ -20,4 +20,4 @@
"include": [
"src/**/*"
]
-}
\ No newline at end of file
+}
diff --git a/webpack/webpack.common.js b/webpack/webpack.common.js
index 3db98d13..512bb7df 100644
--- a/webpack/webpack.common.js
+++ b/webpack/webpack.common.js
@@ -189,7 +189,8 @@ module.exports = env => {
new BuildManifest({
browser: env.browser,
pretty: env.mode === "production",
- stream: env.stream
+ stream: env.stream,
+ autoupdate: env.autoupdate,
}),
new configDiffPlugin()
],
@@ -200,4 +201,4 @@ module.exports = env => {
}
};
-};
\ No newline at end of file
+};
diff --git a/webpack/webpack.manifest.js b/webpack/webpack.manifest.js
index 1666c8a1..2b866498 100644
--- a/webpack/webpack.manifest.js
+++ b/webpack/webpack.manifest.js
@@ -23,10 +23,13 @@ const schema = {
pretty: {
type: 'boolean'
},
- steam: {
+ stream: {
type: 'string'
+ },
+ autoupdate: {
+ type: 'boolean',
}
- }
+ }
};
class BuildManifest {
@@ -39,6 +42,7 @@ class BuildManifest {
apply() {
const distFolder = path.resolve(__dirname, "../dist/");
const distManifestFile = path.resolve(distFolder, "manifest.json");
+ const [owner, repo_name] = (process.env.GITHUB_REPOSITORY ?? "ajayyy/SponsorBlock").split("/");
// Add missing manifest elements
if (this.options.browser.toLowerCase() === "firefox") {
@@ -62,6 +66,10 @@ class BuildManifest {
}
}
+ if (this.options.autoupdate === true && this.options.browser.toLowerCase() === "firefox") {
+ manifest.browser_specific_settings.gecko.update_url = `https://${owner.toLowerCase()}.github.io/${repo_name}/updates.json`;
+ }
+
let result = JSON.stringify(manifest);
if (this.options.pretty) result = JSON.stringify(manifest, null, 2);
@@ -86,4 +94,4 @@ function mergeObjects(object1, object2) {
}
}
-module.exports = BuildManifest;
\ No newline at end of file
+module.exports = BuildManifest;
diff --git a/webpack/webpack.prod.js b/webpack/webpack.prod.js
index 03e1708e..eb66b246 100644
--- a/webpack/webpack.prod.js
+++ b/webpack/webpack.prod.js
@@ -1,12 +1,40 @@
/* eslint-disable @typescript-eslint/no-var-requires */
+const { SourceMapDevToolPlugin } = require('webpack');
const { merge } = require('webpack-merge');
const common = require('./webpack.common.js');
-module.exports = env => {
+async function createGHPSourceMapURL(env) {
+ const manifest = require("../manifest/manifest.json");
+ const version = manifest.version;
+ const [owner, repo_name] = (process.env.GITHUB_REPOSITORY ?? "ajayyy/SponsorBlock").split("/");
+ const ghpUrl = `https://${owner.toLowerCase()}.github.io/${repo_name}/${env.browser}${env.stream === "beta" ? "-beta" : ""}/${version}/`;
+ // make a request to the url and check if we got redirected
+ // firefox doesn't seem to like getting redirected on a source map request
+ try {
+ const resp = await fetch(ghpUrl);
+ return resp.url;
+ } catch {
+ return ghpUrl;
+ }
+}
+
+module.exports = async env => {
let mode = "production";
env.mode = mode;
return merge(common(env), {
- mode
+ mode,
+ ...(env.ghpSourceMaps
+ ? {
+ devtool: false,
+ plugins: [new SourceMapDevToolPlugin({
+ publicPath: await createGHPSourceMapURL(env),
+ filename: '[file].map[query]',
+ })],
+ }
+ : {
+ devtool: "source-map",
+ }
+ ),
});
-};
\ No newline at end of file
+};