Merge pull request #92 from BobbyWibowo/pr-3.2.16b

Pitu · Sep 8, 2023 · 87a5e59 · 87a5e59
2 parents f1682aa + 529ac5f
commit 87a5e59
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 103 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -43,9 +43,6 @@ jobs:
         if: steps.cache-nodemodules.outputs.cache-hit != 'true'
         run: yarn install --frozen-lockfile --non-interactive
 
-      - name: Build application (Classic)
-        run: yarn build
-
       - name: Build application (BetterDiscord plugin)
         run: yarn build-bd
 

diff --git a/dist/magane.min.js b/dist/magane.min.js
diff --git a/dist/magane.min.js.map b/dist/magane.min.js.map
diff --git a/package.json b/package.json
@@ -15,8 +15,6 @@
     }
   ],
   "scripts": {
-    "build": "rollup -c",
-    "dev": "rollup -c -w",
     "build-bd": "rollup -c rollup-bd.config.js",
     "dev-bd": "rollup -c rollup-bd.config.js -w",
     "build-vc": "rollup -c rollup-vencord.config.js",

diff --git a/rollup-bd.config.js b/rollup-bd.config.js
@@ -90,9 +90,11 @@ export default {
 		}),
 		{
 			name: 'copyDistFile',
-			writeBundle: () => Boolean(process.env.BD_PLUGIN_PATH) &&
-				fs.copyFile(file, process.env.BD_PLUGIN_PATH) &&
-				console.log(`Copied dist file to ${process.env.BD_PLUGIN_PATH}`)
+			writeBundle: async () => {
+				if (!Boolean(process.env.BD_PLUGIN_PATH)) return;
+				await fs.copyFile(file, process.env.BD_PLUGIN_PATH);
+				console.log(`Copied dist file to ${process.env.BD_PLUGIN_PATH}`);
+			}
 		}
 	],
 	watch: {

diff --git a/rollup-vencord.config.js b/rollup-vencord.config.js
@@ -102,9 +102,11 @@ export default {
 		}),
 		{
 			name: 'copyDistFile',
-			writeBundle: () => Boolean(process.env.VENCORD_PLUGIN_PATH) &&
-				fs.copyFile(file, process.env.VENCORD_PLUGIN_PATH) &&
-				console.log(`Copied dist file to ${process.env.VENCORD_PLUGIN_PATH}`)
+			writeBundle: async () => {
+				if (!Boolean(process.env.VENCORD_PLUGIN_PATH)) return;
+				await fs.copyFile(file, process.env.VENCORD_PLUGIN_PATH);
+				console.log(`Copied dist file to ${process.env.VENCORD_PLUGIN_PATH}`);
+			}
 		}
 	],
 	watch: {

diff --git a/rollup.config.js b/rollup.config.js
diff --git a/src/main.js b/src/main.js