Merge pull request #729 from integer32llc/help-styles

Author: shepmaster

ui/frontend/Help.tsx

@@ -77,7 +77,7 @@ fn main() {
 
 const Help: React.SFC = () => {
   return (
-    <section className={`help ${styles.container}`}>
+    <section className={styles.container}>
       <h1>The Rust Playground</h1>
       <Link action={actions.navigateToIndex}>Return to the playground</Link>
 

ui/frontend/package.json

@@ -64,7 +64,6 @@
     "postcss-nesting": "^8.0.1",
     "postcss-simple-vars": "^6.0.3",
     "prettier": "^2.2.1",
-    "style-loader": "^2.0.0",
     "stylelint": "^13.12.0",
     "stylelint-config-css-modules": "^2.2.0",
     "stylelint-config-idiomatic-order": "^8.1.0",

ui/frontend/webpack.config.js

@@ -80,34 +80,38 @@ module.exports = function(_, argv) {
           exclude: /node_modules/,
           use: ['babel-loader', 'ts-loader'],
         },
-        {
-          test: /prismjs\/themes\/.*css$/,
-          type: 'asset/resource',
-        },
         {
           test: /\.css$/,
-          include: /node_modules/,
-          use: [
-            MiniCssExtractPlugin.loader,
-            "css-loader",
-            "postcss-loader",
-          ],
-        },
-        {
-          test: /\.module.css$/,
-          exclude: /node_modules/,
-          use: [
-            MiniCssExtractPlugin.loader,
+          oneOf: [
             {
-              loader: "css-loader",
-              options: {
-                modules: {
-                  localIdentName,
+              test: /prismjs\/themes/,
+              type: 'asset/resource',
+            },
+            {
+              test: /\.module.css$/,
+              exclude: /node_modules/,
+              use: [
+                MiniCssExtractPlugin.loader,
+                {
+                  loader: "css-loader",
+                  options: {
+                    modules: {
+                      localIdentName,
+                    },
+                  },
                 },
-              },
+                "postcss-loader",
+              ],
+            },
+            {
+              include: /node_modules/,
+              use: [
+                MiniCssExtractPlugin.loader,
+                "css-loader",
+                "postcss-loader",
+              ],
             },
-            "postcss-loader",
-          ],
+          ]
         },
         {
           test: /\.svg$/,