extension-develop 3.5.1 → 3.6.0

package/dist/warn-no-default-export.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 core_namespaceObject = require("@swc/core");
 const external_schema_utils_namespaceObject = require("schema-utils");
 const schema = {
@@ -197,7 +222,9 @@ function warn_no_default_export(source) {
     });
     try {
         const resourceAbsPath = external_path_default().normalize(this.resourcePath);
-        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 compilation = this._compilation;
         const dedupeKey = `no-default:${resourceAbsPath}`;
         if (compilation) {
@@ -208,10 +235,10 @@ function warn_no_default_export(source) {
         const contentScripts = Array.isArray(manifest.content_scripts) ? manifest.content_scripts : [];
         for (const contentScript of contentScripts){
             const contentScriptJsList = Array.isArray(contentScript?.js) ? contentScript.js : [];
-            for (const contentScriptJs of contentScriptJsList)declaredContentJsAbsPaths.push(external_path_default().resolve(projectPath, contentScriptJs));
+            for (const contentScriptJs of contentScriptJsList)declaredContentJsAbsPaths.push(external_path_default().resolve(manifestDir, contentScriptJs));
         }
         const isDeclaredContentScript = declaredContentJsAbsPaths.some((abs)=>resourceAbsPath === external_path_default().normalize(abs));
-        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;
@@ -224,7 +251,7 @@ function warn_no_default_export(source) {
                         compilation.__extjsWarnedDefaultExportKinds ??= new Set();
                         if (compilation.__extjsWarnedDefaultExportKinds.has(dedupeKindKey)) return source;
                     }
-                    const relativeFile = external_path_default().relative(projectPath, resourceAbsPath);
+                    const relativeFile = external_path_default().relative(packageJsonDir, resourceAbsPath);
                     const found = 'class' === analysis.kind ? 'class' : 'non-callable value';
                     const message = [
                         "Content script default export must be a function.",
@@ -247,7 +274,7 @@ function warn_no_default_export(source) {
                     compilation?.__extjsWarnedDefaultExportKinds?.add(dedupeKindKey);
                 }
             } else {
-                const relativeFile = external_path_default().relative(projectPath, resourceAbsPath);
+                const relativeFile = external_path_default().relative(packageJsonDir, resourceAbsPath);
                 const message = [
                     "Content script requires a default export.",
                     `File: ${relativeFile}`,

package/package.json

@@ -24,7 +24,7 @@
     "webpack/webpack-lib/build-dependencies.json"
   ],
   "name": "extension-develop",
-  "version": "3.5.1",
+  "version": "3.6.0",
   "description": "Develop, build, preview, and package Extension.js projects.",
   "author": {
     "name": "Cezar Augusto",
@@ -85,6 +85,7 @@
     "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",