Merge pull request #1 from dranc/fix/clean-code

Remove some useless code + clean a little bit the webpack packaging even if I'm pretty sure i will delte it later ...
dranc · Jan 3, 2024 · 99155da · 99155da
2 parents cd46aa2 + 2a8fb8f
commit 99155da
Show file tree

Hide file tree

Showing 27 changed files with 5,112 additions and 2,265 deletions.
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -37,7 +37,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: '20.x'
-      - run: npm i
+      - run: npm ci
       - run: npm run build
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v2

diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@
 .DS_Store
 
 npm-debug.log*
+size-plugin.json
diff --git a/backup/manifest.json b/backup/manifest.json
diff --git a/backup/package-lock.json b/backup/package-lock.json
diff --git a/backup/package.json b/backup/package.json
diff --git a/backup/tsconfig.json b/backup/tsconfig.json
diff --git a/config/webpack.common.js b/config/webpack.common.js
@@ -53,7 +53,7 @@ const common = {
       patterns: [
         {
           from: '**/*',
-          context: 'public',
+          context: 'src/asset',
         },
       ]
     }),

diff --git a/config/webpack.config.js b/config/webpack.config.js
@@ -10,23 +10,31 @@ const config = merge(common, {
   entry: {
     popup: PATHS.src + '/popup.ts',
     contentScript: PATHS.src + '/contentScript.ts',
-    background: PATHS.src + '/background.js',
+    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'
+        ]
+    }
     ],
   },
 });
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,3 +8,4 @@
		.DS_Store

		npm-debug.log*
		size-plugin.json