extension-develop 3.5.1 → 3.6.1

package/dist/928.cjs

@@ -184,6 +184,8 @@ exports.modules = {
             return frameworks.some((fw)=>hasDependency(projectPath, fw));
         }
         var config_loader = __webpack_require__("./webpack/webpack-lib/config-loader.ts");
+        var resolve_config = __webpack_require__("./webpack/feature-special-folders/folder-extensions/resolve-config.ts");
+        var get_data = __webpack_require__("./webpack/feature-special-folders/get-data.ts");
         var sanitize = __webpack_require__("./webpack/webpack-lib/sanitize.ts");
         var branding = __webpack_require__("./webpack/webpack-lib/branding.ts");
         function setupCompilerHooks(compiler, port) {
@@ -343,10 +345,18 @@ exports.modules = {
             const safeBrowserConfig = (0, sanitize.a)(browserConfig);
             const safeCommandConfig = (0, sanitize.a)(commandConfig);
             const safeDevOptions = (0, sanitize.a)(devOptions);
+            const specialFoldersData = (0, get_data.H)(packageJsonDir);
+            const mergedExtensionsConfig = safeDevOptions.extensions ?? safeCommandConfig.extensions ?? safeBrowserConfig.extensions ?? specialFoldersData.extensions;
+            const resolvedExtensionsConfig = await (0, resolve_config.R)({
+                projectRoot: packageJsonDir,
+                browser: devOptions.browser,
+                config: mergedExtensionsConfig
+            });
             const baseConfig = (0, webpack_config["default"])(projectStructure, {
                 ...safeBrowserConfig,
                 ...safeCommandConfig,
                 ...safeDevOptions,
+                extensions: resolvedExtensionsConfig,
                 browser: devOptions.browser,
                 mode: 'development',
                 instanceId: currentInstance.instanceId,

package/dist/content-script-wrapper.cjs

@@ -39,6 +39,31 @@ const external_fs_namespaceObject = require("fs");
 var external_fs_default = /*#__PURE__*/ __webpack_require__.n(external_fs_namespaceObject);
 const external_path_namespaceObject = require("path");
 var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
+function findUpLocalSync(filename, options) {
+    const root = external_path_namespaceObject.parse(options.cwd).root;
+    let currentDir = options.cwd;
+    while(true){
+        const candidate = external_path_namespaceObject.join(currentDir, filename);
+        try {
+            const stat = external_fs_namespaceObject.statSync(candidate);
+            if (stat.isFile()) return candidate;
+        } catch  {}
+        if (currentDir === root) return;
+        currentDir = external_path_namespaceObject.dirname(currentDir);
+    }
+}
+function findNearestPackageJsonSync(manifestPath) {
+    try {
+        const manifestDir = external_path_namespaceObject.dirname(manifestPath);
+        const packageJsonPath = findUpLocalSync('package.json', {
+            cwd: manifestDir
+        });
+        return packageJsonPath || null;
+    } catch (error) {
+        console.warn('Failed to find package.json:', error);
+        return null;
+    }
+}
 const external_schema_utils_namespaceObject = require("schema-utils");
 const core_namespaceObject = require("@swc/core");
 const schema = {
@@ -115,7 +140,9 @@ function content_script_wrapper(source) {
     const options = this.getOptions();
     const compilation = this._compilation;
     const manifestPath = options.manifestPath;
-    const projectPath = external_path_default().dirname(manifestPath);
+    const manifestDir = external_path_default().dirname(manifestPath);
+    const packageJsonPath = findNearestPackageJsonSync(manifestPath);
+    const packageJsonDir = packageJsonPath ? external_path_default().dirname(packageJsonPath) : manifestDir;
     const manifest = JSON.parse(external_fs_default().readFileSync(manifestPath, 'utf-8'));
     const isProd = 'production' === String(options && options.mode || '').toLowerCase();
     (0, external_schema_utils_namespaceObject.validate)(schema, options, {
@@ -129,14 +156,14 @@ function content_script_wrapper(source) {
         const runAtRaw = 'string' == typeof cs?.run_at ? cs.run_at : 'document_idle';
         const runAt = 'document_start' === runAtRaw || 'document_end' === runAtRaw || 'document_idle' === runAtRaw ? runAtRaw : 'document_idle';
         for (const js of jsList)declaredContentJsAbsEntries.push({
-            abs: external_path_default().resolve(projectPath, js),
+            abs: external_path_default().resolve(manifestDir, js),
             runAt
         });
     }
     const resourceAbsPath = external_path_default().normalize(this.resourcePath);
     const declaredEntry = declaredContentJsAbsEntries.find((entry)=>resourceAbsPath === external_path_default().normalize(entry.abs));
     const isDeclaredContentScript = Boolean(declaredEntry);
-    const scriptsDir = external_path_default().resolve(projectPath, "scripts");
+    const scriptsDir = external_path_default().resolve(packageJsonDir, "scripts");
     const relToScripts = external_path_default().relative(scriptsDir, resourceAbsPath);
     const isScriptsFolderScript = relToScripts && !relToScripts.startsWith('..') && !external_path_default().isAbsolute(relToScripts);
     const isContentScriptLike = isDeclaredContentScript || isScriptsFolderScript;
@@ -189,6 +216,47 @@ function content_script_wrapper(source) {
             '} catch (error) {',
             '  // Do nothing',
             '}',
+            'try {',
+            '  if (typeof __webpack_require__ === "function" || typeof __webpack_require__ === "object") {',
+            '    var __extjsHasRuntime = !!(__webpack_require__.webExtRt && __webpack_require__.webExtRt.runtime && typeof __webpack_require__.webExtRt.runtime.getURL === "function");',
+            '    if (!__extjsHasRuntime) {',
+            '    var __extjsGetBase = function(){',
+            '      try {',
+            '        if (typeof document === "object" && document && document.documentElement) {',
+            '          return document.documentElement.getAttribute("data-extjs-extension-base") || "";',
+            '        }',
+            '      } catch (e) {}',
+            '      return "";',
+            '    };',
+            '    var __extjsBase = __extjsGetBase();',
+            '    if (__extjsBase) {',
+            '      __webpack_require__.p = __extjsBase.replace(/\\/+$/, "/");',
+            '    }',
+            '    var __extjsOrigHmrF = __webpack_require__.hmrF;',
+            '    if (typeof __extjsOrigHmrF === "function") {',
+            '      __webpack_require__.hmrF = function(){',
+            '        var base = __extjsGetBase();',
+            '        if (base) {',
+            '          __webpack_require__.p = base.replace(/\\/+$/, "/");',
+            '        }',
+            '        return __extjsOrigHmrF();',
+            '      };',
+            '    }',
+            '    if (!__extjsBase) {',
+            '      var __extjsRetries = 0;',
+            '      var __extjsUpdateBase = function(){',
+            '        var base = __extjsGetBase();',
+            '        if (base) {',
+            '          __webpack_require__.p = base.replace(/\\/+$/, "/");',
+            '        } else if (__extjsRetries++ < 50) {',
+            '          setTimeout(__extjsUpdateBase, 100);',
+            '        }',
+            '      };',
+            '      __extjsUpdateBase();',
+            '    }',
+            '    }',
+            '  }',
+            '} catch (e) {}',
             'function loadInnerWrappedModule(){',
             `  try { import(/* webpackMode: "eager" */ ${innerSpecifier}).catch(function(e){ console.warn('[extension.js] content script failed to load. waiting for next successful compile', e) }) } catch (e) { console.warn('[extension.js] content script failed to load. waiting for next successful compile', e) }`,
             '}',
@@ -213,7 +281,7 @@ function content_script_wrapper(source) {
     const cssSpecifiers = cssImportMatches.map((m)=>m.groups?.bare || m.groups?.from);
     const vueImportMatches = Array.from(source.matchAll(/import\s+(?:['\"](?<bare>[^'\"]+\.vue)['\"]|(?:(?:.+?)\s+from\s+['\"](?<from>[^'\"]+\.vue)['\"]))/g));
     const vueSpecifiers = vueImportMatches.map((m)=>m.groups?.bare || m.groups?.from);
-    const runtimeInline = "function __EXTENSIONJS_whenReady(runAt, cb){\n  try {\n    if (typeof document === 'undefined') { cb(); return function(){} }\n    if (runAt === 'document_start') { cb(); return function(){} }\n    var isDone = false;\n    function isReady(){\n      if (runAt === 'document_end') return document.readyState === 'interactive' || document.readyState === 'complete';\n      if (runAt === 'document_idle') return document.readyState !== 'loading';\n      return document.readyState === 'complete';\n    }\n    if (isReady()) { cb(); return function(){} }\n    var onReady = function(){\n      try {\n        if (isDone) return;\n        if (isReady()) { isDone = true; document.removeEventListener('readystatechange', onReady); cb(); }\n      } catch (e) {}\n    };\n    document.addEventListener('readystatechange', onReady);\n    return function(){ try { if (!isDone) document.removeEventListener('readystatechange', onReady); } catch (e) {} };\n  } catch (e) { try { cb(); } catch (_) {} return function(){} }\n}\nfunction __EXTENSIONJS_mountWithHMR(mount, runAt){\n  var cleanup;\n  var cancelReady = function(){};\n  if (typeof mount !== \"function\") { try { console.warn(\"[extension.js] content script default export must be a function; skipping mount\") } catch (_) {} return function(){} }\n  function apply(){ try { cleanup = mount() } catch (e) { try { console.warn(\"[extension.js] content script default export failed to run\", e) } catch (_) {} } }\n  function unmount(){ try { cancelReady && cancelReady(); } catch (e) {} try { if (typeof cleanup === 'function') cleanup() } catch (e2) {} }\n  function remount(){ unmount(); apply(); }\n  cancelReady = __EXTENSIONJS_whenReady(runAt, apply);\n  if (import.meta.webpackHot) {\n    if (typeof import.meta.webpackHot.accept === \"function\") import.meta.webpackHot.accept();\n    if (typeof import.meta.webpackHot.dispose === \"function\") import.meta.webpackHot.dispose(unmount);\n    if (typeof import.meta.webpackHot.addStatusHandler === \"function\") {\n      import.meta.webpackHot.addStatusHandler(function(s){ if (s==='abort'||s==='fail') { console.warn('[extension.js] HMR status:', s) } });\n    }\n  }\n  var cssEvt='__EXTENSIONJS_CSS_UPDATE__';\n  var onCss=function(){ remount() };\n  window.addEventListener(cssEvt, onCss);\n  return function(){ window.removeEventListener(cssEvt, onCss); unmount(); };\n}\n";
+    const runtimeInline = "function __EXTENSIONJS_whenReady(runAt, cb){\n  try {\n    if (typeof document === 'undefined') { cb(); return function(){} }\n    if (runAt === 'document_start') { cb(); return function(){} }\n    var isDone = false;\n    function isReady(){\n      if (runAt === 'document_end') return document.readyState === 'interactive' || document.readyState === 'complete';\n      if (runAt === 'document_idle') return document.readyState !== 'loading';\n      return document.readyState === 'complete';\n    }\n    if (isReady()) { cb(); return function(){} }\n    var onReady = function(){\n      try {\n        if (isDone) return;\n        if (isReady()) { isDone = true; document.removeEventListener('readystatechange', onReady); cb(); }\n      } catch (e) {}\n    };\n    document.addEventListener('readystatechange', onReady);\n    return function(){ try { if (!isDone) document.removeEventListener('readystatechange', onReady); } catch (e) {} };\n  } catch (e) { try { cb(); } catch (_) {} return function(){} }\n}\nfunction __EXTENSIONJS_mountWithHMR(mount, runAt){\n  var cleanup;\n  var cancelReady = function(){};\n  if (typeof mount !== \"function\") { try { console.warn(\"[extension.js] content script default export must be a function; skipping mount\") } catch (_) {} return function(){} }\n  function apply(){ try { cleanup = mount() } catch (e) { try { console.warn(\"[extension.js] content script default export failed to run\", e) } catch (_) {} } }\n  function unmount(){ try { cancelReady && cancelReady(); } catch (e) {} try { if (typeof cleanup === 'function') cleanup() } catch (e2) {} }\n  function remount(){ unmount(); apply(); }\n  cancelReady = __EXTENSIONJS_whenReady(runAt, apply);\n  if (import.meta.webpackHot) {\n    if (typeof import.meta.webpackHot.accept === \"function\") import.meta.webpackHot.accept();\n    if (typeof import.meta.webpackHot.dispose === \"function\") import.meta.webpackHot.dispose(unmount);\n    if (typeof import.meta.webpackHot.addStatusHandler === \"function\") {\n      import.meta.webpackHot.addStatusHandler(function(s){ if (s==='abort'||s==='fail') { console.warn('[extension.js] HMR status:', s) } });\n    }\n  }\n  try {\n    var hot = (typeof module !== \"undefined\" && module && module.hot) ? module.hot : null;\n    if (hot) {\n      if (typeof hot.accept === \"function\") hot.accept();\n      if (typeof hot.dispose === \"function\") hot.dispose(unmount);\n      if (typeof hot.addStatusHandler === \"function\") {\n        hot.addStatusHandler(function(s){ if (s==='abort'||s==='fail') { console.warn('[extension.js] HMR status:', s) } });\n      }\n    }\n  } catch (e) {}\n  var cssEvt='__EXTENSIONJS_CSS_UPDATE__';\n  var onCss=function(){ remount() };\n  window.addEventListener(cssEvt, onCss);\n  return function(){ window.removeEventListener(cssEvt, onCss); unmount(); };\n}\n";
     if (/\bexport\s+default\s+[A-Za-z_$][\w$]*\s*\(/.test(source) && !/\bexport\s+default\s+function\b/.test(source)) {
         this.emitWarning?.(new Error('Default export appears to be an invocation. Export a function reference instead: `export default function init(){}` or `export default init`.'));
         return source;

package/dist/main-world-bridge.cjs

@@ -15,6 +15,8 @@ __webpack_require__.r(__webpack_exports__);
 const EXTJS_MARK = '__extjs__';
 const REQ_TYPE = 'EXTJS_WTW_LOAD';
 const RES_TYPE = 'EXTJS_WTW_LOADED';
+const EXTJS_BASE_KEY = '__EXTJS_EXTENSION_BASE__';
+const EXTJS_BASE_ATTR = 'data-extjs-extension-base';
 function safeString(x) {
     return 'string' == typeof x && x.length > 0;
 }
@@ -30,6 +32,22 @@ function getRuntime() {
     } catch  {}
     return null;
 }
+function setExtensionBaseUrl() {
+    try {
+        const rt = getRuntime();
+        const getURL = rt?.runtime?.getURL;
+        if ('function' != typeof getURL) return;
+        const base = String(getURL('/'));
+        if (base) {
+            window[EXTJS_BASE_KEY] = base;
+            try {
+                const docEl = document && document.documentElement;
+                if (docEl && 'function' == typeof docEl.setAttribute) docEl.setAttribute(EXTJS_BASE_ATTR, base);
+            } catch  {}
+        }
+    } catch  {}
+}
+setExtensionBaseUrl();
 function resolveExtensionUrl(inputUrl) {
     if (!safeString(inputUrl)) return null;
     if (hasForbiddenProtocol(inputUrl)) return null;

package/dist/minimum-script-file.cjs

@@ -12,14 +12,16 @@ var __webpack_require__ = {};
 })();
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
+const safeLocation = "u" > typeof globalThis ? globalThis.location : void 0;
+const safeHistory = "u" > typeof globalThis ? globalThis.history : void 0;
 try {
-    if ('object' == typeof location && location && String(location.protocol || '').includes('-extension:')) {
-        const q = String(location.search || '');
+    if ('object' == typeof safeLocation && safeLocation && String(safeLocation.protocol || '').includes('-extension:')) {
+        const q = String(safeLocation.search || '');
         if (q.toLowerCase().includes('webpack-dev-server-hot=false')) ;
-        else if ('function' == typeof URL && 'object' == typeof history && history && 'function' == typeof history.replaceState) {
-            const u = new URL(String(location.href));
+        else if ('function' == typeof URL && 'object' == typeof safeHistory && safeHistory && 'function' == typeof safeHistory.replaceState) {
+            const u = new URL(String(safeLocation.href));
             u.searchParams.set('webpack-dev-server-hot', 'false');
-            history.replaceState(null, '', u.toString());
+            safeHistory.replaceState(null, '', u.toString());
         }
     }
 } catch  {}