Merge branch '1.13.0' into main

src/app/layout.tsx

@@ -0,0 +1,31 @@
+import { ReactNode } from 'react';
+import Navbar from '../components/Navbar';
+
+interface RootLayoutProps {
+  children: ReactNode;
+}
+
+export default function RootLayout({ children }: RootLayoutProps) {
+  return (
+    <html>
+      <body
+        style={{
+          margin: 0,
+        }}
+      >
+        <div
+          style={{
+            width: '100vw',
+            height: '100vh',
+            display: 'flex',
+            flexDirection: 'column',
+          }}
+        >
+          <Navbar />
+
+          {children}
+        </div>
+      </body>
+    </html>
+  );
+}

src/app/page.tsx

@@ -0,0 +1,3 @@
+export default function Page() {
+  return <h1>Hello, Next.js!</h1>;
+}

src/commands/debug.ts

@@ -12,7 +12,6 @@ const executionStart = new Date().getTime();
 
 export const debugCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()

src/commands/eligible.ts

@@ -26,7 +26,6 @@ export const SKILLED_CLANS: Record<SkilledClan, string> = {
 
 export const eligibleCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: true,
   inPublic: false,
 
   command: new SlashCommandBuilder()

src/commands/evolution.tsx

@@ -29,7 +29,6 @@ export const evolutionCommand = new Promise<CommandRegistryRaw>(
 
     resolve({
       inProduction: true,
-      inDevelopment: true,
       inPublic: true,
 
       command,

src/commands/fullStats.tsx

@@ -29,7 +29,6 @@ export const fullStatsCommand = new Promise<CommandRegistryRaw>(
 
     resolve({
       inProduction: true,
-      inDevelopment: true,
       inPublic: true,
 
       command,

src/commands/help.ts

@@ -30,7 +30,6 @@ function addDocsSubcommands(option: SlashCommandSubcommandsOnlyBuilder) {
 
 export const helpCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: true,
   inPublic: true,
 
   command: addDocsSubcommands(

src/commands/inactive.tsx

@@ -16,7 +16,6 @@ const DEFAULT_THRESHOLD = 7;
 
 export const inactiveCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()

src/commands/ownedTanks.tsx

@@ -46,7 +46,6 @@ const COMP_TANKS = [
 
 export const ownedTanksCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()

src/commands/ping.ts

@@ -3,7 +3,6 @@ import { CommandRegistry } from '../events/interactionCreate';
 
 export const pingCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: true,
   inPublic: true,
   handlesInteraction: true,
 

src/commands/playerAchievements.ts

@@ -16,7 +16,6 @@ type SortBy = 'name' | 'count';
 
 export const playerAchievementsCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()

src/commands/playerInfo.ts

@@ -12,7 +12,6 @@ import { AccountInfo } from '../types/accountInfo';
 
 export const playerInfoCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()

src/commands/ratings.tsx

@@ -218,7 +218,6 @@ export const ratingsCommand = new Promise<CommandRegistryRaw>(
 
     resolve({
       inProduction: true,
-      inDevelopment: true,
       inPublic: true,
 
       command,

src/commands/searchClans.ts

@@ -11,7 +11,6 @@ import { ClanList } from '../types/clanList';
 
 export const searchClansCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()

src/commands/searchPlayers.ts

@@ -12,7 +12,6 @@ import { AccountList } from '../types/accountList';
 
 export const searchPlayersCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()

src/commands/searchTanks.ts

@@ -8,7 +8,6 @@ import { CommandRegistry } from '../events/interactionCreate';
 
 export const searchTanksCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()

src/commands/stats.tsx

@@ -27,7 +27,6 @@ export const statsCommand = new Promise<CommandRegistryRaw>(async (resolve) => {
 
   resolve({
     inProduction: true,
-    inDevelopment: true,
     inPublic: true,
 
     command,

src/commands/today.tsx

@@ -15,7 +15,6 @@ import { AccountInfo } from '../types/accountInfo';
 
 export const todayCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()

src/commands/verify.ts

@@ -14,7 +14,6 @@ import { PlayerClanData } from '../types/playerClanData';
 
 export const verifyCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()

src/components/Navbar.tsx

@@ -0,0 +1,5 @@
+export default function Navbar() {
+  return (
+    <div style={{ display: 'flex', height: 100, backgroundColor: 'red' }}></div>
+  );
+}

src/events/interactionCreate/index.ts

@@ -51,7 +51,6 @@ export type InteractionReturnable =
   | Promise<InteractionIterableReturnable>;
 
 export interface Registry {
-  inDevelopment: boolean;
   inProduction: boolean;
 }
 
@@ -124,14 +123,12 @@ export const publicCommands: RESTPostAPIChatInputApplicationCommandsJSONBody[] =
 
 commands.then((awaitedCommands) => {
   Object.entries(awaitedCommands).forEach(([, registry]) => {
-    if (isDev() ? registry.inDevelopment : registry.inProduction) {
-      const json = registry.command.toJSON();
+    const json = registry.command.toJSON();
 
-      if (registry.inPublic) {
-        publicCommands.push(json);
-      } else {
-        guildCommands.push(json);
-      }
+    if (registry.inPublic) {
+      publicCommands.push(json);
+    } else {
+      guildCommands.push(json);
     }
   });
 

src/routes/stats.tsx

@@ -6,7 +6,6 @@ import { RouteRegistry } from '../server';
 export const statsRoute: RouteRegistry = {
   route: '/stats/:type/:period',
   inProduction: true,
-  inDevelopment: true,
 
   async handler(req) {
     const type = req.params.type as StatType;

src/routes/today.tsx

@@ -5,7 +5,6 @@ import { RouteRegistry } from '../server';
 export const todayRoute: RouteRegistry = {
   route: '/today',
   inProduction: true,
-  inDevelopment: true,
 
   async handler(req) {
     const player = resolvePlayerFromRequest(req);

src/server.ts

@@ -1,7 +1,6 @@
 import express, { Request, Response } from 'express';
 import normalizeRouteReturnable from './core/express/normalizeRouteReturnable';
 import withAutoRefresh from './core/express/withAutoRefresh';
-import isDev from './core/node/isDev';
 import { Registry } from './events/interactionCreate';
 import { statsRoute } from './routes/stats';
 import { todayRoute } from './routes/today';
@@ -22,8 +21,6 @@ export interface RouteRegistry<HandlesInteraction extends boolean = false>
 const app = express();
 
 ([statsRoute, todayRoute] as RouteRegistry[]).forEach((registry) => {
-  if (!(isDev() ? registry.inDevelopment : registry.inProduction)) return;
-
   app.get(registry.route, async (req, res) => {
     console.log(req.originalUrl);