fix: read packageJson.config.prefsPrefix for compatibility

northword · Jan 6, 2025 · 740dcaa · 740dcaa
1 parent 5561a0d
commit 740dcaa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/packages/scaffold/src/config.ts b/packages/scaffold/src/config.ts
@@ -45,7 +45,8 @@ function resolveConfig(config: Config): Context {
   config.id ||= config.name;
   config.namespace ||= config.name;
   config.xpiName ||= kebabCase(config.name);
-  config.build.prefs.prefix ||= `extensions.${config.namespace}`;
+  // Patch to maintain compatibility for zotero-plugin-template users
+  config.build.prefs.prefix ||= pkgUser.config.prefsPrefix || `extensions.${config.namespace}`;
 
   // Parse template strings in config
   const isPreRelease = version.includes("-");

diff --git a/packages/scaffold/src/core/builder.ts b/packages/scaffold/src/core/builder.ts
@@ -280,13 +280,20 @@ export default class Build extends Base {
         for (const match of matchs) {
           const [matched, key] = match;
           if (!prefsWithoutPrefix[key] && !prefsWithoutPrefix[key]) {
-            this.logger.warn(`preference key '${key}' in ${path} not init in prefs.js`);
+            this.logger.warn(`preference key '${key}' in ${path.replace(`${dist}/`, "")} not init in prefs.js`);
             continue;
           }
-          if (key.startsWith(prefix))
+          if (key.startsWith(prefix)) {
             continue;
-          else
+          }
+          // else if (key.startsWith("extensions.")) {
+          //   this.logger.warn(`Pref key '${key}' in ${path} starts with 'extensions' but not ${prefix}.`);
+          //   this.logger.debug(`Skip prefixing '${key}' since it starts with 'extensions'.`);
+          //   continue;
+          // }
+          else {
             content = content.replace(matched, `preference="${prefix}.${key}"`);
+          }
         }
         await outputFile(path, content, "utf-8");
       }));