-
+
+
${!this.embed
? html`
diff --git a/src/misc.ts b/src/misc.ts
index 6acca46..cb94c78 100644
--- a/src/misc.ts
+++ b/src/misc.ts
@@ -6,7 +6,6 @@ import { styleMap } from "lit/directives/style-map.js";
import allCssRaw from "../assets/main.scss";
-import rwpLogo from "../assets/logo.svg";
import type { FavIconEventDetail } from "./types";
const apiPrefix = "./w/api";
@@ -134,63 +133,6 @@ class FaIcon extends LitElement {
}
}
-// ===========================================================================
-class AnimLogo extends FaIcon {
- constructor() {
- super();
- // @ts-expect-error - TS2339 - Property 'svg' does not exist on type 'AnimLogo'.
- this.svg = rwpLogo;
- }
-
- static get styles() {
- return css`
- #wrlogo #stop5687 {
- animation: animLeft 7s linear infinite;
- }
-
- #wrlogo #stop5689 {
- animation: animRight 7s linear infinite;
- }
-
- @keyframes animLeft {
- 0% {
- stop-color: #4876ff;
- }
- 25% {
- stop-color: #1b0921;
- }
- 50% {
- stop-color: #4876ff;
- }
- 75% {
- stop-color: #04cdff;
- }
- 100% {
- stop-color: #4876ff;
- }
- }
-
- @keyframes animRight {
- 0% {
- stop-color: #04cdff;
- }
- 25% {
- stop-color: #4876ff;
- }
- 50% {
- stop-color: #1b0921;
- }
- 75% {
- stop-color: #4876ff;
- }
- 100% {
- stop-color: #04cdff;
- }
- }
- `;
- }
-}
-
// ===========================================================================
class WrModal extends LitElement {
constructor() {
@@ -263,7 +205,6 @@ class WrModal extends LitElement {
}
customElements.define("fa-icon", FaIcon);
-customElements.define("wr-anim-logo", AnimLogo);
customElements.define("wr-modal", WrModal);
@@ -272,9 +213,7 @@ export {
IS_APP,
VERSION,
clickOnSpacebarPress,
- rwpLogo,
FaIcon,
- AnimLogo,
WrModal,
LitElement,
html,
diff --git a/src/replay.ts b/src/replay.ts
index d2b0f85..800dde5 100644
--- a/src/replay.ts
+++ b/src/replay.ts
@@ -1,7 +1,8 @@
import { LitElement, html, css, type PropertyValues } from "lit";
import { property } from "lit/decorators.js";
-import { wrapCss, rwpLogo } from "./misc";
+import { wrapCss } from "./misc";
+import rwpLogo from "~assets/brand/replaywebpage-icon-color.svg";
import type { ItemType } from "./types";
// ===========================================================================
diff --git a/src/swmanager.ts b/src/swmanager.ts
index 2e4ec2f..935fbf6 100644
--- a/src/swmanager.ts
+++ b/src/swmanager.ts
@@ -1,5 +1,6 @@
import { html } from "lit";
import { register } from "register-service-worker";
+import rwpLogo from "~assets/brand/replaywebpage-icon-color.svg";
// ===========================================================================
export class SWManager {
@@ -153,7 +154,7 @@ export class SWManager {
Please try a different browser.`;
}
- renderErrorReport(logo: string, override?: string) {
+ renderErrorReport(override?: string) {
// @ts-expect-error - TS2339 - Property 'errorMsg' does not exist on type 'SWManager'.
const msg = this.errorMsg || override;
@@ -168,7 +169,7 @@ export class SWManager {
style="margin: 1em;flex-grow: 1;"
id="wrlogo"
size="2.5rem"
- .svg=${logo}
+ .svg=${rwpLogo}
aria-hidden="true"
>
diff --git a/tsconfig.json b/tsconfig.json
index e7c6230..6633da1 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -28,7 +28,8 @@
],
"incremental": true,
"paths": {
- "flexsearch": ["./node_modules/@types/flexsearch"]
+ "flexsearch": ["./node_modules/@types/flexsearch"],
+ "~assets/*": ["./src/assets/*"],
}
},
"include": ["src/**/*.ts", "src/**/*.js", "src/**/*.d.ts"]
diff --git a/webpack.config.js b/webpack.config.js
index 3992bbc..628346d 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -8,6 +8,7 @@ const MiniCssExtractPlugin = require("mini-css-extract-plugin");
const CopyPlugin = require("copy-webpack-plugin");
const TerserPlugin = require("terser-webpack-plugin");
const package_json = require("./package.json");
+const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin");
// helper proxy URL, run locally for app
const HELPER_PROXY = "https://helper-proxy.webrecorder.workers.dev";
@@ -32,6 +33,7 @@ const optimization = {
const tsConfig = {
resolve: {
extensions: [".ts", ".js"],
+ plugins: [new TsconfigPathsPlugin()],
},
module: {
rules: [
@@ -73,6 +75,10 @@ const electronMainConfig = (/*env, argv*/) => {
patterns: [
// { from: "node_modules/classic-level/prebuilds/", to: "prebuilds" },
{ from: "build/extra_prebuilds/", to: "prebuilds" },
+ {
+ from: path.resolve(__dirname, "src/assets/favicons"),
+ to: path.resolve(__dirname, "dist"),
+ },
],
}),
],
@@ -105,11 +111,8 @@ const browserConfig = (/*env, argv*/) => {
//const patterns = [{ from: "package.json", to: "_data/package.json" }];
let patterns = [{
- from: "build/icon.png",
- to: "site/assets/favicon.png",
- }, {
- from: "assets/logo.svg",
- to: "site/assets/logo.svg"
+ from: "src/assets/favicons",
+ to: "site/favicons",
}];
if (isDevServer) {
diff --git a/yarn.lock b/yarn.lock
index 33cf977..e06ae1e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2071,6 +2071,14 @@ enhanced-resolve@^5.10.0:
graceful-fs "^4.2.4"
tapable "^2.2.0"
+enhanced-resolve@^5.7.0:
+ version "5.16.0"
+ resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz#65ec88778083056cb32487faa9aef82ed0864787"
+ integrity sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==
+ dependencies:
+ graceful-fs "^4.2.4"
+ tapable "^2.2.0"
+
entities@^4.3.0, entities@^4.4.0:
version "4.4.0"
resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
@@ -3295,6 +3303,11 @@ json5@^2.1.2, json5@^2.2.0:
dependencies:
minimist "^1.2.5"
+json5@^2.2.2:
+ version "2.2.3"
+ resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+ integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
+
jsonfile@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -4977,6 +4990,11 @@ strip-ansi@^7.0.1:
dependencies:
ansi-regex "^6.0.1"
+strip-bom@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+ integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
+
strip-final-newline@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
@@ -5181,6 +5199,24 @@ ts-simple-type@2.0.0-next.0, ts-simple-type@~2.0.0-next.0:
resolved "https://registry.yarnpkg.com/ts-simple-type/-/ts-simple-type-2.0.0-next.0.tgz#262a321ba2a17aa57f88ef31e30453beff5be246"
integrity sha512-A+hLX83gS+yH6DtzNAhzZbPfU+D9D8lHlTSd7GeoMRBjOt3GRylDqLTYbdmjA4biWvq2xSfpqfIDj2l0OA/BVg==
+tsconfig-paths-webpack-plugin@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-4.1.0.tgz#3c6892c5e7319c146eee1e7302ed9e6f2be4f763"
+ integrity sha512-xWFISjviPydmtmgeUAuXp4N1fky+VCtfhOkDUFIv5ea7p4wuTomI4QTrXvFBX2S4jZsmyTSrStQl+E+4w+RzxA==
+ dependencies:
+ chalk "^4.1.0"
+ enhanced-resolve "^5.7.0"
+ tsconfig-paths "^4.1.2"
+
+tsconfig-paths@^4.1.2:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c"
+ integrity sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==
+ dependencies:
+ json5 "^2.2.2"
+ minimist "^1.2.6"
+ strip-bom "^3.0.0"
+
tslib@^1.10.0, tslib@^1.9.3:
version "1.14.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"