extension-develop 3.8.4 → 3.8.5

package/dist/module.cjs

@@ -133424,20 +133424,38 @@ var __webpack_modules__ = {
                 return false;
             }
         }
+        function resolveBuiltInExtensionForBrowser(input) {
+            const engine = (0, _paths__rspack_import_2.gP)(input.browser);
+            const packageRelativeCandidates = [
+                path__rspack_import_1.join('dist', input.packageName, engine)
+            ];
+            const normalizedBaseDir = path__rspack_import_1.normalize(input.baseDir);
+            const parentName = path__rspack_import_1.basename(path__rspack_import_1.dirname(normalizedBaseDir));
+            const baseName = path__rspack_import_1.basename(normalizedBaseDir);
+            if ('programs' === parentName && 'develop' === baseName) packageRelativeCandidates.push(path__rspack_import_1.join('..', '..', 'extensions', input.packageName, 'dist', engine));
+            for (const rel of packageRelativeCandidates){
+                const candidate = path__rspack_import_1.resolve(input.baseDir, rel);
+                if (fs__rspack_import_0.existsSync(candidate)) return candidate;
+            }
+        }
         function computeExtensionsToLoad(baseDir, mode, browser, userExtensionOutputPath, extraExtensionDirs = []) {
             const list = [];
             try {
-                const engine = (0, _paths__rspack_import_2.gP)(browser);
-                const distRoot = path__rspack_import_1.resolve(baseDir, 'dist');
-                const devtoolsRoot = path__rspack_import_1.join(distRoot, 'extension-js-devtools');
-                const themeRoot = path__rspack_import_1.join(distRoot, 'extension-js-theme');
-                const devtoolsForBrowser = path__rspack_import_1.join(devtoolsRoot, engine);
-                const themeForBrowser = path__rspack_import_1.join(themeRoot, engine);
+                const devtoolsForBrowser = resolveBuiltInExtensionForBrowser({
+                    baseDir,
+                    packageName: 'extension-js-devtools',
+                    browser
+                });
+                const themeForBrowser = resolveBuiltInExtensionForBrowser({
+                    baseDir,
+                    packageName: 'extension-js-theme',
+                    browser
+                });
                 const userHasNewTabOverride = hasNewTabOverride(userExtensionOutputPath);
-                const devtoolsHasNewTabOverride = hasNewTabOverride(devtoolsForBrowser);
+                const devtoolsHasNewTabOverride = devtoolsForBrowser ? hasNewTabOverride(devtoolsForBrowser) : false;
                 const shouldSkipDevtoolsForNtpConflict = userHasNewTabOverride && devtoolsHasNewTabOverride;
-                if ('production' !== mode && fs__rspack_import_0.existsSync(devtoolsForBrowser) && !shouldSkipDevtoolsForNtpConflict) list.push(devtoolsForBrowser);
-                if (fs__rspack_import_0.existsSync(themeForBrowser)) list.push(themeForBrowser);
+                if (devtoolsForBrowser && !shouldSkipDevtoolsForNtpConflict) list.push(devtoolsForBrowser);
+                if (themeForBrowser) list.push(themeForBrowser);
             } catch  {}
             for (const p of extraExtensionDirs)list.push(p);
             list.push(userExtensionOutputPath);
@@ -134799,7 +134817,7 @@ var __webpack_modules__ = {
     },
     "./package.json" (module) {
         "use strict";
-        module.exports = JSON.parse('{"rE":"3.8.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"}}');
+        module.exports = JSON.parse('{"rE":"3.8.5","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

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