extension-develop 3.9.3 → 3.9.4

package/dist/module.cjs

@@ -127904,6 +127904,65 @@ var __webpack_modules__ = {
             if (hasEnv) return true;
             return /microsoft/i.test(os__rspack_import_2.release());
         }
+        function findNearestPackageJson(startPath) {
+            let current = path__rspack_import_0.resolve(startPath);
+            for(let i = 0; i < 6; i += 1){
+                const candidate = path__rspack_import_0.join(current, 'package.json');
+                if (fs__rspack_import_1.existsSync(candidate)) return candidate;
+                const parent = path__rspack_import_0.dirname(current);
+                if (parent === current) break;
+                current = parent;
+            }
+            return null;
+        }
+        function safeReadPackageJson(filePath) {
+            try {
+                return JSON.parse(fs__rspack_import_1.readFileSync(filePath, 'utf8'));
+            } catch  {
+                return null;
+            }
+        }
+        function detectCurrentPackageManager(projectRoot, pkg) {
+            const userAgent = String(process.env.npm_config_user_agent || '').toLowerCase();
+            if (userAgent.includes('pnpm')) return 'pnpm';
+            if (userAgent.includes('yarn')) return 'yarn';
+            if (userAgent.includes('bun')) return 'bun';
+            if (userAgent.includes('npm')) return 'npm';
+            const declared = String(pkg?.packageManager || '').trim().toLowerCase();
+            if (declared.startsWith('pnpm@')) return 'pnpm';
+            if (declared.startsWith('yarn@')) return 'yarn';
+            if (declared.startsWith('bun@')) return 'bun';
+            if (declared.startsWith('npm@')) return 'npm';
+            if (fs__rspack_import_1.existsSync(path__rspack_import_0.join(projectRoot, 'pnpm-lock.yaml'))) return 'pnpm';
+            if (fs__rspack_import_1.existsSync(path__rspack_import_0.join(projectRoot, 'yarn.lock'))) return 'yarn';
+            if (fs__rspack_import_1.existsSync(path__rspack_import_0.join(projectRoot, 'bun.lockb'))) return 'bun';
+            if (fs__rspack_import_1.existsSync(path__rspack_import_0.join(projectRoot, 'bun.lock'))) return 'bun';
+            if (fs__rspack_import_1.existsSync(path__rspack_import_0.join(projectRoot, 'package-lock.json'))) return 'npm';
+            return 'unknown';
+        }
+        function preferredManagedInstallCommand(browser) {
+            const packageJsonPath = findNearestPackageJson(process.cwd());
+            const pkg = packageJsonPath ? safeReadPackageJson(packageJsonPath) : null;
+            const projectRoot = packageJsonPath ? path__rspack_import_0.dirname(packageJsonPath) : process.cwd();
+            const hasExtensionScript = Boolean(pkg?.scripts?.extension);
+            const packageManager = detectCurrentPackageManager(projectRoot, pkg);
+            if (hasExtensionScript) {
+                if ('pnpm' === packageManager) return `pnpm extension install ${browser}`;
+                if ('npm' === packageManager) return `npm run extension -- install ${browser}`;
+                if ('bun' === packageManager) return `bun run extension -- install ${browser}`;
+                if ('yarn' === packageManager) return `yarn extension install ${browser}`;
+            }
+            if ('pnpm' === packageManager) return `pnpm exec extension install ${browser}`;
+            if ('bun' === packageManager) return `bunx extension install ${browser}`;
+            return `npx extension install ${browser}`;
+        }
+        function managedBrowserDisplayName(browser) {
+            if ('chrome' === browser) return 'Chrome for Testing';
+            if ('chromium' === browser) return 'Chromium';
+            if ('firefox' === browser) return 'Firefox';
+            if ('edge' === browser) return 'Edge';
+            return browser;
+        }
         function capitalizedBrowserName(browser) {
             return `${browser.charAt(0).toUpperCase() + browser.slice(1)}`;
         }
@@ -128048,44 +128107,25 @@ var __webpack_modules__ = {
         function prettyPuppeteerInstallGuidance(browser, rawGuidance, cacheDir) {
             const dim = pintor__rspack_import_4_default().gray;
             const body = [];
-            let cleaned = String(rawGuidance || '').replace(/^Error:\s*/i, '').trim();
-            try {
-                const looksMinimal = cleaned.split(/\r?\n/).filter(Boolean).length < 2;
-                if (looksMinimal) {
-                    const b = String(browser || '').toLowerCase();
-                    if ('chromium' === b || 'chromium-based' === b) try {
-                        const txt = (0, chromium_location__rspack_import_6.getInstallGuidance)();
-                        if (txt && 'string' == typeof txt) cleaned = String(txt).trim();
-                    } catch  {}
-                    else if ('chrome' === b) try {
-                        const txt = (0, chrome_location2__rspack_import_5.getInstallGuidance)();
-                        if (txt && 'string' == typeof txt) cleaned = String(txt).trim();
-                    } catch  {}
-                    else if ('firefox' === b || 'gecko-based' === b) try {
-                        const txt = (0, firefox_location2__rspack_import_8.getInstallGuidance)();
-                        if (txt && 'string' == typeof txt) cleaned = String(txt).trim();
-                    } catch  {}
-                    else if ('edge' === b) try {
-                        const txt = (0, edge_location__rspack_import_7.getInstallGuidance)();
-                        if (txt && 'string' == typeof txt) cleaned = String(txt).trim();
-                    } catch  {}
-                }
-            } catch  {}
             let browserNorm = 'chromium';
             if ('chromium-based' === browser) browserNorm = 'chromium';
             else if ('gecko-based' === browser) browserNorm = 'firefox';
             else if ('chrome' === browser || 'chromium' === browser || 'firefox' === browser || 'edge' === browser) browserNorm = browser;
             const finalCachePath = browserNorm && cacheDir ? path__rspack_import_0.join(cacheDir, browserNorm) : cacheDir;
-            try {
-                const lines = cleaned.split(/\r?\n/);
-                const idx = lines.findIndex((l)=>/npx\s+@puppeteer\/browsers\s+install\s+|npx\s+playwright\s+install(\s+.+)?/i.test(l));
-                if (-1 !== idx) {
-                    lines[idx] = `npx extension install ${browserNorm}`;
-                    cleaned = lines.join('\n');
-                }
-            } catch  {}
-            body.push(cleaned);
-            if (finalCachePath) body.push(`${dim('INSTALL PATH')} ${pintor__rspack_import_4_default().underline(finalCachePath)}`);
+            const installCommand = preferredManagedInstallCommand(browserNorm);
+            const browserDisplay = managedBrowserDisplayName(browserNorm);
+            body.push(`${getLoggingPrefix('warn')} Browser setup required`);
+            body.push('');
+            body.push(`${browserDisplay} is not available in the managed browser cache.`);
+            body.push('');
+            body.push(pintor__rspack_import_4_default().gray(`Install ${browserDisplay} into the managed browser cache:`));
+            body.push('');
+            body.push(`  ${pintor__rspack_import_4_default().bold(pintor__rspack_import_4_default().blue(installCommand))}`);
+            if (finalCachePath) {
+                body.push('');
+                body.push(`${dim('INSTALL PATH')} ${pintor__rspack_import_4_default().underline(finalCachePath)}`);
+            }
+            body.push(`${dim('NEXT')} Re-run your command after the install finishes.`);
             return body.join('\n') + '\n';
         }
         function firefoxLaunchCalled() {
@@ -128867,6 +128907,7 @@ var __webpack_modules__ = {
             f: ()=>ChromiumLaunchPlugin
         });
         var external_fs_ = __webpack_require__("fs");
+        const external_node_child_process_namespaceObject = require("node:child_process");
         var external_chrome_location2_ = __webpack_require__("chrome-location2");
         var external_chrome_location2_default = /*#__PURE__*/ __webpack_require__.n(external_chrome_location2_);
         var external_chromium_location_ = __webpack_require__("chromium-location");
@@ -129346,7 +129387,14 @@ var __webpack_modules__ = {
                         if ('chromium' === browser || 'chromium-based' === browser) return (0, external_chromium_location_.getChromiumVersion)(bin, {
                             allowExec: true
                         }) || '';
-                        return (0, external_chrome_location2_.getChromeVersion)(bin, {
+                        const versionResult = (0, external_node_child_process_namespaceObject.spawnSync)(bin, [
+                            '--version'
+                        ], {
+                            stdio: 'pipe',
+                            encoding: 'utf8'
+                        });
+                        const versionLine = String(versionResult.stdout || '').trim();
+                        return versionLine || (0, external_chrome_location2_.getChromeVersion)(bin, {
                             allowExec: true
                         }) || '';
                     } catch  {
@@ -135599,7 +135647,7 @@ var __webpack_modules__ = {
     },
     "./package.json" (module) {
         "use strict";
-        module.exports = JSON.parse('{"rE":"3.9.3","El":{"@rspack/core":"^1.7.5","@rspack/dev-server":"^1.1.5","@swc/core":"^1.15.8","@swc/helpers":"^0.5.18","adm-zip":"^0.5.16","browser-extension-manifest-fields":"^2.2.1","case-sensitive-paths-webpack-plugin":"^2.4.0","chrome-location2":"4.0.0","chromium-location":"2.0.0","content-security-policy-parser":"^0.6.0","cross-spawn":"^7.0.6","dotenv":"^17.2.3","edge-location":"2.2.0","extension-from-store":"^0.1.1","firefox-location2":"3.0.0","go-git-it":"^5.1.1","ignore":"^7.0.5","loader-utils":"^3.3.1","magic-string":"^0.30.21","parse5":"^8.0.0","parse5-utilities":"^1.0.0","pintor":"0.3.0","schema-utils":"^4.3.3","tiny-glob":"^0.2.9","unique-names-generator":"^4.7.1","webextension-polyfill":"^0.12.0","webpack-merge":"^6.0.1","webpack-target-webextension":"^2.1.3","ws":"^8.19.0"}}');
+        module.exports = JSON.parse('{"rE":"3.9.4","El":{"@rspack/core":"^1.7.5","@rspack/dev-server":"^1.1.5","@swc/core":"^1.15.8","@swc/helpers":"^0.5.18","adm-zip":"^0.5.16","browser-extension-manifest-fields":"^2.2.1","case-sensitive-paths-webpack-plugin":"^2.4.0","chrome-location2":"4.0.0","chromium-location":"2.0.0","content-security-policy-parser":"^0.6.0","cross-spawn":"^7.0.6","dotenv":"^17.2.3","edge-location":"2.2.0","extension-from-store":"^0.1.1","firefox-location2":"3.0.0","go-git-it":"^5.1.1","ignore":"^7.0.5","loader-utils":"^3.3.1","magic-string":"^0.30.21","parse5":"^8.0.0","parse5-utilities":"^1.0.0","pintor":"0.3.0","schema-utils":"^4.3.3","tiny-glob":"^0.2.9","unique-names-generator":"^4.7.1","webextension-polyfill":"^0.12.0","webpack-merge":"^6.0.1","webpack-target-webextension":"^2.1.3","ws":"^8.19.0"}}');
     }
 };
 var __webpack_module_cache__ = {};

package/package.json

@@ -25,7 +25,7 @@
     "webpack/webpack-lib/optional-dependencies.json"
   ],
   "name": "extension-develop",
-  "version": "3.9.3",
+  "version": "3.9.4",
   "description": "Develop, build, preview, and package Extension.js projects.",
   "author": {
     "name": "Cezar Augusto",