Merge branch 'master' of https://github.com/Miodec/monkeytype

frontend/static/html/popups.html

@@ -987,6 +987,6 @@
       <label>website</label>
       <input class="website" type="text" value="" />
     </div>
-    <div class="button edit-profile-submit">edit</div>
+    <div class="button edit-profile-submit">save</div>
   </div>
 </div>

frontend/static/quotes/english.json

@@ -35634,6 +35634,54 @@
       "source": "The Secret History - Donna Tartt",
       "length": 239,
       "id": 6114
+    },
+    {
+      "text": "\"Wild women don't get the blues\", but I find that lately I've been crying like a tall child.",
+      "source": "First Love / Late Spring",
+      "length": 92,
+      "id": 6115
+    },
+    {
+      "text": "I drive when it rains; at night when it rains, I drive. And the headlight spirits, they lead me down the Styx - so black it shines.",
+      "source": "Carry Me Out",
+      "length": 131,
+      "id": 6116
+    },
+    {
+      "text": "I never said I'd be alright, just thought I could hold myself together. But I couldn't breathe, I went outside - don't know why I thought it'd be any better.",
+      "source": "Me & My Dog",
+      "length": 157,
+      "id": 6117
+    },
+    {
+      "source": "Shades of Cool",
+      "text": "'Cause you are unfixable, I can't break through your world. 'Cause you live in shades of cool, your heart is unbreakable.",
+      "length": 121,
+      "id": 6118
+    },
+    {
+      "text": "Suzanne takes you down to her place near the river. You can hear the boats go by, you can spend the night beside her. And you know that she's half-crazy, but that's why you wanna be there. And she feeds you tea and oranges that come all the way from China.",
+      "source": "Suzanne",
+      "length": 256,
+      "id": 6119
+    },
+    {
+      "text": "They say I'm too young to love you. I don't know what I need. They think I don't understand the freedom land of the seventies.",
+      "source": "Brooklyn Baby",
+      "length": 126,
+      "id": 6120
+    },
+    {
+      "text": "John met me down on the boulevard. Cry on his shoulder 'cause life is hard, the waves came in over my head. What you been up to my baby? Haven't seen you 'round here lately. All the other guys tell me lies, but you don't. You just crack another beer and pretend that you're still here.",
+      "source": "How To Disappear",
+      "length": 285,
+      "id": 6121
+    },
+    {
+      "text": "Thinking outrageously, I write in cursive. I hide in my bed with the lights on the floor. Wearing three layers of coats and leg-warmers, I see my own breath on the face of the door.",
+      "source": "The Predatory Wasp of the Palisades Is Out to Get Us!",
+      "length": 181,
+      "id": 6122
     }
   ]
 }

frontend/webpack/config.base.js

@@ -3,8 +3,6 @@ const CopyPlugin = require("copy-webpack-plugin");
 const CircularDependencyPlugin = require("circular-dependency-plugin");
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const HtmlWebpackPlugin = require("html-webpack-plugin");
-const RemovePlugin = require("remove-files-webpack-plugin");
-const ExtraWatchWebpackPlugin = require("extra-watch-webpack-plugin");
 
 let circularImports = 0;
 
@@ -114,14 +112,6 @@ const BASE_CONFIG = {
     new MiniCssExtractPlugin({
       filename: "./css/style.[chunkhash:8].css",
     }),
-    new RemovePlugin({
-      after: {
-        include: [resolve(__dirname, "../public/html")],
-      },
-    }),
-    new ExtraWatchWebpackPlugin({
-      dirs: [resolve(__dirname, "../static/html")],
-    }),
   ],
 };
 

frontend/webpack/config.dev.js

@@ -1,5 +1,7 @@
+const { resolve } = require("path");
 const { merge } = require("webpack-merge");
 const BASE_CONFIG = require("./config.base");
+const ExtraWatchWebpackPlugin = require("extra-watch-webpack-plugin");
 
 /** @type { import('webpack').Configuration } */
 const DEV_CONFIG = {
@@ -10,12 +12,16 @@ const DEV_CONFIG = {
     port: 3000,
     open: true,
     hot: false,
-    liveReload: true,
     historyApiFallback: true,
     client: {
       overlay: false,
     },
   },
+  plugins: [
+    new ExtraWatchWebpackPlugin({
+      dirs: [resolve(__dirname, "../static/html")],
+    }),
+  ],
 };
 
 module.exports = merge(BASE_CONFIG, DEV_CONFIG);

frontend/webpack/config.prod.js

@@ -1,5 +1,6 @@
 const { resolve } = require("path");
 const { merge } = require("webpack-merge");
+const RemovePlugin = require("remove-files-webpack-plugin");
 const CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
 const HtmlMinimizerPlugin = require("html-minimizer-webpack-plugin");
 const JsonMinimizerPlugin = require("json-minimizer-webpack-plugin");
@@ -64,6 +65,13 @@ const PRODUCTION_CONFIG = {
       new CssMinimizerPlugin(),
     ],
   },
+  plugins: [
+    new RemovePlugin({
+      after: {
+        include: [resolve(__dirname, "../public/html")],
+      },
+    }),
+  ],
 };
 
 module.exports = merge(BASE_CONFIG, PRODUCTION_CONFIG);