correct bundling of js

drbeat · Jan 1, 2024 · ea67f18 · ea67f18
1 parent dfc41b4
commit ea67f18
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 13 deletions.
diff --git a/frontend/public/index.html b/frontend/public/index.html
@@ -6,9 +6,7 @@
     <title>PicCap - Hyperion Sender App</title>
     <script src="./webOSTVjs-1.2.4/webOSTV.js" charset="utf-8"></script>
     <script src="./webOSTVjs-1.2.4/webOSTV-dev.js" charset="utf-8"></script>
-    <script type="text/javascript" src="./ui.bundled.js"></script>
-    <script type="text/javascript" src="./servicecalls.bundled.js"></script>
-    <script type="text/javascript" src="./spatialnavigation.bundled.js"></script>
+    <script src="./index.js"></script>
     <link rel="stylesheet" href="./css/basicui.css" media="screen">
     <link rel="stylesheet" href="./css/blueui.css" media="screen">
     <link rel="stylesheet" href="./css/darkui.css" media="screen">

diff --git a/frontend/src/index.js b/frontend/src/index.js
@@ -0,0 +1,5 @@
+import 'core-js/stable';
+import './domrect-polyfill';
+import './servicecalls';
+import './ui';
+import './spatial-navigation';
diff --git a/frontend/src/servicecalls.js b/frontend/src/servicecalls.js
@@ -1,5 +1,3 @@
-require('core-js/stable');
-
 const availableQuirks = {
   // DILE_VT
   QUIRK_DILE_VT_CREATE_EX: '0x1',

diff --git a/frontend/src/spatial-navigation.js b/frontend/src/spatial-navigation.js
@@ -13,8 +13,6 @@
  *
  * Licensed under the MIT license (MIT)
  */
-import 'core-js';
-import './domrect-polyfill';
 
 (function () {
   // The polyfill must not be executed, if it's already enabled via browser engine or browser extensions.

diff --git a/vite.config.js b/vite.config.js
@@ -16,13 +16,11 @@ export default defineConfig({
   ],
   build: {
     rollupOptions: {
-      input: {
-        ui: normalizePath(path.resolve(__dirname, './frontend/src/ui.js')),
-        servicecalls: normalizePath(path.resolve(__dirname, './frontend/src/servicecalls.js')),
-        spatialnavigation: normalizePath(path.resolve(__dirname, './frontend/src/spatial-navigation.js')),
-      },
+      input: [
+        normalizePath(path.resolve(__dirname, './frontend/src/index.js')),
+      ],
       output: {
-        entryFileNames: `[name].bundled.js`,
+        entryFileNames: `[name].js`,
       },
     },
     target: 'ES2015',