extension-develop 3.8.9 → 3.8.10

package/README.md

@@ -228,6 +228,7 @@ export default {
   2. `.env.development`
   3. `.env.local`
   4. `.env`
+- In monorepos, if none of the files above exist in the project directory, develop falls back to the nearest workspace root (directory containing `pnpm-workspace.yaml`) and applies the same loading order there.
 - Only variables you read explicitly in the config are used there; client-side injection still requires the `EXTENSION_PUBLIC_*` prefix.
 - Example:
 

package/dist/module.cjs

@@ -131453,7 +131453,6 @@ var __webpack_modules__ = {
         var pintor__rspack_import_3_default = /*#__PURE__*/ __webpack_require__.n(pintor__rspack_import_3);
         var _webpack_lib_check_build_dependencies__rspack_import_4 = __webpack_require__("./webpack/webpack-lib/check-build-dependencies.ts");
         var _webpack_lib_package_manager__rspack_import_5 = __webpack_require__("./webpack/webpack-lib/package-manager.ts");
-        var _webpack_lib_progress__rspack_import_6 = __webpack_require__("./webpack/webpack-lib/progress.ts");
         function parseJsonSafe(text) {
             const s = text && 0xfeff === text.charCodeAt(0) ? text.slice(1) : text;
             return JSON.parse(s || '{}');
@@ -131690,34 +131689,25 @@ var __webpack_modules__ = {
                 const setupMessage = setupMessages[0];
                 const hasIndex = Boolean(options?.index && options?.total);
                 const setupMessageWithIndex = hasIndex ? setupMessage.replace('►►► ', `►►► [${options?.index}/${options?.total}] `) : setupMessage;
-                const progressEnabled = !isAuthor && (0, _webpack_lib_progress__rspack_import_6.u)();
-                const progress = (0, _webpack_lib_progress__rspack_import_6.J)(setupMessageWithIndex, {
-                    enabled: progressEnabled,
-                    persistLabel: true
-                });
                 if (isAuthor) console.warn(setupMessageWithIndex);
-                else if (!progressEnabled) console.log(setupMessageWithIndex);
-                try {
-                    for (const dependency of dependencies){
-                        const installCommand = getOptionalInstallCommand(pm, [
-                            dependency
-                        ], wslContext.installDir || installBaseDir);
-                        const execCommand = wrapCommandForWsl(installCommand, wslContext);
-                        const fallbackNpmCommand = wslContext.useWsl ? void 0 : (0, _webpack_lib_package_manager__rspack_import_5.sX)([
-                            '--silent',
-                            'install',
-                            dependency,
-                            '--prefix',
-                            installBaseDir,
-                            '--save-optional'
-                        ]);
-                        await execInstallWithFallback(execCommand, {
-                            cwd: wslContext.useWsl ? void 0 : installBaseDir,
-                            fallbackNpmCommand
-                        });
-                    }
-                } finally{
-                    progress.stop();
+                else console.log(setupMessageWithIndex);
+                for (const dependency of dependencies){
+                    const installCommand = getOptionalInstallCommand(pm, [
+                        dependency
+                    ], wslContext.installDir || installBaseDir);
+                    const execCommand = wrapCommandForWsl(installCommand, wslContext);
+                    const fallbackNpmCommand = wslContext.useWsl ? void 0 : (0, _webpack_lib_package_manager__rspack_import_5.sX)([
+                        '--silent',
+                        'install',
+                        dependency,
+                        '--prefix',
+                        installBaseDir,
+                        '--save-optional'
+                    ]);
+                    await execInstallWithFallback(execCommand, {
+                        cwd: wslContext.useWsl ? void 0 : installBaseDir,
+                        fallbackNpmCommand
+                    });
                 }
                 await new Promise((resolve)=>setTimeout(resolve, 500));
                 if (isAuthor) {
@@ -133159,27 +133149,54 @@ var __webpack_modules__ = {
             fn(exports1, requireFn, module, absolutePath, dirname);
             return module.exports?.default || module.exports;
         }
-        function preloadEnvFiles(projectDir) {
+        function findNearestWorkspaceRoot(startDir) {
+            let current = external_path_.resolve(startDir);
+            while(true){
+                if (external_fs_.existsSync(external_path_.join(current, 'pnpm-workspace.yaml'))) return current;
+                const parent = external_path_.dirname(current);
+                if (parent === current) return;
+                current = parent;
+            }
+        }
+        function preloadEnvFilesFromDir(envDir, options) {
+            let loadedAny = false;
             try {
-                const defaultsPath = external_path_.join(projectDir, '.env.defaults');
-                if (external_fs_.existsSync(defaultsPath)) external_dotenv_default().config({
-                    path: defaultsPath
-                });
+                const defaultsPath = external_path_.join(envDir, '.env.defaults');
+                if (external_fs_.existsSync(defaultsPath)) {
+                    external_dotenv_default().config({
+                        path: defaultsPath,
+                        override: Boolean(options?.override)
+                    });
+                    loadedAny = true;
+                }
                 const envCandidates = [
                     '.env.development',
                     '.env.local',
                     '.env'
                 ];
                 for (const filename of envCandidates){
-                    const filePath = external_path_.join(projectDir, filename);
+                    const filePath = external_path_.join(envDir, filename);
                     if (external_fs_.existsSync(filePath)) {
                         external_dotenv_default().config({
-                            path: filePath
+                            path: filePath,
+                            override: Boolean(options?.override)
                         });
+                        loadedAny = true;
                         break;
                     }
                 }
             } catch  {}
+            return {
+                loadedAny,
+                envDir
+            };
+        }
+        function preloadEnvFiles(projectDir) {
+            const local = preloadEnvFilesFromDir(projectDir);
+            if (local.loadedAny) return local;
+            const workspaceRoot = findNearestWorkspaceRoot(projectDir);
+            if (workspaceRoot && workspaceRoot !== projectDir) return preloadEnvFilesFromDir(workspaceRoot);
+            return local;
         }
         async function loadConfigFile(configPath) {
             const absolutePath = external_path_.resolve(configPath);
@@ -134682,59 +134699,6 @@ var __webpack_modules__ = {
             }
         }
     },
-    "./webpack/webpack-lib/progress.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
-        "use strict";
-        __webpack_require__.d(__webpack_exports__, {
-            J: ()=>startProgressBar,
-            u: ()=>shouldShowProgress
-        });
-        function clearLine() {
-            if (!process.stdout.isTTY) return;
-            process.stdout.write('\r');
-            process.stdout.write('\x1b[2K');
-        }
-        function stripAnsi(input) {
-            return input.replace(/\x1b\[[0-9;]*m/g, '');
-        }
-        function shouldShowProgress() {
-            return Boolean(process.stdout.isTTY) && !process.env.CI;
-        }
-        function startProgressBar(label, options) {
-            const enabled = (options?.enabled ?? true) && shouldShowProgress();
-            if (!enabled) return {
-                stop: ()=>void 0
-            };
-            const width = Math.max(10, options?.width ?? 24);
-            const intervalMs = Math.max(50, options?.intervalMs ?? 90);
-            let tick = 0;
-            let lastVisibleLength = 0;
-            const render = ()=>{
-                const filled = tick % (width + 1);
-                const empty = width - filled;
-                const bar = `[${'='.repeat(filled)}${' '.repeat(empty)}]`;
-                const line = `${label} ${bar}`;
-                lastVisibleLength = stripAnsi(line).length;
-                clearLine();
-                process.stdout.write(line);
-                tick = (tick + 1) % (width + 1);
-            };
-            render();
-            const timer = setInterval(render, intervalMs);
-            return {
-                stop: ()=>{
-                    clearInterval(timer);
-                    if (process.stdout.isTTY) {
-                        clearLine();
-                        if (lastVisibleLength > 0) {
-                            process.stdout.write(' '.repeat(lastVisibleLength));
-                            process.stdout.write('\r');
-                        }
-                        if (options?.persistLabel) process.stdout.write(`${label}\n`);
-                    }
-                }
-            };
-        }
-    },
     "./webpack/webpack-lib/sanitize.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
         "use strict";
         __webpack_require__.d(__webpack_exports__, {
@@ -134866,7 +134830,7 @@ var __webpack_modules__ = {
     },
     "./package.json" (module) {
         "use strict";
-        module.exports = JSON.parse('{"rE":"3.8.9","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.8.10","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__ = {};
@@ -135168,7 +135132,52 @@ var __webpack_exports__ = {};
     var webpack_lib_paths = __webpack_require__("./webpack/webpack-lib/paths.ts");
     var check_build_dependencies = __webpack_require__("./webpack/webpack-lib/check-build-dependencies.ts");
     var package_manager = __webpack_require__("./webpack/webpack-lib/package-manager.ts");
-    var webpack_lib_progress = __webpack_require__("./webpack/webpack-lib/progress.ts");
+    function clearLine() {
+        if (!process.stdout.isTTY) return;
+        process.stdout.write('\r');
+        process.stdout.write('\x1b[2K');
+    }
+    function stripAnsi(input) {
+        return input.replace(/\x1b\[[0-9;]*m/g, '');
+    }
+    function shouldShowProgress() {
+        return Boolean(process.stdout.isTTY) && !process.env.CI;
+    }
+    function startProgressBar(label, options) {
+        const enabled = (options?.enabled ?? true) && shouldShowProgress();
+        if (!enabled) return {
+            stop: ()=>void 0
+        };
+        const width = Math.max(10, options?.width ?? 24);
+        const intervalMs = Math.max(50, options?.intervalMs ?? 90);
+        let tick = 0;
+        let lastVisibleLength = 0;
+        const render = ()=>{
+            const filled = tick % (width + 1);
+            const empty = width - filled;
+            const bar = `[${'='.repeat(filled)}${' '.repeat(empty)}]`;
+            const line = `${label} ${bar}`;
+            lastVisibleLength = stripAnsi(line).length;
+            clearLine();
+            process.stdout.write(line);
+            tick = (tick + 1) % (width + 1);
+        };
+        render();
+        const timer = setInterval(render, intervalMs);
+        return {
+            stop: ()=>{
+                clearInterval(timer);
+                if (process.stdout.isTTY) {
+                    clearLine();
+                    if (lastVisibleLength > 0) {
+                        process.stdout.write(' '.repeat(lastVisibleLength));
+                        process.stdout.write('\r');
+                    }
+                    if (options?.persistLabel) process.stdout.write(`${label}\n`);
+                }
+            }
+        };
+    }
     function getInstallArgs(command, dependencies, dependenciesMap) {
         const depsWithVersions = dependencies.map((dep)=>`${dep}@${dependenciesMap[dep]}`);
         if ('pnpm' === command) return [
@@ -135202,9 +135211,9 @@ var __webpack_exports__ = {};
             const isAuthor = 'true' === process.env.EXTENSION_AUTHOR_MODE;
             const stdio = isAuthor ? 'inherit' : 'ignore';
             const progressLabel = messages.xK(dependencies);
-            const progressEnabled = !isAuthor && (0, webpack_lib_progress.u)();
+            const progressEnabled = !isAuthor && shouldShowProgress();
             const persistLabel = 'true' === process.env.EXTENSION_ONE_TIME_INSTALL_HINT;
-            const progress = (0, webpack_lib_progress.J)(progressLabel, {
+            const progress = startProgressBar(progressLabel, {
                 enabled: progressEnabled,
                 persistLabel
             });

package/package.json

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