202-feature-upgrade-all-dependencies

.gitignore

@@ -12,6 +12,7 @@ yarn.lock
 .env.pro
 dist.zip
 _raw/manifest.json
+_raw/react-devtools.js
 yarn-error.log
 dist2
 src/background/utils/firebase.config.json

build/plugins/AssetReplacePlugin.js

@@ -40,7 +40,7 @@ class AssetReplacePlugin {
 
         for (const chunk of compilation.chunks.values()) {
           const fileName = chunk.files.values().next().value;
-          if (!replaceArr.includes(([, assetName]) => assetName === fileName)) {
+          if (!replaceArr.some(([, assetName]) => assetName === fileName)) {
             compilation.updateAsset(fileName, (content) => {
               const result = replaceFn(content.source());
 

build/plugins/FirebaseFixPlugin.js

@@ -5,7 +5,15 @@ class FirebaseFixPlugin {
       for (const asset in compilation.assets) {
         if (/\.(js|jsx)$/.test(asset)) {
           let content = compilation.assets[asset].source();
+          // Convert Buffer to string if needed
+          if (Buffer.isBuffer(content)) {
+            content = content.toString('utf-8');
+          }
 
+          // Convert other types to string if needed
+          if (typeof content !== 'string') {
+            content = content.toString();
+          }
           // Replace the _loadJS function
           content = content.replace(
             /function\s*\w*\s*_loadJS\([\w\s,]*\)\s*{([\w\W]*?)}$/gim,

build/prepareManifest.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const fs = require('fs-extra');
+const http = require('http');
 // require('dotenv').config();
 
 const PROJECT_ROOT = path.resolve(__dirname, '..');
@@ -8,6 +9,35 @@ const mode = args[0];
 
 require('dotenv').config({ path: `.env.${mode}` });
 
+const OAUTH2_SCOPES = process.env.OAUTH2_SCOPES || '';
+
+const DEVTOOLS_URL = 'http://localhost:8097';
+
+async function fetchDevTools() {
+  return new Promise((resolve, reject) => {
+    const request = http.get(DEVTOOLS_URL, (response) => {
+      if (response.statusCode !== 200) {
+        reject(new Error(`Failed to fetch: ${response.statusCode}`));
+        return;
+      }
+
+      let data = '';
+      response.on('data', (chunk) => (data += chunk));
+      response.on('end', () => {
+        const modifiedScript = `
+          // React DevTools for Chrome Extension
+          (function() {
+            ${data}
+          })();
+        `;
+        resolve(modifiedScript);
+      });
+    });
+
+    request.on('error', reject);
+  });
+}
+
 async function prepare() {
   console.log(process.env.NODE_ENV);
   console.log(process.env.OAUTH2_CLIENT_ID);
@@ -17,12 +47,25 @@ async function prepare() {
 
   manifest.oauth2 = {
     client_id: process.env.OAUTH2_CLIENT_ID,
-    scopes: process.env.OAUTH2_SCOPES.split(','),
+    scopes: OAUTH2_SCOPES.split(','),
   };
 
   if (mode == 'dev') {
     manifest.key = process.env.MANIFEST_KEY;
+    try {
+      const devToolsScript = await fetchDevTools();
+      fs.writeFileSync(path.resolve(__dirname, '../_raw/react-devtools.js'), devToolsScript);
+      console.log('✅ React DevTools source fetched successfully');
+    } catch (error) {
+      console.warn('⚠️ Failed to fetch React DevTools. Run the devtools server first');
+      // Write empty file if fetch fails
+      fs.writeFileSync(
+        path.resolve(__dirname, '../_raw/react-devtools.js'),
+        '// React DevTools not available'
+      );
+    }
   }
+
   fs.writeJSONSync(manifestPath, manifest, { spaces: 2 });
 
   return '';

build/release.js

@@ -1,13 +1,13 @@
 const path = require('path');
-const { prompt } = require('enquirer');
+const { prompt: enquirerPrompt } = require('enquirer');
 const fs = require('fs-extra');
 const shell = require('shelljs');
 const zipdir = require('zip-dir');
 
 const PROJECT_ROOT = path.resolve(__dirname, '..');
 
 async function release() {
-  const input = await prompt({
+  const input = await enquirerPrompt({
     type: 'input',
     name: 'version',
     message: '[Flow Wallet] Please input the release version:',