Migration to Vite

st-matskevich · Oct 14, 2023 · 0884a31 · 0884a31
1 parent 56782fd
commit 0884a31
Show file tree

Hide file tree

Showing 29 changed files with 2,662 additions and 16,719 deletions.
diff --git a/README.md b/README.md
@@ -3,8 +3,8 @@ Template for building Telegram Bots with Mini Apps in React and Go. Deployed ins
 
 ## Features
 - Example of creating [Inline Keyboard](https://core.telegram.org/bots/features#inline-keyboards) to interact with the user. Keyboard creation can be found in [main.go](api/main.go)
-- Example of adjusting UI styles to the user's current color theme using [ThemeParams](https://core.telegram.org/bots/webapps#themeparams). CSS variable usage can be found in [App.css](ui/src/App.css)
-- Example of interaction with [telegram-web-app.js](https://core.telegram.org/bots/webapps#initializing-mini-apps) to show a native alert. Script usage can be found in [App.js](ui/src/App.js) 
+- Example of adjusting UI styles to the user's current color theme using [ThemeParams](https://core.telegram.org/bots/webapps#themeparams). CSS variable usage can be found in [index.css](ui/src/index.css)
+- Example of interaction with [telegram-web-app.js](https://core.telegram.org/bots/webapps#initializing-mini-apps) to show a native alert. Script usage can be found in [App.jsx](ui/src/App.jsx) 
 - [Local environment](#local-environment) with [docker-compose](https://docs.docker.com/compose/), that serves traffic over HTTPS proxy and automatically applies UI changes without rebuilding the container
 - [Continious deliviery](#production-deployment) to [Google Cloud Platform](https://cloud.google.com/)
 
@@ -90,6 +90,7 @@ curl https://api.telegram.org/bot${TELEGRAM_BOT_TOKEN}/setWebhook?url=${BOT_API_
 - [Docker](https://www.docker.com/)
 - [Go](https://go.dev/)
 - [React](https://react.dev/)
+- [Vite](https://vitejs.dev)
 - [gotgbot](https://github.com/PaulSonOfLars/gotgbot)
 - [nginx](https://www.nginx.com/)
 - [ngrok](https://ngrok.com/)

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,13 +13,12 @@ services:
 
   # Bot UI in development mode
   bot-ui:
-    environment:
-      WATCHPACK_POLLING: true
-      WDS_SOCKET_PORT: 443
     restart: on-failure
     volumes:
       - ./ui/src:/app/src
       - ./ui/public:/app/public
+      - ./ui/index.html:/app/index.html
+      - ./ui/vite.config.js:/app/vite.config.js
     build:
       context: ./ui
       dockerfile: dev.dockerfile

diff --git a/ui/.eslintrc.cjs b/ui/.eslintrc.cjs
@@ -0,0 +1,20 @@
+module.exports = {
+  root: true,
+  env: { browser: true, es2020: true },
+  extends: [
+    'eslint:recommended',
+    'plugin:react/recommended',
+    'plugin:react/jsx-runtime',
+    'plugin:react-hooks/recommended',
+  ],
+  ignorePatterns: ['dist', '.eslintrc.cjs'],
+  parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
+  settings: { react: { version: '18.2' } },
+  plugins: ['react-refresh'],
+  rules: {
+    'react-refresh/only-export-components': [
+      'warn',
+      { allowConstantExport: true },
+    ],
+  },
+}
diff --git a/ui/.gitignore b/ui/.gitignore
@@ -1,23 +1,24 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
+# Logs
+logs
+*.log
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/ui/dev.dockerfile b/ui/dev.dockerfile
@@ -6,4 +6,4 @@ COPY package.json ./
 COPY package-lock.json ./
 RUN npm ci
 
-ENTRYPOINT ["npm", "start"]
+ENTRYPOINT ["npm", "run", "dev"]
diff --git a/ui/index.html b/ui/index.html
@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <script src="https://telegram.org/js/telegram-web-app.js"></script>
+    <title>Vite + React</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/index.jsx"></script>
+  </body>
+</html>