Deprecate url-loader and use native webpack file loading instead. Upg…

…rade webpack loaders.
nukeop · Jan 30, 2025 · d3fd11b · d3fd11b
1 parent 0cba60e
commit d3fd11b
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 87 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/app/app/components/ArtistView/PopularTracks/index.tsx b/packages/app/app/components/ArtistView/PopularTracks/index.tsx
@@ -10,8 +10,8 @@ import { ArtistTopTrack } from '@nuclear/core/src/plugins/plugins.types';
 import { TextCell } from '@nuclear/ui/lib/components/GridTrackTable/Cells/TextCell';
 import { Track } from '@nuclear/ui/lib/types';
 
-import trackRowStyles from '../../TrackRow/styles.scss';
 import TrackTableContainer from '../../../containers/TrackTableContainer';
+import * as trackRowStyles from '../../TrackRow/styles.scss';
 import * as styles from './styles.scss';
 
 type AddAllButtonProps = {

diff --git a/packages/app/package.json b/packages/app/package.json
@@ -104,25 +104,23 @@
     "cross-env": "^7.0.3",
     "css-loader": "7.1.2",
     "eslint": "^7.18.0",
-    "file-loader": "^6.2.0",
     "html-webpack-plugin": "5.6.3",
     "i18next-json-sync": "^2.3.1",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^27.5.1",
     "megalodon": "^3.6.1",
     "mock-require": "^3.0.3",
     "react-beautiful-dnd-test-utils": "^4.1.0",
-    "react-hot-loader": "^4.13.1",
+    "react-hot-loader": "4.13.1",
     "redux-mock-store": "^1.5.4",
     "sass": "1.83.4",
     "sass-loader": "16.0.4",
     "style-loader": "4.0.0",
-    "svg-inline-loader": "^0.8.2",
+    "svg-inline-loader": "0.8.2",
     "ts-jest": "^27.1.3",
-    "ts-loader": "^8.0.3",
+    "ts-loader": "9.5.2",
     "ts-node": "^10.7.0",
     "typescript": "^4.2.4",
-    "url-loader": "^4.1.1",
     "utf-8-validate": "^5.0.2",
     "webpack": "5.97.1",
     "webpack-cli": "6.0.1",

diff --git a/packages/app/resources/media/steamgriddb/grid_600x900.jpg b/packages/app/resources/media/steamgriddb/grid_600x900.jpg
diff --git a/packages/app/webpack.config.ts b/packages/app/webpack.config.ts
@@ -222,12 +222,12 @@ module.exports = (env) => {
         },
         {
           test: /\.(png|jpg|gif)$/,
-          loader: 'url-loader',
+          type: 'asset/resource',
           include: [RESOURCES_DIR, APP_DIR, UI_DIR, VENDOR_DIR]
         },
         {
           test: /\.(ttf|eot|woff|woff2|svg)$/,
-          loader: 'url-loader',
+          type: 'asset/resource',
           include: [UI_DIR, APP_DIR, VENDOR_DIR]
         },
         {

diff --git a/packages/main/package.json b/packages/main/package.json
@@ -84,7 +84,7 @@
     "node-loader": "^0.6.0",
     "shx": "^0.3.3",
     "ts-jest": "^27.1.3",
-    "ts-loader": "^9.5.1",
+    "ts-loader": "9.5.2",
     "ts-node": "^10.7.0",
     "type-fest": "^0.8.1",
     "typescript": "^4.2.4",

diff --git a/packages/ui/.storybook/main.js b/packages/ui/.storybook/main.js
@@ -44,14 +44,14 @@ module.exports = {
           },
           {
             test: /\.(ttf|eot|woff|woff2|svg)$/,
-            loader: 'url-loader',
+            type: 'asset/resource',
             include: [
               path.resolve(__dirname, '../resources')
             ]
           },
           {
             test: /\.(png|jpg|gif)$/,
-            loader: 'url-loader',
+            type: 'asset/resource',
             include: path.resolve(__dirname, '../resources')
           }
         ]

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -59,12 +59,12 @@
 		"identity-obj-proxy": "^3.0.0",
 		"ignore-styles": "^5.0.1",
 		"jest": "^27.5.1",
-		"react-hot-loader": "^4.12",
+		"react-hot-loader": "4.13.1",
 		"sass": "1.83.4",
 		"sass-loader": "16.0.4",
 		"style-loader": "4.0.0",
 		"ts-jest": "^27.1.3",
-		"ts-loader": "^8.0.3",
+		"ts-loader": "9.5.2",
 		"ts-node": "^10.7.0",
 		"typescript": "^4.2.4"
 	},