Initial switch to pnpm

injector/README.md

@@ -1,3 +1,3 @@
 # BetterDiscord Injector
 
-You're probably looking for the main app, [click here](https://github.com/rauenzi/BetterDiscordApp) to go there.
+You're probably looking for the main app, [click here](https://github.com/BetterDiscord/BetterDiscord) to go there.

injector/package.json

@@ -1,5 +1,5 @@
 {
-    "name": "betterdiscord-injector",
+    "name": "@betterdiscord/injector",
     "version": "0.6.2",
     "description": "BetterDiscord injector module",
     "main": "src/index.js",
@@ -10,11 +10,7 @@
         "build-prod": "webpack --stats minimal --mode production",
         "lint": "eslint --ext .js src/"
     },
-    "devDependencies": {
+    "peerDependencies": {
-        "circular-dependency-plugin": "^5.2.2",
+        "webpack": "^5.73.0"
-        "copy-webpack-plugin": "^8.0.0",
-        "eslint": "^7.21.0",
-        "webpack": "^5.24.2",
-        "webpack-cli": "^4.5.0"
     }
 }

injector/webpack.config.js

@@ -1,6 +1,4 @@
 const path = require("path");
-const CopyPlugin = require("copy-webpack-plugin");
-const CircularDependencyPlugin = require("circular-dependency-plugin");
 const TerserPlugin = require("terser-webpack-plugin");
 
 module.exports = (env, argv) => ({
@@ -29,20 +27,6 @@ module.exports = (env, argv) => ({
       common: path.resolve(__dirname, "..", "common")
     }
   },
-  plugins: [
-    new CircularDependencyPlugin({
-      exclude: /node_modules/,
-      cwd: process.cwd(),
-    }),
-    new CopyPlugin({
-      patterns: [
-        {
-          from: path.resolve(__dirname, "src", "preload.js"),
-          to: path.resolve(__dirname, "..", "dist", "preload.js")
-        },
-      ],
-    })
-  ],
   optimization: {
     minimizer: [
       new TerserPlugin({

package.json

@@ -4,7 +4,6 @@
     "description": "Enhances Discord by adding functionality and themes.",
     "main": "src/index.js",
     "scripts": {
-        "install": "cd injector && npm install && cd ../renderer && npm install",
         "build": "npm run build-injector && npm run build-renderer",
         "build-prod": "npm run build-prod --prefix injector && npm run build-prod --prefix renderer",
         "build-injector": "npm run build --prefix injector",
@@ -20,7 +19,12 @@
         "asar": "^3.0.3",
         "eslint": "^7.12.0",
         "eslint-plugin-react": "^7.21.5",
-        "jsdoc": "^3.6.11",
+        "mocha": "^10.0.0",
-        "mocha": "^10.0.0"
+        "webpack": "^5.73.0",
+        "webpack-cli": "^4.10.0"
+    },
+    "engines": {
+        "node": ">=14",
+        "pnpm": ">=7"
     }
 }

pnpm-workspace.yaml

@@ -0,0 +1,4 @@
+packages:
+  - "injector/"
+  - "preload/"
+  - "renderer/"

preload/README.md

@@ -0,0 +1,3 @@
+# BetterDiscord Preload
+
+You're probably looking for the main app, [click here](https://github.com/BetterDiscord/BetterDiscord) to go there.

preload/jsconfig.json

@@ -0,0 +1,11 @@
+{
+    "compilerOptions": {
+      "target": "es2020",
+      "allowSyntheticDefaultImports": false,
+      "baseUrl": "./",
+      "paths": {
+        "common": ["../common"]
+      }
+    },
+    "exclude": ["node_modules"]
+  }

preload/package.json

@@ -0,0 +1,16 @@
+{
+    "name": "@betterdiscord/preload",
+    "version": "0.0.1",
+    "description": "BetterDiscord preload module",
+    "main": "src/index.js",
+    "private": true,
+    "scripts": {
+        "build": "webpack --progress --color",
+        "watch": "webpack --progress --color --watch",
+        "build-prod": "webpack --stats minimal --mode production",
+        "lint": "eslint --ext .js src/"
+    },
+    "peerDependencies": {
+        "webpack": "^5.73.0"
+    }
+}

preload/src/index.js

@@ -56,4 +56,4 @@ if (preload) {
     }
 }
 
-Module.globalPaths.push(path.resolve(process.env.DISCORD_APP_PATH, "..", "app.asar", "node_modules"));
+Module.globalPaths.push(path.resolve(process.env.DISCORD_APP_PATH, "..", "app.asar", "node_modules"));

preload/webpack.config.js

@@ -0,0 +1,40 @@
+const path = require("path");
+const TerserPlugin = require("terser-webpack-plugin");
+
+module.exports = (env, argv) => ({
+  mode: "development",
+  target: "node",
+  devtool: argv.mode === "production" ? undefined : "eval-source-map",
+  entry: "./src/index.js",
+  output: {
+    filename: "preload.js",
+    path: path.resolve(__dirname, "..", "dist")
+  },
+  externals: {
+    electron: `require("electron")`,
+    fs: `require("fs")`,
+    path: `require("path")`,
+    request: `require("request")`,
+    events: `require("events")`,
+    rimraf: `require("rimraf")`,
+    yauzl: `require("yauzl")`,
+    mkdirp: `require("mkdirp")`,
+    module: `require("module")`
+  },
+  resolve: {
+    extensions: [".js"],
+    alias: {
+      common: path.resolve(__dirname, "..", "common")
+    }
+  },
+  optimization: {
+    minimizer: [
+      new TerserPlugin({
+        terserOptions: {
+          compress: {drop_debugger: false},
+          keep_classnames: true
+        }
+      })
+    ]
+  }
+});

renderer/package.json

@@ -1,5 +1,5 @@
 {
-    "name": "betterdiscord-renderer",
+    "name": "@betterdiscord/renderer",
     "description": "Renderer portion of the BetterDiscord application.",
     "private": true,
     "main": "src/index.js",
@@ -24,16 +24,15 @@
         "babel-plugin-module-resolver": "^4.1.0",
         "circular-dependency-plugin": "^5.2.2",
         "css-loader": "^6.5.1",
-        "eslint": "^8.8.0",
-        "eslint-plugin-react": "^7.28.0",
         "postcss": "^8.4.5",
         "postcss-cli": "^9.1.0",
         "postcss-csso": "^6.0.0",
         "postcss-easy-import": "^4.0.0",
         "postcss-loader": "^6.2.1",
         "stylelint": "^14.3.0",
-        "stylelint-config-standard": "^24.0.0",
+        "stylelint-config-standard": "^24.0.0"
-        "webpack": "^5.67.0",
+    },
-        "webpack-cli": "^4.9.2"
+    "peerDependencies": {
+        "webpack": "^5.73.0"
     }
 }