extension-develop 3.8.3 → 3.8.5

package/dist/535.cjs

@@ -872,20 +872,9 @@ exports.modules = {
             return styleLoaders.filter(Boolean);
         }
         var is_content_script = __webpack_require__("./webpack/plugin-css/css-lib/is-content-script.ts");
+        var optional_deps_resolver = __webpack_require__("./webpack/webpack-lib/optional-deps-resolver.ts");
         function resolvePreprocessorLoader(loader, projectPath) {
-            const extensionRoot = (0, css_lib_integrations.He)();
-            const paths = [
-                projectPath,
-                extensionRoot || void 0,
-                process.cwd()
-            ].filter(Boolean);
-            try {
-                return require.resolve(loader, {
-                    paths
-                });
-            } catch  {
-                throw new Error(`[CSS] ${loader} could not be resolved for content scripts. Searched: ${paths.join(', ')}`);
-            }
+            return (0, optional_deps_resolver.nR)(loader, projectPath);
         }
         async function cssInContentScriptLoader(projectPath, manifestPath, mode, usage = {}) {
             const { useSass = true, useLess = true } = usage;
@@ -960,19 +949,7 @@ exports.modules = {
             return rules;
         }
         function css_in_html_loader_resolvePreprocessorLoader(loader, projectPath) {
-            const extensionRoot = (0, css_lib_integrations.He)();
-            const paths = [
-                projectPath,
-                extensionRoot || void 0,
-                process.cwd()
-            ].filter(Boolean);
-            try {
-                return require.resolve(loader, {
-                    paths
-                });
-            } catch  {
-                throw new Error(`[CSS] ${loader} could not be resolved for HTML entries. Searched: ${paths.join(', ')}`);
-            }
+            return (0, optional_deps_resolver.nR)(loader, projectPath);
         }
         async function cssInHtmlLoader(projectPath, mode, manifestPath, usage = {}) {
             const { useSass = true, useLess = true } = usage;

package/dist/module.cjs

@@ -131929,7 +131929,7 @@ var __webpack_modules__ = {
         async function maybeUseLess(projectPath, manifestPath) {
             const resolvedManifestPath = manifestPath || path__rspack_import_0.join(projectPath, 'manifest.json');
             if (!isUsingLess(projectPath)) return [];
-            const lessLoaderPath = await (0, _webpack_lib_optional_deps_resolver__rspack_import_5.f)({
+            const lessLoaderPath = await (0, _webpack_lib_optional_deps_resolver__rspack_import_5.fV)({
                 integration: 'LESS',
                 projectPath,
                 dependencyId: 'less-loader',
@@ -132185,7 +132185,7 @@ var __webpack_modules__ = {
             const tailwindPresent = (0, _tailwind__rspack_import_6.F)(projectPath);
             const tailwindConfigured = tailwindPresent || userConfigMentionsTailwind;
             if (!userPostCssConfig && !pkgHasPostCss && !tailwindPresent) return {};
-            const resolvedPostCssLoader = await (0, _webpack_lib_optional_deps_resolver__rspack_import_7.f)({
+            const resolvedPostCssLoader = await (0, _webpack_lib_optional_deps_resolver__rspack_import_7.fV)({
                 integration: 'PostCSS',
                 projectPath,
                 dependencyId: 'postcss-loader',
@@ -132374,7 +132374,7 @@ var __webpack_modules__ = {
         }
         async function maybeUseSass(projectPath) {
             if (!isUsingSass(projectPath)) return [];
-            const sassLoaderPath = await (0, _webpack_lib_optional_deps_resolver__rspack_import_5.f)({
+            const sassLoaderPath = await (0, _webpack_lib_optional_deps_resolver__rspack_import_5.fV)({
                 integration: 'SASS',
                 projectPath,
                 dependencyId: 'sass-loader',
@@ -132581,14 +132581,14 @@ var __webpack_modules__ = {
                 '@rspack/plugin-preact-refresh',
                 'preact'
             ];
-            await (0, _webpack_lib_optional_deps_resolver__rspack_import_5.f)({
+            await (0, _webpack_lib_optional_deps_resolver__rspack_import_5.fV)({
                 integration: 'Preact',
                 projectPath,
                 dependencyId: '@rspack/plugin-preact-refresh',
                 installDependencies: preactDependencies,
                 verifyPackageIds: preactDependencies
             });
-            const PreactRefreshPlugin = await (0, _webpack_lib_optional_deps_resolver__rspack_import_5.C)({
+            const PreactRefreshPlugin = await (0, _webpack_lib_optional_deps_resolver__rspack_import_5.CZ)({
                 integration: 'Preact',
                 projectPath,
                 dependencyId: '@rspack/plugin-preact-refresh',
@@ -132656,14 +132656,14 @@ var __webpack_modules__ = {
                 'react-refresh',
                 '@rspack/plugin-react-refresh'
             ];
-            await (0, _webpack_lib_optional_deps_resolver__rspack_import_5.f)({
+            await (0, _webpack_lib_optional_deps_resolver__rspack_import_5.fV)({
                 integration: 'React',
                 projectPath,
                 dependencyId: 'react-refresh',
                 installDependencies: reactDependencies,
                 verifyPackageIds: reactDependencies
             });
-            const ReactRefreshPlugin = await (0, _webpack_lib_optional_deps_resolver__rspack_import_5.C)({
+            const ReactRefreshPlugin = await (0, _webpack_lib_optional_deps_resolver__rspack_import_5.CZ)({
                 integration: 'React',
                 projectPath,
                 dependencyId: '@rspack/plugin-react-refresh',
@@ -132753,7 +132753,7 @@ var __webpack_modules__ = {
         }
         async function maybeUseSvelte(projectPath, mode) {
             if (!isUsingSvelte(projectPath)) return;
-            const svelteLoaderPath = await (0, _webpack_lib_optional_deps_resolver__rspack_import_6.f)({
+            const svelteLoaderPath = await (0, _webpack_lib_optional_deps_resolver__rspack_import_6.fV)({
                 integration: 'Svelte',
                 projectPath,
                 dependencyId: 'svelte-loader',
@@ -132766,7 +132766,7 @@ var __webpack_modules__ = {
                     'svelte-loader'
                 ]
             });
-            await (0, _webpack_lib_optional_deps_resolver__rspack_import_6.f)({
+            await (0, _webpack_lib_optional_deps_resolver__rspack_import_6.fV)({
                 integration: 'TypeScript',
                 projectPath,
                 dependencyId: "typescript",
@@ -133008,14 +133008,14 @@ var __webpack_modules__ = {
                 'vue-loader',
                 '@vue/compiler-sfc'
             ];
-            const vueLoaderPath = await (0, _webpack_lib_optional_deps_resolver__rspack_import_7.f)({
+            const vueLoaderPath = await (0, _webpack_lib_optional_deps_resolver__rspack_import_7.fV)({
                 integration: 'Vue',
                 projectPath,
                 dependencyId: 'vue-loader',
                 installDependencies: vueDependencies,
                 verifyPackageIds: vueDependencies
             });
-            const VueLoaderPlugin = await (0, _webpack_lib_optional_deps_resolver__rspack_import_7.C)({
+            const VueLoaderPlugin = await (0, _webpack_lib_optional_deps_resolver__rspack_import_7.CZ)({
                 integration: 'Vue',
                 projectPath,
                 dependencyId: 'vue-loader',
@@ -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);
@@ -133863,8 +133881,9 @@ var __webpack_modules__ = {
     "./webpack/webpack-lib/optional-deps-resolver.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
         "use strict";
         __webpack_require__.d(__webpack_exports__, {
-            C: ()=>ensureOptionalModuleLoaded,
-            f: ()=>ensureOptionalPackageResolved
+            CZ: ()=>ensureOptionalModuleLoaded,
+            fV: ()=>ensureOptionalPackageResolved,
+            nR: ()=>resolveOptionalDependencySync
         });
         var fs__rspack_import_0 = __webpack_require__("fs");
         var path__rspack_import_1 = __webpack_require__("path");
@@ -133878,6 +133897,7 @@ var __webpack_modules__ = {
                 extensionRoot || void 0,
                 process.cwd()
             ].filter(Boolean);
+            if (extensionRoot && extensionRoot.includes('.pnpm')) bases.push(path__rspack_import_1.join(extensionRoot, '..', '..'));
             return Array.from(new Set(bases));
         }
         function packageJsonPath(basePath) {
@@ -133916,7 +133936,9 @@ var __webpack_modules__ = {
             const resolved = resolveDependency(dependencyId, projectPath);
             if (resolved) return resolved.resolvedPath;
             if (!installRoot) return;
-            return resolveFromInstallRootPackageDir(dependencyId, installRoot);
+            const fromRoot = resolveFromInstallRootPackageDir(dependencyId, installRoot);
+            if (fromRoot) return fromRoot;
+            if (installRoot.includes('.pnpm')) return resolveFromInstallRootPackageDir(dependencyId, path__rspack_import_1.join(installRoot, '..', '..'));
         }
         function getPackageDirFromInstallRoot(dependencyId, installRoot) {
             return path__rspack_import_1.join(installRoot, 'node_modules', ...dependencyId.split('/'));
@@ -134044,6 +134066,13 @@ var __webpack_modules__ = {
                 installSingleFlight.delete(key);
             }
         }
+        function resolveOptionalDependencySync(dependencyId, projectPath) {
+            const installRoot = (0, _plugin_css_css_lib_integrations__rspack_import_3.He)();
+            const resolved = resolveFromKnownLocations(dependencyId, projectPath, installRoot);
+            if (resolved) return resolved;
+            const bases = getResolutionBases(projectPath);
+            throw new Error(`[CSS] ${dependencyId} could not be resolved. Searched: ${bases.join(', ')}`);
+        }
         async function ensureOptionalPackageResolved(input) {
             const installRoot = (0, _plugin_css_css_lib_integrations__rspack_import_3.He)();
             const resolvedBeforeInstall = resolveFromKnownLocations(input.dependencyId, input.projectPath, installRoot);
@@ -134788,7 +134817,7 @@ var __webpack_modules__ = {
     },
     "./package.json" (module) {
         "use strict";
-        module.exports = JSON.parse('{"rE":"3.8.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.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__ = {};
@@ -135429,6 +135458,7 @@ var __webpack_exports__ = {};
             extensionRoot || void 0,
             process.cwd()
         ].filter(Boolean);
+        if (extensionRoot && extensionRoot.includes('.pnpm')) paths.push(external_path_.join(extensionRoot, '..', '..'));
         return Array.from(new Set(paths));
     }
     function canResolveFromProject(id, projectPath) {

package/package.json

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