try to clean webpack

dranc · Jan 3, 2024 · 2a8fb8f · 2a8fb8f
1 parent 2363e0b
commit 2a8fb8f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/config/webpack.config.js b/config/webpack.config.js
@@ -12,21 +12,29 @@ const config = merge(common, {
     contentScript: PATHS.src + '/contentScript.ts',
     background: PATHS.src + '/background.ts',
     index: PATHS.src + '/index.ts',
+    style: PATHS.src + '/asset/style/index.scss'
   },
   resolve: {
     extensions: ['.tsx', '.ts', '.js'],
   },
   module: {
     rules: [
-      {
+            {
         test: /\.tsx?$/,
         loader: 'ts-loader',
         exclude: /node_modules/,
       },
       {
         test: /\.s[ac]ss$/i,
-        use: ['style-loader', 'css-loader', 'sass-loader'],
-      },
+        exclude: /node_modules/,
+        use: [
+          {
+              loader: 'file-loader',
+              options: { outputPath: 'style/', name: '[name].min.css'}
+          },
+          'sass-loader'
+        ]
+    }
     ],
   },
 });

diff --git a/src/asset/html/index.html b/src/asset/html/index.html
@@ -1,11 +1,11 @@
 <html>
   <head>
-    <link rel="stylesheet" href="index.css" />
+    <link rel="stylesheet" href="../style/index.min.css" />
   </head>
   <body>
     <nav class="demo imponent">
       <a href="" class="brand">
-        <img class="logo" src="icons/icon_128.png" />
+        <img class="logo" src="../icons/icon_128.png" />
         <span>Filigrane</span>
       </a>
     </nav>
@@ -32,6 +32,6 @@
       </div>
     </div>
 
-    <script src="index.js"></script>
+    <script src="../index.js"></script>
   </body>
 </html>
diff --git a/src/asset/style/index.scss b/src/asset/style/index.scss
@@ -1,4 +1,4 @@
-@import url('~picnic/picnic.min.css');
+@import '~picnic/src/picnic';
 
 $height: 500px;
 $width: 350px;

diff --git a/src/index.ts b/src/index.ts
@@ -1,5 +1,3 @@
-import './asset/style/index.scss';
-
 import { saveAs } from 'file-saver';
 
 import { FiligraneServices } from './services/filigrane.services';