Convert easy entrypoints files to Typescript (#30102)

main
Renaud Chaput 2024-04-29 10:02:41 +02:00 committed by GitHub
parent 4f4b77920e
commit 36909065b5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 32 additions and 13 deletions

View File

@ -1,5 +1,5 @@
import './public-path'; import './public-path';
import main from "mastodon/main"; import main from 'mastodon/main';
import { start } from '../mastodon/common'; import { start } from '../mastodon/common';
import { loadLocale } from '../mastodon/locales'; import { loadLocale } from '../mastodon/locales';
@ -10,6 +10,6 @@ start();
loadPolyfills() loadPolyfills()
.then(loadLocale) .then(loadLocale)
.then(main) .then(main)
.catch(e => { .catch((e: unknown) => {
console.error(e); console.error(e);
}); });

View File

@ -2,7 +2,9 @@ import './public-path';
import ready from '../mastodon/ready'; import ready from '../mastodon/ready';
ready(() => { ready(() => {
const image = document.querySelector('img'); const image = document.querySelector<HTMLImageElement>('img');
if (!image) return;
image.addEventListener('mouseenter', () => { image.addEventListener('mouseenter', () => {
image.src = '/oops.gif'; image.src = '/oops.gif';
@ -11,4 +13,6 @@ ready(() => {
image.addEventListener('mouseleave', () => { image.addEventListener('mouseleave', () => {
image.src = '/oops.png'; image.src = '/oops.png';
}); });
}).catch((e: unknown) => {
console.error(e);
}); });

View File

@ -2,7 +2,7 @@
// to share the same assets regardless of instance configuration. // to share the same assets regardless of instance configuration.
// See https://webpack.js.org/guides/public-path/#on-the-fly // See https://webpack.js.org/guides/public-path/#on-the-fly
function removeOuterSlashes(string) { function removeOuterSlashes(string: string) {
return string.replace(/^\/*/, '').replace(/\/*$/, ''); return string.replace(/^\/*/, '').replace(/\/*$/, '');
} }
@ -15,7 +15,9 @@ function formatPublicPath(host = '', path = '') {
return `${formattedHost}/${formattedPath}/`; return `${formattedHost}/${formattedPath}/`;
} }
const cdnHost = document.querySelector('meta[name=cdn-host]'); const cdnHost = document.querySelector<HTMLMetaElement>('meta[name=cdn-host]');
// eslint-disable-next-line no-undef __webpack_public_path__ = formatPublicPath(
__webpack_public_path__ = formatPublicPath(cdnHost ? cdnHost.content : '', process.env.PUBLIC_OUTPUT_PATH); cdnHost ? cdnHost.content : '',
process.env.PUBLIC_OUTPUT_PATH,
);

View File

@ -16,7 +16,7 @@ function loaded() {
if (!attr) return; if (!attr) return;
const props = JSON.parse(attr); const props = JSON.parse(attr) as object;
const root = createRoot(mountNode); const root = createRoot(mountNode);
root.render(<ComposeContainer {...props} />); root.render(<ComposeContainer {...props} />);
@ -24,9 +24,13 @@ function loaded() {
} }
function main() { function main() {
ready(loaded); ready(loaded).catch((error: unknown) => {
console.error(error);
});
} }
loadPolyfills().then(main).catch(error => { loadPolyfills()
.then(main)
.catch((error: unknown) => {
console.error(error); console.error(error);
}); });

View File

@ -167,6 +167,7 @@
"@types/redux-immutable": "^4.0.3", "@types/redux-immutable": "^4.0.3",
"@types/requestidlecallback": "^0.3.5", "@types/requestidlecallback": "^0.3.5",
"@types/webpack": "^4.41.33", "@types/webpack": "^4.41.33",
"@types/webpack-env": "^1.18.4",
"@typescript-eslint/eslint-plugin": "^7.0.0", "@typescript-eslint/eslint-plugin": "^7.0.0",
"@typescript-eslint/parser": "^7.0.0", "@typescript-eslint/parser": "^7.0.0",
"babel-jest": "^29.5.0", "babel-jest": "^29.5.0",

View File

@ -2766,6 +2766,7 @@ __metadata:
"@types/redux-immutable": "npm:^4.0.3" "@types/redux-immutable": "npm:^4.0.3"
"@types/requestidlecallback": "npm:^0.3.5" "@types/requestidlecallback": "npm:^0.3.5"
"@types/webpack": "npm:^4.41.33" "@types/webpack": "npm:^4.41.33"
"@types/webpack-env": "npm:^1.18.4"
"@typescript-eslint/eslint-plugin": "npm:^7.0.0" "@typescript-eslint/eslint-plugin": "npm:^7.0.0"
"@typescript-eslint/parser": "npm:^7.0.0" "@typescript-eslint/parser": "npm:^7.0.0"
arrow-key-navigation: "npm:^1.2.0" arrow-key-navigation: "npm:^1.2.0"
@ -3990,6 +3991,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/webpack-env@npm:^1.18.4":
version: 1.18.4
resolution: "@types/webpack-env@npm:1.18.4"
checksum: 10c0/3fa77dbff0ed71685404576b0a1cf74587567fe2ee1cfd11d56d6eefcab7a61e4c9ead0eced264e289d2cf0fc74296dbd55ed6c95774fe0fd6264d156c5a59f0
languageName: node
linkType: hard
"@types/webpack-sources@npm:*": "@types/webpack-sources@npm:*":
version: 3.2.2 version: 3.2.2
resolution: "@types/webpack-sources@npm:3.2.2" resolution: "@types/webpack-sources@npm:3.2.2"