test with webpack - not working

winter0019 · Mar 31, 2022 · 280cc49 · 280cc49
1 parent 2dfd09a
commit 280cc49
Show file tree

Hide file tree

Showing 87 changed files with 6,684 additions and 843 deletions.
diff --git a/OS.js b/OS.js
diff --git a/background.html b/background.html
@@ -29,9 +29,6 @@
 
     <script type="text/javascript" src="js/components.js"></script>
     <script type="text/javascript" src="js/libtextsecure.js"></script>
-
-    <script type="text/javascript" src="js/views/react_wrapper_view.js"></script>
-    <script type="text/javascript" src="js/views/whisper_view.js"></script>
   </head>
 
   <body>
@@ -42,6 +39,6 @@
       </div>
     </div>
 
-    <script type="text/javascript" src="dist/js/electron-renderer.js"></script>
+    <script type="text/javascript" src="dist/electron_renderer.js"></script>
   </body>
 </html>
diff --git a/js/debug_log_start.js b/js/debug_log_start.js
diff --git a/js/password_start.js b/js/password_start.js
diff --git a/js/views/password_view.js b/js/views/password_view.js
diff --git a/js/views/react_wrapper_view.js b/js/views/react_wrapper_view.js
diff --git a/js/views/whisper_view.js b/js/views/whisper_view.js
diff --git a/js/views/whisper_view.ts b/js/views/whisper_view.ts
diff --git a/libtextsecure/index.d.ts b/libtextsecure/index.d.ts
@@ -0,0 +1 @@
+
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
   "main": "dist/electron_main.js",
   "scripts": {
     "postinstall": "yarn patch-package && yarn electron-builder install-app-deps",
-    "start-prod": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod$MULTI electron .",
+    "start-prod": "cross-env NODE_ENV=dev NODE_APP_INSTANCE=devprod$MULTI electron .",
     "grunt": "yarn clean-transpile  && grunt",
     "generate": "yarn grunt --force",
     "build-release": "run-script-os",
@@ -113,6 +113,10 @@
     "styled-components": "5.1.1",
     "uuid": "3.3.2"
   },
+  "peerDependencies": {
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2"
+  },
   "devDependencies": {
     "@playwright/test": "^1.16.3",
     "@types/backbone": "^1.4.2",
@@ -138,6 +142,7 @@
     "@types/linkify-it": "2.0.3",
     "@types/lodash": "4.14.106",
     "@types/mocha": "5.0.0",
+    "@types/mustache": "^4.1.2",
     "@types/node-fetch": "^2.5.7",
     "@types/pify": "3.0.2",
     "@types/rc-slider": "^8.6.5",
@@ -162,6 +167,7 @@
     "electron": "^17.1.2",
     "electron-builder": "22.8.0",
     "electron-notarize": "^0.2.0",
+    "esbuild": "^0.14.29",
     "eslint": "4.14.0",
     "eslint-config-airbnb-base": "12.1.0",
     "eslint-config-prettier": "2.9.0",
@@ -287,7 +293,7 @@
       "stylesheets/*.css",
       "!js/register.js",
       "js/views/standalone_registration_view.js",
-      "preload.js",
+      "dist/preload.bundled.js",
       "about_preload.js",
       "settings_preload.js",
       "debug_log_preload.js",

diff --git a/password.html b/password.html
@@ -1,7 +1,8 @@
 <html>
-<head>
-  <meta http-equiv="Content-Security-Policy"
-    content="default-src 'none';
+  <head>
+    <meta
+      http-equiv="Content-Security-Policy"
+      content="default-src 'none';
             child-src 'self';
             connect-src 'self' https: wss:;
             font-src 'self';
@@ -12,24 +13,19 @@
             object-src 'none';
             script-src 'self';
             style-src 'self' 'unsafe-inline';"
-  >
-  <link href="stylesheets/manifest.css" rel="stylesheet" type="text/css" />
-  <style>
-  </style>
+    />
+    <link href="stylesheets/manifest.css" rel="stylesheet" type="text/css" />
+    <style></style>
 
-
-  <script type='text/javascript' src='js/components.js'></script>
-  <script type='text/javascript' src='js/views/whisper_view.js'></script>
-  <script type='text/javascript' src='js/views/react_wrapper_view.js'></script>
-  <script type='text/javascript' src='js/views/password_view.js'></script>
-</head>
-<body>
-  <div class='app-loading-screen'>
-    <div class="content session-full-logo">
+    <script type="text/javascript" src="js/components.js"></script>
+  </head>
+  <body>
+    <div class="app-loading-screen">
+      <div class="content session-full-logo">
         <img src="images/session/brand.svg" class="session-brand-logo" />
         <img src="images/session/session-text.svg" class="session-text-logo" />
+      </div>
     </div>
-  </div>
-  <script type='text/javascript' src='js/password_start.js'></script>
-</body>
+    <script type="text/javascript" src="js/password_start.js"></script>
+  </body>
 </html>