Merge pull request #11756 from nanaya/ts-type-thing

Explicit typescript types and rename webpack define const
ppy · Dec 20, 2024 · 79a6ee3 · 79a6ee3
2 parents 3a3ab74 + 5006038
commit 79a6ee3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/resources/js/globals.d.ts b/resources/js/globals.d.ts
@@ -35,16 +35,8 @@ interface Window {
 }
 // #endregion
 
-// #region interfaces for using process.env
-interface Process {
-  env: ProcessEnv;
-}
-
-interface ProcessEnv {
-  [key: string]: string | undefined;
-}
-
-declare const process: Process;
+// #region defined through webpack DefinePlugin
+declare const docsUrl: string;
 // #endregion
 
 // our helpers

diff --git a/resources/js/legacy-api-key/form.tsx b/resources/js/legacy-api-key/form.tsx
@@ -72,7 +72,7 @@ export default class Form extends React.Component<Props> {
           <div>
             <StringWithComponent
               mappings={{ link: (
-                <a href={`${process.env.DOCS_URL}#terms-of-use`}>
+                <a href={`${docsUrl}#terms-of-use`}>
                   {trans('oauth.new_client.terms_of_use.link')}
                 </a>
               ) }}

diff --git a/resources/js/oauth/new-client.tsx b/resources/js/oauth/new-client.tsx
@@ -82,7 +82,7 @@ export class NewClient extends React.Component {
           <div>
             <StringWithComponent
               mappings={{ link: (
-                <a href={`${process.env.DOCS_URL}#terms-of-use`}>
+                <a href={`${docsUrl}#terms-of-use`}>
                   {trans('oauth.new_client.terms_of_use.link')}
                 </a>
               ) }}

diff --git a/tsconfig.json b/tsconfig.json
@@ -14,6 +14,13 @@
     "strictNullChecks": true,
     "strictPropertyInitialization": true,
     "target": "es2015",
+    "types": [
+      "cloudflare-turnstile",
+      "jquery.fileupload",
+      "jquery.scrollto",
+      "jqueryui",
+      "timeago"
+    ],
     "useDefineForClassFields": true
   },
   "include": [

diff --git a/webpack.config.js b/webpack.config.js
@@ -94,7 +94,7 @@ const plugins = [
     ReactDOM: 'react-dom',
   }),
   new webpack.DefinePlugin({
-    'process.env.DOCS_URL': JSON.stringify(process.env.DOCS_URL || 'https://docs.ppy.sh'),
+    docsUrl: JSON.stringify(process.env.DOCS_URL ?? 'https://docs.ppy.sh'),
   }),
   new webpack.IgnorePlugin({
     // don't add moment locales to bundle.