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.

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

Add beta-switch package #1263

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions packages/beta-switch/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/dist/
/node_modules/
/tsconfig.tsbuildinfo
8 changes: 8 additions & 0 deletions packages/beta-switch/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# beta-switch
For switching between two sites running in the same domain


## Scripts

- `yarn run build`: Builds the project
- `yarn run dev`: Builds the project & watches files for changes, triggering a rebuild
16 changes: 16 additions & 0 deletions packages/beta-switch/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "@thunderstore/beta-switch",
"version": "0.1.0",
"description": "Small thing for switching between two projects running in the same domain",
"repository": "https://github.com/thunderstore-io/thunderstore-ui/tree/master/packages/beta-switch",
"main": "dist/thunderstore-beta-switch.cjs.js",
"module": "dist/thunderstore-beta-switch.esm.js",
"types": "dist/thunderstore-beta-switch.cjs.d.ts",
Comment on lines +6 to +8
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There appears to be a mismatch between the output paths specified in package.json and TypeScript's actual output. TypeScript's tsc command will generate different file names than what's listed here. To resolve this, either:

  1. Add a bundler (like Rollup or esbuild) to generate the .cjs.js and .esm.js files, or
  2. Update these paths to match TypeScript's output format (typically .js and .d.ts files)

This will ensure the built files are available at the locations the package declares.

Spotted by Graphite Reviewer

Is this helpful? React 👍 or 👎 to let us know.

"files": [
"dist"
],
"scripts": {
"build": "tsc",
"dev": "tsc --watch"
}
}
137 changes: 137 additions & 0 deletions packages/beta-switch/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
const enabledPages = ["/communities", "c/[^/]+/?$"];

const legacy = {
protocol: "http://",
hostname: "thunderstore.temp",
port: "",
};

const beta = {
protocol: "http://",
hostname: "new.thunderstore.temp",
port: "",
};

function setCookie(key: string, value: string) {
const date = new Date();
date.setFullYear(date.getFullYear() + 1);
document.cookie = `${key}=${value}; expires=${date.toUTCString()}; path=/`;
}

function checkBetaRedirect() {
let betaIsAvailable = false;
enabledPages.forEach((regPath) => {
const regExecuted = new RegExp(regPath).exec(window.location.pathname);
const found = regExecuted !== null && regExecuted.length < 2;
if (!betaIsAvailable && found) {
betaIsAvailable = true;
}
}, betaIsAvailable);
Comment on lines +23 to +29
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The forEach has a second argument betaIsAvailable passed as thisArg which appears unintentional and could lead to bugs. The thisArg parameter is meant to set the value of this inside the callback function, but isn't needed here. Consider removing the second argument to forEach.

Spotted by Graphite Reviewer

Is this helpful? React 👍 or 👎 to let us know.


const desireCookie = new RegExp("betaDesire=([^;]+);").exec(
document.cookie[-1] === ";" ? document.cookie : document.cookie + ";"
)?.[1];
Comment on lines +31 to +33
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JavaScript does not support negative array indexing. To check if the last character is a semicolon, replace document.cookie[-1] with document.cookie[document.cookie.length - 1]. This will properly access the last character of the string.

Spotted by Graphite Reviewer

Is this helpful? React 👍 or 👎 to let us know.

console.log("betaDesire:", desireCookie);

if (!desireCookie) {
setCookie("betaDesire", "legacy");
}
let userDesiredProject = legacy;
if (desireCookie === "beta") {
userDesiredProject = beta;
}

// const wouldBeRedirect = `${userDesiredProject.protocol}${userDesiredProject.hostname}${userDesiredProject.port !== "" ? ":" : ""}${userDesiredProject.port}${window.location.pathname}${window.location.search}`;
// console.log("would be redirect", wouldBeRedirect);
// const legacyRedirect = `${legacy.protocol}${legacy.hostname}${legacy.port !== "" ? ":" : ""}${legacy.port}${window.location.pathname}${window.location.search}`;
// console.log("legacy redirect", legacyRedirect);

// const currentUrl = `${window.location.protocol}//${window.location.hostname}${window.location.port !== "" ? ":" : ""}${window.location.port}`;
// const desiredUrl = `${userDesiredProject.protocol}${userDesiredProject.hostname}${userDesiredProject.port !== "" ? ":" : ""}${userDesiredProject.port}`;

// console.log("currentUrl", currentUrl);
// console.log("desiredUrl", desiredUrl);
if (betaIsAvailable) {
if (
`${window.location.protocol}//${window.location.hostname}${
window.location.port !== "" ? ":" : ""
}${window.location.port}` !==
`${userDesiredProject.protocol}${userDesiredProject.hostname}${
userDesiredProject.port !== "" ? ":" : ""
}${userDesiredProject.port}`
) {
console.log("redirecting desired");
window.location.replace(
`${userDesiredProject.protocol}${userDesiredProject.hostname}${
userDesiredProject.port !== "" ? ":" : ""
}${userDesiredProject.port}${window.location.pathname}${
window.location.search
}`
);
}
// "else" user is on desired and available page
} else {
console.log("redirecting to legacy");
window.location.replace(
`${legacy.protocol}${legacy.hostname}${legacy.port !== "" ? ":" : ""}${
legacy.port
}${window.location.pathname}${window.location.search}`
);
}
// console.log("not redirecting");
}

async function insertSwitchBar() {
const bar = document.createElement("div");
bar.setAttribute(
"style",
"position:relative;top:0;width:100%;display: flex;padding: 6px 8px;justify-content: center;align-items: center;gap: 8px;align-self: stretch;background:#3498DB;font-family: Lato;font-size: 13px;font-style: normal;font-weight: 700;color: #FFF;"
);

bar.innerHTML =
'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512" style="fill:#FFF;height:16px;width:16px;"><!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M288 0L160 0 128 0C110.3 0 96 14.3 96 32s14.3 32 32 32l0 132.8c0 11.8-3.3 23.5-9.5 33.5L10.3 406.2C3.6 417.2 0 429.7 0 442.6C0 480.9 31.1 512 69.4 512l309.2 0c38.3 0 69.4-31.1 69.4-69.4c0-12.8-3.6-25.4-10.3-36.4L329.5 230.4c-6.2-10.1-9.5-21.7-9.5-33.5L320 64c17.7 0 32-14.3 32-32s-14.3-32-32-32L288 0zM192 196.8L192 64l64 0 0 132.8c0 23.7 6.6 46.9 19 67.1L309.5 320l-171 0L173 263.9c12.4-20.2 19-43.4 19-67.1z"/></svg>';

const text = document.createElement("p");
text.setAttribute("style", "line-height: 140%");
text.innerHTML =
"There’s a new beta version of this page available. Want to take it for a spin?";

const switchToBetaButton = document.createElement("button");
switchToBetaButton.setAttribute(
"style",
"display:flex;padding:6px 8px;justify-content:center;align-items:center;gap:12px;border-radius:6px;border:1px solid #FFF;background:transparent;"
);
switchToBetaButton.onclick = () => {
setCookie("betaDesire", "beta");
checkBetaRedirect();
};
switchToBetaButton.innerHTML = "Switch to beta";

const ignoreBarButton = document.createElement("button");
ignoreBarButton.setAttribute(
"style",
"color:#FFF;position:absolute;right:16px;height:16px;width:16px;background:transparent;fill:#FFF;"
);
ignoreBarButton.onclick = () => {
setCookie("hideBetaBar", "hide");
};
ignoreBarButton.innerHTML =
'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512" style="fill:#FFF;height:16px;width:16px;"><!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M342.6 150.6c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0L192 210.7 86.6 105.4c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3L146.7 256 41.4 361.4c-12.5 12.5-12.5 32.8 0 45.3s32.8 12.5 45.3 0L192 301.3 297.4 406.6c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3L237.3 256 342.6 150.6z"/></svg>';

bar.appendChild(text);
bar.appendChild(switchToBetaButton);
bar.appendChild(ignoreBarButton);
await new Promise((r) => setTimeout(r, 1000));
document.body.insertBefore(bar, document.body.firstChild);
}

const hideBetaBarCookie = new RegExp("hideBetaBar=([^;]+);").exec(
document.cookie[-1] === ";" ? document.cookie : document.cookie + ";"
)?.[1];
console.log("hideBetaBar:", hideBetaBarCookie);
if (hideBetaBarCookie !== "hide") {
insertSwitchBar();
}
console.log("inserted switch bar");
checkBetaRedirect();
console.log("checked beta");
29 changes: 29 additions & 0 deletions packages/beta-switch/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"compilerOptions": {
"target": "ESNext",
"module": "ESNext",
"skipLibCheck": true,
"moduleResolution": "node",
"removeComments": true,
"noImplicitAny": true,
"strictNullChecks": true,
"strictFunctionTypes": true,
"noImplicitThis": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noImplicitReturns": true,
"noFallthroughCasesInSwitch": true,
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"resolveJsonModule": true,
"forceConsistentCasingInFileNames": true,
"composite": true,
"outDir": "./dist",
"rootDir": "./src",
"jsx": "react-jsx"
},
"include": ["./src/**/*.tsx", "./src/**/*.ts"],
"exclude": ["node_modules"]
}
Loading