extension-develop 3.18.5-canary.local-b4fd0431 → 4.0.0

package/dist/0~rspack-config.mjs

@@ -12,11 +12,11 @@ import { getManifestFieldsData } from "browser-extension-manifest-fields";
 import content_security_policy_parser from "content-security-policy-parser";
 import path_0 from "path";
 import fs from "fs";
+import { isResourceUnderDirs, findNearestPackageJsonSync, backgroundIsRequiredMessageOnly, canonicalizeDir } from "./775.mjs";
 import { getCanonicalContentScriptEntryName, parseCanonicalContentScriptAsset, getCanonicalContentScriptJsAssetName, getCanonicalContentScriptCssAssetName, EXTENSIONJS_CONTENT_SCRIPT_LAYER } from "./291.mjs";
 import { isUsingTypeScript, jsFrameworksIntegrationsEnabled, ensureTypeScriptConfig, ensureOptionalContractModuleLoaded, resolveDevelopInstallRoot, isUsingCustomLoader, resolveOptionalDependencySync, loadOptionalContractModuleWithoutInstall, isUsingIntegration as messages_isUsingIntegration, resolveOptionalContractPackageWithoutInstall, jsFrameworksHmrSummary, parseJsonSafe, getUserTypeScriptConfigFile, jsFrameworksConfigsDetected, hasDependency, resolveDevelopDistFile, optional_deps_resolver_ensureOptionalContractPackageResolved } from "./839.mjs";
 import { debugExtensionsToLoad, treeWithSourceFiles, getDirs, bundlerFatalError, bundlerRecompiling, asAbsolute, browserRunnerDisabled, packagingDistributionFiles, PlaywrightPlugin, resolveCompanionExtensionDirs, debugContextPath, noEntrypointsDetected, packagingSourceFiles, debugBrowser, spacerLine, debugOutputPath, messages_ready, manifestInvalidJson, treeWithSourceAndDistFiles, treeWithDistFilesbrowser, getSpecialFoldersDataForCompiler, computeExtensionsToLoad, noCompanionExtensionsResolved } from "./101.mjs";
 import { scrubBrand, makeSanitizedConsole } from "./0~branding.mjs";
-import { findNearestPackageJsonSync, backgroundIsRequiredMessageOnly } from "./224.mjs";
 import { fileURLToPath as __rspack_fileURLToPath } from "node:url";
 import { dirname as __rspack_dirname } from "node:path";
 var __rspack_import_meta_dirname__ = __rspack_dirname(__rspack_fileURLToPath(import.meta.url));
@@ -149,9 +149,9 @@ function resolveTranspilePackageDirs(projectRoot, transpilePackages) {
     return Array.from(resolvedDirs);
 }
 function isSubPath(resourcePath, directoryPath) {
-    const resource = normalizePath(resourcePath);
-    const dir = normalizePath(directoryPath).replace(/\/+$/, '');
-    return resource === dir || resource.startsWith(`${dir}/`);
+    return isResourceUnderDirs(resourcePath, [
+        canonicalizeDir(directoryPath)
+    ]);
 }
 function serverRestartRequiredFromSpecialFolderMessageOnly(addingOrRemoving, folder, typeOfAsset) {
     return `${pintor.red('ERROR')} in ${pintor.yellow('manifest.json')} entrypoint: ${addingOrRemoving} ${pintor.yellow(typeOfAsset)} in ${pintor.underline(folder + '/')} requires a dev server restart to apply changes.`;
@@ -5424,17 +5424,6 @@ function getMainWorldBridgeScripts(manifestPath) {
     } catch  {}
     return bridgeScripts;
 }
-function canonicalizeDir(dir) {
-    try {
-        return __rspack_external_fs.realpathSync.native(dir);
-    } catch  {
-        try {
-            return __rspack_external_fs.realpathSync(dir);
-        } catch  {
-            return dir;
-        }
-    }
-}
 class AddContentScriptWrapper {
     static getBridgeScripts(manifestPath) {
         return getMainWorldBridgeScripts(manifestPath);
@@ -5461,10 +5450,13 @@ class AddContentScriptWrapper {
             manifestDir,
             packageJsonDir
         ];
+        const includeMatcher = (resource)=>isResourceUnderDirs(resource, includeDirs);
         compiler.options.module.rules.push({
             test: /\.(js|cjs|mjs|jsx|mjsx|ts|mts|tsx|mtsx)$/,
             resourceQuery: /__extensionjs_classic_concat__/,
-            include: includeDirs,
+            include: [
+                includeMatcher
+            ],
             exclude: [
                 /([\\/])node_modules\1/
             ],
@@ -5483,7 +5475,9 @@ class AddContentScriptWrapper {
         });
         compiler.options.module.rules.push({
             test: /\.(js|cjs|mjs|jsx|mjsx|ts|mts|tsx|mtsx)$/,
-            include: includeDirs,
+            include: [
+                includeMatcher
+            ],
             exclude: [
                 /([\\/])node_modules\1/
             ],

package/dist/101.mjs

@@ -13,7 +13,7 @@ import * as __rspack_external_fs from "fs";
 import * as __rspack_external_path from "path";
 import * as __rspack_external_os from "os";
 import * as __rspack_external_vm from "vm";
-var package_namespaceObject = /*#__PURE__*/ JSON.parse('{"rE":"3.18.5-canary.local-b4fd0431","El":{"@prefresh/core":"1.5.9","@prefresh/utils":"1.2.1","@rspack/core":"^2.1.1","@rspack/dev-server":"2.1.0","@rspack/plugin-preact-refresh":"2.0.1","@rspack/plugin-react-refresh":"2.0.2","@vue/compiler-sfc":"3.5.26","adm-zip":"^0.5.16","browser-extension-manifest-fields":"^2.2.7","case-sensitive-paths-webpack-plugin":"^2.4.0","content-security-policy-parser":"^0.6.0","dotenv":"^17.2.3","es-module-lexer":"^2.1.0","extension-from-store":"^0.1.1","go-git-it":"^5.1.5","ignore":"^7.0.5","less":"4.5.1","less-loader":"13.0.0","parse5-utilities":"^1.0.0","pintor":"0.3.0","postcss":"8.5.10","postcss-loader":"8.2.1","postcss-preset-env":"11.1.1","postcss-scss":"4.0.9","preact":"10.27.3","prefers-yarn":"2.0.1","react-refresh":"0.18.0","sass-loader":"17.0.0","schema-utils":"^4.3.3","svelte-loader":"3.2.4","tiny-glob":"^0.2.9","typescript":"5.9.3","vue":"3.5.26","vue-loader":"17.4.2","webextension-polyfill":"^0.12.0","webpack-merge":"^6.0.1","webpack-target-webextension":"^2.1.3","ws":"^8.20.1"}}');
+var package_namespaceObject = /*#__PURE__*/ JSON.parse('{"rE":"4.0.0","El":{"@prefresh/core":"1.5.9","@prefresh/utils":"1.2.1","@rspack/core":"^2.1.1","@rspack/dev-server":"2.1.0","@rspack/plugin-preact-refresh":"2.0.1","@rspack/plugin-react-refresh":"2.0.2","@vue/compiler-sfc":"3.5.26","adm-zip":"^0.5.16","browser-extension-manifest-fields":"^2.2.7","case-sensitive-paths-webpack-plugin":"^2.4.0","content-security-policy-parser":"^0.6.0","dotenv":"^17.2.3","es-module-lexer":"^2.1.0","extension-from-store":"^0.1.1","go-git-it":"^5.1.5","ignore":"^7.0.5","less":"4.5.1","less-loader":"13.0.0","parse5-utilities":"^1.0.0","pintor":"0.3.0","postcss":"8.5.10","postcss-loader":"8.2.1","postcss-preset-env":"11.1.1","postcss-scss":"4.0.9","preact":"10.27.3","prefers-yarn":"2.0.1","react-refresh":"0.18.0","sass-loader":"17.0.0","schema-utils":"^4.3.3","svelte-loader":"3.2.4","tiny-glob":"^0.2.9","typescript":"5.9.3","vue":"3.5.26","vue-loader":"17.4.2","webextension-polyfill":"^0.12.0","webpack-merge":"^6.0.1","webpack-target-webextension":"^2.1.3","ws":"^8.20.1"}}');
 const fmt = {
     heading: (title)=>pintor.underline(pintor.blue(title)),
     label: (key)=>pintor.gray(key.toUpperCase()),

package/dist/{224.mjs → 775.mjs}

@@ -32,4 +32,32 @@ function reservedScriptsFolder(relPath, indicators) {
     const reasons = indicators.map((r)=>`- ${pintor.gray(r)}`).join('\n');
     return `${pintor.red('ERROR')} scripts/ is a reserved folder in Extension.js.\nEvery file under ${pintor.yellow("scripts/")} is wrapped with the browser content-script mount runtime, so Node.js-only files placed here will fail to parse or run.\nRename the folder at the project root (for example ${pintor.yellow('bin/')}, ${pintor.yellow('tools/')}, ${pintor.yellow('ops/')}, ${pintor.yellow('tasks/')}, or ${pintor.yellow("ci-scripts/")}) or move the file out of scripts/.\n\n${pintor.red('NODE.JS SHAPE')}\n${reasons}\n${pintor.red('NOT ALLOWED')} ${pintor.underline(relPath)}`;
 }
-export { backgroundIsRequiredMessageOnly, findNearestPackageJsonSync, reservedScriptsFolder };
+function canonicalizeDir(dir) {
+    try {
+        return __rspack_external_fs.realpathSync.native(dir);
+    } catch  {
+        try {
+            return __rspack_external_fs.realpathSync(dir);
+        } catch  {
+            return dir;
+        }
+    }
+}
+function canonicalizeResourcePath(resourcePath) {
+    if ('string' != typeof resourcePath || 0 === resourcePath.length) return resourcePath;
+    try {
+        return __rspack_external_path.normalize(__rspack_external_path.join(canonicalizeDir(__rspack_external_path.dirname(resourcePath)), __rspack_external_path.basename(resourcePath)));
+    } catch  {
+        return __rspack_external_path.normalize(resourcePath);
+    }
+}
+function isResourceUnderDirs(resource, dirs) {
+    if ('string' != typeof resource || 0 === resource.length) return false;
+    const candidate = canonicalizeResourcePath(resource);
+    return dirs.some((dir)=>{
+        if (candidate === dir) return true;
+        const rel = __rspack_external_path.relative(dir, candidate);
+        return rel.length > 0 && !rel.startsWith('..') && !__rspack_external_path.isAbsolute(rel);
+    });
+}
+export { backgroundIsRequiredMessageOnly, canonicalizeDir, canonicalizeResourcePath, findNearestPackageJsonSync, isResourceUnderDirs, reservedScriptsFolder };