diff --git a/package.json b/package.json index 3b5eb0b..6d7f3ea 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,6 @@ "@types/styled-components": "^5.1.11", "@types/tmp": "^0.2.2", "autoprefixer": "^10.4.19", - "css-modules-typescript-loader": "^4.0.1", "electron": "^28.2.2", "electron-builder": "^24.9.1", "postcss": "^8.4.38", diff --git a/src/react/index.tsx b/src/react/index.tsx index 7f15d94..1a3e066 100644 --- a/src/react/index.tsx +++ b/src/react/index.tsx @@ -1,5 +1,6 @@ import * as ReactDOM from "react-dom"; import App from "./App"; +import 'typeface-roboto'; import './index.css'; // We find our app DOM element as before diff --git a/webpack.react.config.js b/webpack.react.config.js index 9c35105..c6aad4f 100644 --- a/webpack.react.config.js +++ b/webpack.react.config.js @@ -30,8 +30,7 @@ module.exports = { // at the moment the only custom handling we have is for typescript files // .ts and .tsx files get passed to ts-loader { - test: /\.css$/, - exclude: /node_modules/, + test: /\.(scss|css)$/i, use: ['style-loader', 'css-loader', 'postcss-loader'], }, { test: /\.tsx?$/, diff --git a/yarn.lock b/yarn.lock index c9838d9..89901fd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2193,16 +2193,6 @@ __metadata: languageName: node linkType: hard -"css-modules-typescript-loader@npm:^4.0.1": - version: 4.0.1 - resolution: "css-modules-typescript-loader@npm:4.0.1" - dependencies: - line-diff: "npm:^2.0.1" - loader-utils: "npm:^1.2.3" - checksum: 10/44943afdf3ba65029d61f58e99eeb8e0f913f0700eec4fa5bb7d3a0dabaadcfebc2b01e10f825f7316e32d9126d53d50f61bf92e900ec85690a8c4776c397dd2 - languageName: node - linkType: hard - "css-select@npm:^4.1.3": version: 4.3.0 resolution: "css-select@npm:4.3.0" @@ -3711,17 +3701,6 @@ __metadata: languageName: node linkType: hard -"json5@npm:^1.0.1": - version: 1.0.2 - resolution: "json5@npm:1.0.2" - dependencies: - minimist: "npm:^1.2.0" - bin: - json5: lib/cli.js - checksum: 10/a78d812dbbd5642c4f637dd130954acfd231b074965871c3e28a5bbd571f099d623ecf9161f1960c4ddf68e0cc98dee8bebfdb94a71ad4551f85a1afc94b63f6 - languageName: node - linkType: hard - "json5@npm:^2.1.2, json5@npm:^2.2.0": version: 2.2.3 resolution: "json5@npm:2.2.3" @@ -3865,13 +3844,6 @@ __metadata: languageName: node linkType: hard -"levdist@npm:^1.0.0": - version: 1.0.0 - resolution: "levdist@npm:1.0.0" - checksum: 10/3f942770b44c94f07a7fd5dd64e13da1a43dfc13cee1abc9dac1c1f912f9959e8b50419cd3a2963892810142ba9d29a20fa8d0500900969fcbee0871b3d1de33 - languageName: node - linkType: hard - "lilconfig@npm:^2.1.0": version: 2.1.0 resolution: "lilconfig@npm:2.1.0" @@ -3886,15 +3858,6 @@ __metadata: languageName: node linkType: hard -"line-diff@npm:^2.0.1": - version: 2.1.1 - resolution: "line-diff@npm:2.1.1" - dependencies: - levdist: "npm:^1.0.0" - checksum: 10/5a40ec97abb048511f98e71699c2776d991cb8bb18bc637b8f3f008186f514674847a104880649123cf3038db2b9c2c3842452151e21331592308654478f92e6 - languageName: node - linkType: hard - "lines-and-columns@npm:^1.1.6": version: 1.2.4 resolution: "lines-and-columns@npm:1.2.4" @@ -3909,17 +3872,6 @@ __metadata: languageName: node linkType: hard -"loader-utils@npm:^1.2.3": - version: 1.4.2 - resolution: "loader-utils@npm:1.4.2" - dependencies: - big.js: "npm:^5.2.2" - emojis-list: "npm:^3.0.0" - json5: "npm:^1.0.1" - checksum: 10/2ae94cc88ad9cf2991e322b9ddf547cff80cf6fc0f9c77546b258c5ed9f77b0827f64c2625cb0baa06432f1f441bb4744c9ab1e1412ee6f8e97d31f8e9c730d6 - languageName: node - linkType: hard - "loader-utils@npm:^2.0.0": version: 2.0.4 resolution: "loader-utils@npm:2.0.4" @@ -4115,7 +4067,7 @@ __metadata: languageName: node linkType: hard -"minimist@npm:^1.2.0, minimist@npm:^1.2.6": +"minimist@npm:^1.2.6": version: 1.2.8 resolution: "minimist@npm:1.2.8" checksum: 10/908491b6cc15a6c440ba5b22780a0ba89b9810e1aea684e253e43c4e3b8d56ec1dcdd7ea96dde119c29df59c936cde16062159eae4225c691e19c70b432b6e6f @@ -5881,7 +5833,6 @@ __metadata: "@types/tmp": "npm:^0.2.2" autoprefixer: "npm:^10.4.19" css-loader: "npm:^5.2.6" - css-modules-typescript-loader: "npm:^4.0.1" electron: "npm:^28.2.2" electron-builder: "npm:^24.9.1" file-loader: "npm:^6.2.0"