Fix importing ipcRenderer in the webview-imported script

nukeop · Apr 14, 2022 · 52769a2 · 52769a2
1 parent 0437aed
commit 52769a2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/packages/app/app/containers/SpotifyPlaylistImporter/hooks.tsx b/packages/app/app/containers/SpotifyPlaylistImporter/hooks.tsx
@@ -61,7 +61,8 @@ export const useSpotifyPlaylistImporterProps = (t: TFunction<string>) => {
             const ipcRenderer = window.require('electron').ipcRenderer;
             (${extractPlaylist.toString()})()
             })()`
-            .replaceAll('electron__WEBPACK_IMPORTED_MODULE_0__.', '');
+            .replaceAll('electron__WEBPACK_IMPORTED_MODULE_0__.', '')
+            .replaceAll('a(\'electron\')', 'window.require(\'electron\'))');
 
           w.executeJavaScript(js);
         }, 1500);

diff --git a/packages/core/src/helpers/playlist/spotify.ts b/packages/core/src/helpers/playlist/spotify.ts
@@ -1,5 +1,5 @@
-import { ipcRenderer } from 'electron';
-
+/* eslint-disable node/no-extraneous-require */
+/* eslint-disable @typescript-eslint/no-var-requires */
 type SpotifyTrack = {
   index: number;
   id?: string;
@@ -19,6 +19,8 @@ type SpotifyPlaylist = {
 }
 
 export default (async function () {
+  const { ipcRenderer } = window.require('electron');
+
   function getPlaylistGeneralInfo() {
     const tracklistContainer = document.querySelector('div[data-testid="playlist-tracklist"]');
     const totalTracks = parseInt(
@@ -45,7 +47,6 @@ export default (async function () {
   }
 
   function getTracksFromDOM(processedIndex) {
-
     const nodeTracks = document.querySelector('div[data-testid="top-sentinel"] + div').childNodes as NodeListOf<Element>;
     const tracks = [];
 
@@ -139,7 +140,6 @@ export default (async function () {
       y += scrollHeight;
 
       await wait(1000);
-
     }
 
     playlist.tracks = extractedTracks;