Revert "Migrate a module bundler from webpack to vite"

remap-keys · May 30, 2024 · 924ea0e · 924ea0e
1 parent 8188bad
commit 924ea0e
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 1,229 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -3,8 +3,7 @@
     "es6": true,
     "node": true,
     "jest": true,
-    "jasmine": true,
-    "browser": true
+    "jasmine": true
   },
   "parser": "@typescript-eslint/parser",
   "plugins": ["react", "prettier"],

diff --git a/package.json b/package.json
@@ -41,10 +41,9 @@
     "web-vitals": "^1.1.0"
   },
   "scripts": {
-    "start": "vite",
+    "start": "NODE_OPTIONS=--openssl-legacy-provider react-scripts start",
     "type-check": "tsc --noEmit",
-    "lint": "eslint src --ext .ts,.tsx",
-    "build": "yarn type-check && yarn lint && vite build",
+    "build": "yarn type-check && NODE_OPTIONS=--openssl-legacy-provider react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
     "format": "prettier --write './src/**/*.{ts,tsx}'",
@@ -99,9 +98,7 @@
     "@types/wicg-file-system-access": "^2020.9.7",
     "@typescript-eslint/eslint-plugin": "^4.10.0",
     "@typescript-eslint/parser": "^7.11.0",
-    "@vitejs/plugin-react": "^4.3.0",
     "babel-eslint": "^10.1.0",
-    "eslint": "8.57.0",
     "eslint-config-prettier": "^7.0.0",
     "eslint-plugin-prettier": "^5.1.3",
     "eslint-plugin-react": "^7.21.5",
@@ -110,8 +107,7 @@
     "lint-staged": "^10.5.3",
     "prettier": "^3.2.5",
     "react-scripts": "^4.0.1",
-    "sinon": "^11.1.2",
-    "vite": "^5.2.12"
+    "sinon": "^11.1.2"
   },
   "husky": {
     "hooks": {
@@ -128,6 +124,5 @@
       "git add"
     ]
   },
-  "packageManager": "[email protected]",
-  "type": "module"
+  "packageManager": "[email protected]"
 }
diff --git a/src/index.html → public/index.html b/src/index.html → public/index.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
   <head prefix="og: http://ogp.me/ns#">
     <!-- Global site tag (gtag.js) - Google Analytics -->
@@ -12,7 +12,7 @@
     </script>
 
     <meta charset="utf-8" />
-    <link rel="icon" href="/favicon.ico" />
+    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <link
       rel="stylesheet"
       href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"
@@ -43,11 +43,15 @@
       content="Remap allows you to find, build, set up and customize your keyboard quickly and easily in Web Browser."
       data-rh="true"
     />
-    <meta property="og:url" content="https://remap-keys.app" data-rh="true" />
-    <meta property="og:image" content="/ogp_image.png" data-rh="true" />
+    <meta property="og:url" content="%PUBLIC_URL%" data-rh="true" />
+    <meta
+      property="og:image"
+      content="%PUBLIC_URL%/ogp_image.png"
+      data-rh="true"
+    />
 
-    <link rel="apple-touch-icon" href="/logo192.png" />
-    <link rel="manifest" href="/manifest.json" />
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
     <script type="application/ld+json">
       {
         "@context": "https://schema.org",
@@ -68,7 +72,6 @@
         "keywords": "remap,keyboard,keymap,qmk,via,customize,led,diy,webhid"
       }
     </script>
-    <script type="module" src="./index.tsx"></script>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/src/services/provider/Firebase.ts b/src/services/provider/Firebase.ts
@@ -52,14 +52,14 @@ import { IDeviceInformation } from '../hid/Hid';
 import * as crypto from 'crypto';
 import { IBootloaderType } from '../firmware/Types';
 
-export type IFirebaseConfiguration = {
-  apiKey: string;
-  authDomain: string;
-  projectId: string;
-  storageBucket: string;
-  messagingSenderId: string;
-  appId: string;
-  measurementId: string;
+const config = {
+  apiKey: process.env.REACT_APP_FIREBASE_API_KEY,
+  authDomain: process.env.REACT_APP_FIREBASE_AUTH_DOMAIN,
+  projectId: process.env.REACT_APP_FIREBASE_PROJECT_ID,
+  storageBucket: process.env.REACT_APP_FIREBASE_STORAGE_BUCKET,
+  messagingSenderId: process.env.REACT_APP_FIREBASE_MESSAGE_SENDER_ID,
+  appId: process.env.REACT_APP_FIREBASE_APP_ID,
+  measurementId: process.env.REACT_APP_FIREBASE_MEASUREMENT_ID,
 };
 
 const FUNCTIONS_REGION = 'asia-northeast1';
@@ -71,7 +71,7 @@ export class FirebaseProvider implements IStorage, IAuth {
   private functions: firebase.functions.Functions;
   private unsubscribeAuthStateChanged?: firebase.Unsubscribe;
 
-  constructor(config: IFirebaseConfiguration) {
+  constructor() {
     firebase.initializeApp(config);
     firebase.analytics();
     const app = firebase.app();

diff --git a/src/services/provider/FirebaseConfiguration.ts b/src/services/provider/FirebaseConfiguration.ts
diff --git a/src/store/state.ts b/src/store/state.ts
@@ -35,7 +35,6 @@ import { IFirmwareWriter } from '../services/firmware/FirmwareWriter';
 import { FirmwareWriterWebApiImpl } from '../services/firmware/FirmwareWriterWebApiImpl';
 import { IBootloaderType } from '../services/firmware/Types';
 import { getLocalAuthenticationUid } from '../utils/AuthUtils';
-import { firebaseConfiguration } from '../services/provider/FirebaseConfiguration';
 
 export type ISetupPhase =
   | 'init'
@@ -489,9 +488,9 @@ export type RootState = {
 
 let firebaseProvider;
 try {
-  firebaseProvider = new FirebaseProvider(firebaseConfiguration);
+  firebaseProvider = new FirebaseProvider();
 } catch (cause) {
-  if (import.meta.env.NODE_ENV === 'production') {
+  if (process.env.NODE_ENV === 'production') {
     throw cause;
   } else {
     console.warn(

diff --git a/src/utils/GoogleAnalytics.ts b/src/utils/GoogleAnalytics.ts
@@ -48,7 +48,7 @@ let analytics: firebase.analytics.Analytics | null;
 try {
   analytics = firebase.analytics();
 } catch (cause) {
-  if (import.meta.env.NODE_ENV === 'production') {
+  if (process.env.NODE_ENV === 'production') {
     throw cause;
   } else {
     analytics = null;

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
-    "target": "esnext",
-    "lib": ["dom", "esnext"],
+    "target": "es5",
+    "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
@@ -15,16 +15,7 @@
     "isolatedModules": true,
     "noEmit": true,
     "jsx": "react-jsx",
-    "typeRoots": ["node_modules/@types", "node_modules", "src/@types"],
-    "types": [
-      "node",
-      "@types/jest",
-      "@types/w3c-web-hid",
-      "@types/w3c-web-usb",
-      "@types/w3c-web-serial",
-      "@types/wicg-file-system-access",
-      "vite/client"
-    ]
+    "typeRoots": ["node_modules/@types"]
   },
   "include": ["src"]
 }
diff --git a/vite.config.ts b/vite.config.ts